[libpng16] Imported from libpng-1.6.2rc05.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 6530011..95af231 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 @@
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.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 9ca0491..f252da5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4497,8 +4497,10 @@
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 c06b337..4aa416d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -271,7 +271,7 @@
# 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 0b97f07..e8da27b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,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-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 6b40d83..cc67c41 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 0eb8921..e48bb0a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
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 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 @@
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 a53db4d..64215d3 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
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2013 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
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 @@
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 b397aed..2c90c69 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 <png.h>\fP
@@ -504,7 +504,7 @@
.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
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2013 Glenn Randers-Pehrson
@@ -515,7 +515,7 @@
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 @@
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 @@
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 @@
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 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 ed6e15f..74c2994 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 b7a6ece..aee3b7c 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 @@
#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 faad3f1..bfff276 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 @@
/* 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 3b9c48a..93290f1 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 859b170..2e5a77e 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1968,4 +1968,4 @@
#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 c25502b..c82db5b 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 80b532d..c77d42f 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.6.2rc04 - April 23, 2013
+ * libpng version 1.6.2rc05 - April 23, 2013
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index a6cd8c3..b0c1457 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,9 +1,9 @@
-Makefiles for libpng version 1.6.2rc04 - April 23, 2013
+Makefiles for libpng version 1.6.2rc05 - April 23, 2013
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng16.so.16.1.6.2rc04)
+ (gcc, creates libpng16.so.16.1.6.2rc05)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -20,7 +20,7 @@
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
- (gcc, creates libpng16.so.16.1.6.2rc04)
+ (gcc, creates libpng16.so.16.1.6.2rc05)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@@ -35,12 +35,12 @@
makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng16.so.16.1.6.2rc04)
+ creates libpng16.so.16.1.6.2rc05)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng16.so.16.1.6.2rc04)
+ creates libpng16.so.16.1.6.2rc05)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng16.so.16.1.6.2rc04)
+ creates libpng16.so.16.1.6.2rc05)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
diff --git a/scripts/def.dfn b/scripts/def.dfn
index 34c4b5e..3ac8c4f 100644
--- a/scripts/def.dfn
+++ b/scripts/def.dfn
@@ -21,7 +21,7 @@
PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE"
PNG_DFN ""
PNG_DFN "EXPORTS"
-PNG_DFN ";Version 1.6.2rc04"
+PNG_DFN ";Version 1.6.2rc05"
#define PNG_EXPORTA(ordinal, type, name, args, attributes)\
PNG_DFN "@" SYMBOL_PREFIX "@@" name "@"
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index ec181fc..fcf7398 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.6.2rc04
+version=1.6.2rc05
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 8eb93b2..3ba0bb1 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.6.2rc04
+Version: 1.6.2rc05
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 22f935e..24e403d 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@
LIB= png16
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.6.2rc04
+SHLIB_MINOR= 1.6.2rc05
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index f28293b..789072e 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@
LIB= png
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.2rc04
+SHLIB_MINOR= 1.6.2rc05
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index fbf177f..1abfe42 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.2rc04
+SHLIB_MINOR= 1.6.2rc05
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index b54b141..48ffd79 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -1,8 +1,8 @@
-/* libpng 1.6.2rc04 STANDARD API DEFINITION */
+/* libpng 1.6.2rc05 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
-/* Libpng version 1.6.2rc04 - April 23, 2013 */
+/* Libpng version 1.6.2rc05 - April 23, 2013 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
diff --git a/scripts/symbols.def b/scripts/symbols.def
index 9fa2459..0747cba 100644
--- a/scripts/symbols.def
+++ b/scripts/symbols.def
@@ -1,4 +1,4 @@
-;Version 1.6.2rc04
+;Version 1.6.2rc05
;--------------------------------------------------------------
; LIBPNG symbol list as a Win32 DEF file
; Contains all the symbols that can be exported from libpng