From a69e82ed16fefaa8ce4741c75a5c8ae1d320b7f8 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Sun, 13 Dec 2015 21:30:52 -0600 Subject: [PATCH] [libpng14] Imported from libpng-1.4.19rc01.tar --- ANNOUNCE | 18 +++++++-------- CHANGES | 2 +- CMakeLists.txt | 2 +- INSTALL | 4 ++-- LICENSE | 4 ++-- Makefile.am | 2 +- Makefile.in | 2 +- README | 12 +++++----- configure | 22 +++++++++---------- configure.ac | 4 ++-- ...-1.4.19beta02.txt => libpng-1.4.19rc01.txt | 8 +++---- libpng.3 | 20 ++++++++--------- libpngpf.3 | 4 ++-- png.5 | 2 +- png.c | 6 ++--- png.h | 22 +++++++++---------- pngconf.h | 2 +- pngpriv.h | 6 ++--- pngset.c | 8 +++---- pngtest.c | 2 +- pngwutil.c | 2 +- projects/vstudio/readme.txt | 2 +- projects/vstudio/zlib.props | 2 +- scripts/README.txt | 12 +++++----- scripts/libpng-config-head.in | 2 +- scripts/libpng.pc.in | 2 +- scripts/makefile.ne12bsd | 2 +- scripts/makefile.netbsd | 2 +- scripts/makefile.openbsd | 2 +- scripts/png32ce.def | 2 +- scripts/pngos2.def | 2 +- scripts/pngwin.def | 2 +- 32 files changed, 93 insertions(+), 93 deletions(-) rename libpng-1.4.19beta02.txt => libpng-1.4.19rc01.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index 9cd53338f..209da701d 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.4.19beta02 - December 13, 2015 +Libpng 1.4.19rc01 - December 14, 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,20 +9,20 @@ Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.4.19beta02.tar.xz (LZMA-compressed, recommended) - 1.4.19beta02.tar.gz + 1.4.19rc01.tar.xz (LZMA-compressed, recommended) + 1.4.19rc01.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1419b02.7z (LZMA-compressed, recommended) - lp1419b02.zip + lp1419r01.7z (LZMA-compressed, recommended) + lp1419r01.zip Other information: - 1.4.19beta02-README.txt - 1.4.19beta02-LICENSE.txt - libpng-1.4.19beta02-*.asc (armored detached GPG signatures) + 1.4.19rc01-README.txt + 1.4.19rc01-LICENSE.txt + libpng-1.4.19rc01-*.asc (armored detached GPG signatures) Changes since the last public release (1.4.18): @@ -30,7 +30,7 @@ version 1.4.19beta01 [December 11, 2015] Fixed an out-of-range read in png_check_keyword() (Bug report from Qixue Xiao, CVE-2015-8540). -version 1.4.19beta02 [December 13, 2015] +version 1.4.19rc01 [December 14, 2015] Corrected copyright dates in source files. Moved png_check_keyword() from pngwutil.c to pngset.c diff --git a/CHANGES b/CHANGES index ccadf7af7..e0ab16b4e 100644 --- a/CHANGES +++ b/CHANGES @@ -3026,7 +3026,7 @@ version 1.4.19beta01 [December 11, 2015] Fixed an out-of-range read in png_check_keyword() (Bug report from Qixue Xiao, CVE-2015-8540). -version 1.4.19beta02 [December 13, 2015] +version 1.4.19rc01 [December 14, 2015] Corrected copyright dates in source files. Moved png_check_keyword() from pngwutil.c to pngset.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 762d1d9c8..0ee77a293 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -255,7 +255,7 @@ install(CODE ${PNG_CONFIG_INSTALL_CODE}) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 14.${PNGLIB_RELEASE}.1.4.19beta02 +# VERSION 14.${PNGLIB_RELEASE}.1.4.19rc01 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index b756549ef..14fd85738 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.19beta02 - December 13, 2015 +Installing libpng version 1.4.19rc01 - December 14, 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.4.19beta02" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.19rc01" or "libpng14" 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/LICENSE b/LICENSE index 05dc9d6df..467523655 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.4.19beta02, December 13, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.4.19rc01, December 14, 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 -December 13, 2015 +December 14, 2015 diff --git a/Makefile.am b/Makefile.am index edbd7c077..d95d1d5fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -79,7 +79,7 @@ EXTRA_DIST= \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.19beta02.txt + example.c libpng-1.4.19rc01.txt CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym diff --git a/Makefile.in b/Makefile.in index 4815c7daa..b83d27cf1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -628,7 +628,7 @@ EXTRA_DIST = \ ${srcdir}/contrib/pngsuite/* \ ${srcdir}/contrib/visupng/* \ $(TESTS) \ - example.c libpng-1.4.19beta02.txt + example.c libpng-1.4.19rc01.txt CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym diff --git a/README b/README index 85c65df89..6f4df9661 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.19beta02 - December 13, 2015 (shared library 14.0) +README for libpng version 1.4.19rc01 - December 14, 2015 (shared library 14.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -187,9 +187,9 @@ Files in this distribution: makefile.std => Generic UNIX makefile (cc, creates static libpng.a) makefile.elf => Linux/ELF makefile symbol versioning, - (gcc, creates libpng14.so.14.1.4.19beta02) + (gcc, creates libpng14.so.14.1.4.19rc01) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.19beta02) + (gcc, creates libpng14.so.14.1.4.19rc01) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -211,12 +211,12 @@ Files in this distribution: makefile.openbsd => OpenBSD makefile makefile.sgi => Silicon Graphics IRIX (cc, creates static lib) makefile.sggcc => Silicon Graphics - (gcc, creates libpng14.so.14.1.4.19beta02) + (gcc, creates libpng14.so.14.1.4.19rc01) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.19beta02) + (gcc, creates libpng14.so.14.1.4.19rc01) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.19beta02) + (gcc, creates libpng14.so.14.1.4.19rc01) 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/configure b/configure index 21342c650..28ebb253a 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.4.19beta02. +# Generated by GNU Autoconf 2.69 for libpng 1.4.19rc01. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.19beta02' -PACKAGE_STRING='libpng 1.4.19beta02' +PACKAGE_VERSION='1.4.19rc01' +PACKAGE_STRING='libpng 1.4.19rc01' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1333,7 +1333,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.4.19beta02 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.19rc01 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1403,7 +1403,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.4.19beta02:";; + short | recursive ) echo "Configuration of libpng 1.4.19rc01:";; esac cat <<\_ACEOF @@ -1520,7 +1520,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.4.19beta02 +libpng configure 1.4.19rc01 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1943,7 +1943,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.4.19beta02, which was +It was created by libpng $as_me 1.4.19rc01, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2806,7 +2806,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.4.19beta02' + VERSION='1.4.19rc01' cat >>confdefs.h <<_ACEOF @@ -2923,7 +2923,7 @@ fi -PNGLIB_VERSION=1.4.19beta02 +PNGLIB_VERSION=1.4.19rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=19 @@ -13615,7 +13615,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.4.19beta02, which was +This file was extended by libpng $as_me 1.4.19rc01, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13681,7 +13681,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.4.19beta02 +libpng config.status 1.4.19rc01 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 31a54bfbd..f29178a95 100644 --- a/configure.ac +++ b/configure.ac @@ -16,14 +16,14 @@ dnl should not be necessary to regenerate configure if the time dnl stamps are correct AC_PREREQ(2.59) -AC_INIT([libpng], [1.4.19beta02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.19rc01], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE dnl stop configure from automagically running automake AM_MAINTAINER_MODE dnl Version number stuff here: -PNGLIB_VERSION=1.4.19beta02 +PNGLIB_VERSION=1.4.19rc01 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=19 diff --git a/libpng-1.4.19beta02.txt b/libpng-1.4.19rc01.txt similarity index 99% rename from libpng-1.4.19beta02.txt rename to libpng-1.4.19rc01.txt index ee5c0bb20..2027a62b0 100644 --- a/libpng-1.4.19beta02.txt +++ b/libpng-1.4.19rc01.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.19beta02 - December 13, 2015 + libpng version 1.4.19rc01 - December 14, 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.4.19beta02 - December 13, 2015 + libpng versions 0.97, January 1998, through 1.4.19rc01 - December 14, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -907,7 +907,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.4.19beta02, not all possible expansions are supported. +As of libpng version 1.4.19rc01, 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 @@ -3298,7 +3298,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.4.19beta02 are Y2K compliant. It is my belief that earlier +upward through 1.4.19rc01 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 9f267d7c9..52f2e075e 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "December 13, 2015" +.TH LIBPNG 3 "December 14, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.19beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.19rc01 .SH SYNOPSIS \fB #include \fP @@ -442,7 +442,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT libpng.txt - A description on how to use and modify libpng - libpng version 1.4.19beta02 - December 13, 2015 + libpng version 1.4.19rc01 - December 14, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -453,7 +453,7 @@ libpng.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.4.19beta02 - December 13, 2015 + libpng versions 0.97, January 1998, through 1.4.19rc01 - December 14, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -1349,7 +1349,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.4.19beta02, not all possible expansions are supported. +As of libpng version 1.4.19rc01, 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 @@ -3740,7 +3740,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.4.19beta02 are Y2K compliant. It is my belief that earlier +upward through 1.4.19rc01 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 @@ -3837,7 +3837,7 @@ the first widely used release: ... 1.0.19 10 10019 10.so.0.19[.0] ... - 1.4.18 14 10418 14.so.14.18[.0] + 1.4.18 14 10419 14.so.14.19[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -3893,7 +3893,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.19beta02 - December 13, 2015: +Libpng version 1.4.19rc01 - December 14, 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). @@ -3918,7 +3918,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.4.19beta02, December 13, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.4.19rc01, December 14, 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 @@ -4015,7 +4015,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -December 13, 2015 +December 14, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 9c7f7c25a..105a91ee1 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "December 13, 2015" +.TH LIBPNGPF 3 "December 14, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.19beta02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.19rc01 (private functions) .SH SYNOPSIS \fB#include diff --git a/png.5 b/png.5 index e20620bb3..6ad904066 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "December 13, 2015" +.TH PNG 5 "December 14, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 52b79025d..29d552043 100644 --- a/png.c +++ b/png.c @@ -17,7 +17,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_19beta02 Your_png_h_is_not_version_1_4_19beta02; +typedef version_1_4_19rc01 Your_png_h_is_not_version_1_4_19rc01; /* Tells libpng that we have already handled the first "num_bytes" bytes * of the PNG file signature. If the PNG data is embedded into another @@ -558,14 +558,14 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.19beta02 - December 13, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.4.19rc01 - December 14, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-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.4.19beta02 - December 13, 2015\ + return ((png_charp) "libpng version 1.4.19rc01 - December 14, 2015\ Copyright (c) 1998-2002,2004,2006-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 a0e15298e..b89a78e2e 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.19beta02, December 13, 2015 + * libpng version 1.4.19rc01, December 14, 2015 * * Copyright (c) 1998-2002,2004,2006-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.4.19beta02, December 13, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.4.19rc01, December 14, 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.4.19beta02, December 13, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.4.19rc01, December 14, 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,7 +179,7 @@ * ... * 1.0.19 10 10019 10.so.0.19[.0] * ... - * 1.4.18 14 10418 14.so.14.18[.0] + * 1.4.19 14 10419 14.so.14.19[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -207,13 +207,13 @@ * Y2K compliance in libpng: * ========================= * - * December 13, 2015 + * December 14, 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.4.19beta02 are Y2K compliant. It is my belief that earlier + * upward through 1.4.19rc01 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 @@ -269,9 +269,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.4.19beta02" +#define PNG_LIBPNG_VER_STRING "1.4.19rc01" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.19beta02 - December 13, 2015\n" + " libpng version 1.4.19rc01 - December 14, 2015\n" #define PNG_LIBPNG_VER_SONUM 14 #define PNG_LIBPNG_VER_DLLNUM 14 @@ -284,7 +284,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 @@ -301,7 +301,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. @@ -1378,7 +1378,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_4_19beta02; +typedef png_structp version_1_4_19rc01; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index ca74f7e5f..d999aaa85 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.19beta02, December 13, 2015 + * libpng version 1.4.19rc01, December 14, 2015 * * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngpriv.h b/pngpriv.h index 7a145dd0c..2e136401a 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.19beta02 - December 13, 2015 + * libpng version 1.4.19rc01 - December 14, 2015 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2002,2004,2006-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -417,8 +417,8 @@ PNG_EXTERN void png_write_hIST PNGARG((png_structp png_ptr, png_uint_16p hist, int num_hist)); #endif -#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_pCAL_SUPPORTED) || \ - defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) +#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \ + defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED) PNG_EXTERN png_size_t png_check_keyword PNGARG((png_structp png_ptr, png_charp key, png_charpp new_key)); #endif diff --git a/pngset.c b/pngset.c index 22bfeb529..b4adea88c 100644 --- a/pngset.c +++ b/pngset.c @@ -1,8 +1,8 @@ /* pngset.c - storage of image information into info struct * + * Last changed in libpng 1.4.19 [December 14, 2015] * Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson - * 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.) * @@ -1187,8 +1187,8 @@ png_set_benign_errors(png_structp png_ptr, int allowed) } #endif /* PNG_BENIGN_ERRORS_SUPPORTED */ -#if defined(PNG_TEXT_SUPPORTED) || defined(PNG_pCAL_SUPPORTED) || \ - defined(PNG_iCCP_SUPPORTED) || defined(PNG_sPLT_SUPPORTED) +#if defined(PNG_WRITE_TEXT_SUPPORTED) || defined(PNG_WRITE_pCAL_SUPPORTED) || \ + defined(PNG_WRITE_iCCP_SUPPORTED) || defined(PNG_WRITE_sPLT_SUPPORTED) /* Check that the tEXt or zTXt keyword is valid per PNG 1.0 specification, * and if invalid, correct the keyword rather than discarding the entire * chunk. The PNG 1.0 specification requires keywords 1-79 characters in @@ -1316,5 +1316,5 @@ png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key) return (key_len); } -#endif /* TEXT || pCAL) || iCCP || sPLT */ +#endif /* WRITE_TEXT || WRITE_pCAL) || WRITE_iCCP || WRITE_sPLT */ #endif /* READ || WRITE */ diff --git a/pngtest.c b/pngtest.c index 33ac4eece..729215e71 100644 --- a/pngtest.c +++ b/pngtest.c @@ -1737,4 +1737,4 @@ main(int argc, char *argv[]) } /* Generate a compiler error if there is an old png.h in the search path. */ -typedef version_1_4_19beta02 your_png_h_is_not_version_1_4_19beta02; +typedef version_1_4_19rc01 your_png_h_is_not_version_1_4_19rc01; diff --git a/pngwutil.c b/pngwutil.c index 3123a46d2..f2f32bde1 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.4.17 [November 12, 2015] + * Last changed in libpng 1.4.19 [December 14, 2015] * Copyright (c) 1998-2002,2004,2006-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.) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index ac766f764..46e38b41e 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.19beta02 - December 13, 2015 +libpng version 1.4.19rc01 - December 14, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 7c102c707..673af55a5 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@