diff -ru4NwbB libpng-1.4.5/contrib/pngminim/encoder/pngusr.h libpng-1.4.6beta02/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.6beta02/contrib/pngminim/encoder/pngusr.h 2011-01-14 20:22:58.095010418 -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.6beta02/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.6beta02/contrib/pngminim/preader/pngusr.h 2011-01-14 20:22:58.129854193 -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.6beta02/png.h --- libpng-1.4.5/png.h 2010-12-09 07:48:11.265430061 -0600 +++ libpng-1.4.6beta02/png.h 2011-01-14 20:22:57.175178925 -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-02 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.6beta02/pngread.c --- libpng-1.4.5/pngread.c 2010-12-09 07:48:11.337481929 -0600 +++ libpng-1.4.6beta02/pngread.c 2011-01-14 20:22:57.248855988 -0600 @@ -1,8 +1,8 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.4.5 [January 15, 2011] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.4.5/pngrio.c libpng-1.4.6beta02/pngrio.c --- libpng-1.4.5/pngrio.c 2010-12-09 07:48:11.342533773 -0600 +++ libpng-1.4.6beta02/pngrio.c 2011-01-14 20:22:57.254126391 -0600 @@ -1,8 +1,8 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.4.5 [January 15, 2011] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.4.5/pngrtran.c libpng-1.4.6beta02/pngrtran.c --- libpng-1.4.5/pngrtran.c 2010-12-09 07:48:11.359864654 -0600 +++ libpng-1.4.6beta02/pngrtran.c 2011-01-14 20:22:57.271291516 -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.6beta02/pngrutil.c --- libpng-1.4.5/pngrutil.c 2010-12-09 07:48:11.374981056 -0600 +++ libpng-1.4.6beta02/pngrutil.c 2011-01-14 20:22:57.286413138 -0600 @@ -1,8 +1,8 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.5 [January 15, 2011] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.4.5/pngset.c libpng-1.4.6beta02/pngset.c --- libpng-1.4.5/pngset.c 2010-12-09 07:48:11.383950690 -0600 +++ libpng-1.4.6beta02/pngset.c 2011-01-14 20:22:57.295108119 -0600 @@ -1,8 +1,8 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.5 [January 15, 2011] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.4.5/pngtest.c libpng-1.4.6beta02/pngtest.c --- libpng-1.4.5/pngtest.c 2010-12-09 07:48:11.393765714 -0600 +++ libpng-1.4.6beta02/pngtest.c 2011-01-14 20:22:57.305025777 -0600 @@ -1,8 +1,8 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.4.5 [January 15, 2011] + * Last changed in libpng 1.4.5 [December 9, 2010] * Copyright (c) 1998-2010 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.) *