diff -ru4NwbB libpng-1.4.5/contrib/pngminim/encoder/pngusr.h libpng-1.4.6beta03/contrib/pngminim/encoder/pngusr.h --- libpng-1.4.5/contrib/pngminim/encoder/pngusr.h 2010-12-09 07:48:12.146321599 -0600 +++ libpng-1.4.6beta03/contrib/pngminim/encoder/pngusr.h 2011-01-14 21:02:09.314831849 -0600 @@ -69,7 +69,7 @@ #define PNG_NO_ERROR_NUMBERS #define PNG_NO_EASY_ACCESS #define PNG_NO_USER_LIMITS #define PNG_NO_SET_USER_LIMITS -#define PNG_NO_TIME_RFC1143 +#define PNG_NO_TIME_RFC1123 #endif /* MINWRPNGCONF_H */ diff -ru4NwbB libpng-1.4.5/contrib/pngminim/preader/pngusr.h libpng-1.4.6beta03/contrib/pngminim/preader/pngusr.h --- libpng-1.4.5/contrib/pngminim/preader/pngusr.h 2010-12-09 07:48:12.181767101 -0600 +++ libpng-1.4.6beta03/contrib/pngminim/preader/pngusr.h 2011-01-14 21:02:09.349348982 -0600 @@ -62,7 +62,7 @@ #define PNG_NO_ERROR_NUMBERS #define PNG_NO_EASY_ACCESS #define PNG_NO_USER_LIMITS #define PNG_NO_SET_USER_LIMITS -#define PNG_NO_TIME_RFC1143 +#define PNG_NO_TIME_RFC1123 #endif /* MINPRDPNGCONF_H */ diff -ru4NwbB libpng-1.4.5/png.h libpng-1.4.6beta03/png.h --- libpng-1.4.5/png.h 2010-12-09 07:48:11.265430061 -0600 +++ libpng-1.4.6beta03/png.h 2011-01-14 21:02:08.423523450 -0600 @@ -152,8 +152,10 @@ * 1.4.5rc01 14 10405 14.so.14.5[.0] * 1.4.5beta05-07 14 10405 14.so.14.5[.0] * 1.4.5rc02-03 14 10405 14.so.14.5[.0] * 1.4.5 14 10405 14.so.14.5[.0] + * 1.4.6beta01-03 14 10406 14.so.14.6[.0] + * 1.4.6rc01 14 10406 14.so.14.6[.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 -ru4NwbB libpng-1.4.5/pngread.c libpng-1.4.6beta03/pngread.c --- libpng-1.4.5/pngread.c 2010-12-09 07:48:11.337481929 -0600 +++ libpng-1.4.6beta03/pngread.c 2011-01-14 21:02:08.496402067 -0600 @@ -1,9 +1,9 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.5 [January 15, 2011] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.4.6 [January 14, 2011] + * Copyright (c) 1998-2011 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.) * * This code is released under the libpng license. diff -ru4NwbB libpng-1.4.5/pngrio.c libpng-1.4.6beta03/pngrio.c --- libpng-1.4.5/pngrio.c 2010-12-09 07:48:11.342533773 -0600 +++ libpng-1.4.6beta03/pngrio.c 2011-01-14 21:02:08.501524558 -0600 @@ -1,9 +1,9 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.5 [January 15, 2011] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.4.6 [January 14, 2011] + * Copyright (c) 1998-2011 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.) * * This code is released under the libpng license. diff -ru4NwbB libpng-1.4.5/pngrtran.c libpng-1.4.6beta03/pngrtran.c --- libpng-1.4.5/pngrtran.c 2010-12-09 07:48:11.359864654 -0600 +++ libpng-1.4.6beta03/pngrtran.c 2011-01-14 21:02:08.518416203 -0600 @@ -1,9 +1,9 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.5 [January 15, 2011] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.4.6 [%RDATE%] + * Copyright (c) 1998-2011 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.) * * This code is released under the libpng license. @@ -1007,9 +1007,9 @@ * to a simple alpha channel strip. */ png_ptr->transformations &= ~PNG_BACKGROUND; png_ptr->transformations &= ~PNG_GAMMA; - png_ptr->transformations |= PNG_STRIP_ALPHA; + png_ptr->flags |= PNG_FLAG_STRIP_ALPHA; } /* if (png_ptr->background_gamma_type!=PNG_BACKGROUND_GAMMA_UNKNOWN) */ else /* color_type != PNG_COLOR_TYPE_PALETTE */ @@ -1130,9 +1130,9 @@ } /* Handled alpha, still need to strip the channel. */ png_ptr->transformations &= ~PNG_BACKGROUND; - png_ptr->transformations |= PNG_STRIP_ALPHA; + png_ptr->flags |= PNG_FLAG_STRIP_ALPHA; } #endif /* PNG_READ_BACKGROUND_SUPPORTED */ #ifdef PNG_READ_SHIFT_SUPPORTED diff -ru4NwbB libpng-1.4.5/pngrutil.c libpng-1.4.6beta03/pngrutil.c --- libpng-1.4.5/pngrutil.c 2010-12-09 07:48:11.374981056 -0600 +++ libpng-1.4.6beta03/pngrutil.c 2011-01-14 21:02:08.533451249 -0600 @@ -1,9 +1,9 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.5 [January 15, 2011] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.4.6 [January 14, 2011] + * Copyright (c) 1998-2011 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.) * * This code is released under the libpng license. @@ -137,9 +137,9 @@ /* Put the chunk name into png_ptr->chunk_name. */ png_memcpy(png_ptr->chunk_name, buf + 4, 4); png_debug2(0, "Reading %s chunk, length = %lu", - png_ptr->chunk_name, length); + png_ptr->chunk_name, (unsigned long)length); /* Reset the crc and run it over the chunk name. */ png_reset_crc(png_ptr); png_calculate_crc(png_ptr, png_ptr->chunk_name, 4); @@ -1725,9 +1725,9 @@ return; } png_debug1(2, "Allocating and reading pCAL chunk data (%lu bytes)", - length + 1); + (unsigned long)(length + 1)); png_free(png_ptr, png_ptr->chunkdata); png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1); if (png_ptr->chunkdata == NULL) { @@ -1863,9 +1863,9 @@ return; } png_debug1(2, "Allocating and reading sCAL chunk data (%lu bytes)", - length + 1); + (unsigned long)(length + 1)); png_ptr->chunkdata = (png_charp)png_malloc_warn(png_ptr, length + 1); if (png_ptr->chunkdata == NULL) { png_warning(png_ptr, "Out of memory while processing sCAL chunk"); @@ -2970,9 +2970,10 @@ png_read_filter_row(png_structp png_ptr, png_row_infop row_info, png_bytep row, png_bytep prev_row, int filter) { png_debug(1, "in png_read_filter_row"); - png_debug2(2, "row = %lu, filter = %d", png_ptr->row_number, filter); + png_debug2(2, "row = %lu, filter = %d", + (unsigned long)png_ptr->row_number, filter); switch (filter) { case PNG_FILTER_VALUE_NONE: break; @@ -3411,15 +3412,15 @@ } png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1); - png_debug1(3, "width = %lu,", png_ptr->width); - png_debug1(3, "height = %lu,", png_ptr->height); - png_debug1(3, "iwidth = %lu,", png_ptr->iwidth); - png_debug1(3, "num_rows = %lu,", png_ptr->num_rows); - png_debug1(3, "rowbytes = %lu,", png_ptr->rowbytes); + png_debug1(3, "width = %lu,", (unsigned long)png_ptr->width); + png_debug1(3, "height = %lu,", (unsigned long)png_ptr->height); + png_debug1(3, "iwidth = %lu,", (unsigned long)png_ptr->iwidth); + png_debug1(3, "num_rows = %lu,", (unsigned long)png_ptr->num_rows); + png_debug1(3, "rowbytes = %lu,", (unsigned long)png_ptr->rowbytes); png_debug1(3, "irowbytes = %lu", - PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1); + (unsigned long)PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->iwidth) + 1); png_ptr->flags |= PNG_FLAG_ROW_INIT; } #endif /* PNG_READ_SUPPORTED */ diff -ru4NwbB libpng-1.4.5/pngset.c libpng-1.4.6beta03/pngset.c --- libpng-1.4.5/pngset.c 2010-12-09 07:48:11.383950690 -0600 +++ libpng-1.4.6beta03/pngset.c 2011-01-14 21:02:08.542252543 -0600 @@ -1,9 +1,9 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.5 [January 15, 2011] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.4.6 [January 14, 2011] + * Copyright (c) 1998-2011 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.) * * This code is released under the libpng license. diff -ru4NwbB libpng-1.4.5/pngtest.c libpng-1.4.6beta03/pngtest.c --- libpng-1.4.5/pngtest.c 2010-12-09 07:48:11.393765714 -0600 +++ libpng-1.4.6beta03/pngtest.c 2011-01-14 21:02:08.551852883 -0600 @@ -1,9 +1,9 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.5 [January 15, 2011] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.4.6 [January 14, 2011] + * Copyright (c) 1998-2011 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.) * * This code is released under the libpng license. diff -ru4NwbB libpng-1.4.5/pngwrite.c libpng-1.4.6beta03/pngwrite.c --- libpng-1.4.5/pngwrite.c 2010-12-09 07:48:11.415259742 -0600 +++ libpng-1.4.6beta03/pngwrite.c 2011-01-14 21:02:08.573279129 -0600 @@ -1,9 +1,9 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.4.0 [January 3, 2010] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.4.6 [January 14, 2011] + * Copyright (c) 1998-2011 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.) * * This code is released under the libpng license. @@ -660,10 +660,10 @@ { if (png_ptr == NULL) return; - png_debug2(1, "in png_write_row (row %ld, pass %d)", - png_ptr->row_number, png_ptr->pass); + png_debug2(1, "in png_write_row (row %lu, pass %d)", + (unsigned long)png_ptr->row_number, png_ptr->pass); /* Initialize transformations and other stuff if first time */ if (png_ptr->row_number == 0 && png_ptr->pass == 0) { @@ -777,9 +777,10 @@ png_ptr->row_info.rowbytes = PNG_ROWBYTES(png_ptr->row_info.pixel_depth, png_ptr->row_info.width); png_debug1(3, "row_info->color_type = %d", png_ptr->row_info.color_type); - png_debug1(3, "row_info->width = %lu", png_ptr->row_info.width); + png_debug1(3, "row_info->width = %lu", + (unsigned long)png_ptr->row_info.width); png_debug1(3, "row_info->channels = %d", png_ptr->row_info.channels); png_debug1(3, "row_info->bit_depth = %d", png_ptr->row_info.bit_depth); png_debug1(3, "row_info->pixel_depth = %d", png_ptr->row_info.pixel_depth); png_debug1(3, "row_info->rowbytes = %lu", png_ptr->row_info.rowbytes);