[libpng14] Imported from libpng-1.4.22.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 61ddb16..f7bee67 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,46 +1,39 @@
-Libpng 1.4.22rc01 - September 20, 2017
+Libpng 1.4.22 - September 28, 2017
-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.22rc01.tar.xz (LZMA-compressed, recommended)
- 1.4.22rc01.tar.gz
+ libpng-1.4.22.tar.xz (LZMA-compressed, recommended)
+ libpng-1.4.22.tar.gz
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1422r01.7z (LZMA-compressed, recommended)
- lp1422r01.zip
+ lpng1422.7z (LZMA-compressed, recommended)
+ lpng1422.zip
Other information:
- 1.4.22rc01-README.txt
- 1.4.22rc01-LICENSE.txt
- libpng-1.4.22rc01-*.asc (armored detached GPG signatures)
+ libpng-1.4.22-README.txt
+ libpng-1.4.22-LICENSE.txt
+ libpng-1.4.22-*.asc (armored detached GPG signatures)
-Changes since the last public release (1.4.20):
-
-version 1.4.22beta01 [August 28. 2017]
+Changes since the last public release (1.4.21):
Added PNGMINUS_UNUSED macro to contrib/pngminus/p*.c and added missing
parenthesis in contrib/pngminus/pnm2png.c (bug report by Christian Hesse).
-
-version 1.4.22beta02 [September 14, 2017]
Compute a larger limit on IDAT because some applications write a deflate
buffer for each row (Bug report by Andrew Church).
Fixed incorrect typecast of some arguments to png_malloc() and
png_calloc() that were png_uint_32 instead of png_alloc_size_t
(Bug report by "irwir" in Github libpng issue #175).
-
-version 1.4.22beta03 [September 20, 2017]
Initialize memory allocated by png_inflate to zero, using memset, to
stop an oss-fuzz "use of uninitialized value" detection in png_set_text_2()
- due to truncated iTXT or zTXT chunk.
+ due to truncated iTXt or zTXt chunk.
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CHANGES b/CHANGES
index b036f01..3d69edf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -768,7 +768,7 @@
Removed the new PNG_CREATED_READ_STRUCT and PNG_CREATED_WRITE_STRUCT modes
which are no longer used.
Eliminated the three new members of png_text when PNG_LEGACY_SUPPORTED is
- defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXT_SUPPORTED
+ defined or when neither PNG_READ_iTXt_SUPPORTED nor PNG_WRITE_iTXt_SUPPORTED
is defined.
Made PNG_NO_READ|WRITE_iTXt the default setting, to avoid memory
overrun when old applications fill the info_ptr->text structure directly.
@@ -3067,10 +3067,12 @@
png_calloc() that were png_uint_32 instead of png_alloc_size_t
(Bug report by "irwir" in Github libpng issue #175).
-version 1.4.22beta03 [September 20, 2017]
+version 1.4.22rc01 [September 20, 2017]
Initialize memory allocated by png_inflate to zero, using memset, to
stop an oss-fuzz "use of uninitialized value" detection in png_set_text_2()
- due to truncated iTXT or zTXT chunk.
+ due to truncated iTXt or zTXt chunk.
+
+version 1.4.22 [September 28, 2017]
Send comments/corrections/commendations to glennrp at users.sourceforge.net
or to png-mng-implement at lists.sf.net (subscription required; visit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 089be28..401b03c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -255,7 +255,7 @@
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 14.${PNGLIB_RELEASE}.1.4.22rc01
+# VERSION 14.${PNGLIB_RELEASE}.1.4.22
VERSION 14.${PNGLIB_RELEASE}.0
SOVERSION 14
CLEAN_DIRECT_OUTPUT 1)
diff --git a/INSTALL b/INSTALL
index 6937214..befea2d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.22rc01 - September 20, 2017
+Installing libpng version 1.4.22 - September 28, 2017
On Unix/Linux and similar systems, you can simply type
@@ -46,7 +46,7 @@
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.4.22rc01" or "libpng14" and "zlib-1.2.3"
+might be called "libpng-1.4.22" 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 bafb269..0d97f11 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.4.22rc01, September 20, 2017, are
+libpng versions 1.0.7, July 1, 2000, through 1.4.22, September 28, 2017, are
Copyright (c) 2000-2002, 2004, 2006-2017 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 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 20, 2017
+September 28, 2017
diff --git a/Makefile.am b/Makefile.am
index 6e50ea4..85a3fb6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.4.22rc01.txt
+ example.c libpng-1.4.22.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 bcbb252..171d582 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -628,7 +628,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.4.22rc01.txt
+ example.c libpng-1.4.22.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 be801cb..b4c0c01 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.22rc01 - September 20, 2017 (shared library 14.0)
+README for libpng version 1.4.22 - September 28, 2017 (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 @@
makefile.std => Generic UNIX makefile (cc, creates static
libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- (gcc, creates libpng14.so.14.1.4.22rc01)
+ (gcc, creates libpng14.so.14.1.4.22)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.22rc01)
+ (gcc, creates libpng14.so.14.1.4.22)
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 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng14.so.14.1.4.22rc01)
+ (gcc, creates libpng14.so.14.1.4.22)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng14.so.14.1.4.22rc01)
+ (gcc, creates libpng14.so.14.1.4.22)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng14.so.14.1.4.22rc01)
+ (gcc, creates libpng14.so.14.1.4.22)
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 2be5df1..ae2921e 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.22rc01.
+# Generated by GNU Autoconf 2.69 for libpng 1.4.22.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
-PACKAGE_VERSION='1.4.22rc01'
-PACKAGE_STRING='libpng 1.4.22rc01'
+PACKAGE_VERSION='1.4.22'
+PACKAGE_STRING='libpng 1.4.22'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1333,7 +1333,7 @@
# 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.22rc01 to adapt to many kinds of systems.
+\`configure' configures libpng 1.4.22 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1403,7 +1403,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.4.22rc01:";;
+ short | recursive ) echo "Configuration of libpng 1.4.22:";;
esac
cat <<\_ACEOF
@@ -1520,7 +1520,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.4.22rc01
+libpng configure 1.4.22
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1943,7 +1943,7 @@
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.22rc01, which was
+It was created by libpng $as_me 1.4.22, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2806,7 +2806,7 @@
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.4.22rc01'
+ VERSION='1.4.22'
cat >>confdefs.h <<_ACEOF
@@ -2923,7 +2923,7 @@
-PNGLIB_VERSION=1.4.22rc01
+PNGLIB_VERSION=1.4.22
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=22
@@ -13615,7 +13615,7 @@
# 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.22rc01, which was
+This file was extended by libpng $as_me 1.4.22, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13681,7 +13681,7 @@
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.22rc01
+libpng config.status 1.4.22
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index ef6f302..a0a0e06 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,14 +16,14 @@
dnl stamps are correct
AC_PREREQ(2.59)
-AC_INIT([libpng], [1.4.22rc01], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.4.22], [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.22rc01
+PNGLIB_VERSION=1.4.22
PNGLIB_MAJOR=1
PNGLIB_MINOR=4
PNGLIB_RELEASE=22
diff --git a/libpng-1.4.22rc01.txt b/libpng-1.4.22.txt
similarity index 99%
rename from libpng-1.4.22rc01.txt
rename to libpng-1.4.22.txt
index 313b1cf..8f84150 100644
--- a/libpng-1.4.22rc01.txt
+++ b/libpng-1.4.22.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.22rc01 - September 20, 2017
+ libpng version 1.4.22 - September 28, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.22rc01 - September 20, 2017
+ libpng versions 0.97, January 1998, through 1.4.22 - September 28, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -907,7 +907,7 @@
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.22rc01, not all possible expansions are supported.
+As of libpng version 1.4.22, not all possible expansions are supported.
In the following table, the 01 means grayscale with depth<8, 31 means
indexed with depth<8, other numerals represent the color type, "T" means
@@ -3298,7 +3298,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.22rc01 are Y2K compliant. It is my belief that earlier
+upward through 1.4.22 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 aaa77b3..846044f 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "September 20, 2017"
+.TH LIBPNG 3 "September 28, 2017"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.22rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.22
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -444,7 +444,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.22rc01 - September 20, 2017
+ libpng version 1.4.22 - September 28, 2017
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -455,7 +455,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.22rc01 - September 20, 2017
+ libpng versions 0.97, January 1998, through 1.4.22 - September 28, 2017
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -1351,7 +1351,7 @@
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.22rc01, not all possible expansions are supported.
+As of libpng version 1.4.22, 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
@@ -3742,7 +3742,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.4.22rc01 are Y2K compliant. It is my belief that earlier
+upward through 1.4.22 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
@@ -3895,7 +3895,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.22rc01 - September 20, 2017:
+Libpng version 1.4.22 - September 28, 2017:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -3920,7 +3920,7 @@
This code is released under the libpng license.
-libpng versions 1.0.7, July 1, 2000, through 1.4.22rc01, September 20, 2017, are
+libpng versions 1.0.7, July 1, 2000, through 1.4.22, September 28, 2017, are
Copyright (c) 2000-2002, 2004, 2006-2017 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
@@ -4017,7 +4017,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-September 20, 2017
+September 28, 2017
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index 81b61a0..9e53f29 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "September 20, 2017"
+.TH LIBPNGPF 3 "September 28, 2017"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.4.22rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.4.22
(private functions)
.SH SYNOPSIS
\fB#include <png.h>
diff --git a/png.5 b/png.5
index fd37546..df6ae2b 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "September 20, 2017"
+.TH PNG 5 "September 28, 2017"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index 23ecfdc..5dd8989 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_22rc01 Your_png_h_is_not_version_1_4_22rc01;
+typedef version_1_4_22 Your_png_h_is_not_version_1_4_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
@@ -559,14 +559,14 @@
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.4.22rc01 - September 20, 2017" PNG_STRING_NEWLINE \
+ "libpng version 1.4.22 - September 28, 2017" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2002,2004,2006-2016 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.22rc01 - September 20, 2017\
+ return ((png_charp) "libpng version 1.4.22 - September 28, 2017\
Copyright (c) 1998-2002,2004,2006-2016 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 522ebfb..70b81bc 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.4.22rc01, September 20, 2017
+ * libpng version 1.4.22, September 28, 2017
*
* Copyright (c) 1998-2002,2004,2006-2017 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.22rc01, September 20, 2017: Glenn
+ * libpng versions 0.97, January 1998, through 1.4.22, September 28, 2017: 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.22rc01, September 20, 2017, are
+ * libpng versions 1.0.7, July 1, 2000, through 1.4.22, September 28, 2017, are
* Copyright (c) 2000-2002, 2004, 2006-2017 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:
* =========================
*
- * September 20, 2017
+ * September 28, 2017
*
* 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.22rc01 are Y2K compliant. It is my belief that earlier
+ * upward through 1.4.22 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.22rc01"
+#define PNG_LIBPNG_VER_STRING "1.4.22"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.4.22rc01 - September 20, 2017\n"
+ " libpng version 1.4.22 - September 28, 2017\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 @@
/* 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_22rc01;
+typedef png_structp version_1_4_22;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index bb7bd63..d340260 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.4.22rc01, September 20, 2017
+ * libpng version 1.4.22, September 28, 2017
*
* Copyright (c) 1998-2002,2004,2006-2015 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpriv.h b/pngpriv.h
index cee2772..6f2d8ff 100644
--- a/pngpriv.h
+++ b/pngpriv.h
@@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
- * libpng version 1.4.22rc01 - September 20, 2017
+ * libpng version 1.4.22 - September 28, 2017
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2002,2004,2006-2014,2017 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index ae79883..8e9371d 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.22 [September 20, 2017]
+ * Last changed in libpng 1.4.22 [September 28, 2017]
* Copyright (c) 1998-2002,2004,2006-2015,2017 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 f40c4ae..68a915a 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.22 [September 20, 2017]
+ * Last changed in libpng 1.4.22 [September 28, 2017]
* Copyright (c) 1998-2002,2004,2006-2015,2017 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 c42523f..f6f1431 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1737,4 +1737,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_4_22rc01 your_png_h_is_not_version_1_4_22rc01;
+typedef version_1_4_22 your_png_h_is_not_version_1_4_22;
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index eb8fd53..7aa34d3 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.4.22rc01 - September 20, 2017
+libpng version 1.4.22 - September 28, 2017
Copyright (c) 2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index b2b30ce..2a85494 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.22rc01 - September 20, 2017
+ * libpng version 1.4.22 - September 28, 2017
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 0f7e125..2228d11 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,8 +1,8 @@
-Makefiles for libpng version 1.4.22rc01 - September 20, 2017
+Makefiles for libpng version 1.4.22 - September 28, 2017
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng14.so.14.1.4.22rc01)
+ (gcc, creates libpng14.so.14.1.4.22)
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 @@
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.22rc01)
+ (gcc, creates libpng14.so.14.1.4.22)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@@ -36,12 +36,12 @@
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.22rc01)
+ creates libpng14.so.14.1.4.22)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng14.so.14.1.4.22rc01)
+ creates libpng14.so.14.1.4.22)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng14.so.14.1.4.22rc01)
+ creates libpng14.so.14.1.4.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/libpng-config-head.in b/scripts/libpng-config-head.in
index 486f7ca..0a7ee09 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.4.22rc01
+version=1.4.22
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 2263857..a1149dd 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.4.22rc01
+Version: 1.4.22
Libs: -L${libdir} -lpng14
Cflags: -I${includedir}
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index b583048..56ff5e5 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@
LIB= png14
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.22rc01
+SHLIB_MINOR= 1.4.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 7182f6b..07922bd 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.4.22rc01
+SHLIB_MINOR= 1.4.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 2e43f30..5ad2891 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.4.22rc01
+SHLIB_MINOR= 1.4.22
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/png32ce.def b/scripts/png32ce.def
index 4fd7393..c850b2e 100644
--- a/scripts/png32ce.def
+++ b/scripts/png32ce.def
@@ -15,7 +15,7 @@
png_get_int_32
EXPORTS
-;Version 1.4.22rc01
+;Version 1.4.22
png_build_grayscale_palette @1
; png_check_sig @2
png_chunk_error @3
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 059e500..31831ba 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.4.22rc01
+; Version 1.4.22
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngwin.def b/scripts/pngwin.def
index 6f5785b..ec74c42 100644
--- a/scripts/pngwin.def
+++ b/scripts/pngwin.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.4.22rc01
+;Version 1.4.22
png_build_grayscale_palette
png_chunk_error
png_chunk_warning