diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-12-02 19:41:28 -0600 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-12-02 22:30:18 -0600 |
commit | 8c12b3c2cc24a4c0d5889e0e2a02e7f340a9dc9a (patch) | |
tree | 52cfc7cc6fbfcf5132b1ecd689fa971d5d47141d | |
parent | 7fe34165202ae2ed07cba3ad0e779af84756ab42 (diff) | |
download | libpng-8c12b3c2cc24a4c0d5889e0e2a02e7f340a9dc9a.tar.gz |
[libpng14] Imported from libpng-1.4.18.tarv1.4.18libpng-1.4.18-signed
-rw-r--r-- | ANNOUNCE | 26 | ||||
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | INSTALL | 4 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | Makefile.in | 2 | ||||
-rw-r--r-- | README | 18 | ||||
-rwxr-xr-x | configure | 22 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | libpng-1.4.18.txt (renamed from libpng-1.4.18rc01.txt) | 17 | ||||
-rw-r--r-- | libpng.3 | 27 | ||||
-rw-r--r-- | libpngpf.3 | 4 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 6 | ||||
-rw-r--r-- | png.h | 20 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngpriv.h | 2 | ||||
-rw-r--r-- | pngrutil.c | 2 | ||||
-rw-r--r-- | pngtest.c | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 12 | ||||
-rwxr-xr-x | scripts/libpng-config-head.in | 2 | ||||
-rw-r--r-- | scripts/libpng.pc.in | 2 | ||||
-rw-r--r-- | scripts/makefile.ne12bsd | 2 | ||||
-rw-r--r-- | scripts/makefile.netbsd | 2 | ||||
-rw-r--r-- | scripts/makefile.openbsd | 2 | ||||
-rw-r--r-- | scripts/png32ce.def | 2 | ||||
-rw-r--r-- | scripts/pngos2.def | 2 | ||||
-rw-r--r-- | scripts/pngwin.def | 2 |
31 files changed, 105 insertions, 98 deletions
@@ -1,43 +1,37 @@ -Libpng 1.4.18rc01 - November 26, 2015 +Libpng 1.4.18 - December 3, 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.18rc01.tar.xz (LZMA-compressed, recommended) - 1.4.18rc01.tar.gz - 1.4.18rc01.tar.bz2 + libpng-1.4.18.tar.xz (LZMA-compressed, recommended) + libpng-1.4.18.tar.gz Source files with CRLF line endings (for Windows), without the "configure" script - lp1418r01.7z (LZMA-compressed, recommended) - lp1418r01.zip + lpng1418.7z (LZMA-compressed, recommended) + lpng1418.zip Other information: - 1.4.18rc01-README.txt - 1.4.18rc01-LICENSE.txt - libpng-1.4.18rc01-*.asc (armored detached GPG signatures) + libpng-1.4.18-README.txt + libpng-1.4.18-LICENSE.txt + libpng-1.4.18-*.asc (armored detached GPG signatures) Changes since the last public release (1.4.17): -version 1.4.18beta01 [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.4.18beta02 [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.4.18rc01 [November 26, 2015] Discontinued distributing tar.bz2 archives. + Discontinued distributing libpng-oldversion-newversion-diff.txt Send comments/corrections/commendations to glennrp at users.sourceforge.net or to png-mng-implement at lists.sf.net (subscription required; visit @@ -3019,6 +3019,9 @@ version 1.4.18beta02 [November 23, 2015] version 1.4.18rc01 [November 26, 2015] Discontinued distributing tar.bz2 archives. +version 1.4.18 [December 3, 2015] + Discontinued distributing libpng-oldversion-newversion-diff.txt + 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 632ab13d8..7334b114b 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.18rc01 +# VERSION 14.${PNGLIB_RELEASE}.1.4.18 VERSION 14.${PNGLIB_RELEASE}.0 SOVERSION 14 CLEAN_DIRECT_OUTPUT 1) @@ -1,5 +1,5 @@ -Installing libpng version 1.4.18rc01 - November 26, 2015 +Installing libpng version 1.4.18 - December 3, 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.18rc01" or "libpng14" and "zlib-1.2.3" +might be called "libpng-1.4.18" 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: @@ -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.18rc01, November 26, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.4.18, December 3, 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 26, 2015 +December 3, 2015 diff --git a/Makefile.am b/Makefile.am index 69f7a1eee..63a2e478d 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.18rc01.txt + example.c libpng-1.4.18.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 e0e2a8a10..07003d2aa 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.18rc01.txt + example.c libpng-1.4.18.txt CLEANFILES = pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \ libpng.sym @@ -1,11 +1,11 @@ -README for libpng version 1.4.18rc01 - November 26, 2015 (shared library 14.0) +README for libpng version 1.4.18 - December 3, 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. -Libpng comes in several distribution formats. Get libpng-*.tar.gz, -libpng-*.tar.xz or libpng-*.tar.bz2 if you want UNIX-style line endings -in the text files, or lpng*.zip if you want DOS-style line endings. +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*.zip if you want DOS-style line endings. Version 0.89 was the first official release of libpng. Don't let the fact that it's the first release fool you. The libpng library has been in @@ -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.18rc01) + (gcc, creates libpng14.so.14.1.4.18) makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.18rc01) + (gcc, creates libpng14.so.14.1.4.18) 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.18rc01) + (gcc, creates libpng14.so.14.1.4.18) makefile.sunos => Sun makefile makefile.solaris => Solaris 2.X makefile - (gcc, creates libpng14.so.14.1.4.18rc01) + (gcc, creates libpng14.so.14.1.4.18) makefile.so9 => Solaris 9 makefile - (gcc, creates libpng14.so.14.1.4.18rc01) + (gcc, creates libpng14.so.14.1.4.18) 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,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.4.18rc01. +# Generated by GNU Autoconf 2.69 for libpng 1.4.18. # # 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.4.18rc01' -PACKAGE_STRING='libpng 1.4.18rc01' +PACKAGE_VERSION='1.4.18' +PACKAGE_STRING='libpng 1.4.18' 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.18rc01 to adapt to many kinds of systems. +\`configure' configures libpng 1.4.18 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.18rc01:";; + short | recursive ) echo "Configuration of libpng 1.4.18:";; 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.18rc01 +libpng configure 1.4.18 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.18rc01, which was +It was created by libpng $as_me 1.4.18, 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.18rc01' + VERSION='1.4.18' cat >>confdefs.h <<_ACEOF @@ -2923,7 +2923,7 @@ fi -PNGLIB_VERSION=1.4.18rc01 +PNGLIB_VERSION=1.4.18 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=18 @@ -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.18rc01, which was +This file was extended by libpng $as_me 1.4.18, 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.18rc01 +libpng config.status 1.4.18 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 7235c1bb7..20de2386f 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.18rc01], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.4.18], [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.18rc01 +PNGLIB_VERSION=1.4.18 PNGLIB_MAJOR=1 PNGLIB_MINOR=4 PNGLIB_RELEASE=18 diff --git a/libpng-1.4.18rc01.txt b/libpng-1.4.18.txt index 06cb68e6d..3fa478c1a 100644 --- a/libpng-1.4.18rc01.txt +++ b/libpng-1.4.18.txt @@ -1,6 +1,6 @@ libpng.txt - A description on how to use and modify libpng - libpng version 1.4.18rc01 - November 26, 2015 + libpng version 1.4.18 - December 3, 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.4.18rc01 - November 26, 2015 + libpng versions 0.97, January 1998, through 1.4.18 - December 3, 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.18rc01, not all possible expansions are supported. +As of libpng version 1.4.18, 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 @@ -1889,8 +1889,7 @@ Some of the more important parts of the png_info are: If you call png_set_IHDR(), the call must appear before any of the other png_set_*() functions, because they might require access to some of -the IHDR settings. The remaining png_set_*() functions can be called -in any order. +the IHDR settings. If you wish, you can reset the compression_type, interlace_type, or filter_method later by calling png_set_IHDR() again; if you do this, the @@ -1902,6 +1901,12 @@ width, height, bit_depth, and color_type must be the same in each call. (array of png_color) num_palette - number of entries in the palette +If you call png_set_PLTE(), the call must appear before either of +png_set_tRNS() or png_set_hIST() appears, because they require access +to the palette length. + +The remaining png_set_*() functions can be called in any order. + png_set_gAMA(png_ptr, info_ptr, gamma); gamma - the gamma the image was created at (PNG_INFO_gAMA) @@ -3293,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.18rc01 are Y2K compliant. It is my belief that earlier +upward through 1.4.18 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 26, 2015" +.TH LIBPNG 3 "December 3, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.18rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.18 .SH SYNOPSIS \fB #include <png.h>\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.18rc01 - November 26, 2015 + libpng version 1.4.18 - December 3, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> 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.18rc01 - November 26, 2015 + libpng versions 0.97, January 1998, through 1.4.18 - December 3, 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.18rc01, not all possible expansions are supported. +As of libpng version 1.4.18, 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 @@ -2331,8 +2331,7 @@ Some of the more important parts of the png_info are: If you call png_set_IHDR(), the call must appear before any of the other png_set_*() functions, because they might require access to some of -the IHDR settings. The remaining png_set_*() functions can be called -in any order. +the IHDR settings. If you wish, you can reset the compression_type, interlace_type, or filter_method later by calling png_set_IHDR() again; if you do this, the @@ -2344,6 +2343,12 @@ width, height, bit_depth, and color_type must be the same in each call. (array of png_color) num_palette - number of entries in the palette +If you call png_set_PLTE(), the call must appear before either of +png_set_tRNS() or png_set_hIST() appears, because they require access +to the palette length. + +The remaining png_set_*() functions can be called in any order. + png_set_gAMA(png_ptr, info_ptr, gamma); gamma - the gamma the image was created at (PNG_INFO_gAMA) @@ -3735,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.18rc01 are Y2K compliant. It is my belief that earlier +upward through 1.4.18 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 +3893,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.4.18rc01 - November 26, 2015: +Libpng version 1.4.18 - December 3, 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 +3918,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.0.7, July 1, 2000, through 1.4.18rc01, November 26, 2015, are +libpng versions 1.0.7, July 1, 2000, through 1.4.18, December 3, 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 +4015,7 @@ the additional disclaimers inserted at version 1.0.7. Glenn Randers-Pehrson glennrp at users.sourceforge.net -November 26, 2015 +December 3, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index e278a6461..32189ab25 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "November 26, 2015" +.TH LIBPNGPF 3 "December 3, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.4.18rc01 +libpng \- Portable Network Graphics (PNG) Reference Library 1.4.18 (private functions) .SH SYNOPSIS \fB#include <png.h> @@ -1,4 +1,4 @@ -.TH PNG 5 "November 26, 2015" +.TH PNG 5 "December 3, 2015" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -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_18rc01 Your_png_h_is_not_version_1_4_18rc01; +typedef version_1_4_18 Your_png_h_is_not_version_1_4_18; /* 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.18rc01 - November 26, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.4.18 - December 3, 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.18rc01 - November 26, 2015\ + return ((png_charp) "libpng version 1.4.18 - December 3, 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.4.18rc01, November 26, 2015 + * libpng version 1.4.18, December 3, 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.18rc01, November 26, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.4.18, December 3, 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.18rc01, November 26, 2015, are + * libpng versions 1.0.7, July 1, 2000, through 1.4.18, December 3, 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 26, 2015 + * December 3, 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.18rc01 are Y2K compliant. It is my belief that earlier + * upward through 1.4.18 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.18rc01" +#define PNG_LIBPNG_VER_STRING "1.4.18" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.4.18rc01 - November 26, 2015\n" + " libpng version 1.4.18 - December 3, 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 01 +#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_18rc01; +typedef png_structp version_1_4_18; typedef png_struct FAR * FAR * png_structpp; @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.4.18rc01, November 26, 2015 + * libpng version 1.4.18, December 3, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * libpng version 1.4.18rc01 - November 26, 2015 + * libpng version 1.4.18 - December 3, 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/pngrutil.c b/pngrutil.c index 826775a0a..b0b9c2f58 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.18 [November 26, 2015] + * Last changed in libpng 1.4.18 [December 3, 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_18rc01 your_png_h_is_not_version_1_4_18rc01; +typedef version_1_4_18 your_png_h_is_not_version_1_4_18; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index d1db0b0a2..c6ea23457 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.4.18rc01 - November 26, 2015 +libpng version 1.4.18 - December 3, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index 7969e0360..d3894e55d 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source and build * - * libpng version 1.4.18rc01 - November 26, 2015 + * libpng version 1.4.18 - December 3, 2015 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 044db07e0..e7081d5d5 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,8 +1,8 @@ -Makefiles for libpng version 1.4.18rc01 - November 26, 2015 +Makefiles for libpng version 1.4.18 - December 3, 2015 makefile.linux => Linux/ELF makefile - (gcc, creates libpng14.so.14.1.4.18rc01) + (gcc, creates libpng14.so.14.1.4.18) 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.4.18rc01 - November 26, 2015 makefile.dec => DEC Alpha UNIX makefile makefile.dj2 => DJGPP 2 makefile makefile.elf => Linux/ELF makefile symbol versioning, - (gcc, creates libpng14.so.14.1.4.18rc01) + (gcc, creates libpng14.so.14.1.4.18) makefile.freebsd => FreeBSD makefile makefile.gcc => Generic gcc makefile makefile.hpgcc => HPUX makefile using gcc @@ -36,12 +36,12 @@ Makefiles for libpng version 1.4.18rc01 - November 26, 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 libpng14.so.14.1.4.18rc01) + creates libpng14.so.14.1.4.18) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng14.so.14.1.4.18rc01) + creates libpng14.so.14.1.4.18) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng14.so.14.1.4.18rc01) + creates libpng14.so.14.1.4.18) 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 7d737e987..cece9d749 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.4.18rc01 +version=1.4.18 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 473c8a42f..9dd36d233 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng14 Name: libpng Description: Loads and saves PNG files -Version: 1.4.18rc01 +Version: 1.4.18 Libs: -L${libdir} -lpng14 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 316bf303f..94df3d5c2 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng14 LIB= png14 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.4.18rc01 +SHLIB_MINOR= 1.4.18 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 e2e0c4a2c..1cd0979ce 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 3 -SHLIB_MINOR= 1.4.18rc01 +SHLIB_MINOR= 1.4.18 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.openbsd b/scripts/makefile.openbsd index eb0768348..b86bf28a4 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.4.18rc01 +SHLIB_MINOR= 1.4.18 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/png32ce.def b/scripts/png32ce.def index 7d06b052a..83a099a17 100644 --- a/scripts/png32ce.def +++ b/scripts/png32ce.def @@ -15,7 +15,7 @@ LIBRARY lpngce png_get_int_32 EXPORTS -;Version 1.4.18rc01 +;Version 1.4.18 png_build_grayscale_palette @1 ; png_check_sig @2 png_chunk_error @3 diff --git a/scripts/pngos2.def b/scripts/pngos2.def index 3c3662f9d..f4ce091a0 100644 --- a/scripts/pngos2.def +++ b/scripts/pngos2.def @@ -2,7 +2,7 @@ ; PNG.LIB module definition file for OS/2 ;---------------------------------------- -; Version 1.4.18rc01 +; Version 1.4.18 LIBRARY PNG DESCRIPTION "PNG image compression library for OS/2" diff --git a/scripts/pngwin.def b/scripts/pngwin.def index 9f02ebe02..57d2c75bd 100644 --- a/scripts/pngwin.def +++ b/scripts/pngwin.def @@ -5,7 +5,7 @@ LIBRARY EXPORTS -;Version 1.4.18rc01 +;Version 1.4.18 png_build_grayscale_palette png_chunk_error png_chunk_warning |