diff -ru4NwbB libpng-1.2.32/example.c libpng-1.2.33rc01/example.c --- libpng-1.2.32/example.c 2008-09-18 04:48:01.734430400 -0500 +++ libpng-1.2.33rc01/example.c 2008-10-15 11:07:47.987973956 -0500 @@ -1,9 +1,9 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.2.32 [October 15, 2008] + * Last changed in libpng 1.2.33 [October 15, 2008] * This file has been placed in the public domain by the authors. * Maintained 1998-2008 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger) * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) @@ -203,9 +203,9 @@ png_set_palette_to_rgb(png_ptr); /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_gray_1_2_4_to_8(png_ptr); + png_set_expand_gray_1_2_4_to_8(png_ptr); /* Expand paletted or RGB images with transparency to full alpha channels * so the data will be available as RGBA quartets. */ diff -ru4NwbB libpng-1.2.32/png.h libpng-1.2.33rc01/png.h --- libpng-1.2.32/png.h 2008-09-18 04:48:01.711532270 -0500 +++ libpng-1.2.33rc01/png.h 2008-10-15 11:07:47.972126307 -0500 @@ -206,8 +206,9 @@ * 1.0.40rc01 10 10040 10.so.0.40[.0] * 1.2.32rc01 13 10232 12.so.0.32[.0] * 1.0.40 10 10040 10.so.0.40[.0] * 1.2.32 13 10232 12.so.0.32[.0] + * 1.2.33beta01-02 13 10233 12.so.0.33[.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.2.32/scripts/makefile.darwin libpng-1.2.33rc01/scripts/makefile.darwin --- libpng-1.2.32/scripts/makefile.darwin 2008-09-18 04:48:05.484287099 -0500 +++ libpng-1.2.33rc01/scripts/makefile.darwin 2008-10-15 11:07:49.555951854 -0500 @@ -103,16 +103,16 @@ $(LIBSOVER): $(OBJSDLL) $(CC) -dynamiclib \ -install_name $(LIBPATH)/$(LIBSOMAJ) \ - -current_version $(SONUM) -compatibility_version $(SONUM) \ + -current_version %SONUM% -compatibility_version %SONUM% \ -o $(LIBSOVER) \ $(OBJSDLL) -L$(ZLIBLIB) -lz $(OLDSOVER): $(OBJSDLL) $(CC) -dynamiclib \ -install_name $(LIBPATH)/$(OLDSOMAJ) \ - -current_version %OLDSONUM% -compatibility_version %OLDSONUM% \ + -current_version %OLDNUM% -compatibility_version %OLDNUM% \ -o $(OLDSOVER) \ $(OBJSDLL) -L$(ZLIBLIB) -lz pngtest: pngtest.o $(LIBSO)