FCL/sf/mw/qt: comparison src/3rdparty/libpng/example.c

equal deleted inserted replaced

-:b72c6db6890b
+:5dc02b23752f
 #if 0 /* in case someone actually tries to compile this */
 /* example.c - an example of using libpng
-* Last changed in libpng 1.2.37 [June 4, 2009]
+* Last changed in libpng 1.4.0 [January 3, 2010]
 * This file has been placed in the public domain by the authors.
-* Maintained 1998-2009 Glenn Randers-Pehrson
+* Maintained 1998-2010 Glenn Randers-Pehrson
 * Maintained 1996, 1997 Andreas Dilger)
 * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
 */
 /* This is an example of how to use libpng to read and write PNG files.
 /* Allocate/initialize the memory for image information.  REQUIRED. */
 info_ptr = png_create_info_struct(png_ptr);
 if (info_ptr == NULL)
 {
 fclose(fp);
-png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+png_destroy_read_struct(&png_ptr, NULL, NULL);
 return (ERROR);
 }
 /* Set error handling if you are using the setjmp/longjmp method (this is
 * the normal method of doing things with libpng).  REQUIRED unless you
 */
 if (setjmp(png_jmpbuf(png_ptr)))
 {
 /* Free all of the memory associated with the png_ptr and info_ptr */
-png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 fclose(fp);
 /* If we get here, we had a problem reading the file */
 return (ERROR);
 }
 * with one of the PNG_TRANSFORM_* bits (this presently excludes
 * dithering, filling, setting background, and doing gamma
 * adjustment), then you can read the entire image (including
 * pixels) into the info structure with this call:
 */
-png_read_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
+png_read_png(png_ptr, info_ptr, png_transforms, NULL);
 #else
 /* OK, you're doing it the hard way, with the lower-level functions */
 /* The call to png_read_info() gives us all of the information from the
 * PNG file before the first IDAT (image data chunk).  REQUIRED
 */
 png_read_info(png_ptr, info_ptr);
 png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
-&interlace_type, int_p_NULL, int_p_NULL);
+&interlace_type, NULL, NULL);
 /* Set up the data transformations you want.  Note that these are all
 * optional.  Only call them if you want/need them.  Many of the
 * transformations only work on specific types of images, and many
 * are mutually exclusive.
 {
 /* An array of colors to which the image should be dithered */
 png_color std_color_cube[MAX_SCREEN_COLORS];
 png_set_dither(png_ptr, std_color_cube, MAX_SCREEN_COLORS,
-MAX_SCREEN_COLORS, png_uint_16p_NULL, 0);
+MAX_SCREEN_COLORS, NULL, 0);
 }
 /* This reduces the image to the palette supplied in the file */
 else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette))
 {
 png_uint_16p histogram = NULL;
 for (pass = 0; pass < number_passes; pass++)
 {
 #ifdef single /* Read the image a single row at a time */
 for (y = 0; y < height; y++)
 {
-png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL, 1);
+png_read_rows(png_ptr, &row_pointers[y], NULL, 1);
 }
 #else no_single /* Read the image several rows at a time */
 for (y = 0; y < height; y += number_of_rows)
 {
 #ifdef sparkle /* Read the image using the "sparkle" effect. */
-png_read_rows(png_ptr, &row_pointers[y], png_bytepp_NULL,
+png_read_rows(png_ptr, &row_pointers[y], NULL,
 number_of_rows);
 #else no_sparkle /* Read the image using the "rectangle" effect */
-png_read_rows(png_ptr, png_bytepp_NULL, &row_pointers[y],
+png_read_rows(png_ptr, NULL, &row_pointers[y],
 number_of_rows);
 #endif no_sparkle /* Use only one of these two methods */
 }
 /* If you want to display the image after every pass, do so here */
 #endif hilevel
 /* At this point you have read the entire image */
 /* Clean up after the read, and free any memory allocated - REQUIRED */
-png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
 /* Close the file */
 fclose(fp);
 /* That's it */
 *info_ptr = png_create_info_struct(png_ptr);
 if (*info_ptr == NULL)
 {
-png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
+png_destroy_read_struct(png_ptr, info_ptr, NULL);
 return (ERROR);
 }
 if (setjmp(png_jmpbuf((*png_ptr))))
 {
-png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
+png_destroy_read_struct(png_ptr, info_ptr, NULL);
 return (ERROR);
 }
 /* This one's new.  You will need to provide all three
 * function callbacks, even if you aren't using them all.
 png_bytep buffer, png_uint_32 length)
 {
 if (setjmp(png_jmpbuf((*png_ptr))))
 {
 /* Free the png_ptr and info_ptr memory on error */
-png_destroy_read_struct(png_ptr, info_ptr, png_infopp_NULL);
+png_destroy_read_struct(png_ptr, info_ptr, NULL);
 return (ERROR);
 }
 /* This one's new also.  Simply give it chunks of data as
 * they arrive from the data stream (in order, of course).
 /* Allocate/initialize the image information data.  REQUIRED */
 info_ptr = png_create_info_struct(png_ptr);
 if (info_ptr == NULL)
 {
 fclose(fp);
-png_destroy_write_struct(&png_ptr,  png_infopp_NULL);
+png_destroy_write_struct(&png_ptr,  NULL);
 return (ERROR);
 }
 /* Set error handling.  REQUIRED if you aren't supplying your own
 * error handling functions in the png_create_write_struct() call.
 #ifdef hilevel
 /* This is the easy way.  Use it if you already have all the
 * image info living in the structure.  You could "|" many
 * PNG_TRANSFORM flags into the png_transforms integer here.
 */
-png_write_png(png_ptr, info_ptr, png_transforms, png_voidp_NULL);
+png_write_png(png_ptr, info_ptr, png_transforms, NULL);
 #else
 /* This is the hard way */
 /* Set the image information here.  Width and height are up to 2^31,

changeset 30	5dc02b23752f
parent 0	1918ee327afb