[cairo-commit] cairo-demo/png ChangeLog,1.6,1.7 write_png.c,1.2,1.3 write_png.h,1.1,1.2

[Richard Worth]

Committed by: rworth

Update of /cvs/cairo/cairo-demo/png
In directory pdx:/tmp/cvs-serv21553

Modified Files:
	ChangeLog write_png.c write_png.h 
Log Message:
* write_png.c, write_png.h: style changes


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-demo/png/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** a/ChangeLog	19 Feb 2004 23:22:04 -0000	1.6
--- b/ChangeLog	13 Mar 2004 11:57:33 -0000	1.7
***************
*** 1,2 ****
--- 1,6 ----
+ 2004-03-13  Richard Worth  <richard at theworths.org>
+ 
+ 	* write_png.c, write_png.h: style changes
+ 
  2004-02-19  Dave Beckett  <Dave.Beckett at bristol.ac.uk>
  

Index: write_png.c
===================================================================
RCS file: /cvs/cairo/cairo-demo/png/write_png.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** a/write_png.c	10 Dec 2003 21:32:10 -0000	1.2
--- b/write_png.c	13 Mar 2004 11:57:33 -0000	1.3
***************
*** 27,32 ****
  
  #include <stdio.h>
- #include <png.h>
  #include <stdlib.h>
  
  #include "write_png.h"
--- 27,32 ----
  
  #include <stdio.h>
  #include <stdlib.h>
+ #include <png.h>
  
  #include "write_png.h"
***************
*** 54,72 ****
  
  void
! write_png_argb32 (char *buffer, char* filename,
  		  int width, int height, int stride)
  {
!     FILE* f;
!     png_struct* png;
!     png_info* info;
!     png_byte** rows;
!     int       i;
      png_color_16 white;
      
      f = fopen (filename, "w");
!     rows = malloc (height*sizeof (png_byte*));
  
!     for (i=0;i<height;i++) {
! 	rows[i]=buffer+i*stride;
      }
  
--- 54,72 ----
  
  void
! write_png_argb32 (char *buffer, char *filename,
  		  int width, int height, int stride)
  {
!     FILE *f;
!     int i;
!     png_struct *png;
!     png_info *info;
!     png_byte **rows;
      png_color_16 white;
      
      f = fopen (filename, "w");
!     rows = malloc (height * sizeof(png_byte*));
  
!     for (i = 0; i < height; i++) {
! 	rows[i] = buffer + i * stride;
      }
  
***************
*** 82,88 ****
  		  PNG_FILTER_TYPE_DEFAULT);
  
!     white.red=0xff;
!     white.blue=0xff;
!     white.green=0xff;
      png_set_bKGD (png, info, &white);
  
--- 82,88 ----
  		  PNG_FILTER_TYPE_DEFAULT);
  
!     white.red = 0xff;
!     white.blue = 0xff;
!     white.green = 0xff;
      png_set_bKGD (png, info, &white);
  

Index: write_png.h
===================================================================
RCS file: /cvs/cairo/cairo-demo/png/write_png.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** a/write_png.h	18 Aug 2003 18:11:38 -0000	1.1
--- b/write_png.h	13 Mar 2004 11:57:33 -0000	1.2
***************
*** 30,34 ****
  
  void
! write_png_argb32 (char *buffer, char* filename,
  		  int width, int height, int stride);
  
--- 30,34 ----
  
  void
! write_png_argb32 (char *buffer, char *filename,
  		  int width, int height, int stride);