diff options
| author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-11-26 00:01:58 -0600 |
|---|---|---|
| committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-11-26 07:03:58 -0600 |
| commit | 96fa2ae9434de3b324161bafd85dfcee120677d3 (patch) | |
| tree | ccf03bd06529e90236a426e4cf45f4061468d39c | |
| parent | bf2feb235f5f06c5dbe162e69691be409f02f770 (diff) | |
| download | libpng-96fa2ae9434de3b324161bafd85dfcee120677d3.tar.gz | |
[libpng12] Imported from libpng-1.2.55rc01.tarv1.2.55rc01
52 files changed, 136 insertions, 131 deletions
@@ -1,5 +1,5 @@ -Libpng 1.2.55beta02 - November 23, 2015 +Libpng 1.2.55rc01 - November 26, 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,34 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - libpng-1.2.55beta02.tar.xz (LZMA-compressed, recommended) - libpng-1.2.55beta02.tar.gz - libpng-1.2.55beta02.tar.bz2 + libpng-1.2.55rc01.tar.xz (LZMA-compressed, recommended) + libpng-1.2.55rc01.tar.gz Source files with LF line endings (for Unix/Linux) without the "configure" script - libpng-1.2.55beta02-no-config.tar.xz (LZMA-compressed, recommended) - libpng-1.2.55beta02-no-config.tar.gz - libpng-1.2.55beta02-no-config.tar.bz2 + libpng-1.2.55rc01-no-config.tar.xz (LZMA-compressed, recommended) + libpng-1.2.55rc01-no-config.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1255b02.zip - lp1255b02.7z - lp1255b02.tar.bz2 + lp1255r01.zip + lp1255r01.7z Project files - libpng-1.2.55beta02-project-netware.zip - libpng-1.2.55beta02-project-wince.zip + libpng-1.2.55rc01-project-netware.zip + libpng-1.2.55rc01-project-wince.zip Other information: - libpng-1.2.55beta02-README.txt - libpng-1.2.55beta02-KNOWNBUGS.txt - libpng-1.2.55beta02-LICENSE.txt - libpng-1.2.55beta02-Y2K-compliance.txt - libpng-1.2.55beta02-[previous version]-diff.txt - libpng-1.2.55beta02-*.asc (armored detached GPG signatures) + libpng-1.2.55rc01-README.txt + libpng-1.2.55rc01-KNOWNBUGS.txt + libpng-1.2.55rc01-LICENSE.txt + libpng-1.2.55rc01-Y2K-compliance.txt + libpng-1.2.55rc01-[previous version]-diff.txt + libpng-1.2.55rc01-*.asc (armored detached GPG signatures) Changes since the last public release (1.2.54): @@ -47,9 +44,13 @@ version 1.2.55beta01 [November 20, 2015] Avoid potential pointer overflow in png_handle_iTXt(), png_handle_zTXt(), png_handle_sPLT(), and png_handle_pCAL() (Bug report by John Regehr). -version 1.2.55beta02 [%RDATE%] - Fixed bug recently introduced in png_set_PLTE() that uses png_ptr - not info_ptr. +version 1.2.55beta02 [November 23, 2015] + Fixed incorrect implementation of png_set_PLTE() that uses png_ptr + not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126 + vulnerability. + +version 1.2.55rc01 [November 26, 2015] + Discontinued distributing tar.bz2 archives. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -2898,9 +2898,13 @@ version 1.2.55beta01 [November 20, 2015] Avoid potential pointer overflow in png_handle_iTXt(), png_handle_zTXt(), png_handle_sPLT(), and png_handle_pCAL() (Bug report by John Regehr). -version 1.2.55beta02 [%RDATE%] - Fixed bug recently introduced in png_set_PLTE() that uses png_ptr - not info_ptr. +version 1.2.55beta02 [November 23, 2015] + Fixed incorrect implementation of png_set_PLTE() that uses png_ptr + not info_ptr, that left png_set_PLTE() open to the CVE-2015-8126 + vulnerability. + +version 1.2.55rc01 [November 26, 2015] + Discontinued distributing tar.bz2 archives. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index a0f2e3adc..f3a66db5e 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.55beta02 +# VERSION 0.${PNGLIB_RELEASE}.1.2.55rc01 VERSION 0.${PNGLIB_RELEASE}.0 SOVERSION 0 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.2.55beta02 - November 23, 2015 +Installing libpng version 1.2.55rc01 - November 26, 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.55beta02" or "libpng12" and "zlib-1.2.3" +might be called "libpng-1.2.55rc01" 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: @@ -1,5 +1,5 @@ -Known bugs in libpng version 1.2.55beta02 +Known bugs in libpng version 1.2.55rc01 1. February 23, 2006: The custom makefiles don't build libpng with -lz. @@ -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.55beta02, November 23, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.2.55rc01, November 26, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 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 -November 23, 2015 +November 26, 2015 diff --git a/Makefile.am b/Makefile.am index 294c46486..dfcaec278 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.55beta02.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.55rc01.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 148b86d44..9b27951ac 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.55beta02.txt pnggccrd.c pngvcrd.c + example.c libpng-1.2.55rc01.txt pnggccrd.c pngvcrd.c CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \ libpng.sym @@ -1,10 +1,10 @@ -README for libpng version 1.2.55beta02 - November 23, 2015 (shared library 12.0) +README for libpng version 1.2.55rc01 - November 26, 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. -Libpng comes in several distribution formats. Get libpng-*.tar.gz, -libpng-*.tar.xz, or libpng-*.tar.bz2 if you want UNIX-style line +Libpng comes in several distribution formats. Get libpng-*.tar.gz or +libpng-*.tar.xz if you want UNIX-style line endings in the text files, or lpng*.7z or lpng*.zip if you want DOS-style line endings. You can get UNIX-style line endings from the *.zip file by using "unzip -a" but there seems to be no simple way to recover @@ -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.55beta02) + creates libpng12.so.0.1.2.55rc01) makefile.linux => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.55beta02) + libpng12.so.0.1.2.55rc01) makefile.gcmmx => Linux/ELF makefile (gcc, creates - libpng12.so.0.1.2.55beta02, previously + libpng12.so.0.1.2.55rc01, 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.55beta02) + (gcc, creates libpng12.so.0.1.2.55rc01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng12.so.0.1.2.55beta02) + (gcc, creates libpng12.so.0.1.2.55rc01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng12.so.0.1.2.55beta02) + (gcc, creates libpng12.so.0.1.2.55rc01) 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 @@ -1,13 +1,13 @@ Y2K compliance in libpng: ========================= - November 23, 2015 + November 26, 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.55beta02 are Y2K compliant. It is my belief that earlier + upward through 1.2.55rc01 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 @@ -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.55beta02. +# Generated by GNU Autoconf 2.69 for libpng 1.2.55rc01. # # Report bugs to <png-mng-implement@lists.sourceforge.net>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.2.55beta02' -PACKAGE_STRING='libpng 1.2.55beta02' +PACKAGE_VERSION='1.2.55rc01' +PACKAGE_STRING='libpng 1.2.55rc01' 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.55beta02 to adapt to many kinds of systems. +\`configure' configures libpng 1.2.55rc01 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.55beta02:";; + short | recursive ) echo "Configuration of libpng 1.2.55rc01:";; 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.55beta02 +libpng configure 1.2.55rc01 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.55beta02, which was +It was created by libpng $as_me 1.2.55rc01, 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.55beta02' + VERSION='1.2.55rc01' cat >>confdefs.h <<_ACEOF @@ -2926,7 +2926,7 @@ fi -PNGLIB_VERSION=1.2.55beta02 +PNGLIB_VERSION=1.2.55rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=55 @@ -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.55beta02, which was +This file was extended by libpng $as_me 1.2.55rc01, 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.55beta02 +libpng config.status 1.2.55rc01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 744d05d1f..61e931d0f 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.55beta02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.2.55rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.2.55beta02 +PNGLIB_VERSION=1.2.55rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=2 PNGLIB_RELEASE=55 diff --git a/libpng-1.2.55beta02.txt b/libpng-1.2.55rc01.txt index 7f3aa07cf..a4aa954d6 100644 --- a/libpng-1.2.55beta02.txt +++ b/libpng-1.2.55rc01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.2.55beta02 - November 23, 2015 + libpng version 1.2.55rc01 - November 26, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.55beta02 - November 23, 2015 + libpng versions 0.97, January 1998, through 1.2.55rc01 - November 26, 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.55beta02, not all possible expansions are supported. +As of libpng version 1.2.55rc01, 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 @@ -3161,7 +3161,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.55beta02 are Y2K compliant. It is my belief that earlier +upward through 1.2.55rc01 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 23, 2015" +.TH LIBPNG 3 "November 26, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.55beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.55rc01 .SH SYNOPSIS \fB #include <png.h>\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.55beta02 - November 23, 2015 + libpng version 1.2.55rc01 - November 26, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.55beta02 - November 23, 2015 + libpng versions 0.97, January 1998, through 1.2.55rc01 - November 26, 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.55beta02, not all possible expansions are supported. +As of libpng version 1.2.55rc01, 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 @@ -3571,7 +3571,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.55beta02 are Y2K compliant. It is my belief that earlier +upward through 1.2.55rc01 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 @@ -3668,8 +3668,8 @@ the first widely used release: ... 1.0.19 10 10019 10.so.0.19[.0] ... - 1.0.64 10 10064 10.so.0.64[.0] - 1.2.54 13 10254 12.so.0.54[.0] + 1.0.65 10 10065 10.so.0.65[.0] + 1.2.55 13 10255 12.so.0.55[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3725,7 +3725,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.2.55beta02 - November 23, 2015: +Libpng version 1.2.55rc01 - November 26, 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). @@ -3750,7 +3750,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.2.55beta02, November 23, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.2.55rc01, November 26, 2015, are Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -3847,7 +3847,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 23, 2015 +November 26, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index f28d40f77..dd085d0db 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 23, 2015" +.TH LIBPNGPF 3 "November 26, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.2.55beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.2.55rc01 (private functions) .SH SYNOPSIS \fB#include <png.h>\fP @@ -1,4 +1,4 @@ -.TH PNG 5 "November 23, 2015" +.TH PNG 5 "November 26, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_55beta02 Your_png_h_is_not_version_1_2_55beta02; +typedef version_1_2_55rc01 Your_png_h_is_not_version_1_2_55rc01; /* 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.55beta02 - November 23, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.2.55rc01 - November 26, 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.55beta02 - November 23, 2015\ + return ((png_charp) "libpng version 1.2.55rc01 - November 26, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."); @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.2.55beta02, November 23, 2015 + * libpng version 1.2.55rc01, November 26, 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.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.2.55beta02, November 23, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.2.55rc01, November 26, 2015: 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.55beta02, November 23, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.2.55rc01, November 26, 2015, are * Copyright (c) 2000-2002, 2004, 2006-2015 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 @@ -179,8 +179,8 @@ * ... * 1.0.19 10 10019 10.so.0.19[.0] * ... - * 1.0.64 10 10064 10.so.0.64[.0] - * 1.2.54 13 10254 12.so.0.54[.0] + * 1.0.65 10 10065 10.so.0.65[.0] + * 1.2.55 13 10255 12.so.0.55[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -208,13 +208,13 @@ * Y2K compliance in libpng: * ========================= * - * November 23, 2015 + * November 26, 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.55beta02 are Y2K compliant. It is my belief that earlier + * upward through 1.2.55rc01 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.55beta02" +#define PNG_LIBPNG_VER_STRING "1.2.55rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.2.55beta02 - November 23, 2015\n" + " libpng version 1.2.55rc01 - November 26, 2015\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 02 +#define PNG_LIBPNG_VER_BUILD 01 /* 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_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_RC /* 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_55beta02; +typedef png_structp version_1_2_55rc01; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.2.55beta02, November 23, 2015 + * libpng version 1.2.55rc01, November 26, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -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_55beta02 your_png_h_is_not_version_1_2_55beta02; +typedef version_1_2_55rc01 your_png_h_is_not_version_1_2_55rc01; diff --git a/projects/wince.txt b/projects/wince.txt index 43a09212f..d32ad2cae 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.55beta02-project-wince.zip from a libpng distribution +libpng-1.2.55rc01-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.55beta02-project-wince.zip" +"unzip -a libpng-1.2.55rc01-project-wince.zip" diff --git a/projects/xcode/libpng.xcodeproj/project.pbxproj b/projects/xcode/libpng.xcodeproj/project.pbxproj index 8b75bab7e..c123e8a06 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.55beta02; + FRAMEWORK_VERSION = 1.2.55rc01; 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.55beta02; + FRAMEWORK_VERSION = 1.2.55rc01; GCC_PRECOMPILE_PREFIX_HEADER = NO; GCC_PREFIX_HEADER = ""; INFOPLIST_FILE = Info.plist; diff --git a/scripts/README.txt b/scripts/README.txt index c62fc44ac..4eab9b8cf 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.2.55beta02 - November 23, 2015 +Makefiles for libpng version 1.2.55rc01 - November 26, 2015 makefile.linux => Linux/ELF makefile - (gcc, creates libpng12.so.0.1.2.55beta02) + (gcc, creates libpng12.so.0.1.2.55rc01) 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.55beta02 - November 23, 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.55beta02) + gcc, creates libpng12.so.0.1.2.55rc01) 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.55beta02 - November 23, 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.55beta02) + creates libpng12.so.0.1.2.55rc01) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng12.so.0.1.2.55beta02) + creates libpng12.so.0.1.2.55rc01) makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code, - creates libpng12.so.0.1.2.55beta02) + creates libpng12.so.0.1.2.55rc01) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng12.so.0.1.2.55beta02) + creates libpng12.so.0.1.2.55rc01) 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 c86d39dcd..9cfed75ae 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.2.55beta02 +version=1.2.55rc01 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 7fcfd025e..64631fcf3 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.55beta02 +Version: 1.2.55rc01 Libs: -L${libdir} -lpng12 Cflags: -I${includedir} diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu index 53aa0eda4..18acd1585 100644 --- a/scripts/makefile.32sunu +++ b/scripts/makefile.32sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu index ca58a16e1..352a55d2c 100644 --- a/scripts/makefile.64sunu +++ b/scripts/makefile.64sunu @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.aix b/scripts/makefile.aix index a52a53eed..f55c7a976 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.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) prefix=/usr/local diff --git a/scripts/makefile.beos b/scripts/makefile.beos index 7deedffbf..b52535a48 100644 --- a/scripts/makefile.beos +++ b/scripts/makefile.beos @@ -11,7 +11,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin index 63c139c11..2603c2024 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.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=cygpng$(CYGDLL).dll diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin index 61eed372e..3af7ce6fd 100644 --- a/scripts/makefile.darwin +++ b/scripts/makefile.darwin @@ -22,7 +22,7 @@ ZLIBINC=../zlib # Library name: LIBNAME = libpng12 PNGMAJ = 12 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.dec b/scripts/makefile.dec index b7477285a..955b23d57 100644 --- a/scripts/makefile.dec +++ b/scripts/makefile.dec @@ -8,7 +8,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.elf b/scripts/makefile.elf index d75eefeab..421a1da95 100644 --- a/scripts/makefile.elf +++ b/scripts/makefile.elf @@ -16,7 +16,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx index 516ff5bfb..8fae57019 100644 --- a/scripts/makefile.gcmmx +++ b/scripts/makefile.gcmmx @@ -17,7 +17,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64 index b34460bc2..d65029920 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.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc index 9700b143b..b1203590d 100644 --- a/scripts/makefile.hpgcc +++ b/scripts/makefile.hpgcc @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux index a1e46e91f..ec5e8755b 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.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.linux b/scripts/makefile.linux index 6c003d917..0cbd1fd6d 100644 --- a/scripts/makefile.linux +++ b/scripts/makefile.linux @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw index 7466cc296..dd8e068b1 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.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) SHAREDLIB=libpng$(MINGDLL).dll diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index dbe8dbc31..cb9b90a47 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.55beta02 +SHLIB_MINOR= 1.2.55rc01 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 fc693bca4..6527ccce9 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.55beta02 +SHLIB_MINOR= 1.2.55rc01 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 ce2149938..a377191e1 100644 --- a/scripts/makefile.nommx +++ b/scripts/makefile.nommx @@ -10,7 +10,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd index b20700d50..a9da68ddf 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.55beta02 +SHLIB_MINOR= 1.2.55rc01 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/makefile.sco b/scripts/makefile.sco index aa92ca8a6..c39b10fae 100644 --- a/scripts/makefile.sco +++ b/scripts/makefile.sco @@ -12,7 +12,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc index f5d645955..06cba9217 100644 --- a/scripts/makefile.sggcc +++ b/scripts/makefile.sggcc @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi index f8f364683..25729aaf5 100644 --- a/scripts/makefile.sgi +++ b/scripts/makefile.sgi @@ -9,7 +9,7 @@ # Library name: LIBNAME=libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.so9 b/scripts/makefile.so9 index effb38299..23e4eb0e5 100644 --- a/scripts/makefile.so9 +++ b/scripts/makefile.so9 @@ -11,7 +11,7 @@ # Library name: PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) LIBNAME = libpng12 diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris index 7dbd2d9c4..7752e662f 100644 --- a/scripts/makefile.solaris +++ b/scripts/makefile.solaris @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86 index cd46aa2fc..d611c7d29 100644 --- a/scripts/makefile.solaris-x86 +++ b/scripts/makefile.solaris-x86 @@ -11,7 +11,7 @@ # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.55beta02 +PNGMIN = 1.2.55rc01 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 0ee066f4e..85ae07447 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -5,7 +5,7 @@ LIBRARY lpngce EXPORTS -;Version 1.2.55beta02 +;Version 1.2.55rc01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 084086660..51f0e4feb 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.2.55beta02 +; Version 1.2.55rc01 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngw32.def b/scripts/pngw32.def index a205edc7e..b15059333 100644 --- a/scripts/pngw32.def +++ b/scripts/pngw32.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.2.55beta02 +;Version 1.2.55rc01 png_build_grayscale_palette @1 png_check_sig @2 png_chunk_error @3 |