diff --git a/ANNOUNCE b/ANNOUNCE index 95af23162..6eb05ab84 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.6.2rc05 - April 23, 2013 +Libpng 1.6.2rc03 - April 22, 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.2rc05.tar.xz (LZMA-compressed, recommended) - 1.6.2rc05.tar.gz + 1.6.2rc03.tar.xz (LZMA-compressed, recommended) + 1.6.2rc03.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp162r05.7z (LZMA-compressed, recommended) - lp162r05.zip + lp162r03.7z (LZMA-compressed, recommended) + lp162r03.zip Other information: - 1.6.2rc05-README.txt - 1.6.2rc05-LICENSE.txt + 1.6.2rc03-README.txt + 1.6.2rc03-LICENSE.txt Changes since the last public release (1.6.1): @@ -50,15 +50,6 @@ Version 1.6.2rc02 [April 18, 2013] Version 1.6.2rc03 [April 22, 2013] Trivial spelling cleanup. -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 f252da595..be26c4fe2 100644 --- a/CHANGES +++ b/CHANGES @@ -4497,14 +4497,6 @@ Version 1.6.2rc02 [April 18, 2013] Version 1.6.2rc03 [April 22, 2013] Trivial spelling cleanup. -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/CMakeLists.txt b/CMakeLists.txt index 4aa416d0f..b3e6b766d 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.2rc05 +# VERSION 16.${PNGLIB_RELEASE}.1.6.2rc03 VERSION 16.${PNGLIB_RELEASE}.0 SOVERSION 16 CLEAN_DIRECT_OUTPUT 1) diff --git a/LICENSE b/LICENSE index e8da27bed..276aa7c96 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.2rc05, April 23, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.2rc03, April 22, 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 @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 23, 2013 +April 22, 2013 diff --git a/README b/README index cc67c4191..6925fd772 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.6.2rc05 - April 23, 2013 (shared library 16.0) +README for libpng version 1.6.2rc03 - April 22, 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 c4946b171..72420a9e3 100644 --- a/arm/filter_neon.S +++ b/arm/filter_neon.S @@ -1,9 +1,9 @@ /* filter_neon.S - NEON optimised filter functions * - * Copyright (c) 2013 Glenn Randers-Pehrson + * Copyright (c) 2011 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.2 [(PENDING RELEASE)] + * Last changed in libpng 1.5.7 [December 15, 2011] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -16,13 +16,12 @@ #define PNG_VERSION_INFO_ONLY #include "../pngpriv.h" +#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \ + defined(__ARM_NEON__) #if defined(__linux__) && defined(__ELF__) .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ #endif -#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \ - defined(__ARM_NEON__) - #ifdef __ELF__ # define ELF #else diff --git a/configure.ac b/configure.ac index e48bb0af3..407a6786e 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.2rc05],[png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng],[1.6.2rc03],[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.2rc05 +PNGLIB_VERSION=1.6.2rc03 PNGLIB_MAJOR=1 PNGLIB_MINOR=6 PNGLIB_RELEASE=2 @@ -226,6 +226,11 @@ 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 by GCC specific) +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:] @@ -234,12 +239,9 @@ AC_ARG_ENABLE([arm-neon], [a call to png_set_option; on: turn on unconditionally. The] [default is 'on' if __ARM_NEON__ is defined, otherwise 'off'.]), [case "$enableval" in - no|off) - # disable the default enabling on __ARM_NEON__ systems: + off) AC_DEFINE([PNG_NO_ARM_NEON], [], - [Disable ARM Neon optimizations]) - # Prevent use of the assembler files below: - enable_arm_neon=no;; + [Disable ARM Neon optimizations]);; check) AC_DEFINE([PNG_ARM_NEON_CHECK_SUPPORTED], [], [Check for ARM Neon support at run-time]);; diff --git a/libpng-manual.txt b/libpng-manual.txt index 64215d3ff..95d7032fb 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.2rc05 - April 23, 2013 + libpng version 1.6.2rc03 - April 22, 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.2rc05 - April 23, 2013 + libpng versions 0.97, January 1998, through 1.6.2rc03 - April 22, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5165,13 +5165,13 @@ Other rules can be inferred by inspecting the libpng source. XVI. Y2K Compliance in libpng -April 23, 2013 +April 22, 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.2rc05 are Y2K compliant. It is my belief that earlier +upward through 1.6.2rc03 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 2c90c69e4..18e65dce5 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "April 23, 2013" +.TH LIBPNG 3 "April 22, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2rc05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2rc03 .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.2rc05 - April 23, 2013 + libpng version 1.6.2rc03 - April 22, 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.2rc05 - April 23, 2013 + libpng versions 0.97, January 1998, through 1.6.2rc03 - April 22, 2013 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2013 Glenn Randers-Pehrson @@ -5670,13 +5670,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XVI. Y2K Compliance in libpng -April 23, 2013 +April 22, 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.2rc05 are Y2K compliant. It is my belief that earlier +upward through 1.6.2rc03 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-05 16 10602 16.so.16.2[.0] + 1.6.2rc01-03 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.2rc05 - April 23, 2013: +Libpng version 1.6.2rc03 - April 22, 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.2rc05, April 23, 2013, are +libpng versions 1.2.6, August 15, 2004, through 1.6.2rc03, April 22, 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 @@ -6067,7 +6067,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -April 23, 2013 +April 22, 2013 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 74c2994c3..d0ae0b4a1 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "April 23, 2013" +.TH LIBPNGPF 3 "April 22, 2013" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2rc05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.6.2rc03 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" diff --git a/png.5 b/png.5 index 58e2c5538..8720fcd89 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "April 23, 2013" +.TH PNG 5 "April 22, 2013" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index aee3b7c45..121f52ee4 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_2rc05 Your_png_h_is_not_version_1_6_2rc05; +typedef png_libpng_version_1_6_2rc03 Your_png_h_is_not_version_1_6_2rc03; /* 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.2rc05 - April 23, 2013" PNG_STRING_NEWLINE \ + "libpng version 1.6.2rc03 - April 22, 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.2rc05 - April 23, 2013\ + return "libpng version 1.6.2rc03 - April 22, 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 bfff27680..9fa9921b5 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.2rc05 - April 23, 2013 + * libpng version 1.6.2rc03 - April 22, 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.2rc05 - April 23, 2013: Glenn + * libpng versions 0.97, January 1998, through 1.6.2rc03 - April 22, 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-05 16 10602 16.so.16.2[.0] + * 1.6.2rc01-03 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.2rc05, April 23, 2013, are + * libpng versions 1.2.6, August 15, 2004, through 1.6.2rc03, April 22, 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: @@ -317,13 +317,13 @@ * Y2K compliance in libpng: * ========================= * - * April 23, 2013 + * April 22, 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.2rc05 are Y2K compliant. It is my belief that + * upward through 1.6.2rc03 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.2rc05" +#define PNG_LIBPNG_VER_STRING "1.6.2rc03" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.6.2rc05 - April 23, 2013\n" + " libpng version 1.6.2rc03 - April 22, 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 05 +#define PNG_LIBPNG_VER_BUILD 03 /* 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_2rc05; +typedef char* png_libpng_version_1_6_2rc03; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * diff --git a/pngconf.h b/pngconf.h index 93290f18d..1e0346312 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.2rc05 - April 23, 2013 + * libpng version 1.6.2rc03 - April 22, 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 2e5a77eb6..e156b8f6a 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_2rc05 Your_png_h_is_not_version_1_6_2rc05; +typedef png_libpng_version_1_6_2rc03 Your_png_h_is_not_version_1_6_2rc03; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index c82db5b10..98daa9a6f 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.6.2rc05 - April 23, 2013 +libpng version 1.6.2rc03 - April 22, 2013 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index c77d42f6d..097cbb039 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@