Binary files libpng-1.2.25/contrib/gregbook/toucan.png and libpng-1.2.26beta01/contrib/gregbook/toucan.png differ diff -ru4N libpng-1.2.25/png.h libpng-1.2.26beta01/png.h --- libpng-1.2.25/png.h Mon Feb 18 16:31:08 2008 +++ libpng-1.2.26beta01/png.h Thu Feb 21 13:31:07 2008 @@ -176,8 +176,11 @@ * 1.2.24rc01 13 10224 12.so.0.24[.0] * 1.2.24 13 10224 12.so.0.24[.0] * 1.2.25beta01-06 13 10225 12.so.0.25[.0] * 1.2.25rc01-02 13 10225 12.so.0.25[.0] + * 1.0.31 10 10031 10.so.0.31[.0] + * 1.2.25 13 10225 12.so.0.25[.0] + * 1.2.26beta01 13 10226 12.so.0.26[.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 diff -ru4N libpng-1.2.25/pngmem.c libpng-1.2.26beta01/pngmem.c --- libpng-1.2.25/pngmem.c Mon Feb 18 16:31:08 2008 +++ libpng-1.2.26beta01/pngmem.c Thu Feb 21 13:31:07 2008 @@ -455,9 +455,9 @@ #ifdef PNG_MAX_MALLOC_64K if (size > (png_uint_32)65536L) { #ifndef PNG_USER_MEM_SUPPORTED - if(png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0) + if ((png_ptr->flags&PNG_FLAG_MALLOC_NULL_MEM_OK) == 0) png_error(png_ptr, "Cannot Allocate > 64K"); else #endif return NULL;