From 877590539cb260dbad950b35ead729f3869d7838 Mon Sep 17 00:00:00 2001 From: Glenn Randers-Pehrson Date: Thu, 12 Nov 2015 06:58:03 -0600 Subject: [PATCH] [libpng14] Imported from libpng-1.4.17.tar --- ANNOUNCE | 39 ++++++---------------- CHANGES | 3 ++ CMakeLists.txt | 2 +- INSTALL | 4 +-- LICENSE | 4 +-- Makefile.am | 2 +- Makefile.in | 2 +- README | 12 +++---- configure | 22 ++++++------ configure.ac | 4 +-- libpng-1.4.17rc04.txt => libpng-1.4.17.txt | 8 ++--- libpng.3 | 18 +++++----- libpngpf.3 | 4 +-- png.5 | 2 +- png.c | 6 ++-- png.h | 20 +++++------ pngconf.h | 4 +-- pngpriv.h | 2 +- pngrtran.c | 2 +- pngrutil.c | 2 +- pngset.c | 2 +- pngtest.c | 4 +-- 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 +- 34 files changed, 94 insertions(+), 108 deletions(-) rename libpng-1.4.17rc04.txt => libpng-1.4.17.txt (99%) diff --git a/ANNOUNCE b/ANNOUNCE index f6e21a13b..7df0406f5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,34 +1,32 @@ -Libpng 1.4.17rc04 - November 5, 2015 +Libpng 1.4.17 - November 12, 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. +This is a public release of libpng, intended for use in production codes. Files available for download: Source files with LF line endings (for Unix/Linux) and with a "configure" script - 1.4.17rc04.tar.xz (LZMA-compressed, recommended) - 1.4.17rc04.tar.gz - 1.4.17rc04.tar.bz2 + libpng-1.4.17.tar.xz (LZMA-compressed, recommended) + libpng-1.4.17.tar.gz + libpng-1.4.17.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1417r04.7z (LZMA-compressed, recommended) - lp1417r04.zip + lpng1417.7z (LZMA-compressed, recommended) + lpng1417.zip Other information: - 1.4.17rc04-README.txt - 1.4.17rc04-LICENSE.txt - libpng-1.4.17rc04-*.asc (armored detached GPG signatures) + libpng-1.4.17-README.txt + libpng-1.4.17-LICENSE.txt + libpng-1.4.17-*.asc (armored detached GPG signatures) Changes since the last public release (1.4.16): -version 1.4.17beta01 [August 19, 2015] - Fix typecast in a png_debug2() statement in png_set_text_2() to + Fixed typecast in a png_debug2() statement in png_set_text_2() to avoid a compiler warning in PNG_DEBUG builds. Avoid Coverity issues 80855, 80856, and 80857 (PRINTF_ARG_MISMATCH) in pngtest.c PNG_DEBUG builds. @@ -48,32 +46,17 @@ version 1.4.17beta01 [August 19, 2015] to 0x80000000) can still pass through, but since these are not illegal in ANSI-C (unlike 0x80000000 in the signed case) the checking that occurs later can catch them (John Bowler). - -version 1.4.17beta02 [October 15, 2015] Fixed png_save_int_32 when int is not 2's complement (John Bowler). Added sPLT support to pngtest.c - -version 1.4.17beta03 [October 23, 2015] Added a safety check in png_set_tIME() (Fixes CVE-2015-7981, bug report from Qixue Xiao). - -version 1.4.17rc01 [October 28, 2015] - No changes. - -version 1.4.17rc02 [October 31, 2015] Prevent writing over-length PLTE chunk (Cosmin Truta). Silently truncate over-length PLTE chunk while reading. - -version 1.4.17rc03 [November 3, 2013] Clarified COPYRIGHT information to state explicitly that versions are derived from previous versions. Removed much of the long list of previous versions from png.h and libpng.3. -version 1.4.17rc04 [November 5, 2013] - Fixed new bug with CRC error after reading an over-length palette - (bug report by Cosmin Truta). - Send comments/corrections/commendations to glennrp at users.sourceforge.net or 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 0e72faf86..392df7534 100644 --- a/CHANGES +++ b/CHANGES @@ -3004,6 +3004,9 @@ version 1.4.17rc04 [November 5, 2015] Fixed new bug with CRC error after reading an over-length palette (bug report by Cosmin Truta). +version 1.4.17 [November 12, 2015] + Cleaned up coding style in png_handle_PLTE(). + Send comments/corrections/commendations to glennrp at users.sourceforge.net or 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 319e30d06..7617fd2d0 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.17rc04 +# VERSION 14.${PNGLIB_RELEASE}.1.4.17 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) diff --git a/INSTALL b/INSTALL index 4e6f575bc..01f2907f3 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -Installing libpng version 1.4.17rc04 - November 5, 2015 +Installing libpng version 1.4.17 - November 12, 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.17rc04" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.17" 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 71cec88c1..c2777731f 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.17rc04, November 5, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.4.17, November 12, 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 5, 2015 +November 12, 2015 diff --git a/Makefile.am b/Makefile.am index 03e37ffe4..87f25e58d 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.17rc04.txt + example.c libpng-1.4.17.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 201bf9667..f38add091 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.17rc04.txt + example.c libpng-1.4.17.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 6cb34369b..ea95cf1a9 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -README for libpng version 1.4.17rc04 - November 5, 2015 (shared library 14.0) +README for libpng version 1.4.17 - November 12, 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.17rc04) + (gcc, creates libpng14.so.14.1.4.17) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.17rc04) + (gcc, creates libpng14.so.14.1.4.17) 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.17rc04) + (gcc, creates libpng14.so.14.1.4.17) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.17rc04) + (gcc, creates libpng14.so.14.1.4.17) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.17rc04) + (gcc, creates libpng14.so.14.1.4.17) 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 e8f5873bd..ae419fd29 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.17rc04. +# Generated by GNU Autoconf 2.69 for libpng 1.4.17. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpng' PACKAGE_TARNAME='libpng' -PACKAGE_VERSION='1.4.17rc04' -PACKAGE_STRING='libpng 1.4.17rc04' +PACKAGE_VERSION='1.4.17' +PACKAGE_STRING='libpng 1.4.17' 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.17rc04 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.17 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.17rc04:";; + short | recursive ) echo "Configuration of libpng 1.4.17:";; 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.17rc04 +libpng configure 1.4.17 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.17rc04, which was +It was created by libpng $as_me 1.4.17, 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.17rc04' + VERSION='1.4.17' cat >>confdefs.h <<_ACEOF @@ -2923,7 +2923,7 @@ fi -PNGLIB_VERSION=1.4.17rc04 +PNGLIB_VERSION=1.4.17 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=17 @@ -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.17rc04, which was +This file was extended by libpng $as_me 1.4.17, 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.17rc04 +libpng config.status 1.4.17 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 3ce350a5f..115f00f42 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.17rc04], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.17], [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.17rc04 +PNGLIB_VERSION=1.4.17 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=17 diff --git a/libpng-1.4.17rc04.txt b/libpng-1.4.17.txt similarity index 99% rename from libpng-1.4.17rc04.txt rename to libpng-1.4.17.txt index f4a064f75..a0b27be19 100644 --- a/libpng-1.4.17rc04.txt +++ b/libpng-1.4.17.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.17rc04 - November 5, 2015 + libpng version 1.4.17 - November 12, 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.17rc04 - November 5, 2015 + libpng versions 0.97, January 1998, through 1.4.17 - November 12, 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.17rc04, not all possible expansions are supported. +As of libpng version 1.4.17, 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 @@ -3293,7 +3293,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.17rc04 are Y2K compliant. It is my belief that earlier +upward through 1.4.17 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 b1345709b..7bb601f2a 100644 --- a/libpng.3 +++ b/libpng.3 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "November 5, 2015" +.TH LIBPNG 3 "November 12, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.17rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.17 .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.17rc04 - November 5, 2015 + libpng version 1.4.17 - November 12, 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.17rc04 - November 5, 2015 + libpng versions 0.97, January 1998, through 1.4.17 - November 12, 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.17rc04, not all possible expansions are supported. +As of libpng version 1.4.17, 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 @@ -3735,7 +3735,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.17rc04 are Y2K compliant. It is my belief that earlier +upward through 1.4.17 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 @@ -3888,7 +3888,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.17rc04 - November 5, 2015: +Libpng version 1.4.17 - November 12, 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). @@ -3913,7 +3913,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.4.17rc04, November 5, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.4.17, November 12, 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 @@ -4010,7 +4010,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 5, 2015 +November 12, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 8565bf4bd..b4ad23e26 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 5, 2015" +.TH LIBPNGPF 3 "November 12, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.17rc04 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.17 (private functions) .SH SYNOPSIS \fB#include diff --git a/png.5 b/png.5 index f4fe07118..1e515b7f5 100644 --- a/png.5 +++ b/png.5 @@ -1,4 +1,4 @@ -.TH PNG 5 "November 5, 2015" +.TH PNG 5 "November 12, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION diff --git a/png.c b/png.c index 5f6c1dfae..e1e810617 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_17rc04 Your_png_h_is_not_version_1_4_17rc04; +typedef version_1_4_17 Your_png_h_is_not_version_1_4_17; /* 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,13 +558,13 @@ png_get_copyright(png_const_structp png_ptr) #else #ifdef __STDC__ return ((png_charp) PNG_STRING_NEWLINE \ - "libpng version 1.4.17rc04 - November 5, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.4.17 - November 12, 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.4.17rc04 - November 5, 2015\ + return ((png_charp) "libpng version 1.4.17 - November 12, 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 209797040..6a585c4fa 100644 --- a/png.h +++ b/png.h @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.4.17rc04, November 5, 2015 + * libpng version 1.4.17, November 12, 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.4.17rc04, November 5, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.4.17, November 12, 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.17rc04, November 5, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.4.17, November 12, 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 @@ -207,13 +207,13 @@ * Y2K compliance in libpng: * ========================= * - * November 5, 2015 + * November 12, 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.17rc04 are Y2K compliant. It is my belief that earlier + * upward through 1.4.17 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.17rc04" +#define PNG_LIBPNG_VER_STRING "1.4.17" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.17rc04 - November 5, 2015\n" + " libpng version 1.4.17 - November 12, 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 04 +#define PNG_LIBPNG_VER_BUILD 0 /* 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_RC +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE /* Careful here. At one time, Guy wanted to use 082, but that would be octal. * We must not include leading zeros. @@ -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_17rc04; +typedef png_structp version_1_4_17; typedef png_struct FAR * FAR * png_structpp; diff --git a/pngconf.h b/pngconf.h index 6eb6c9f73..7ef79da39 100644 --- a/pngconf.h +++ b/pngconf.h @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.17rc04, November 5, 2015 + * libpng version 1.4.17, November 12, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1461,7 +1461,7 @@ typedef char FAR * FAR * FAR * png_charppp; # define png_strncpy lstrcpynA # define png_strlen lstrlenA # define png_memcmp memcmp -# define png_memcpy CopyMemory +# define png_memcpy memcpy # define png_memset memset # define png_sprintf wsprintfA # else diff --git a/pngpriv.h b/pngpriv.h index 6d92cd8de..344e02c20 100644 --- a/pngpriv.h +++ b/pngpriv.h @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.17rc04 - November 5, 2015 + * libpng version 1.4.17 - November 12, 2015 * For conditions of distribution and use, see copyright notice in png.h * Copyright (c) 1998-2014 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index 48eba1582..cc0586307 100644 --- a/pngrtran.c +++ b/pngrtran.c @@ -1,7 +1,7 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.4.17 [November 5, 2015] + * Last changed in libpng 1.4.17 [November 12, 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.) diff --git a/pngrutil.c b/pngrutil.c index f5d433147..c3860f379 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.4.17 [November 5, 2015] + * Last changed in libpng 1.4.17 [November 12, 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.) diff --git a/pngset.c b/pngset.c index 32d32765a..2d2c0d72c 100644 --- a/pngset.c +++ b/pngset.c @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.4.17 [November 5, 2015] + * Last changed in libpng 1.4.17 [November 12, 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.) diff --git a/pngtest.c b/pngtest.c index d642e9d65..695f47c3e 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.4.17 [November 5, 2015] + * Last changed in libpng 1.4.17 [November 12, 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.) @@ -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_17rc04 your_png_h_is_not_version_1_4_17rc04; +typedef version_1_4_17 your_png_h_is_not_version_1_4_17; diff --git a/pngwutil.c b/pngwutil.c index 81418f5db..141edd585 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 5, 2015] + * Last changed in libpng 1.4.17 [November 12, 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.) diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index 8e0f72955..54aaad05e 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.17rc04 - November 5, 2015 +libpng version 1.4.17 - November 12, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index b0a9ae310..3871b052c 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@