diff -ru4NwbB libpng-1.2.38/png.c libpng-1.2.39beta02/png.c --- libpng-1.2.38/png.c 2009-07-16 05:58:32.186509840 -0500 +++ libpng-1.2.39beta02/png.c 2009-07-27 22:24:23.344140170 -0500 @@ -1,8 +1,8 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.37 [June 4, 2009] + * Last changed in libpng 1.2.39 [July 28, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -147,9 +147,9 @@ /* Function to allocate memory for zlib and clear it to 0. */ #ifdef PNG_1_0_X voidpf PNGAPI #else -voidpf /* private */ +voidpf /* PRIVATE */ #endif png_zalloc(voidpf png_ptr, uInt items, uInt size) { png_voidp ptr; @@ -191,9 +191,9 @@ /* Function to free memory for zlib */ #ifdef PNG_1_0_X void PNGAPI #else -void /* private */ +void /* PRIVATE */ #endif png_zfree(voidpf png_ptr, voidpf ptr) { png_free((png_structp)png_ptr, (png_voidp)ptr); @@ -827,9 +827,13 @@ * C and D are the 16-bit words of V2, AD is the product of * A and D, and X || Y is (X << 16) + Y. */ -void png_64bit_product (long v1, long v2, unsigned long *hi_product, +void /* PRIVATE */ +png_64bit_product (long v1, long v2, unsigned long *hi_product, + unsigned long *lo_product); +void /* PRIVATE */ +png_64bit_product (long v1, long v2, unsigned long *hi_product, unsigned long *lo_product) { int a, b, c, d; long lo, hi, x, y; @@ -851,9 +855,9 @@ *hi_product = (unsigned long)hi; *lo_product = (unsigned long)lo; } -int /* private */ +int /* PRIVATE */ png_check_cHRM_fixed(png_structp png_ptr, png_fixed_point white_x, png_fixed_point white_y, png_fixed_point red_x, png_fixed_point red_y, png_fixed_point green_x, png_fixed_point green_y, png_fixed_point blue_x, png_fixed_point blue_y) diff -ru4NwbB libpng-1.2.38/png.h libpng-1.2.39beta02/png.h --- libpng-1.2.38/png.h 2009-07-19 13:30:15.661713321 -0500 +++ libpng-1.2.39beta02/png.h 2009-07-27 22:24:23.321312695 -0500 @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.38 - July 16, 2009 + * libpng version 1.2.39beta02 - July 28, 2009 * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -9,9 +9,9 @@ * * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.38 - July 16, 2009: Glenn + * libpng versions 0.97, January 1998, through 1.2.39beta02 - July 28, 2009: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: * @@ -236,8 +236,9 @@ * 1.2.38beta01 13 10238 12.so.0.38[.0] * 1.2.38rc01-03 13 10238 12.so.0.38[.0] * 1.0.47 10 10047 10.so.0.47[.0] * 1.2.38 13 10238 12.so.0.38[.0] + * 1.2.39beta01-02 13 10239 12.so.0.39[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be * used for changes in backward compatibility, as it is intended. The @@ -267,9 +268,9 @@ * this sentence. * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.2.38, July 16, 2009, are + * libpng versions 1.2.6, August 15, 2004, through 1.2.39beta02, July 28, 2009, are * Copyright (c) 2004, 2006-2009 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: * @@ -379,15 +380,15 @@ /* * Y2K compliance in libpng: * ========================= * - * July 16, 2009 + * July 28, 2009 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.2.38 are Y2K compliant. It is my belief that earlier + * upward through 1.2.39beta02 are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer * that will hold years up to 65535. The other two hold the date in text @@ -441,11 +442,11 @@ * at the actual function definitions and structure components. */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.38" +#define PNG_LIBPNG_VER_STRING "1.2.39beta02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.38 - July 16, 2009\n" + " libpng version 1.2.39beta02 - July 28, 2009\n" #define PNG_LIBPNG_VER_SONUM %SONUM% #define PNG_LIBPNG_VER_DLLNUM %DLLNUM% diff -ru4NwbB libpng-1.2.38/pngconf.h libpng-1.2.39beta02/pngconf.h --- libpng-1.2.38/pngconf.h 2009-07-19 13:30:32.001356007 -0500 +++ libpng-1.2.39beta02/pngconf.h 2009-07-27 22:24:23.329961671 -0500 @@ -1,8 +1,8 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.38 - July 16, 2009 + * libpng version 1.2.39beta02 - July 28, 2009 * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * diff -ru4NwbB libpng-1.2.38/pngrutil.c libpng-1.2.39beta02/pngrutil.c --- libpng-1.2.38/pngrutil.c 2009-07-19 13:31:12.427315118 -0500 +++ libpng-1.2.39beta02/pngrutil.c 2009-07-27 22:24:23.414260187 -0500 @@ -1,8 +1,8 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.38 [July 16, 2009] + * Last changed in libpng 1.2.38 [June 16, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * diff -ru4NwbB libpng-1.2.38/pngset.c libpng-1.2.39beta02/pngset.c --- libpng-1.2.38/pngset.c 2009-07-19 13:31:09.105481885 -0500 +++ libpng-1.2.39beta02/pngset.c 2009-07-27 22:24:23.422258889 -0500 @@ -1,8 +1,8 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.2.38 [July 16, 2009] + * Last changed in libpng 1.2.39 [July 28, 2009] * Copyright (c) 1998-2009 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * @@ -707,9 +707,10 @@ int num_text) { int i; - png_debug1(1, "in %s storage function", (png_ptr->chunk_name[0] == '\0' ? + png_debug1(1, "in %s storage function", ((png_ptr == NULL || + png_ptr->chunk_name[0] == '\0') ? "text" : (png_const_charp)png_ptr->chunk_name)); if (png_ptr == NULL || info_ptr == NULL || num_text == 0) return(0);