diff options
author | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-03-26 08:04:55 -0500 |
---|---|---|
committer | Glenn Randers-Pehrson <glennrp at users.sourceforge.net> | 2015-03-26 08:11:00 -0500 |
commit | 4b1b9ce0285b541f1af8a88a2496e06c5c7c25c7 (patch) | |
tree | a7fdce2d993d36323b7360204a9f810ea317fd2d | |
parent | 76a0ff6a102fdf7f75b3f997722837f681c3cc99 (diff) | |
download | libpng-4b1b9ce0285b541f1af8a88a2496e06c5c7c25c7.tar.gz |
[libpng15] Imported from libpng-1.5.22.tarv1.5.22libpng-1.5.22-signed
-rw-r--r-- | ANNOUNCE | 40 | ||||
-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-- | libpng-manual.txt | 8 | ||||
-rw-r--r-- | libpng.3 | 23 | ||||
-rw-r--r-- | libpngpf.3 | 4 | ||||
-rw-r--r-- | png.5 | 2 | ||||
-rw-r--r-- | png.c | 12 | ||||
-rw-r--r-- | png.h | 23 | ||||
-rw-r--r-- | pngconf.h | 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-- | projects/vstudio/readme.txt | 2 | ||||
-rw-r--r-- | projects/vstudio/zlib.props | 2 | ||||
-rw-r--r-- | scripts/README.txt | 10 | ||||
-rw-r--r-- | scripts/def.c | 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 |
29 files changed, 88 insertions, 105 deletions
@@ -1,74 +1,54 @@ -Libpng 1.5.22rc05 - March 17, 2015 +Libpng 1.5.22 - March 26, 2015 -This is not intended to be a public release. It will be replaced -within a few weeks by a public version or by another test version. +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.22rc05.tar.xz (LZMA-compressed, recommended) - 1.5.22rc05.tar.gz - 1.5.22rc05.tar.bz2 + libpng-1.5.22.tar.xz (LZMA-compressed, recommended) + libpng-1.5.22.tar.gz + libpng-1.5.22.tar.bz2 Source files with CRLF line endings (for Windows), without the "configure" script - lp1522r05.7z (LZMA-compressed, recommended) - lp1522r05.zip + lpng1522.7z (LZMA-compressed, recommended) + lpng1522.zip Other information: - 1.5.22rc05-README.txt - 1.5.22rc05-LICENSE.txt - libpng-1.5.22rc05-*.asc (armored detached GPG signatures) + libpng-1.5.22-README.txt + libpng-1.5.22-LICENSE.txt + libpng-1.5.22-*.asc (armored detached GPG signatures) Changes since the last public release (1.5.21): -Version 1.5.22beta01 [January 29, 2015] Regenerated configure scripts with libtool-2.4.4 Made the check for out-of-range values in png_set_tRNS() detect values that are exactly 2^bit_depth, and work on 16-bit platforms. Quieted some warnings from Coverity-scan. - -Version 1.5.22beta02 [February 17, 2015] Merged pngtest.c with libpng-1.6.17/pngtest.c Display user limits in the output from pngtest. Eliminated the PNG_SAFE_LIMITS macro and restored the 1-million-column and 1-million-row default limits in pnglibconf.dfa, that can be reset by the user at build time or run time. This provides a more robust defense against DOS and as-yet undiscovered overflows. - -Version 1.5.22beta03 [February 21, 2015] Added PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED macro, on by default. Allow user to call png_get_IHDR() with NULL arguments (Reuben Hawkins). Rebuilt configure scripts with automake-1.15 and libtool-2.4.6 - -Version 1.5.22beta04 [February 25, 2015] - Relocated a misplaced "}" in png_reciprocal2(). - -Version 1.5.22rc01 [March 4, 2015] - No changes. - -Version 1.5.22rc02 [March 9, 2015] Removed some comments that the configure script did not handle properly from scripts/pnglibconf.dfa and pnglibconf.h.prebuilt. Merged png_free_data() with libpng-1.6.17 - -Version 1.5.22rc03 [March 12, 2015] Updated CMakeLists.txt to add OSX framework, change YES/NO to ON/OFF for consistency, and remove some useless tests (Alexey Petruchik). - -Version 1.5.22rc04 [March 16, 2015] Remove pnglibconf.h, pnglibconf.c, and pnglibconf.out instead of pnglibconf.* in "make clean" (Cosmin). Fix incorrect calculation of maximum number of unknown chunks or sPLT chunks to be stored (John Bowler). -Version 1.5.22rc05 [March 17, 2015] - Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit https://lists.sourceforge.net/lists/listinfo/png-mng-implement @@ -4331,7 +4331,8 @@ Version 1.5.22rc04 [March 16, 2015] Fix incorrect calculation of maximum number of unknown chunks or sPLT chunks to be stored (John Bowler). -Version 1.5.22rc05 [March 17, 2015] +Version 1.5.22 [March 26, 2015] + No changes. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CMakeLists.txt b/CMakeLists.txt index c95da8e99..e29707bd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -224,7 +224,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.22rc05 +# VERSION 15.${PNGLIB_RELEASE}.1.5.22 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.22rc05, March 17, 2015, are +libpng versions 1.2.6, August 15, 2004, through 1.5.22, March 26, 2015, are Copyright (c) 2004, 2006-2015 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 -March 17, 2015 +March 26, 2015 @@ -1,4 +1,4 @@ -README for libpng version 1.5.22rc05 - March 17, 2015 (shared library 15.0) +README for libpng version 1.5.22 - March 26, 2015 (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.22rc05. +# Generated by GNU Autoconf 2.69 for libpng 1.5.22. # # 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.22rc05' -PACKAGE_STRING='libpng 1.5.22rc05' +PACKAGE_VERSION='1.5.22' +PACKAGE_STRING='libpng 1.5.22' PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net' PACKAGE_URL='' @@ -1354,7 +1354,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.22rc05 to adapt to many kinds of systems. +\`configure' configures libpng 1.5.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1424,7 +1424,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpng 1.5.22rc05:";; + short | recursive ) echo "Configuration of libpng 1.5.22:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpng configure 1.5.22rc05 +libpng configure 1.5.22 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2002,7 +2002,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.22rc05, which was +It was created by libpng $as_me 1.5.22, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2865,7 +2865,7 @@ fi # Define the identity of the package. PACKAGE='libpng' - VERSION='1.5.22rc05' + VERSION='1.5.22' cat >>confdefs.h <<_ACEOF @@ -2982,7 +2982,7 @@ fi -PNGLIB_VERSION=1.5.22rc05 +PNGLIB_VERSION=1.5.22 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=22 @@ -14124,7 +14124,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.22rc05, which was +This file was extended by libpng $as_me 1.5.22, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14190,7 +14190,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.22rc05 +libpng config.status 1.5.22 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9e7b886d9..1931eb223 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.22rc05], [png-mng-implement@lists.sourceforge.net]) +AC_INIT([libpng], [1.5.22], [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.22rc05 +PNGLIB_VERSION=1.5.22 PNGLIB_MAJOR=1 PNGLIB_MINOR=5 PNGLIB_RELEASE=22 diff --git a/libpng-manual.txt b/libpng-manual.txt index 5fd9172dc..f3f52cd40 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.22rc05 - March 17, 2015 + libpng version 1.5.22 - March 26, 2015 Updated and distributed by Glenn Randers-Pehrson <glennrp at users.sourceforge.net> Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -11,7 +11,7 @@ Libpng-manual.txt - A description on how to use and modify libpng Based on: - libpng versions 0.97, January 1998, through 1.5.22rc05 - March 17, 2015 + libpng versions 0.97, January 1998, through 1.5.22 - March 26, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -4535,13 +4535,13 @@ Other rules can be inferred by inspecting the libpng source. XIV. Y2K Compliance in libpng -March 17, 2015 +March 26, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.5.22rc05 are Y2K compliant. It is my belief that earlier +upward through 1.5.22 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 @@ -1,6 +1,6 @@ -.TH LIBPNG 3 "March 17, 2015" +.TH LIBPNG 3 "March 26, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.22rc05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.22 .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.22rc05 - March 17, 2015 + libpng version 1.5.22 - March 26, 2015 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.22rc05 - March 17, 2015 + libpng versions 0.97, January 1998, through 1.5.22 - March 26, 2015 Updated and distributed by Glenn Randers-Pehrson Copyright (c) 1998-2014 Glenn Randers-Pehrson @@ -5027,13 +5027,13 @@ Other rules can be inferred by inspecting the libpng source. .SH XIV. Y2K Compliance in libpng -March 17, 2015 +March 26, 2015 Since the PNG Development group is an ad-hoc body, we can't make an official declaration. This is your unofficial assurance that libpng from version 0.71 and -upward through 1.5.22rc05 are Y2K compliant. It is my belief that earlier +upward through 1.5.22 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 @@ -5278,7 +5278,8 @@ the first widely used release: 1.5.21rc01-03 15 10521 15.so.15.21[.0] 1.5.21 15 10521 15.so.15.21[.0] 1.5.22beta01-04 15 10522 15.so.15.22[.0] - 1.5.22rc01-05 15 10522 15.so.15.22[.0] + 1.5.22rc01-04 15 10522 15.so.15.22[.0] + 1.5.22 15 10522 15.so.15.22[.0] Henceforth the source version will match the shared-library minor and patch numbers; the shared-library major version number will be @@ -5335,7 +5336,7 @@ possible without all of you. Thanks to Frank J. T. Wojcik for helping with the documentation. -Libpng version 1.5.22rc05 - March 17, 2015: +Libpng version 1.5.22 - March 26, 2015: Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc. Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net). @@ -5358,8 +5359,8 @@ this sentence. This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.22rc05, March 17, 2015, are -Copyright (c) 2004,2006-20014 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.5.22, March 26, 2015, are +Copyright (c) 2004,2006-2015 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 @@ -5457,7 +5458,7 @@ certification mark of the Open Source Initiative. Glenn Randers-Pehrson glennrp at users.sourceforge.net -March 17, 2015 +March 26, 2015 .\" end of man page diff --git a/libpngpf.3 b/libpngpf.3 index 2b07089a2..6df15f6db 100644 --- a/libpngpf.3 +++ b/libpngpf.3 @@ -1,6 +1,6 @@ -.TH LIBPNGPF 3 "March 17, 2015" +.TH LIBPNGPF 3 "March 26, 2015" .SH NAME -libpng \- Portable Network Graphics (PNG) Reference Library 1.5.22rc05 +libpng \- Portable Network Graphics (PNG) Reference Library 1.5.22 (private functions) .SH SYNOPSIS \fB#include \fI"pngpriv.h" @@ -1,4 +1,4 @@ -.TH PNG 5 "March 17, 2015" +.TH PNG 5 "March 26, 2015" .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.22 [(PENDING RELEASE)] + * Last changed in libpng 1.5.22 [March 26, 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.) @@ -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_22rc05 Your_png_h_is_not_version_1_5_22rc05; +typedef png_libpng_version_1_5_22 Your_png_h_is_not_version_1_5_22; /* 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 @@ -648,13 +648,13 @@ png_get_copyright(png_const_structp png_ptr) #else # ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.5.22rc05 - March 17, 2015" PNG_STRING_NEWLINE \ + "libpng version 1.5.22 - March 26, 2015" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2015 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; # else - return "libpng version 1.5.22rc05 - March 17, 2015\ + return "libpng version 1.5.22 - March 26, 2015\ Copyright (c) 1998-2015 Glenn Randers-Pehrson\ Copyright (c) 1996-1997 Andreas Dilger\ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; @@ -1741,7 +1741,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size, /* Check for an exponent, if we don't need one we are * done and just need to terminate the string. At * this point exp_b10==(-1) is effectively if flag - it got - * to '-1' because of the decrement after outputing + * to '-1' because of the decrement after outputting * the decimal point above (the exponent required is * *not* -1!) */ @@ -1749,7 +1749,7 @@ png_ascii_from_fp(png_structp png_ptr, png_charp ascii, png_size_t size, { /* The following only happens if we didn't output the * leading zeros above for negative exponent, so this - * doest add to the digit requirement. Note that the + * doesn't add to the digit requirement. Note that the * two zeros here can only be output if the two leading * zeros were *not* output, so this doesn't increase * the output count. @@ -1,7 +1,7 @@ /* png.h - header file for PNG reference library * - * libpng version 1.5.22rc05, March 17, 2015 + * libpng version 1.5.22, March 26, 2015 * * Copyright (c) 1998-2015 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) @@ -12,7 +12,7 @@ * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.5.22rc05, March 17, 2015: Glenn + * libpng versions 0.97, January 1998, through 1.5.22, March 26, 2015: Glenn * See also "Contributing Authors", below. * * Note about libpng version numbers: @@ -207,7 +207,8 @@ * 1.5.21rc01-03 15 10521 15.so.15.21[.0] * 1.5.21 15 10521 15.so.15.21[.0] * 1.5.22beta01-04 15 10522 15.so.15.22[.0] - * 1.5.22rc01-05 15 10522 15.so.15.22[.0] + * 1.5.22rc01-04 15 10522 15.so.15.22[.0] + * 1.5.22 15 10522 15.so.15.22[.0] * * Henceforth the source version will match the shared-library major * and minor numbers; the shared-library major version number will be @@ -239,7 +240,7 @@ * * This code is released under the libpng license. * - * libpng versions 1.2.6, August 15, 2004, through 1.5.22rc05, March 17, 2015, are + * libpng versions 1.2.6, August 15, 2004, through 1.5.22, March 26, 2015, are * Copyright (c) 2004, 2006-2015 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: @@ -351,13 +352,13 @@ * Y2K compliance in libpng: * ========================= * - * March 17, 2015 + * March 26, 2015 * * Since the PNG Development group is an ad-hoc body, we can't make * an official declaration. * * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.5.22rc05 are Y2K compliant. It is my belief that + * upward through 1.5.22 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 @@ -418,9 +419,9 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.5.22rc05" +#define PNG_LIBPNG_VER_STRING "1.5.22" #define PNG_HEADER_VERSION_STRING \ - " libpng version 1.5.22rc05 - March 17, 2015\n" + " libpng version 1.5.22 - March 26, 2015\n" #define PNG_LIBPNG_VER_SONUM 15 #define PNG_LIBPNG_VER_DLLNUM 15 @@ -434,7 +435,7 @@ * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 05 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -451,7 +452,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. @@ -581,7 +582,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_22rc05; +typedef char* png_libpng_version_1_5_22; /* 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.22rc05, March 17, 2015 + * libpng version 1.5.22, March 26, 2015 * * Copyright (c) 1998-2013 Glenn Randers-Pehrson * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) diff --git a/pngrtran.c b/pngrtran.c index bdb51fcf6..c8bcb45b8 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.22 [(PENDING RELEASE)] + * Last changed in libpng 1.5.22 [March 26, 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 4c0493366..dccca52c4 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.22 [(PENDING RELEASE)] + * Last changed in libpng 1.5.22 [March 26, 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.) @@ -1,7 +1,7 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.5.22 [(PENDING RELEASE)] + * Last changed in libpng 1.5.22 [March 26, 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.) @@ -1,6 +1,6 @@ /* pngtest.c - a simple test program to test libpng * - * Last changed in libpng 1.5.22 [(PENDING RELEASE)] + * Last changed in libpng 1.5.22 [March 26, 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.) @@ -2024,4 +2024,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_22rc05 Your_png_h_is_not_version_1_5_22rc05; +typedef png_libpng_version_1_5_22 Your_png_h_is_not_version_1_5_22; diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt index e1709dfcb..9b949c198 100644 --- a/projects/vstudio/readme.txt +++ b/projects/vstudio/readme.txt @@ -1,7 +1,7 @@ VisualStudio instructions -libpng version 1.5.22rc05 - March 17, 2015 +libpng version 1.5.22 - March 26, 2015 Copyright (c) 1998-2010 Glenn Randers-Pehrson diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props index fef8a8cac..cb52fb2d6 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.22rc05 - March 17, 2015 + * libpng version 1.5.22 - March 26, 2015 * * Copyright (c) 1998-2011 Glenn Randers-Pehrson * diff --git a/scripts/README.txt b/scripts/README.txt index cb4b9bb75..968b9e0f0 100644 --- a/scripts/README.txt +++ b/scripts/README.txt @@ -1,9 +1,9 @@ -Makefiles for libpng version 1.5.22rc05 - March 17, 2015 +Makefiles for libpng version 1.5.22 - March 26, 2015 pnglibconf.h.prebuilt => Stores configuration settings makefile.linux => Linux/ELF makefile - (gcc, creates libpng15.so.15.1.5.22rc05) + (gcc, creates libpng15.so.15.1.5.22) 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.22rc05) + creates libpng15.so.15.1.5.22) makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib) makefile.solaris => Solaris 2.X makefile (gcc, - creates libpng15.so.15.1.5.22rc05) + creates libpng15.so.15.1.5.22) makefile.so9 => Solaris 9 makefile (gcc, - creates libpng15.so.15.1.5.22rc05) + creates libpng15.so.15.1.5.22) 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/def.c b/scripts/def.c index 1486c1694..081404aaf 100644 --- a/scripts/def.c +++ b/scripts/def.c @@ -21,7 +21,7 @@ PNG_DFN "OS2 DESCRIPTION "PNG image compression library"" PNG_DFN "OS2 CODE PRELOAD MOVEABLE DISCARDABLE" PNG_DFN "" PNG_DFN "EXPORTS" -PNG_DFN ";Version 1.5.22rc05" +PNG_DFN ";Version 1.5.22" #define PNG_EXPORTA(ordinal, type, name, args, attributes)\ PNG_DFN "@" SYMBOL_PREFIX "@@" name "@" diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in index 962261ef5..12c77371e 100755 --- a/scripts/libpng-config-head.in +++ b/scripts/libpng-config-head.in @@ -11,7 +11,7 @@ # Modeled after libxml-config. -version=1.5.22rc05 +version=1.5.22 prefix="" libdir="" libs="" diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in index 932874226..a1b5c66b0 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.22rc05 +Version: 1.5.22 Libs: -L${libdir} -lpng15 Cflags: -I${includedir} diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index cc98a3cce..c0b5b8587 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.22rc05 +SHLIB_MINOR= 1.5.22 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 629171015..0d8e97718 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.22rc05 +SHLIB_MINOR= 1.5.22 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 e2077cf15..652781ea9 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.22rc05 +SHLIB_MINOR= 1.5.22 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 a431c95b8..480321c1c 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -1,7 +1,7 @@ -/* 1.5.22rc05 STANDARD API DEFINITION */ +/* 1.5.22 STANDARD API DEFINITION */ /* pnglibconf.h - library build configuration */ -/* libpng version 1.5.22rc05 - March 17, 2015 */ +/* libpng version 1.5.22 - March 26, 2015 */ /* Copyright (c) 1998-2013 Glenn Randers-Pehrson */ diff --git a/scripts/symbols.def b/scripts/symbols.def index edcd550be..c0f9db156 100644 --- a/scripts/symbols.def +++ b/scripts/symbols.def @@ -1,4 +1,4 @@ -;Version 1.5.22rc05 +;Version 1.5.22 ;-------------------------------------------------------------- ; LIBPNG symbol list as a Win32 DEF file ; Contains all the symbols that can be exported from libpng |