From b407af65038d6899dddc5537895ed6ca356250cf Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Mon, 17 Mar 2014 10:28:56 -0500 Subject: [PATCH] [libpng17] Imported from libpng-1.7.0beta34.tar --- INSTALL | 4 ++-- LICENSE | 4 ++-- Makefile.am | 4 ++-- README | 2 +- TODO | 1 + arm/arm_init.c | 2 +- configure.ac | 4 ++-- contrib/arm-neon/android-ndk.c | 2 +- contrib/arm-neon/linux-auxv.c | 2 +- contrib/arm-neon/linux.c | 2 +- contrib/libtests/pngimage.c | 2 +- contrib/libtests/pngunknown.c | 2 +- contrib/tools/pngfix.c | 2 +- libpngpf.3 | 2 +- png.5 | 2 +- png.c | 4 ++-- png.h | 10 +++++----- pngconf.h | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 2 +- scripts/dfn.awk | 20 ++++++++++---------- scripts/pnglibconf.h.prebuilt | 2 +- 23 files changed, 41 insertions(+), 40 deletions(-) diff --git a/INSTALL b/INSTALL index 8e42354f2..781f760e0 100644 --- a/INSTALL +++ b/INSTALL @@ -12,10 +12,10 @@ Contents VII. Building with makefiles VIII. Configuring libpng for 16-bit platforms IX. Configuring for DOS - X. Configuring for Medium Model + X. Configuring for Medium Model XI. Prepending a prefix to exported symbols XII. Configuring for compiler xxx: -XIII Removing unwanted object code +XIII. Removing unwanted object code XIV. Changes to the build and configuration of libpng in libpng-1.5.x XV. Configuring libpng for multiprocessing XVI. Other sources of information about libpng: diff --git a/LICENSE b/LICENSE index 6199fed13..22ce03a1d 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.7.0beta34, February 27, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.7.0beta34, March 17, 2014, are Copyright (c) 2004, 2006-2014 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -February 27, 2014 +March 17, 2014 diff --git a/Makefile.am b/Makefile.am index d1188d16d..3faab3247 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,8 +145,8 @@ config.sub configure depcomp install-sh ltmain.sh missing PNG_COPTS = @PNG_COPTS@ AM_CFLAGS = ${PNG_COPTS} -# DFNCPP is normally just CPP - the C preprocessor - but on Solaris and maybe -# other operating systems (NeXT?) the C preprocessor selected by configure +# DFNCPP is normally just "CPP -E" - the C preprocessor - but on Solaris and +# maybe other operating systems (NeXT?) the C preprocessor selected by configure # checks input tokens for validity - effectively it performs part of the ANSI-C # parsing - and therefore fails with the .df files. configure.ac has special # checks for this and sets DFNCPP appropriately. diff --git a/README b/README index 18085a6ae..f9630695f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.7.0beta34 - February 27, 2014 (shared library 17.0) +README for libpng version 1.7.0beta34 - March 17, 2014 (shared library 17.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. diff --git a/TODO b/TODO index 63613b8dd..72633774f 100644 --- a/TODO +++ b/TODO @@ -6,6 +6,7 @@ Better C++ wrapper/full C++ implementation? Fix problem with C++ and EXTERN "C". cHRM transformation. Remove setjmp/longjmp usage in favor of returning error codes. +Palette creation. Add "grayscale->palette" transformation and "palette->grayscale" detection. Improved dithering. Multi-lingual error and warning message support. diff --git a/arm/arm_init.c b/arm/arm_init.c index 580053016..a672eaebb 100644 --- a/arm/arm_init.c +++ b/arm/arm_init.c @@ -22,7 +22,7 @@ /* WARNING: it is strongly recommended that you do not build libpng with * run-time checks for CPU features if at all possible. In the case of the ARM * NEON instructions there is no processor-specific way of detecting the - * presense of the required support, therefore run-time detectioon is extremely + * presence of the required support, therefore run-time detection is extremely * OS specific. * * You may set the macro PNG_ARM_NEON_FILE to the file name of file containing diff --git a/configure.ac b/configure.ac index 76cdcc920..5a10a2438 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,7 @@ fi # This is a remnant of the old cc -E validation, where it may have been # necessary to use a different preprocessor for .dfn files -DFNCPP="$CPP" +DFNCPP="$CPP -E" AC_SUBST(DFNCPP) # -Werror cannot be passed to GCC in CFLAGS because configure will fail (it @@ -294,7 +294,7 @@ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") if test "$have_ld_version_script" = "yes"; then AC_MSG_CHECKING([for symbol prefix]) SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \ - | ${CPP-${CC-gcc} -E} - 2>&1 \ + | ${DFNCPP-${CC-gcc -E}} - 2>&1 \ | ${EGREP-grep} "^PREFIX=" \ | ${SED-sed} -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"` AC_SUBST(SYMBOL_PREFIX) diff --git a/contrib/arm-neon/android-ndk.c b/contrib/arm-neon/android-ndk.c index a6e5de557..724012348 100644 --- a/contrib/arm-neon/android-ndk.c +++ b/contrib/arm-neon/android-ndk.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Bowler, 2014. - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/arm-neon/linux-auxv.c b/contrib/arm-neon/linux-auxv.c index 6fc978240..696e297ef 100644 --- a/contrib/arm-neon/linux-auxv.c +++ b/contrib/arm-neon/linux-auxv.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/arm-neon/linux.c b/contrib/arm-neon/linux.c index ccf23620e..182f37605 100644 --- a/contrib/arm-neon/linux.c +++ b/contrib/arm-neon/linux.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Bowler, 2014. - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngimage.c b/contrib/libtests/pngimage.c index 17040566d..372845ead 100644 --- a/contrib/libtests/pngimage.c +++ b/contrib/libtests/pngimage.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 John Cunningham Bowler * - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/contrib/libtests/pngunknown.c b/contrib/libtests/pngunknown.c index a1d944e23..b8c4899de 100644 --- a/contrib/libtests/pngunknown.c +++ b/contrib/libtests/pngunknown.c @@ -1,7 +1,7 @@ /* pngunknown.c - test the read side unknown chunk handling * - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * Copyright (c) 2014 Glenn Randers-Pehrson * Written by John Cunningham Bowler * diff --git a/contrib/tools/pngfix.c b/contrib/tools/pngfix.c index 1bd74159a..3b64627c2 100644 --- a/contrib/tools/pngfix.c +++ b/contrib/tools/pngfix.c @@ -2,7 +2,7 @@ * * Copyright (c) 2014 John Cunningham Bowler * - * Last changed in libpng 1.6.10 [(PENDING RELEASE)] + * Last changed in libpng 1.6.10 [March 6, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/libpngpf.3 b/libpngpf.3 index 5c9092f80..876f9dace 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,4 +1,4 @@ -.TH LIBPNGPF 3 "February 27, 2014" +.TH LIBPNGPF 3 "March 17, 2014" .SH NAME libpng \- Portable Network Graphics (PNG) Reference Library 1.7.0beta34 (private functions) diff --git a/png.5 b/png.5 index f254b86bb..54f5409a0 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "February 27, 2014" +.TH PNG 5 "March 17, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 8f0d25e02..b025e3760 100644 --- a/png.c +++ b/png.c @@ -696,13 +696,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.7.0beta34 - March 8, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.7.0beta34 - March 17, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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 "libpng version 1.7.0beta34 - March 8, 2014\ + return "libpng version 1.7.0beta34 - March 17, 2014\ Copyright (c) 1998-2014 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; diff --git a/png.h b/png.h index 641b34cd8..60e337ead 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.7.0beta34 - February 27, 2014 + * libpng version 1.7.0beta34 - March 17, 2014 * Copyright (c) 1998-2013 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.) @@ -11,7 +11,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.7.0beta34 - February 27, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.7.0beta34 - March 17, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -200,7 +200,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta34, February 27, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.7.0beta34, March 17, 2014, are * Copyright (c) 2004, 2006-2013 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: @@ -312,7 +312,7 @@ * Y2K compliance in libpng: * ========================= * - * February 27, 2014 + * March 17, 2014 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. @@ -380,7 +380,7 @@ /* Version information for png.h - this should match the version in png.c */ #define PNG_LIBPNG_VER_STRING "1.7.0beta34" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.7.0beta34 - February 27, 2014\n" + " libpng version 1.7.0beta34 - March 17, 2014\n" #define PNG_LIBPNG_VER_SONUM 17 #define PNG_LIBPNG_VER_DLLNUM 17 diff --git a/pngconf.h b/pngconf.h index 289bc5d9e..6801bd78d 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.7.0beta34 - February 27, 2014 + * libpng version 1.7.0beta34 - March 17, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c20554ba3..442e60773 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.7.0beta34 - February 27, 2014 +libpng version 1.7.0beta34 - March 17, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 3bf883a0c..2be37b3ec 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@