diff -ru4NwbB libpng-1.2.45/Makefile.am libpng-1.2.46/Makefile.am --- libpng-1.2.45/Makefile.am 2011-07-07 06:53:51.347766499 -0500 +++ libpng-1.2.46/Makefile.am 2011-07-09 05:30:37.523956588 -0500 @@ -73,21 +73,24 @@ #extra source distribution files. EXTRA_DIST= \ ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \ pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \ + CMakeLists.txt \ ${srcdir}/projects/cbuilder5/* \ ${srcdir}/projects/beos/* \ ${srcdir}/projects/visualc6/* \ ${srcdir}/projects/visualc71/* \ ${srcdir}/projects/wince.txt \ ${srcdir}/projects/netware.txt \ + ${srcdir}/projects/xcode/* \ ${srcdir}/scripts/* \ ${srcdir}/contrib/gregbook/* \ + ${srcdir}/contrib/pngminim/* \ ${srcdir}/contrib/pngminus/* \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.46.txt pngvcrd.c + example.c libpng-1.2.46.txt pnggccrd.c pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym @@ -101,10 +104,9 @@ cp libpng-config $@ libpng.sym: png.h pngconf.h rm -f $@ $@.new - $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h $(srcdir)/$@ - cat $(srcdir)/$@ | \ + $(CPP) @LIBPNG_DEFINES@ $(CPPFLAGS) -DPNG_BUILDSYMS $(srcdir)/png.h | \ $(SED) -n -e \ 's|^.*PNG_FUNCTION_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \ -e 's|^.*PNG_DATA_EXPORT[ ]*\([$(AN)]*\).*$$|$(SYMBOL_PREFIX)\1|p' \ >$@.new diff -ru4NwbB libpng-1.2.45/png.c libpng-1.2.46/png.c --- libpng-1.2.45/png.c 2011-07-07 06:53:37.120017100 -0500 +++ libpng-1.2.46/png.c 2011-07-09 05:30:23.271567092 -0500 @@ -1,9 +1,9 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.43 [February 25, 2010] - * Copyright (c) 1998-2010 Glenn Randers-Pehrson + * Last changed in libpng 1.2.46 [February 25, 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. @@ -724,15 +724,15 @@ #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ "libpng version 1.2.46 - July 9, 2011" PNG_STRING_NEWLINE \ - "Copyright (c) 1998-2010 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ + "Copyright (c) 1998-2011 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE); #else return ((png_charp) "libpng version 1.2.46 - July 9, 2011\ - Copyright (c) 1998-2010 Glenn Randers-Pehrson\ + Copyright (c) 1998-2011 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); #endif #endif diff -ru4NwbB libpng-1.2.45/png.h libpng-1.2.46/png.h --- libpng-1.2.45/png.h 2011-07-07 06:53:37.095765499 -0500 +++ libpng-1.2.46/png.h 2011-07-09 05:30:23.247015613 -0500 @@ -262,12 +262,15 @@ * 1.2.44beta01-03 13 10244 12.so.0.44[.0] * 1.2.44rc01-03 13 10244 12.so.0.44[.0] * 1.2.44 13 10244 12.so.0.44[.0] * 1.2.45beta01-03 13 10245 12.so.0.45[.0] - * 1.0.55rc01 13 10055 10.so.0.55[.0] + * 1.0.55rc01 10 10055 10.so.0.55[.0] * 1.2.45rc01 13 10245 12.so.0.45[.0] - * 1.0.55 13 10055 10.so.0.55[.0] + * 1.0.55 10 10055 10.so.0.55[.0] * 1.2.45 13 10245 12.so.0.45[.0] + * 1.2.46rc01-02 13 10246 12.so.0.46[.0] + * 1.0.56 10 10056 10.so.0.56[.0] + * 1.2.46 13 10246 12.so.0.46[.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 @@ -298,9 +301,9 @@ * * This code is released under the libpng license. * * libpng versions 1.2.6, August 15, 2004, through 1.2.46, July 9, 2011, are - * Copyright (c) 2004, 2006-2010 Glenn Randers-Pehrson, and are + * Copyright (c) 2004, 2006-2011 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: * * Cosmin Truta diff -ru4NwbB libpng-1.2.45/projects/xcode/libpng.xcodeproj/project.pbxproj libpng-1.2.46/projects/xcode/libpng.xcodeproj/project.pbxproj --- libpng-1.2.45/projects/xcode/libpng.xcodeproj/project.pbxproj 2011-07-07 06:53:38.613174824 -0500 +++ libpng-1.2.46/projects/xcode/libpng.xcodeproj/project.pbxproj 2011-07-09 05:30:24.540767500 -0500 @@ -221,9 +221,9 @@ buildSettings = { COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.45; + FRAMEWORK_VERSION = 1.2.46; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@executable_path/../Frameworks"; @@ -239,9 +239,9 @@ isa = XCBuildConfiguration; buildSettings = { DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.45; + FRAMEWORK_VERSION = 1.2.46; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "@executable_path/../Frameworks";