diff --git a/ANNOUNCE b/ANNOUNCE index ca50ce72..b1eaeabf 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.2.54rc01 - October 28, 2015 +Libpng 1.2.54rc02 - October 31, 2015 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,37 +9,37 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.54rc01.tar.xz (LZMA-compressed, recommended) - libpng-1.2.54rc01.tar.gz - libpng-1.2.54rc01.tar.bz2 + libpng-1.2.54rc02.tar.xz (LZMA-compressed, recommended) + libpng-1.2.54rc02.tar.gz + libpng-1.2.54rc02.tar.bz2 Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.54rc01-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.2.54rc01-no-config.tar.gz - libpng-1.2.54rc01-no-config.tar.bz2 + libpng-1.2.54rc02-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.2.54rc02-no-config.tar.gz + libpng-1.2.54rc02-no-config.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1254r01.zip - lp1254r01.7z - lp1254r01.tar.bz2 + lp1254r02.zip + lp1254r02.7z + lp1254r02.tar.bz2 Project files - libpng-1.2.54rc01-project-netware.zip - libpng-1.2.54rc01-project-wince.zip + libpng-1.2.54rc02-project-netware.zip + libpng-1.2.54rc02-project-wince.zip Other information: - libpng-1.2.54rc01-README.txt - libpng-1.2.54rc01-KNOWNBUGS.txt - libpng-1.2.54rc01-LICENSE.txt - libpng-1.2.54rc01-Y2K-compliance.txt - libpng-1.2.54rc01-[previous version]-diff.txt - libpng-1.2.54rc01-*.asc (armored detached GPG signatures) + libpng-1.2.54rc02-README.txt + libpng-1.2.54rc02-KNOWNBUGS.txt + libpng-1.2.54rc02-LICENSE.txt + libpng-1.2.54rc02-Y2K-compliance.txt + libpng-1.2.54rc02-[previous version]-diff.txt + libpng-1.2.54rc02-*.asc (armored detached GPG signatures) Changes since the last public release (1.2.53): @@ -61,6 +61,10 @@ version 1.2.54beta01 [October 23, 2015] version 1.2.54rc01 [October 28, 2015] No changes. +version 1.2.54rc02 [October 31, 2015] + Prevent writing over-length PLTE chunk (Cosmin Truta). + Silently truncate over-length PLTE chunk while reading. + 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 4fae3b29..2706db86 100644 --- a/CHANGES +++ b/CHANGES @@ -2877,6 +2877,10 @@ version 1.2.54beta01 [October 23, 2015] version 1.2.54rc01 [October 28, 2015] No changes. +version 1.2.54rc02 [October 31, 2015] + Prevent writing over-length PLTE chunk (Cosmin Truta). + Silently truncate over-length PLTE chunk while reading. + 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 274e437c..4d801c8e 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.54rc01 +# VERSION 0.${PNGLIB_RELEASE}.1.2.54rc02 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 6576c12d..8bf53749 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.2.54rc01 - October 28, 2015 +Installing libpng version 1.2.54rc02 - October 31, 2015 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.54rc01" or "libpng12" and "zlib-1.2.3" +might be called "libpng-1.2.54rc02" 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 958cd26d..8e31e0cc 100644 --- a/KNOWNBUG +++ b/KNOWNBUG @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.54rc01 +Known bugs in libpng version 1.2.54rc02 1. February 23, 2006: The custom makefiles don't build libpng with -lz. diff --git a/LICENSE b/LICENSE index 0090b66f..d4bec76b 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.54rc01, October 28, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.2.54rc02, October 31, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -102,4 +102,4 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 28, 2015 +October 31, 2015 diff --git a/Makefile.am b/Makefile.am index e5b82df5..2788961b 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.54rc01.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.54rc02.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 44960e44..9aa50d63 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.54rc01.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.54rc02.txt pnggccrd.c pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym diff --git a/README b/README index a3cd7ec5..88a48783 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.2.54rc01 - October 28, 2015 (shared library 12.0) +README for libpng version 1.2.54rc02 - October 31, 2015 (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.54rc01) + creates libpng12.so.0.1.2.54rc02) makefile.linux => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.54rc01) + libpng12.so.0.1.2.54rc02) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.54rc01, previously + libpng12.so.0.1.2.54rc02, 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.54rc01) + (gcc, creates libpng12.so.0.1.2.54rc02) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.54rc01) + (gcc, creates libpng12.so.0.1.2.54rc02) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.54rc01) + (gcc, creates libpng12.so.0.1.2.54rc02) 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 28efe17e..6daad647 100644 --- a/Y2KINFO +++ b/Y2KINFO @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - October 28, 2015 + October 31, 2015 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.54rc01 are Y2K compliant. It is my belief that earlier + upward through 1.2.54rc02 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 e7bdac6b..5bad289e 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.54rc01. +# Generated by GNU Autoconf 2.69 for libpng 1.2.54rc02. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.54rc01' -PACKAGE_STRING='libpng 1.2.54rc01' +PACKAGE_VERSION='1.2.54rc02' +PACKAGE_STRING='libpng 1.2.54rc02' 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.54rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.54rc02 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.54rc01:";; + short | recursive ) echo "Configuration of libpng 1.2.54rc02:";; 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.54rc01 +libpng configure 1.2.54rc02 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.54rc01, which was +It was created by libpng $as_me 1.2.54rc02, 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.54rc01' + VERSION='1.2.54rc02' cat >>confdefs.h <<_ACEOF @@ -2926,7 +2926,7 @@ fi -PNGLIB_VERSION=1.2.54rc01 +PNGLIB_VERSION=1.2.54rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=54 @@ -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.54rc01, which was +This file was extended by libpng $as_me 1.2.54rc02, 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.54rc01 +libpng config.status 1.2.54rc02 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index b59b9f2b..348631a1 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.54rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.54rc02], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.54rc01 +PNGLIB_VERSION=1.2.54rc02 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=54 diff --git a/libpng-1.2.54rc01.txt b/libpng-1.2.54rc02.txt similarity index 99% rename from libpng-1.2.54rc01.txt rename to libpng-1.2.54rc02.txt index 1839f114..4a7e8a73 100644 --- a/libpng-1.2.54rc01.txt +++ b/libpng-1.2.54rc02.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.54rc01 - October 28, 2015 + libpng version 1.2.54rc02 - October 31, 2015 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.54rc01 - October 28, 2015 + libpng versions 0.97, January 1998, through 1.2.54rc02 - October 31, 2015 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.54rc01, not all possible expansions are supported. +As of libpng version 1.2.54rc02, 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 @@ -3013,6 +3013,11 @@ which does not. It has been deprecated since libpng-1.0.18 and 1.2.9. IX. (Omitted) +Starting with libpng-1.2.54, attempting to set an over-length +PLTE chunk is an error. Previously this requirement of the PNG specification +was not enforced, and the palette was always limited to 256 entries. +An over-length PLTE chunk found in an input PNG is silently truncated. + X. Detecting libpng The png_get_io_ptr() function has been present since libpng-0.88, has never @@ -3152,13 +3157,13 @@ Other rules can be inferred by inspecting the libpng source. XIII. Y2K Compliance in libpng -October 28, 2015 +October 31, 2015 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.54rc01 are Y2K compliant. It is my belief that earlier +upward through 1.2.54rc02 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 0195c830..ecb4fbb4 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "October 28, 2015" +.TH LIBPNG 3 "October 31, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.54rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.54rc02 .SH SYNOPSIS \fB #include \fP @@ -410,7 +410,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.54rc01 - October 28, 2015 + libpng version 1.2.54rc02 - October 31, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -421,7 +421,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.2.54rc01 - October 28, 2015 + libpng versions 0.97, January 1998, through 1.2.54rc02 - October 31, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -1289,7 +1289,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.54rc01, not all possible expansions are supported. +As of libpng version 1.2.54rc02, 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 @@ -3423,6 +3423,11 @@ which does not. It has been deprecated since libpng-1.0.18 and 1.2.9. .SH IX. (Omitted) +Starting with libpng-1.2.54, attempting to set an over-length +PLTE chunk is an error. Previously this requirement of the PNG specification +was not enforced, and the palette was always limited to 256 entries. +An over-length PLTE chunk found in an input PNG is silently truncated. + .SH X. Detecting libpng The png_get_io_ptr() function has been present since libpng-0.88, has never @@ -3562,13 +3567,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIII. Y2K Compliance in libpng -October 28, 2015 +October 31, 2015 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.54rc01 are Y2K compliant. It is my belief that earlier +upward through 1.2.54rc02 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 @@ -3904,7 +3909,7 @@ the first widely used release: 1.0.63 10 10063 10.so.0.63[.0] 1.2.53 13 10253 12.so.0.53[.0] 1.2.54beta01 13 10254 12.so.0.54[.0] - 1.2.54rc01 13 10254 12.so.0.54[.0] + 1.2.54rc01-02 13 10254 12.so.0.54[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3960,7 +3965,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.54rc01 - October 28, 2015: +Libpng version 1.2.54rc02 - October 31, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -3983,7 +3988,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.2.54rc01, October 28, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.2.54rc02, October 31, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: @@ -4075,7 +4080,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -October 28, 2015 +October 31, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 71454ebd..aa3a68a9 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "October 28, 2015" +.TH LIBPNGPF 3 "October 31, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.54rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.54rc02 (private functions) .SH SYNOPSIS \fB#include \fP diff --git a/png.5 b/png.5 index 8bdec3e6..f8029bf0 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "October 28, 2015" +.TH PNG 5 "October 31, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 6d501165..1a901d55 100644 --- a/png.c +++ b/png.c @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.2.53 [February 26, 2015] + * Last changed in libpng 1.2.54 [October 31, 2015] * Copyright (c) 1998-2015 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.) @@ -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_54rc01 Your_png_h_is_not_version_1_2_54rc01; +typedef version_1_2_54rc02 Your_png_h_is_not_version_1_2_54rc02; /* Version information for C files. This had better match the version * string defined in png.h. @@ -731,13 +731,13 @@ png_get_copyright(png_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.2.54rc01 - October 28, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.2.54rc02 - October 31, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 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.54rc01 - October 28, 2015\ + return ((png_charp) "libpng version 1.2.54rc02 - October 31, 2015\ Copyright (c) 1998-2015 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 5f872527..877d45ce 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.54rc01, October 28, 2015 + * libpng version 1.2.54rc02, October 31, 2015 * * Copyright (c) 1998-2015 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.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.54rc01, October 28, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.2.54rc02, October 31, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -299,7 +299,7 @@ * 1.0.63 10 10063 10.so.0.63[.0] * 1.2.53 13 10253 12.so.0.53[.0] * 1.2.54beta01 13 10254 12.so.0.54[.0] - * 1.2.54rc01 13 10254 12.so.0.54[.0] + * 1.2.54rc01-02 13 10254 12.so.0.54[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -331,7 +331,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.0.7, July 1, 2000, through 1.2.54rc01, October 28, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.54rc02, October 31, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.0.6 * with the following individuals added to the list of Contributing Authors: @@ -438,13 +438,13 @@ * Y2K compliance in libpng: * ========================= * - * October 28, 2015 + * October 31, 2015 * * 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.54rc01 are Y2K compliant. It is my belief that earlier + * upward through 1.2.54rc02 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 @@ -500,9 +500,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.2.54rc01" +#define PNG_LIBPNG_VER_STRING "1.2.54rc02" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.54rc01 - October 28, 2015\n" + " libpng version 1.2.54rc02 - October 31, 2015\n" #define PNG_LIBPNG_VER_SONUM 0 #define PNG_LIBPNG_VER_DLLNUM 13 @@ -515,7 +515,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 01 +#define PNG_LIBPNG_VER_BUILD 02 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -1570,7 +1570,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_54rc01; +typedef png_structp version_1_2_54rc02; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 75e256cb..23f770de 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.54rc01, October 28, 2015 + * libpng version 1.2.54rc02, October 31, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngtest.c b/pngtest.c index 0ba1f2ae..9c07ffce 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.2.53 [February 26, 2015] + * Last changed in libpng 1.2.54 [October 31, 2015] * Copyright (c) 1998-2015 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.) @@ -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_54rc01 your_png_h_is_not_version_1_2_54rc01; +typedef version_1_2_54rc02 your_png_h_is_not_version_1_2_54rc02; diff --git a/projects/wince.txt b/projects/wince.txt index cd723571..410f1696 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.54rc01-project-wince.zip from a libpng distribution +libpng-1.2.54rc02-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.54rc01-project-wince.zip" +"unzip -a libpng-1.2.54rc02-project-wince.zip" diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index cba442aa..dfb9325e 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.54rc01; + FRAMEWORK_VERSION = 1.2.54rc02; 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.54rc01; + FRAMEWORK_VERSION = 1.2.54rc02; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/README.txt b/scripts/README.txt index 4c725050..4df244df 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.2.54rc01 - October 28, 2015 +Makefiles for libpng version 1.2.54rc02 - October 31, 2015 makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.54rc01) + (gcc, creates libpng12.so.0.1.2.54rc02) 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.54rc01 - October 28, 2015 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.54rc01) + gcc, creates libpng12.so.0.1.2.54rc02) 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.54rc01 - October 28, 2015 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.54rc01) + creates libpng12.so.0.1.2.54rc02) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.54rc01) + creates libpng12.so.0.1.2.54rc02) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng12.so.0.1.2.54rc01) + creates libpng12.so.0.1.2.54rc02) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.54rc01) + creates libpng12.so.0.1.2.54rc02) 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 b897c7e1..6cb66905 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.2.54rc01 +version=1.2.54rc02 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index cce78aa4..66b78750 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.54rc01 +Version: 1.2.54rc02 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 17057dd4..2613d07b 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index e8423101..5451bbfc 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index 38ce80c6..8f251542 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.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 583d1df5..5314bfb4 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index b9f967b5..1324174d 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.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index adb383bc..c1c6730c 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index 0a62dd1f..d2b6f50f 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index 39a63d70..bc5e679d 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 04423f17..251429a8 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index a89d6126..f6e902da 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.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index d9c873b5..94a15711 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index c3c36127..a0f48b7f 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.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index c368dd69..39484c0b 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 876108b7..c3b32eed 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.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 5a51ab59..4d60fdac 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.54rc01 +SHLIB_MINOR= 1.2.54rc02 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 438ee486..8e7ccb61 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.54rc01 +SHLIB_MINOR= 1.2.54rc02 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 2e084059..3e655e50 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index 12980b77..e371af38 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.54rc01 +SHLIB_MINOR= 1.2.54rc02 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index c04d56eb..0ef7b6ad 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index 624a9d32..11b2c69a 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index 5a283b32..3847f0d4 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index 792efa40..33cd55f1 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index dbc5762b..a9bb36c6 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index ab3865bc..03951380 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.54rc01 +PNGMIN = 1.2.54rc02 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index f90fd313..dfbad67a 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.2.54rc01 +;Version 1.2.54rc02 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 64f489e3..bc4c1f42 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.54rc01 +; Version 1.2.54rc02 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index 265dc458..14d7a8bf 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.54rc01 +;Version 1.2.54rc02 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3