diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-08-21 05:51:07 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2014-08-21 05:57:34 -0500 |
commit | e73cc88b21d25a6451dbc3e90fc6d60967269820 (patch) | |
tree | 06179786547acd3346756ca682191dd064bbf51c | |
parent | 60b6a64975a08aed00b88f43a9e9e83b29f91595 (diff) | |
download | libpng-e73cc88b21d25a6451dbc3e90fc6d60967269820.tar.gz |
[libpng15] Imported from libpng-1.5.19.tarv1.5.19
-rw-r--r-- | ANNOUNCE | 45 | ||||
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | CMakeLists.txt | 2 | ||||
-rw-r--r-- | LICENSE | 4 | ||||
-rw-r--r-- | README | 2 | ||||
-rwxr-xr-x | configure | 22 | ||||
-rw-r--r-- | configure.ac | 4 | ||||
-rw-r--r-- | example.c | 2 | ||||
-rw-r--r-- | libpng-manual.txt | 8 | ||||
-rw-r--r-- | libpng.3 | 21 | ||||
-rw-r--r-- | libpngpf.3 | 4 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 8 | ||||
-rw-r--r-- | png.h | 23 | ||||
-rw-r--r-- | pngconf.h | 2 | ||||
-rw-r--r-- | pngdebug.h | 2 | ||||
-rw-r--r-- | pngerror.c | 5 | ||||
-rw-r--r-- | pngget.c | 2 | ||||
-rw-r--r-- | pngpread.c | 2 | ||||
-rw-r--r-- | pngpriv.h | 2 | ||||
-rw-r--r-- | pngread.c | 2 | ||||
-rw-r--r-- | pngrtran.c | 2 | ||||
-rw-r--r-- | pngrutil.c | 2 | ||||
-rw-r--r-- | pngset.c | 2 | ||||
-rw-r--r-- | pngtest.c | 4 | ||||
-rw-r--r-- | pngtrans.c | 2 | ||||
-rw-r--r-- | pngwutil.c | 2 | ||||
-rw-r--r-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 10 | ||||
-rwxr-xr-x | scripts/dfn.awk | 2 | ||||
-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/pnglibconf.h.prebuilt | 4 | ||||
-rw-r--r-- | scripts/symbols.def | 2 |
38 files changed, 101 insertions, 112 deletions
@@ -1,44 +1,37 @@ -Libpng 1.5.19rc02 - August 14, 2014 +Libpng 1.5.19 - August 21, 2014 -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.5.19rc02.tar.xz (LZMA-compressed, recommended) - 1.5.19rc02.tar.gz - 1.5.19rc02.tar.bz2 + libpng-1.5.19.tar.xz (LZMA-compressed, recommended) + libpng-1.5.19.tar.gz + libpng-1.5.19.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1519r02.7z (LZMA-compressed, recommended) - lp1519r02.zip + lpng1519.7z (LZMA-compressed, recommended) + lpng1519.zip Other information: - 1.5.19rc02-README.txt - 1.5.19rc02-LICENSE.txt - libpng-1.5.19rc02-*.asc (armored detached GPG signatures) + libpng-1.5.19-README.txt + libpng-1.5.19-LICENSE.txt + libpng-1.5.19-*.asc (armored detached GPG signatures) Changes since the last public release (1.5.18): - -Version 1.5.19beta01 [February 26, 2014] Moved redefines of png_error(), png_warning(), png_chunk_error(), and png_chunk_warning() from pngpriv.h to png.h to make them visible to libpng-calling applications. Fixed typos in the manual and in scripts/pnglibconf.dfa (CFLAGS -> CPPFLAGS and PNG_USR_CONFIG -> PNG_USER_CONFIG). - -Version 1.5.19beta02 [March 17, 2014] Use "if (value != 0)" instead of "if (value)" consistently. Moved configuration information from the manual to the INSTALL file. - -Version 1.5.19beta03 [April 6, 2014] Removed #if/#else/#endif from inside two pow() calls in pngvalid.c because they were handled improperly by Portland Group's PGI-14.1 - PGI-14.3 when using its "__builtin_pow()" function. @@ -46,28 +39,18 @@ Version 1.5.19beta03 [April 6, 2014] $(CP) is now used alongside $(RM_F). Also, use 'copy' instead of 'cp' where applicable, and applied other minor makefile changes. Don't warn about invalid dimensions exceeding user limits. - Allow an easy replacement of the default pre-built configuration - header with a custom header, via the make PNGLIBCONF_H_PREBUILT - macro. Fixed a typo in pngrutil.c, introduced in libpng-1.5.6, that interferes with "blocky" expansion of sub-8-bit interlaced PNG files (Eric Huss). - -Version 1.5.19beta04 [August 4, 2014] Removed scripts/makefile.elf. It has not worked since libpng-1.5.0beta14 due to elimination of the PNG_FUNCTION_EXPORT and PNG_DATA_EXPORT definitions from pngconf.h. - -Version 1.5.19beta05 [August 8, 2014] + Allow an easy replacement of the default pre-built configuration + header with a custom header, via the make PNGLIBCONF_H_PREBUILT + macro. Added opinion that the ECCN (Export Control Classification Number) for libpng is EAR99 to the README file. - Eliminated use of "$<" in makefile explicit rules, when copying - $PNGLIBCONF_H_PREBUILT. This does not work on some versions of make; - bug introduced in libpng version 1.5.19beta03. - -Version 1.5.19rc01 [August 14, 2014] Made "ccopts" agree with "CFLAGS" in scripts/makefile.hp* and makefile.*sunu - -Version 1.5.19rc02 [August 14, 2014] + Added PNG_UNUSED(png_ptr) and PNG_UNUSED(val) in png_longjmp() (Cosmin). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit @@ -4243,7 +4243,8 @@ Version 1.5.19beta05 [August 8, 2014] Version 1.5.19rc01 [August 14, 2014] Made "ccopts" agree with "CFLAGS" in scripts/makefile.hp* and makefile.*sunu -Version 1.5.19rc02 [August 14, 2014] +Version 1.5.19 [August 21, 2014] + Added PNG_UNUSED(png_ptr) and PNG_UNUSED(val) in png_longjmp() (Cosmin). Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cc5c9139..71529a738 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -219,7 +219,7 @@ endif(NOT WIN32 OR CYGWIN OR MINGW) # SET UP LINKS if(PNG_SHARED) set_target_properties(${PNG_LIB_NAME} PROPERTIES -# VERSION 15.${PNGLIB_RELEASE}.1.5.19rc02 +# VERSION 15.${PNGLIB_RELEASE}.1.5.19 VERSION 15.${PNGLIB_RELEASE}.0 SOVERSION 15 CLEAN_DIRECT_OUTPUT 1) @@ -10,7 +10,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.19rc02, August 14, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.19, August 21, 2014, are Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -108,4 +108,4 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 14, 2014 +August 21, 2014 @@ -1,4 +1,4 @@ -README for libpng version 1.5.19rc02 - August 14, 2014 (shared library 15.0) +README for libpng version 1.5.19 - August 21, 2014 (shared library 15.0) See the note about version numbers near the top of png.h See INSTALL for instructions on how to install libpng. @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpng 1.5.19rc02. +# Generated by GNU Autoconf 2.69 for libpng 1.5.19. # # 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.5.19rc02' -PACKAGE_STRING='libpng 1.5.19rc02' +PACKAGE_VERSION='1.5.19' +PACKAGE_STRING='libpng 1.5.19' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1351,7 +1351,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.5.19rc02 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.19 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1421,7 +1421,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.19rc02:";; + short | recursive ) echo "Configuration of libpng 1.5.19:";; esac cat <<\_ACEOF @@ -1571,7 +1571,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.19rc02 +libpng configure 1.5.19 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1994,7 +1994,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.5.19rc02, which was +It was created by libpng $as_me 1.5.19, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2857,7 +2857,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.19rc02' + VERSION='1.5.19' cat >>confdefs.h <<_ACEOF @@ -2973,7 +2973,7 @@ fi -PNGLIB_VERSION=1.5.19rc02 +PNGLIB_VERSION=1.5.19 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=19 @@ -13628,7 +13628,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.5.19rc02, which was +This file was extended by libpng $as_me 1.5.19, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13694,7 +13694,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.5.19rc02 +libpng config.status 1.5.19 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 70852f6af..21e011444 100644 --- a/configure.ac +++ b/configure.ac @@ -18,12 +18,12 @@ AC_PREREQ(2.59) dnl Version number stuff here: -AC_INIT([libpng], [1.5.19rc02], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.19], [png-mng-implement@lists.sourceforge.net]) AM_INIT_AUTOMAKE([1.13 serial-tests subdir-objects]) dnl stop configure from automagically running automake AM_MAINTAINER_MODE -PNGLIB_VERSION=1.5.19rc02 +PNGLIB_VERSION=1.5.19 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=19 @@ -2,7 +2,7 @@ #if 0 /* in case someone actually tries to compile this */ /* example.c - an example of using libpng - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Maintained 1998-2014 Glenn Randers-Pehrson * Maintained 1996, 1997 Andreas Dilger * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc. diff --git a/libpng-manual.txt b/libpng-manual.txt index 2ff658281..230bc6239 100644 --- a/libpng-manual.txt +++ b/libpng-manual.txt @@ -1,6 +1,6 @@ Libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.19rc02 - August 14, 2014 + libpng version 1.5.19 - August 21, 2014 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.19rc02 - August 14, 2014 + libpng versions 0.97, January 1998, through 1.5.19 - August 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4531,13 +4531,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -August 14, 2014 +August 21, 2014 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.5.19rc02 are Y2K compliant. It is my belief that earlier +upward through 1.5.19 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer that @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "August 14, 2014" +.TH LIBPNG 3 "August 21, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.19rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.19 .SH SYNOPSIS \fB #include <png.h>\fP @@ -492,7 +492,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng. .SH LIBPNG.TXT Libpng-manual.txt - A description on how to use and modify libpng - libpng version 1.5.19rc02 - August 14, 2014 + libpng version 1.5.19 - August 21, 2014 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -503,7 +503,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.19rc02 - August 14, 2014 + libpng versions 0.97, January 1998, through 1.5.19 - August 21, 2014 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5023,13 +5023,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -August 14, 2014 +August 21, 2014 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.5.19rc02 are Y2K compliant. It is my belief that earlier +upward through 1.5.19 are Y2K compliant. It is my belief that earlier versions were also Y2K compliant. Libpng only has two year fields. One is a 2-byte unsigned integer that @@ -5265,7 +5265,8 @@ the first widely used release: 1.5.18rc01-02 15 10518 15.so.15.18[.0] 1.5.18 15 10518 15.so.15.18[.0] 1.5.19beta01-05 15 10519 15.so.15.19[.0] - 1.5.19rc01-02 15 10519 15.so.15.19[.0] + 1.5.19rc01 15 10519 15.so.15.19[.0] + 1.5.19 15 10519 15.so.15.19[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5322,7 +5323,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.19rc02 - August 14, 2014: +Libpng version 1.5.19 - August 21, 2014: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5345,7 +5346,7 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.19rc02, August 14, 2014, are +libpng versions 1.2.6, August 15, 2004, through 1.5.19, August 21, 2014, are Copyright (c) 2004,2006-2007 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -5444,7 +5445,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -August 14, 2014 +August 21, 2014 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 6a5cf7be8..7e85f8564 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "August 14, 2014" +.TH LIBPNGPF 3 "August 21, 2014" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.19rc02 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.19 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" @@ -1,4 +1,4 @@ -.TH PNG 5 "August 14, 2014" +.TH PNG 5 "August 21, 2014" .SH NAME png \- Portable Network Graphics (PNG) format .SH DESCRIPTION @@ -1,7 +1,7 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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.) @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_19rc02 Your_png_h_is_not_version_1_5_19rc02; +typedef png_libpng_version_1_5_19 Your_png_h_is_not_version_1_5_19; /* 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 @@ -658,13 +658,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.19rc02 - August 14, 2014" PNG_STRING_NEWLINE \ + "libpng version 1.5.19 - August 21, 2014" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2014 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 "libpng version 1.5.19rc02 - August 14, 2014\ + return "libpng version 1.5.19 - August 21, 2014\ Copyright (c) 1998-2014 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.5.19rc02 - August 14, 2014 + * libpng version 1.5.19 - August 21, 2014 * Copyright (c) 1998-2014 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.) @@ -11,7 +11,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.5.19rc02 - August 14, 2014: Glenn + * libpng versions 0.97, January 1998, through 1.5.19 - August 21, 2014: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -197,7 +197,8 @@ * 1.5.18rc01-02 15 10518 15.so.15.18[.0] * 1.5.18 15 10518 15.so.15.18[.0] * 1.5.19beta01-05 15 10519 15.so.15.19[.0] - * 1.5.19rc01-02 15 10519 15.so.15.19[.0] + * 1.5.19rc01 15 10519 15.so.15.19[.0] + * 1.5.19 15 10519 15.so.15.19[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -229,7 +230,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.19rc02, August 14, 2014, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.19, August 21, 2014, are * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are * distributed according to the same disclaimer and license as libpng-1.2.5 * with the following individual added to the list of Contributing Authors: @@ -341,13 +342,13 @@ * Y2K compliance in libpng: * ========================= * - * August 14, 2014 + * August 21, 2014 * * 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.5.19rc02 are Y2K compliant. It is my belief that + * upward through 1.5.19 are Y2K compliant. It is my belief that * earlier versions were also Y2K compliant. * * Libpng only has two year fields. One is a 2-byte unsigned integer @@ -408,9 +409,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.19rc02" +#define PNG_LIBPNG_VER_STRING "1.5.19" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.19rc02 - August 14, 2014\n" + " libpng version 1.5.19 - August 21, 2014\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -424,7 +425,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -441,7 +442,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. @@ -571,7 +572,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_5_19rc02; +typedef char* png_libpng_version_1_5_19; /* Three color definitions. The order of the red, green, and blue, (and the * exact size) is not important, although the size of the fields need to @@ -1,7 +1,7 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.5.19rc02 - August 14, 2014 + * libpng version 1.5.19 - August 21, 2014 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngdebug.h b/pngdebug.h index ad3aca4de..c23dd2c63 100644 --- a/pngdebug.h +++ b/pngdebug.h @@ -5,7 +5,7 @@ * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) * - * Last changed in libpng 1.5.18 [(PENDING RELEASE)] + * Last changed in libpng 1.5.18 [August 21, 2014] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/pngerror.c b/pngerror.c index 18daf3ec3..b01bc28f9 100644 --- a/pngerror.c +++ b/pngerror.c @@ -1,7 +1,7 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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.) @@ -578,6 +578,9 @@ png_longjmp,(png_structp png_ptr, int val),PNG_NORETURN) png_ptr->longjmp_fn(png_ptr->longjmp_buffer, val); # endif } +#else + PNG_UNUSED(png_ptr); + PNG_UNUSED(val); #endif /* Here if not setjmp support or if png_ptr is null. */ PNG_ABORT(); @@ -1,7 +1,7 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2013 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/pngpread.c b/pngpread.c index 710fec0e7..7a35ad189 100644 --- a/pngpread.c +++ b/pngpread.c @@ -1,7 +1,7 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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.) @@ -1,7 +1,7 @@ /* pngpriv.h - private declarations for use inside libpng * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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.) @@ -1,7 +1,7 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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/pngrtran.c b/pngrtran.c index e0cf977fe..9bcacec3e 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.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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 66f5a72f7..6b32fa6cc 100644 --- a/pngrutil.c +++ b/pngrutil.c @@ -1,7 +1,7 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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.) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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.) @@ -1,7 +1,7 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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.) @@ -1990,4 +1990,4 @@ main(void) #endif /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_5_19rc02 Your_png_h_is_not_version_1_5_19rc02; +typedef png_libpng_version_1_5_19 Your_png_h_is_not_version_1_5_19; diff --git a/pngtrans.c b/pngtrans.c index 0529bf5f6..b7dea267b 100644 --- a/pngtrans.c +++ b/pngtrans.c @@ -1,7 +1,7 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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/pngwutil.c b/pngwutil.c index 946de6cd6..cc2b9ba25 100644 --- a/pngwutil.c +++ b/pngwutil.c @@ -1,7 +1,7 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.5.19 [(PENDING RELEASE)] + * Last changed in libpng 1.5.19 [August 21, 2014] * Copyright (c) 1998-2014 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 90700712a..744d4eb2a 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.19rc02 - August 14, 2014 +libpng version 1.5.19 - August 21, 2014 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index e2129fd61..560d89583 100644 --- a/projects/vstudio/zlib.props +++ b/projects/vstudio/zlib.props @@ -2,7 +2,7 @@ <!-- * zlib.props - location of zlib source * - * libpng version 1.5.19rc02 - August 14, 2014 + * libpng version 1.5.19 - August 21, 2014 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index 9e3cd0802..98132c196 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.5.19rc02 - August 14, 2014 +Makefiles for libpng version 1.5.19 - August 21, 2014 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng15.so.15.1.5.19rc02) + (gcc, creates libpng15.so.15.1.5.19) makefile.gcc => Generic makefile (gcc, creates static libpng.a) makefile.knr => Archaic UNIX Makefile that converts files with ansi2knr (Requires ansi2knr.c from @@ -34,12 +34,12 @@ pnglibconf.h.prebuilt => Stores configuration settings makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def) makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc makefile.sggcc => Silicon Graphics (gcc, - creates libpng15.so.15.1.5.19rc02) + creates libpng15.so.15.1.5.19) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng15.so.15.1.5.19rc02) + creates libpng15.so.15.1.5.19) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng15.so.15.1.5.19rc02) + creates libpng15.so.15.1.5.19) 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/dfn.awk b/scripts/dfn.awk index 54a8ea3ca..675829d47 100755 --- a/scripts/dfn.awk +++ b/scripts/dfn.awk @@ -1,7 +1,7 @@ #!/bin/awk -f # scripts/dfn.awk - process a .dfn file # -# last changed in libpng version 1.5.19 - (PENDING RELEASE) +# last changed in libpng version 1.5.19 - August 21, 2014 # # Copyright (c) 2013-2014 Glenn Randers-Pehrson # diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 864d60745..3fd752633 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.5.19rc02 +version=1.5.19 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 7e1885fab..4611ee2ff 100644 --- a/scripts/libpng.pc.in +++ b/scripts/libpng.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@/libpng15 Name: libpng Description: Loads and saves PNG files -Version: 1.5.19rc02 +Version: 1.5.19 Libs: -L${libdir} -lpng15 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index 60b3a6e11..52de5d87c 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15 LIB= png15 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.5.19rc02 +SHLIB_MINOR= 1.5.19 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 b3f127516..2834b5a76 100644 --- a/scripts/makefile.netbsd +++ b/scripts/makefile.netbsd @@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include LIB= png SHLIB_MAJOR= 15 -SHLIB_MINOR= 1.5.19rc02 +SHLIB_MINOR= 1.5.19 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 75b6536e3..3f814c716 100644 --- a/scripts/makefile.openbsd +++ b/scripts/makefile.openbsd @@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib MANDIR= ${PREFIX}/man/cat SHLIB_MAJOR= 15 -SHLIB_MINOR= 1.5.19rc02 +SHLIB_MINOR= 1.5.19 LIB= png SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \ diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index 27e10b2a4..91e38c467 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,7 +1,7 @@ -/* 1.5.19rc02 STANDARD API DEFINITION */ +/* 1.5.19 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* libpng version 1.5.19rc02 - August 14, 2014 */ +/* libpng version 1.5.19 - August 21, 2014 */ /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ diff --git a/scripts/symbols.def b/scripts/symbols.def index d49378ba5..dd1162d3a 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def @@ -1,4 +1,4 @@ -;Version 1.5.19rc02 +;Version 1.5.19 ;-------------------------------------------------------------- ; LIBPNG symbol list as a Win32 DEF file ; Contains all the symbols that can be exported from libpng |