From 5bb5bf345aef1e62adcfe30791f4364730a2aede Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 28 Sep 2017 14:02:28 -0500 Subject: [PATCH] [libpng12] Imported from libpng-1.2.59.tar --- ANNOUNCE | 41 ++++++++----------- CHANGES | 10 +++-- CMakeLists.txt | 2 +- INSTALL | 4 +- KNOWNBUG | 2 +- LICENSE | 4 +- Makefile.am | 2 +- Makefile.in | 2 +- README | 14 +++---- Y2KINFO | 4 +- configure | 22 +++++----- configure.ac | 4 +- libpng-1.2.59rc01.txt => libpng-1.2.59.txt | 8 ++-- libpng.3 | 18 ++++---- libpngpf.3 | 4 +- png.5 | 2 +- png.c | 6 +-- png.h | 20 ++++----- pngconf.h | 2 +- pngrutil.c | 2 +- pngtest.c | 2 +- projects/wince.txt | 4 +- .../xcode/libpng.xcodeproj/project.pbxproj | 4 +- scripts/README.txt | 14 +++---- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.32sunu | 2 +- scripts/makefile.64sunu | 2 +- scripts/makefile.aix | 2 +- scripts/makefile.beos | 2 +- scripts/makefile.cygwin | 2 +- scripts/makefile.darwin | 2 +- scripts/makefile.dec | 2 +- scripts/makefile.elf | 2 +- scripts/makefile.gcmmx | 2 +- scripts/makefile.hp64 | 2 +- scripts/makefile.hpgcc | 2 +- scripts/makefile.hpux | 2 +- scripts/makefile.linux | 2 +- scripts/makefile.mingw | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.nommx | 2 +- scripts/makefile.openbsd | 2 +- scripts/makefile.sco | 2 +- scripts/makefile.sggcc | 2 +- scripts/makefile.sgi | 2 +- scripts/makefile.so9 | 2 +- scripts/makefile.solaris | 2 +- scripts/makefile.solaris-x86 | 2 +- scripts/png32ce.def | 2 +- scripts/pngos2.def | 2 +- scripts/pngw32.def | 2 +- 53 files changed, 126 insertions(+), 129 deletions(-) rename libpng-1.2.59rc01.txt => libpng-1.2.59.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 49ebcfb3..86c86bb0 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,57 +1,52 @@ -Libpng 1.2.59rc01 - September 20, 2017 +Libpng 1.2.59 - September 28, 2017 -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. +This is a public release of libpng, intended for use in production codes. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.59rc01.tar.xz (LZMA-compressed, recommended) - libpng-1.2.59rc01.tar.gz + libpng-1.2.59.tar.xz (LZMA-compressed, recommended) + libpng-1.2.59.tar.gz Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.59rc01-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.2.59rc01-no-config.tar.gz + libpng-1.2.59-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.2.59-no-config.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1259r01.zip - lp1259r01.7z + lpng1259.zip + lpng1259.7z Project files - libpng-1.2.59rc01-project-netware.zip - libpng-1.2.59rc01-project-wince.zip + libpng-1.2.59-project-netware.zip + libpng-1.2.59-project-wince.zip Other information: - libpng-1.2.59rc01-README.txt - libpng-1.2.59rc01-KNOWNBUGS.txt - libpng-1.2.59rc01-LICENSE.txt - libpng-1.2.59rc01-Y2K-compliance.txt - libpng-1.2.59rc01-[previous version]-diff.txt - libpng-1.2.59rc01-*.asc (armored detached GPG signatures) + libpng-1.2.59-README.txt + libpng-1.2.59-KNOWNBUGS.txt + libpng-1.2.59-LICENSE.txt + libpng-1.2.59-Y2K-compliance.txt + libpng-1.2.59-[previous version]-diff.txt + libpng-1.2.59-*.asc (armored detached GPG signatures) Changes since the last public release (1.2.58): -Version 1.2.59beta01 [August 28, 2017] +version 1.2.59 [September 28, 2017] Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse). - -Version 1.2.59beta02 [September 14, 2017] Compute a larger limit on IDAT because some applications write a deflate buffer for each row (Bug report by Andrew Church). - -Version 1.2.59beta03 [September 20, 2017] Initialize memory allocated by png_inflate to zero, using memset, to stop an oss-fuzz "use of uninitialized value" detection in png_set_text_2() - due to truncated iTXT or zTXT chunk. + due to truncated iTXt or zTXt chunk. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 3e923d92..2455f3b2 100644 --- a/CHANGES +++ b/CHANGES @@ -768,7 +768,7 @@ version 1.0.7beta11 [May 7, 2000] Removed the new PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT modes which are no longer used. Eliminated the three new members of png_text when PNG_LEGACY_SUPPORTED is - defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXT_SUPPORTED + defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXt_SUPPORTED is defined. Made PNG_NO_READ|WRITE_iTXt the default setting, to avoid memory overrun when old applications fill the info_ptr->text structure directly. @@ -2939,7 +2939,7 @@ version 1.2.58rc01 [August 19, 2017] in contrib/pngminus/*.c to stop some Coverity issues (162705, 162706, and 162707). -version 1.0.68 and 1.2.58 [September 20, 2017] +version 1.0.68 and 1.2.58 [September 28, 2017] No changes. Version 1.2.59beta01 [August 28, 2017] @@ -2950,10 +2950,12 @@ Version 1.2.59beta02 [September 14, 2017] Compute a larger limit on IDAT because some applications write a deflate buffer for each row (Bug report by Andrew Church). -Version 1.2.59beta03 [September 20, 2017] +Version 1.2.59rc01 [September 21, 2017] Initialize memory allocated by png_inflate to zero, using memset, to stop an oss-fuzz "use of uninitialized value" detection in png_set_text_2() - due to truncated iTXT or zTXT chunk. + due to truncated iTXt or zTXt chunk. + +Version 1.0.69 and 1.2.59 [September 28, 2017] Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a8ffc36..c04eb57e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -215,7 +215,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/libpng-config.in # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 0.${PNGLIB_RELEASE}.1.2.59rc01 +# VERSION 0.${PNGLIB_RELEASE}.1.2.59 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 91fc8610..d54c2316 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.59rc01 - September 20, 2017 +Installing libpng version 1.2.59 - September 28, 2017 On Unix/Linux and similar systems, you can simply type @@ -46,7 +46,7 @@ to have access to the zlib.h and zconf.h include files that correspond to the version of zlib that's installed. You can rename the directories that you downloaded (they -might be called "libpng-1.2.59rc01" or "libpng12" and "zlib-1.2.3" +might be called "libpng-1.2.59" or "libpng12" and "zlib-1.2.3" or "zlib123") so that you have directories called "zlib" and "libpng". Your directory structure should look like this: diff --git a/KNOWNBUG b/KNOWNBUG index c8f60c84..701318e0 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.59rc01 +Known bugs in libpng version 1.2.59 1. February 23, 2006: The custom makefiles don't build libpng with -lz. diff --git a/LICENSE b/LICENSE index 3edfa3c8..2537334a 100644 --- a/LICENSE +++ b/LICENSE @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.2.59rc01, September 20, 2017, are +libpng versions 1.0.7, July 1, 2000, through 1.2.59, September 28, 2017, are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -107,4 +107,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 20, 2017 +September 28, 2017 diff --git a/Makefile.am b/Makefile.am index 3fc8950b..892521b4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -89,7 +89,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.59rc01.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.59.txt pnggccrd.c pngvcrd.c CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 0bfae06a..f75e70fa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -647,7 +647,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.2.59rc01.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.59.txt pnggccrd.c pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/README b/README index 4ed5f051..53d02bb4 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.59rc01 - September 20, 2017 (shared library 12.0) +README for libpng version 1.2.59 - September 28, 2017 (shared library 12.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -207,11 +207,11 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF gcc makefile symbol versioning, - creates libpng12.so.0.1.2.59rc01) + creates libpng12.so.0.1.2.59) makefile.linux => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.59rc01) + libpng12.so.0.1.2.59) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.59rc01, previously + libpng12.so.0.1.2.59, previously used assembler code tuned for Intel MMX platform) makefile.gcc => Generic makefile (gcc, creates static @@ -236,12 +236,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng12.so.0.1.2.59rc01) + (gcc, creates libpng12.so.0.1.2.59) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.59rc01) + (gcc, creates libpng12.so.0.1.2.59) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.59rc01) + (gcc, creates libpng12.so.0.1.2.59) makefile.32sunu => Sun Ultra 32-bit makefile makefile.64sunu => Sun Ultra 64-bit makefile makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc diff --git a/Y2KINFO b/Y2KINFO index d8ee959d..72c00959 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - September 20, 2017 + September 28, 2017 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.2.59rc01 are Y2K compliant. It is my belief that earlier + upward through 1.2.59 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer diff --git a/configure b/configure index e0e66ac7..dfa4b5af 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.2.59rc01. +# Generated by GNU Autoconf 2.69 for libpng 1.2.59. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.59rc01' -PACKAGE_STRING='libpng 1.2.59rc01' +PACKAGE_VERSION='1.2.59' +PACKAGE_STRING='libpng 1.2.59' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1334,7 +1334,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpng 1.2.59rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.59 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1404,7 +1404,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.2.59rc01:";; + short | recursive ) echo "Configuration of libpng 1.2.59:";; esac cat <<\_ACEOF @@ -1523,7 +1523,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.2.59rc01 +libpng configure 1.2.59 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1946,7 +1946,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpng $as_me 1.2.59rc01, which was +It was created by libpng $as_me 1.2.59, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2809,7 +2809,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.2.59rc01' + VERSION='1.2.59' cat >>confdefs.h <<_ACEOF @@ -2926,7 +2926,7 @@ fi -PNGLIB_VERSION=1.2.59rc01 +PNGLIB_VERSION=1.2.59 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=59 @@ -13619,7 +13619,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpng $as_me 1.2.59rc01, which was +This file was extended by libpng $as_me 1.2.59, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13685,7 +13685,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpng config.status 1.2.59rc01 +libpng config.status 1.2.59 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index e8c65875..8dc8e1f1 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.2.59rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.59], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.59rc01 +PNGLIB_VERSION=1.2.59 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=59 diff --git a/libpng-1.2.59rc01.txt b/libpng-1.2.59.txt similarity index 99% rename from libpng-1.2.59rc01.txt rename to libpng-1.2.59.txt index ed9b1a60..e66ca013 100644 --- a/libpng-1.2.59rc01.txt +++ b/libpng-1.2.59.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.59rc01 - September 20, 2017 + libpng version 1.2.59 - September 28, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.59rc01 - September 20, 2017 + libpng versions 0.97, January 1998, through 1.2.59 - September 28, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -879,7 +879,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.2.59rc01, not all possible expansions are supported. +As of libpng version 1.2.59, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3162,7 +3162,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.2.59rc01 are Y2K compliant. It is my belief that earlier +upward through 1.2.59 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that diff --git a/libpng.3 b/libpng.3 index b9160090..41673d68 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "September 20, 2017" +.TH LIBPNG 3 "September 28, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.59rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.59 .SH SYNOPSIS \fB #include \fP @@ -424,7 +424,7 @@ Following is a copy of the libpng.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.2.59rc01 - September 20, 2017 + libpng version 1.2.59 - September 28, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -435,7 +435,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.59rc01 - September 20, 2017 + libpng versions 0.97, January 1998, through 1.2.59 - September 28, 2017 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -1303,7 +1303,7 @@ things. As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was added. It expands the sample depth without changing tRNS to alpha. -As of libpng version 1.2.59rc01, not all possible expansions are supported. +As of libpng version 1.2.59, not all possible expansions are supported. In the following table, the 01 means grayscale with depth<8, 31 means indexed with depth<8, other numerals represent the color type, "T" means @@ -3586,7 +3586,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.2.59rc01 are Y2K compliant. It is my belief that earlier +upward through 1.2.59 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has three year fields. One is a 2-byte unsigned integer that @@ -3740,7 +3740,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.59rc01 - September 20, 2017: +Libpng version 1.2.59 - September 28, 2017: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3765,7 +3765,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.2.59rc01, September 20, 2017, are +libpng versions 1.0.7, July 1, 2000, through 1.2.59, September 28, 2017, are Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals @@ -3862,7 +3862,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -September 20, 2017 +September 28, 2017 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index a9f52b23..784cebe0 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "September 20, 2017" +.TH LIBPNGPF 3 "September 28, 2017" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.59rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.59 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 68202a4d..a2b7da20 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "September 20, 2017" +.TH PNG 5 "September 28, 2017" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 99942a54..71a0ae70 100644 --- a/png.c +++ b/png.c @@ -17,7 +17,7 @@ #include "png.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_59rc01 Your_png_h_is_not_version_1_2_59rc01; +typedef version_1_2_59 Your_png_h_is_not_version_1_2_59; /* Version information for C files. This had better match the version * string defined in png.h. @@ -732,14 +732,14 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.2.59rc01 - September 20, 2017" PNG_STRING_NEWLINE \ + "libpng version 1.2.59 - September 28, 2017" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2017 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 ((png_charp) "libpng version 1.2.59rc01 - September 20, 2017\ + return ((png_charp) "libpng version 1.2.59 - September 28, 2017\ Copyright (c) 1998-2002,2004,2006-2017 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 bcd17c6a..977bb459 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.59rc01, September 20, 2017 + * libpng version 1.2.59, September 28, 2017 * * Copyright (c) 1998-2017 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.59rc01, September 20, 2017: Glenn + * libpng versions 0.97, January 1998, through 1.2.59, September 28, 2017: Glenn * See also "Contributing Authors", below. */ @@ -24,7 +24,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.59rc01, September 20, 2017, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.59, September 28, 2017, are * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are * derived from libpng-1.0.6, and are distributed according to the same * disclaimer and license as libpng-1.0.6 with the following individuals @@ -208,13 +208,13 @@ * Y2K compliance in libpng: * ========================= * - * September 20, 2017 + * September 28, 2017 * * 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.2.59rc01 are Y2K compliant. It is my belief that earlier + * upward through 1.2.59 are Y2K compliant. It is my belief that earlier * versions were also Y2K compliant. * * Libpng only has three year fields. One is a 2-byte unsigned integer @@ -270,9 +270,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.59rc01" +#define PNG_LIBPNG_VER_STRING "1.2.59" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.59rc01 - September 20, 2017\n" + " libpng version 1.2.59 - September 28, 2017\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -285,7 +285,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -302,7 +302,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_RC +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -1340,7 +1340,7 @@ struct png_struct_def /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef png_structp version_1_2_59rc01; +typedef png_structp version_1_2_59; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 02c274dd..3ae7a28b 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.59rc01, September 20, 2017 + * libpng version 1.2.59, September 28, 2017 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrutil.c b/pngrutil.c index 29b4551b..7a226253 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.2.59 [(PENDING RELEASE)] + * Last changed in libpng 1.2.59 [September 28, 2017] * Copyright (c) 1998-2002,2004,2006-2015,2017 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.) diff --git a/pngtest.c b/pngtest.c index f94cac24..238d8833 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1731,4 +1731,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_2_59rc01 your_png_h_is_not_version_1_2_59rc01; +typedef version_1_2_59 your_png_h_is_not_version_1_2_59; diff --git a/projects/wince.txt b/projects/wince.txt index 755933d9..a1541018 100644 --- a/projects/wince.txt +++ b/projects/wince.txt @@ -1,6 +1,6 @@ A set of project files is available for WinCE. Get -libpng-1.2.59rc01-project-wince.zip from a libpng distribution +libpng-1.2.59-project-wince.zip from a libpng distribution site such as http://libpng.sourceforge.net/index.html Put the zip file in this directory (projects) and then run -"unzip -a libpng-1.2.59rc01-project-wince.zip" +"unzip -a libpng-1.2.59-project-wince.zip" diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index d3b1d575..262e4bdd 100644 --- a/projects/xcode/libpng.xcodeproj/project.pbxproj +++ b/projects/xcode/libpng.xcodeproj/project.pbxproj @@ -222,7 +222,7 @@ COPY_PHASE_STRIP = NO; DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.59rc01; + FRAMEWORK_VERSION = 1.2.59; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; @@ -240,7 +240,7 @@ buildSettings = { DYLIB_COMPATIBILITY_VERSION = 3; DYLIB_CURRENT_VERSION = 3; - FRAMEWORK_VERSION = 1.2.59rc01; + FRAMEWORK_VERSION = 1.2.59; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/README.txt b/scripts/README.txt index 6b3f4aa5..53bb85ae 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.2.59rc01 - September 20, 2017 +Makefiles for libpng version 1.2.59 - September 28, 2017 makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.59rc01) + (gcc, creates libpng12.so.0.1.2.59) 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 @@ Makefiles for libpng version 1.2.59rc01 - September 20, 2017 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - gcc, creates libpng12.so.0.1.2.59rc01) + gcc, creates libpng12.so.0.1.2.59) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.gccmmx => Generic gcc makefile previously using MMX code @@ -38,14 +38,14 @@ Makefiles for libpng version 1.2.59rc01 - September 20, 2017 makefile.os2 => OS/2 Makefile (gcc and emx, requires pngos2.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng12.so.0.1.2.59rc01) + creates libpng12.so.0.1.2.59) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.59rc01) + creates libpng12.so.0.1.2.59) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng12.so.0.1.2.59rc01) + creates libpng12.so.0.1.2.59) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.59rc01) + creates libpng12.so.0.1.2.59) 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/libpng-config-head.in b/scripts/libpng-config-head.in index 24d5049e..25998ebe 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.2.59rc01 +version=1.2.59 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 783b83e8..5bf867c7 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng12 Name: libpng Description: Loads and saves PNG files -Version: 1.2.59rc01 +Version: 1.2.59 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index aad84f33..106581c2 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index 496c41d3..1aa418d4 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index a8499c79..f0f52de4 100644 --- a/scripts/makefile.aix +++ b/scripts/makefile.aix @@ -23,7 +23,7 @@ LN_SF = ln -f -s LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 55fb9be8..b33e0c49 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 863acc3c..36472e2b 100644 --- a/scripts/makefile.cygwin +++ b/scripts/makefile.cygwin @@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 CYGDLL = 12 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index b8a9b8a6..8e5358d4 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 93d1d2e5..1db64044 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index bde27532..9f94cf59 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 594cff58..2f1d8b78 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index 06033819..9503ecc6 100644 --- a/scripts/makefile.hp64 +++ b/scripts/makefile.hp64 @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index e81c02f3..795f4617 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index 0fdc7e32..3e6bf630 100644 --- a/scripts/makefile.hpux +++ b/scripts/makefile.hpux @@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 8c69ab4e..974a5adb 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 169c097c..d75e5b7a 100644 --- a/scripts/makefile.mingw +++ b/scripts/makefile.mingw @@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \ LIBNAME = libpng12 PNGMAJ = 0 MINGDLL = 12 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 07f13d30..c77980b6 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng12 LIB= png12 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.59rc01 +SHLIB_MINOR= 1.2.59 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 7a098c67..58fd257f 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.2.59rc01 +SHLIB_MINOR= 1.2.59 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.nommx b/scripts/makefile.nommx index ad881bea..ac77e2f3 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index bb2c4bac..99e63793 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.59rc01 +SHLIB_MINOR= 1.2.59 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index a2a9dacf..07435311 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index c6c9a632..5297fd04 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 25f5f830..1d35e3d2 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 6131a9d1..573651ba 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 18e67990..5a1af83d 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index 581f4862..6268ebd6 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.59rc01 +PNGMIN = 1.2.59 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 9f31f677..af06b032 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.2.59rc01 +;Version 1.2.59 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 842bd233..d42d8856 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.59rc01 +; Version 1.2.59 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 37a12525..bffd8b97 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.59rc01 +;Version 1.2.59 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3