From 9bdba4e630abadc4d0d87228e7a77026adb7ce26 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Tue, 23 Apr 2013 18:30:51 -0500 Subject: [PATCH] [libpng16] Imported from libpng-1.6.2rc05.tar --- ANNOUNCE | 19 +++++++++++-------- CHANGES | 4 +++- CMakeLists.txt | 2 +- LICENSE | 2 +- README | 2 +- configure.ac | 10 ++-------- libpng-manual.txt | 6 +++--- libpng.3 | 14 +++++++------- libpngpf.3 | 2 +- png.c | 6 +++--- png.h | 18 +++++++++--------- pngconf.h | 2 +- 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.h.prebuilt | 4 ++-- scripts/symbols.def | 2 +- 24 files changed, 61 insertions(+), 62 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 65300119a..95af23162 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.2rc04 - April 23, 2013 +Libpng 1.6.2rc05 - April 23, 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.2rc04.tar.xz (LZMA-compressed, recommended) - 1.6.2rc04.tar.gz + 1.6.2rc05.tar.xz (LZMA-compressed, recommended) + 1.6.2rc05.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp162r04.7z (LZMA-compressed, recommended) - lp162r04.zip + lp162r05.7z (LZMA-compressed, recommended) + lp162r05.zip Other information: - 1.6.2rc04-README.txt - 1.6.2rc04-LICENSE.txt + 1.6.2rc05-README.txt + 1.6.2rc05-LICENSE.txt Changes since the last public release (1.6.1): @@ -50,12 +50,15 @@ Version 1.6.2rc02 [April 18, 2013] Version 1.6.2rc03 [April 22, 2013] Trivial spelling cleanup. -Version 1.6.2rc04 [April 23, 2013] +Version 1.6.2rc04 [April 22, 2013] Revised stack marking in arm/filter_neon.S and configure.ac + +Version 1.6.2rc05 [April 23, 2013] Ensure that NEON filter stuff is completely disabled when switched 'off'. Previously the ARM NEON specific files were still built if the option was switched 'off' as opposed to being explicitly disabled. + Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement diff --git a/CHANGES b/CHANGES index 9ca0491c5..f252da595 100644 --- a/CHANGES +++ b/CHANGES @@ -4497,8 +4497,10 @@ Version 1.6.2rc02 [April 18, 2013] Version 1.6.2rc03 [April 22, 2013] Trivial spelling cleanup. -Version 1.6.2rc04 [April 23, 2013] +Version 1.6.2rc04 [April 22, 2013] Revised stack marking in arm/filter_neon.S and configure.ac + +Version 1.6.2rc05 [April 23, 2013] Ensure that NEON filter stuff is completely disabled when switched 'off'. Previously the ARM NEON specific files were still built if the option was switched 'off' as opposed to being explicitly disabled. diff --git a/CMakeLists.txt b/CMakeLists.txt index c06b33726..4aa416d0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -271,7 +271,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.2rc04 +# VERSION 16.${PNGLIB_RELEASE}.1.6.2rc05 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index 0b97f078d..e8da27bed 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.2rc04, April 23, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.2rc05, April 23, 2013, are Copyright (c) 2004, 2006-2012 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 diff --git a/README b/README index 6b40d837a..cc67c4191 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.2rc04 - April 23, 2013 (shared library 16.0) +README for libpng version 1.6.2rc05 - April 23, 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/configure.ac b/configure.ac index 0eb8921bd..e48bb0af3 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.2rc04],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.2rc05],[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.2rc04 +PNGLIB_VERSION=1.6.2rc05 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=2 @@ -226,12 +226,6 @@ AC_ARG_WITH(libpng-prefix, fi]) AM_CONDITIONAL([DO_PNG_PREFIX], [test "${with_libpng_prefix:-no}" != "no"]) -# Because GCC by default assembles code with an executable stack, even though it -# compiles C code with a non-executable stack, it is necessary to do a fixup -# here (this may be GCC specific) -# The following line was removed by request of gentoo distributors -# AC_SUBST([AM_CCASFLAGS], [-Wa,--noexecstack]) - AC_ARG_ENABLE([arm-neon], AS_HELP_STRING([[[--enable-arm-neon]]], [Enable ARM NEON optimizations: =off, check, api, on:] diff --git a/libpng-manual.txt b/libpng-manual.txt index a53db4dc2..64215d3ff 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.2rc04 - April 23, 2013 + libpng version 1.6.2rc05 - April 23, 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.2rc04 - April 23, 2013 + libpng versions 0.97, January 1998, through 1.6.2rc05 - April 23, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5171,7 +5171,7 @@ 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.2rc04 are Y2K compliant. It is my belief that earlier +upward through 1.6.2rc05 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 b397aedeb..2c90c69e4 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ .TH LIBPNG 3 "April 23, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2rc05 .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.2rc04 - April 23, 2013 + libpng version 1.6.2rc05 - April 23, 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.2rc04 - April 23, 2013 + libpng versions 0.97, January 1998, through 1.6.2rc05 - April 23, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5676,7 +5676,7 @@ 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.2rc04 are Y2K compliant. It is my belief that earlier +upward through 1.6.2rc05 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 @@ -5888,7 +5888,7 @@ the first widely used release: 1.6.1rc01 16 10601 16.so.16.1[.0] 1.6.1 16 10601 16.so.16.1[.0] 1.6.2beta01 16 10602 16.so.16.2[.0] - 1.6.2rc01-04 16 10602 16.so.16.2[.0] + 1.6.2rc01-05 16 10602 16.so.16.2[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5945,7 +5945,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.6.2rc04 - April 23, 2013: +Libpng version 1.6.2rc05 - April 23, 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). @@ -5968,7 +5968,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.6.2rc04, April 23, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.2rc05, April 23, 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 diff --git a/libpngpf.3 b/libpngpf.3 index ed6e15f74..74c2994c3 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ .TH LIBPNGPF 3 "April 23, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2rc05 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.c b/png.c index b7a6ece62..aee3b7c45 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_2rc04 Your_png_h_is_not_version_1_6_2rc04; +typedef png_libpng_version_1_6_2rc05 Your_png_h_is_not_version_1_6_2rc05; /* 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.2rc04 - April 23, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.2rc05 - April 23, 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.2rc04 - April 23, 2013\ + return "libpng version 1.6.2rc05 - April 23, 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 faad3f17b..bfff27680 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.2rc04 - April 23, 2013 + * libpng version 1.6.2rc05 - April 23, 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.2rc04 - April 23, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.2rc05 - April 23, 2013: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -173,7 +173,7 @@ * 1.6.1rc01 16 10601 16.so.16.1[.0] * 1.6.1 16 10601 16.so.16.1[.0] * 1.6.2beta01 16 10602 16.so.16.2[.0] - * 1.6.2rc01-04 16 10602 16.so.16.2[.0] + * 1.6.2rc01-05 16 10602 16.so.16.2[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -205,7 +205,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.6.2rc04, April 23, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.2rc05, April 23, 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: @@ -323,7 +323,7 @@ * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.2rc04 are Y2K compliant. It is my belief that + * upward through 1.6.2rc05 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 @@ -383,9 +383,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.2rc04" +#define PNG_LIBPNG_VER_STRING "1.6.2rc05" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.2rc04 - April 23, 2013\n" + " libpng version 1.6.2rc05 - April 23, 2013\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -399,7 +399,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 04 +#define PNG_LIBPNG_VER_BUILD 05 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -529,7 +529,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_2rc04; +typedef char* png_libpng_version_1_6_2rc05; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 3b9c48a1d..93290f18d 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.2rc04 - April 23, 2013 + * libpng version 1.6.2rc05 - April 23, 2013 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 859b17004..2e5a77eb6 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1968,4 +1968,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_2rc04 Your_png_h_is_not_version_1_6_2rc04; +typedef png_libpng_version_1_6_2rc05 Your_png_h_is_not_version_1_6_2rc05; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c25502bb2..c82db5b10 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.2rc04 - April 23, 2013 +libpng version 1.6.2rc05 - April 23, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 80b532dc1..c77d42f6d 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@