From d2d09e5bf9f77be06496f40715bcae13c844d82d Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sat, 2 Nov 2013 15:41:20 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.7rc01.tar --- ANNOUNCE | 18 +++++++++--------- CHANGES | 4 ++-- CMakeLists.txt | 2 +- LICENSE | 4 ++-- README | 2 +- arm/filter_neon.S | 2 +- configure.ac | 4 ++-- libpng-manual.txt | 8 ++++---- libpng.3 | 21 +++++++++++---------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 +++--- png.h | 23 ++++++++++++----------- pngconf.h | 2 +- pngpriv.h | 6 +++--- pngtest.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 ++++++------ scripts/def.dfn | 2 +- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/pnglibconf.dfa | 2 +- scripts/pnglibconf.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 28 files changed, 74 insertions(+), 72 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 91d5dbe63..4d7f348fe 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.7beta05 - October 26, 2013 +Libpng 1.6.7rc01 - November 2, 2013 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -9,19 +9,19 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.6.7beta05.tar.xz (LZMA-compressed, recommended) - 1.6.7beta05.tar.gz + 1.6.7rc01.tar.xz (LZMA-compressed, recommended) + 1.6.7rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp167b05.7z (LZMA-compressed, recommended) - lp167b05.zip + lp167r01.7z (LZMA-compressed, recommended) + lp167r01.zip Other information: - 1.6.7beta05-README.txt - 1.6.7beta05-LICENSE.txt + 1.6.7rc01-README.txt + 1.6.7rc01-LICENSE.txt Gnupg/*.asc (PGP armored detached signatures) Changes since the last public release (1.6.6): @@ -88,9 +88,9 @@ Version 1.6.7beta04 [October 26, 2013] Changed NEON implementation selection mechanism. This allows assembler or intrinsics to be turned on at compile time during the build by defining PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1). This macro - undefined by default and the build type is selected in pngpriv.h. + is undefined by default and the build type is selected in pngpriv.h. -Version 1.6.7beta05 [October 26, 2013] +Version 1.6.7rc01 [November 2, 2013] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 38828f50d..8b5328ffb 100644 --- a/CHANGES +++ b/CHANGES @@ -4702,9 +4702,9 @@ Version 1.6.7beta04 [October 26, 2013] Changed NEON implementation selection mechanism. This allows assembler or intrinsics to be turned on at compile time during the build by defining PNG_ARM_NEON_IMPLEMENTATION to the correct value (2 or 1). This macro - undefined by default and the build type is selected in pngpriv.h. + is undefined by default and the build type is selected in pngpriv.h. -Version 1.6.7beta05 [October 26, 2013] +Version 1.6.7rc01 [November 2, 2013] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 814e9bfe5..68420ff70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -252,7 +252,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 16.${PNGLIB_RELEASE}.1.6.7beta05 +# VERSION 16.${PNGLIB_RELEASE}.1.6.7rc01 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index a1828c254..3a745e205 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.6.7beta05, October 26, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.7rc01, November 2, 2013, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 26, 2013 +November 2, 2013 diff --git a/README b/README index 7be88df2d..beb5addec 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.7beta05 - October 26, 2013 (shared library 16.0) +README for libpng version 1.6.7rc01 - November 2, 2013 (shared library 16.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/arm/filter_neon.S b/arm/filter_neon.S index 08544384e..c5d0b5313 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -3,7 +3,7 @@ * * Copyright (c) 2013 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.5.17 [July 18, 2013] + * Last changed in libpng 1.6.7 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/configure.ac b/configure.ac index 94082b32d..edca878a1 100644 --- a/configure.ac +++ b/configure.ac @@ -18,7 +18,7 @@ AC_PREREQ([2.68]) dnl Version number stuff here: -AC_INIT([libpng],[1.6.7beta05],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.7rc01],[png-mng-implement@lists.sourceforge.net]) AC_CONFIG_MACRO_DIR([scripts]) # libpng does not follow GNU file name conventions (hence 'foreign') @@ -39,7 +39,7 @@ dnl automake, so the following is not necessary (and is not defined anyway): dnl AM_PREREQ([1.11.2]) dnl stop configure from automagically running automake -PNGLIB_VERSION=1.6.7beta05 +PNGLIB_VERSION=1.6.7rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=7 diff --git a/libpng-manual.txt b/libpng-manual.txt index 709439b71..96b14d1db 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.7beta05 - October 26, 2013 + libpng version 1.6.7rc01 - November 2, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.7beta05 - October 26, 2013 + libpng versions 0.97, January 1998, through 1.6.7rc01 - November 2, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5232,13 +5232,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -October 26, 2013 +November 2, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.7beta05 are Y2K compliant. It is my belief that earlier +upward through 1.6.7rc01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer diff --git a/libpng.3 b/libpng.3 index f39716dd7..f92592010 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "October 26, 2013" +.TH LIBPNG 3 "November 2, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7rc01 .SH SYNOPSIS \fB #include \fP @@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.6.7beta05 - October 26, 2013 + libpng version 1.6.7rc01 - November 2, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.6.7beta05 - October 26, 2013 + libpng versions 0.97, January 1998, through 1.6.7rc01 - November 2, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5737,13 +5737,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -October 26, 2013 +November 2, 2013 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.6.7beta05 are Y2K compliant. It is my belief that earlier +upward through 1.6.7rc01 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer @@ -5965,7 +5965,8 @@ the first widely used release: 1.6.4 16 10604 16.so.16.4[.0] 1.6.5 16 10605 16.so.16.5[.0] 1.6.6 16 10606 16.so.16.6[.0] - 1.6.7beta01-05 16 10607 16.so.16.7[.0] + 1.6.7beta01-04 16 10607 16.so.16.7[.0] + 1.6.7rc01 16 10607 16.so.16.7[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -6022,7 +6023,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.7beta05 - October 26, 2013: +Libpng version 1.6.7rc01 - November 2, 2013: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -6045,7 +6046,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.7beta05, October 26, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.7rc01, November 2, 2013, are Copyright (c) 2004,2006-2007 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 @@ -6144,7 +6145,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 26, 2013 +November 2, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index fd5194ce2..766ce931c 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "October 26, 2013" +.TH LIBPNGPF 3 "November 2, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7beta05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.7rc01 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 0e96a1500..694ac22fb 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "October 26, 2013" +.TH PNG 5 "November 2, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 078b74936..8c2d599d6 100644 --- a/png.c +++ b/png.c @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_7beta05 Your_png_h_is_not_version_1_6_7beta05; +typedef png_libpng_version_1_6_7rc01 Your_png_h_is_not_version_1_6_7rc01; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -768,13 +768,13 @@ png_get_copyright(png_const_structrp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.7beta05 - October 26, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.7rc01 - November 2, 2013" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2013 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.6.7beta05 - October 26, 2013\ + return "libpng version 1.6.7rc01 - November 2, 2013\ Copyright (c) 1998-2013 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 23356eccf..0c0f52f25 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.7beta05 - October 26, 2013 + * libpng version 1.6.7rc01 - November 2, 2013 * 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.6.7beta05 - October 26, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.7rc01 - November 2, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -183,7 +183,8 @@ * 1.6.4 16 10604 16.so.16.4[.0] * 1.6.5 16 10605 16.so.16.5[.0] * 1.6.6 16 10606 16.so.16.6[.0] - * 1.6.7beta01-05 16 10607 16.so.16.7[.0] + * 1.6.7beta01-04 16 10607 16.so.16.7[.0] + * 1.6.7rc01 16 10607 16.so.16.7[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -215,7 +216,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.7beta05, October 26, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.7rc01, November 2, 2013, 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: @@ -327,13 +328,13 @@ * Y2K compliance in libpng: * ========================= * - * October 26, 2013 + * November 2, 2013 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.7beta05 are Y2K compliant. It is my belief that + * upward through 1.6.7rc01 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -393,9 +394,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.7beta05" +#define PNG_LIBPNG_VER_STRING "1.6.7rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.7beta05 - October 26, 2013\n" + " libpng version 1.6.7rc01 - November 2, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -409,7 +410,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 05 +#define PNG_LIBPNG_VER_BUILD 01 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -426,7 +427,7 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -539,7 +540,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_7beta05; +typedef char* png_libpng_version_1_6_7rc01; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 651c7b174..24822e2a3 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.7beta05 - October 26, 2013 + * libpng version 1.6.7rc01 - November 2, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 8c9c53470..2f4028f39 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -6,7 +6,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.6.3 [July 18, 2013] + * Last changed in libpng 1.6.7 [(PENDING RELEASE)] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -157,11 +157,11 @@ # define PNG_ARM_NEON_IMPLEMENTATION 2 # endif /* no GNUC support */ # endif /* __GNUC__ */ -# else /* !__ARM_NEON__ */ +# else /* !defined __ARM_NEON__ */ /* The 'intrinsics' code simply won't compile without this -mfpu=neon: */ # define PNG_ARM_NEON_IMPLEMENTATION 2 -# endif /* !__ARM_NEON */ +# endif /* __ARM_NEON__ */ # endif /* !defined PNG_ARM_NEON_IMPLEMENTATION */ # ifndef PNG_ARM_NEON_IMPLEMENTATION diff --git a/pngtest.c b/pngtest.c index a22aac5b1..2fd1079fc 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1970,4 +1970,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_7beta05 Your_png_h_is_not_version_1_6_7beta05; +typedef png_libpng_version_1_6_7rc01 Your_png_h_is_not_version_1_6_7rc01; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 5f900dab1..c6e1d6099 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.7beta05 - October 26, 2013 +libpng version 1.6.7rc01 - November 2, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 3d3220011..53106d580 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@