summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-11-20 09:04:20 -0600
committerGlenn Randers-Pehrson <glennrp at users.sourceforge.net>2014-11-20 10:54:25 -0600
commit0f820b1a7010ccb56a3d3f934b5f19dfa4cd4054 (patch)
tree146c7b2598ed54aeeb9f3023e4fdd17046e3896b
parent9d6ff2c566f84516131e3f6e504185f3ba9a5fbb (diff)
downloadlibpng-0f820b1a7010ccb56a3d3f934b5f19dfa4cd4054.tar.gz
[libpng10] Imported from libpng-1.0.62.tarv1.0.62libpng-1.0.62-signed
-rw-r--r--ANNOUNCE61
-rw-r--r--CHANGES13
-rw-r--r--INSTALL4
-rw-r--r--KNOWNBUG2
-rw-r--r--LICENSE2
-rw-r--r--Makefile.am2
-rw-r--r--Makefile.in4
-rw-r--r--README20
-rw-r--r--Y2KINFO2
-rwxr-xr-xconfigure24
-rw-r--r--configure.ac6
-rw-r--r--libpng-1.0.62.txt (renamed from libpng-1.0.61.txt)11
-rw-r--r--libpng.321
-rw-r--r--libpngpf.32
-rw-r--r--png.c6
-rw-r--r--png.h22
-rw-r--r--pngconf.h2
-rw-r--r--pngread.c20
-rw-r--r--pngrtran.c3
-rw-r--r--pngtest.c2
-rw-r--r--pngwrite.c23
-rw-r--r--projects/wince.txt4
-rw-r--r--scripts/README.txt14
-rwxr-xr-xscripts/libpng-config-head.in2
-rw-r--r--scripts/libpng.pc.in2
-rw-r--r--scripts/makefile.32sunu2
-rw-r--r--scripts/makefile.64sunu2
-rw-r--r--scripts/makefile.aix2
-rw-r--r--scripts/makefile.beos2
-rw-r--r--scripts/makefile.cegcc2
-rw-r--r--scripts/makefile.cygwin2
-rw-r--r--scripts/makefile.darwin2
-rw-r--r--scripts/makefile.dec2
-rw-r--r--scripts/makefile.elf2
-rw-r--r--scripts/makefile.gcmmx2
-rw-r--r--scripts/makefile.hp642
-rw-r--r--scripts/makefile.hpgcc2
-rw-r--r--scripts/makefile.hpux2
-rw-r--r--scripts/makefile.linux2
-rw-r--r--scripts/makefile.mingw2
-rw-r--r--scripts/makefile.ne12bsd2
-rw-r--r--scripts/makefile.netbsd2
-rw-r--r--scripts/makefile.nommx2
-rw-r--r--scripts/makefile.openbsd2
-rw-r--r--scripts/makefile.sco2
-rw-r--r--scripts/makefile.sggcc2
-rw-r--r--scripts/makefile.sgi2
-rw-r--r--scripts/makefile.so92
-rw-r--r--scripts/makefile.solaris2
-rw-r--r--scripts/makefile.solaris-x862
-rw-r--r--scripts/makefile.vcawin322
-rw-r--r--scripts/makefile.vcwin322
-rw-r--r--scripts/png32ce.def2
-rw-r--r--scripts/pngos2.def2
-rw-r--r--scripts/pngw32.def2
55 files changed, 183 insertions, 151 deletions
diff --git a/ANNOUNCE b/ANNOUNCE
index 0cbf2aae1..804284b6f 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.0.61 - February 6, 2014
+Libpng 1.0.62 - February 6, 2014
This is a public release of libpng, intended for use in production codes.
@@ -8,57 +8,42 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.0.61.tar.xz (LZMA-compressed, recommended)
- libpng-1.0.61.tar.gz
- libpng-1.0.61.tar.bz2
+ libpng-1.0.62.tar.xz (LZMA-compressed, recommended)
+ libpng-1.0.62.tar.gz
+ libpng-1.0.62.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.0.61-no-config.tar.xz (LZMA-compressed, recommended)
- libpng-1.0.61-no-config.tar.gz
- libpng-1.0.61-no-config.tar.bz2
+ libpng-1.0.62-no-config.tar.xz (LZMA-compressed, recommended)
+ libpng-1.0.62-no-config.tar.gz
+ libpng-1.0.62-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lpng1061.zip
- lpng1061.7z
- lpng1061.tar.bz2
+ lpng1062.zip
+ lpng1062.7z
+ lpng1062.tar.bz2
Project files
- libpng-1.0.61-project-netware.zip
- libpng-1.0.61-project-wince.zip
+ libpng-1.0.62-project-netware.zip
+ libpng-1.0.62-project-wince.zip
Other information:
- libpng-1.0.61-README.txt
- libpng-1.0.61-KNOWNBUGS.txt
- libpng-1.0.61-LICENSE.txt
- libpng-1.0.61-Y2K-compliance.txt
-
-Changes since the last public release (1.0.60):
-
-version 1.0.61 [February 6, 2014]
-
-version 1.0.61 and 1.2.51 [February 6, 2014]
- Ignore, with a warning, out-of-range value of num_trans in png_set_tRNS().
- Replaced AM_CONFIG_HEADER(config.h) with AC_CONFIG_HEADERS([config.h])
- in configure.ac
- Changed default value of PNG_USER_CACHE_MAX from 0 to 32767 in pngconf.h.
- Avoid a possible memory leak in contrib/gregbook/readpng.c
- Revised libpng.3 so that "doclifter" can process it.
- Changed '"%s"m' to '"%s" m' in png_debug macros to improve portability
- among compilers.
- Rebuilt the configure scripts with autoconf-2.69 and automake-1.14.1
- Removed potentially misleading warning from png_check_IHDR().
- Quiet set-but-not-used warnings in pngset.c
- Quiet an uninitialized memory warning from VC2013 in png_get_png().
- Quiet unused variable warnings from clang by porting PNG_UNUSED() from
- libpng-1.4.6.
- Added -DZ_SOLO to CFLAGS in contrib/pngminim/*/makefile
- Added an #ifdef PNG_FIXED_POINT_SUPPORTED/#endif in pngset.c
+ libpng-1.0.62-README.txt
+ libpng-1.0.62-KNOWNBUGS.txt
+ libpng-1.0.62-LICENSE.txt
+ libpng-1.0.62-Y2K-compliance.txt
+ libpng-1.0.62-*.asc (armored detached GPG signatures)
+
+Changes since the last public release (1.0.61):
+ Avoid out-of-bounds memory access while checking version string in
+ pngread.c and pngwrite.c
+ Added "-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS" to
+ CFLAGS in scripts/makefile.vcwin32
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 544e615e6..f57039099 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2803,6 +2803,19 @@ version 1.2.51rc04 [February 3, 2014]
version 1.0.61 and 1.2.51 [February 6, 2014]
Added an #ifdef PNG_FIXED_POINT_SUPPORTED/#endif in pngset.c
+version 1.2.52beta01 [November 6, 2014]
+ Avoid out-of-bounds memory access while checking version string in
+ pngread.c and pngwrite.c
+
+version 1.2.52rc01 [November 13, 2014]
+ No changes.
+
+version 1.2.52rc02 [November 17, 2014]
+ Added "-D_CRT_SECURE_NO_DEPRECATE" to CFLAGS in scripts/makefile.vcwin32
+ and scripts/makefile.vcawin32.
+
+version 1.0.62 and 1.2.52 [February 6, 2014]
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/INSTALL b/INSTALL
index 0d23c6b85..8718990d0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.0.61 - February 6, 2014
+Installing libpng version 1.0.62 - February 6, 2014
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.0.61" or "libpng10" and "zlib-1.2.3"
+might be called "libpng-1.0.62" or "libpng10" 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/KNOWNBUG b/KNOWNBUG
index ee6f8a8ec..fa2379d44 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.0.61
+Known bugs in libpng version 1.0.62
1. February 23, 2006: The custom makefiles don't build libpng with -lz.
diff --git a/LICENSE b/LICENSE
index e971dbfa0..720d07ee0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.0.61, February 6, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.0.62, February 6, 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
diff --git a/Makefile.am b/Makefile.am
index f74de84a1..6a99579ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -89,7 +89,7 @@ EXTRA_DIST= \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.0.61.txt pnggccrd.c pngvcrd.c
+ example.c libpng-1.0.62.txt pnggccrd.c pngvcrd.c
CLEANFILES= pngout.png libpng10.pc libpng10-config libpng.vers \
libpng.sym
diff --git a/Makefile.in b/Makefile.in
index 8ea5728e9..0ae3f43f8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -607,7 +607,7 @@ libpng10_la_LDFLAGS = -no-undefined -export-dynamic -version-number \
0:@PNGLIB_RELEASE@:0 $(am__append_1) $(am__append_2)
# -rpath is needed as automake doesn't know the directory
libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
- -version-number 3:@PNGLIB_RELEASE@:0
+ -version-number 2:@PNGLIB_RELEASE@:0
@HAVE_LD_VERSION_SCRIPT_FALSE@libpng10_la_DEPENDENCIES = libpng.sym
@HAVE_LD_VERSION_SCRIPT_TRUE@libpng10_la_DEPENDENCIES = libpng.vers
@@ -637,7 +637,7 @@ EXTRA_DIST = \
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.0.61.txt pnggccrd.c pngvcrd.c
+ example.c libpng-1.0.62.txt pnggccrd.c pngvcrd.c
CLEANFILES = pngout.png libpng10.pc libpng10-config libpng.vers \
libpng.sym
diff --git a/README b/README
index 9eeea6240..ca08fd999 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.0.61 - February 6, 2014 (shared library 10.0)
+README for libpng version 1.0.62 - February 6, 2014 (shared library 10.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -93,6 +93,12 @@ This code is currently being archived at libpng.sf.net in the
at GO GRAPHSUP. If you can't find it in any of those places,
e-mail me, and I'll help you find it.
+I am not a lawyer, but I believe that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because it
+is open source, publicly available software, that does not contain any
+encryption software. See the EAR, paragraphs 734.3(b)(3) and 734.7(b).
+
If you have any code changes, requests, problems, etc., please e-mail
them to me. Also, I'd appreciate any make files or project files,
and any modifications you needed to make to get libpng to compile,
@@ -201,11 +207,11 @@ Files in this distribution:
makefile.std => Generic UNIX makefile (cc, creates static
libpng.a)
makefile.elf => Linux/ELF gcc makefile symbol versioning,
- creates libpng10.so.0.1.0.61)
+ creates libpng10.so.0.1.0.62)
makefile.linux => Linux/ELF makefile (gcc, creates
- libpng10.so.0.1.0.61)
+ libpng10.so.0.1.0.62)
makefile.gcmmx => Linux/ELF makefile (gcc, creates
- libpng10.so.0.1.0.61, previously
+ libpng10.so.0.1.0.62, previously
used assembler code tuned for Intel MMX
platform)
makefile.gcc => Generic makefile (gcc, creates static
@@ -230,12 +236,12 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng10.so.0.1.0.61)
+ (gcc, creates libpng10.so.0.1.0.62)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng10.so.0.1.0.61)
+ (gcc, creates libpng10.so.0.1.0.62)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng10.so.0.1.0.61)
+ (gcc, creates libpng10.so.0.1.0.62)
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/Y2KINFO b/Y2KINFO
index bfda3334f..6dac521c0 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -7,7 +7,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
- upward through 1.0.61 are Y2K compliant. It is my belief that earlier
+ upward through 1.0.62 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
diff --git a/configure b/configure
index 7325a1187..3403c1739 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.0.61.
+# Generated by GNU Autoconf 2.69 for libpng 1.0.62.
#
# 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.0.61'
-PACKAGE_STRING='libpng 1.0.61'
+PACKAGE_VERSION='1.0.62'
+PACKAGE_STRING='libpng 1.0.62'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@@ -1331,7 +1331,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.0.61 to adapt to many kinds of systems.
+\`configure' configures libpng 1.0.62 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1401,7 +1401,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libpng 1.0.61:";;
+ short | recursive ) echo "Configuration of libpng 1.0.62:";;
esac
cat <<\_ACEOF
@@ -1515,7 +1515,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libpng configure 1.0.61
+libpng configure 1.0.62
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1938,7 +1938,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.0.61, which was
+It was created by libpng $as_me 1.0.62, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2801,7 +2801,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
- VERSION='1.0.61'
+ VERSION='1.0.62'
cat >>confdefs.h <<_ACEOF
@@ -2917,10 +2917,10 @@ fi
-PNGLIB_VERSION=1.0.61
+PNGLIB_VERSION=1.0.62
PNGLIB_MAJOR=1
PNGLIB_MINOR=0
-PNGLIB_RELEASE=61
+PNGLIB_RELEASE=62
@@ -13123,7 +13123,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.0.61, which was
+This file was extended by libpng $as_me 1.0.62, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13189,7 +13189,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.0.61
+libpng config.status 1.0.62
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 712a8850a..b0aca5273 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,15 +18,15 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
-AC_INIT([libpng], [1.0.61], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.0.62], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.0.61
+PNGLIB_VERSION=1.0.62
PNGLIB_MAJOR=1
PNGLIB_MINOR=0
-PNGLIB_RELEASE=61
+PNGLIB_RELEASE=62
dnl End of version number stuff
diff --git a/libpng-1.0.61.txt b/libpng-1.0.62.txt
index 2bcd2f1d1..b5997b45e 100644
--- a/libpng-1.0.61.txt
+++ b/libpng-1.0.62.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.0.61 - February 6, 2014
+ libpng version 1.0.62 - February 6, 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.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.0.61 - February 6, 2014
+ libpng versions 0.97, January 1998, through 1.0.62 - February 6, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -878,7 +878,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.0.61, not all possible expansions are supported.
+As of libpng version 1.0.62, 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
@@ -2971,7 +2971,8 @@ the libpng bug tracker at
XII. Coding style
-Our coding style is similar to the "Allman" style, with curly
+Our coding style is similar to the "Allman" style
+(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly
braces on separate lines:
if (condition)
@@ -3085,7 +3086,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.0.61 are Y2K compliant. It is my belief that earlier
+upward through 1.0.62 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 8209333f2..897b276e7 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
.TH LIBPNG 3 "February 6, 2014"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.61
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.62
.SH SYNOPSIS
\fB
#include <png.h>\fP
@@ -410,7 +410,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.0.61 - February 6, 2014
+ libpng version 1.0.62 - February 6, 2014
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -421,7 +421,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
- libpng versions 0.97, January 1998, through 1.0.61 - February 6, 2014
+ libpng versions 0.97, January 1998, through 1.0.62 - February 6, 2014
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2014 Glenn Randers-Pehrson
@@ -1288,7 +1288,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.0.61, not all possible expansions are supported.
+As of libpng version 1.0.62, 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
@@ -3381,7 +3381,8 @@ the libpng bug tracker at
.SH XII. Coding style
-Our coding style is similar to the "Allman" style, with curly
+Our coding style is similar to the "Allman" style
+(See http://en.wikipedia.org/wiki/Indent_style#Allman_style), with curly
braces on separate lines:
if (condition)
@@ -3495,7 +3496,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.0.61 are Y2K compliant. It is my belief that earlier
+upward through 1.0.62 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
@@ -3822,6 +3823,10 @@ the first widely used release:
1.2.51rc01-04 13 10251 12.so.0.51[.0]
1.0.61 10 10061 10.so.0.61[.0]
1.2.51 13 10251 12.so.0.51[.0]
+ 1.2.52beta01 13 10252 12.so.0.52[.0]
+ 1.2.52rc01-02 13 10252 12.so.0.52[.0]
+ 1.0.62 10 10062 10.so.0.62[.0]
+ 1.2.52 13 10252 12.so.0.52[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3877,7 +3882,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.0.61 - February 6, 2014:
+Libpng version 1.0.62 - February 6, 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).
@@ -3900,7 +3905,7 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.0.61, February 6, 2014, are
+libpng versions 1.2.6, August 15, 2004, through 1.0.62, February 6, 2014, are
Copyright (c) 2004,2006-2008 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
diff --git a/libpngpf.3 b/libpngpf.3
index b4f2badd3..2e48f524a 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "February 6, 2014"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.61
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.62
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.c b/png.c
index e107b6854..5df3105ab 100644
--- a/png.c
+++ b/png.c
@@ -17,7 +17,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_61 Your_png_h_is_not_version_1_0_61;
+typedef version_1_0_62 Your_png_h_is_not_version_1_0_62;
/* Version information for C files. This had better match the version
* string defined in png.h.
@@ -724,13 +724,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
- "libpng version 1.0.61 - February 6, 2014" PNG_STRING_NEWLINE \
+ "libpng version 1.0.62 - February 6, 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 ((png_charp) "libpng version 1.0.61 - February 6, 2014\
+ return ((png_charp) "libpng version 1.0.62 - February 6, 2014\
Copyright (c) 1998-2014 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 257a16df5..178226ebe 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.0.61 - February 6, 2014
+ * libpng version 1.0.62 - February 6, 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.)
@@ -10,7 +10,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.0.61 - February 6, 2014: Glenn
+ * libpng versions 0.97, January 1998, through 1.0.62 - February 6, 2014: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -288,6 +288,10 @@
* 1.2.51rc01-04 13 10251 12.so.0.51[.0]
* 1.0.61 10 10061 10.so.0.61[.0]
* 1.2.51 13 10251 12.so.0.51[.0]
+ * 1.2.52beta01 13 10252 12.so.0.52[.0]
+ * 1.2.52rc01-02 13 10252 12.so.0.52[.0]
+ * 1.0.62 10 10062 10.so.0.62[.0]
+ * 1.2.52 13 10252 12.so.0.52[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -319,7 +323,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.0.61, February 6, 2014, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.0.62, February 6, 2014, are
* Copyright (c) 2004, 2006-2013 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:
@@ -437,7 +441,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.0.61 are Y2K compliant. It is my belief that earlier
+ * upward through 1.0.62 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
@@ -493,9 +497,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.61"
+#define PNG_LIBPNG_VER_STRING "1.0.62"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.0.61 - February 6, 2014\n"
+ " libpng version 1.0.62 - February 6, 2014\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 10
@@ -503,7 +507,7 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 0
-#define PNG_LIBPNG_VER_RELEASE 61
+#define PNG_LIBPNG_VER_RELEASE 62
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
@@ -533,7 +537,7 @@
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release
*/
-#define PNG_LIBPNG_VER 10061 /* 1.0.61 */
+#define PNG_LIBPNG_VER 10062 /* 1.0.62 */
#ifndef PNG_VERSION_INFO_ONLY
/* Include the compression library's header */
@@ -1573,7 +1577,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_0_61;
+typedef png_structp version_1_0_62;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 97d65129f..3db31234d 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.0.61 - February 6, 2014
+ * libpng version 1.0.62 - February 6, 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/pngread.c b/pngread.c
index 2197ff178..24277b185 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
- * Last changed in libpng 1.2.51 [February 6, 2014]
+ * Last changed in libpng 1.2.52 [November 20, 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.)
@@ -100,16 +100,22 @@ png_create_read_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
- if (user_png_ver)
+ if (user_png_ver != NULL)
{
- i = 0;
+ int found_dots = 0;
+ i = -1;
+
do
{
- if (user_png_ver[i] != png_libpng_ver[i])
+ i++;
+ if (user_png_ver[i] != PNG_LIBPNG_VER_STRING[i])
png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
- } while (png_libpng_ver[i++]);
- }
- else
+ if (user_png_ver[i] == '.')
+ found_dots++;
+ } while (found_dots < 2 && user_png_ver[i] != 0 &&
+ PNG_LIBPNG_VER_STRING[i] != 0);
+ }
+ else
png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
diff --git a/pngrtran.c b/pngrtran.c
index 9e8ff9f01..0a760cef0 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1379,6 +1379,9 @@ png_do_read_transformations(png_structp png_ptr)
{
if (png_ptr->row_info.color_type == PNG_COLOR_TYPE_PALETTE)
{
+ if (png_ptr->palette == NULL)
+ png_error (png_ptr, "Palette is NULL in indexed image");
+
png_do_expand_palette(&(png_ptr->row_info), png_ptr->row_buf + 1,
png_ptr->palette, png_ptr->trans, png_ptr->num_trans);
}
diff --git a/pngtest.c b/pngtest.c
index cf403c325..a3f7fb9ab 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1702,4 +1702,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_61 your_png_h_is_not_version_1_0_61;
+typedef version_1_0_62 your_png_h_is_not_version_1_0_62;
diff --git a/pngwrite.c b/pngwrite.c
index 1d94404db..894a9843d 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
- * Last changed in libpng 1.2.51 [February 6, 2014]
+ * Last changed in libpng 1.2.52 [November 20, 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.)
@@ -525,15 +525,23 @@ png_create_write_struct_2(png_const_charp user_png_ver, png_voidp error_ptr,
#endif /* PNG_USER_MEM_SUPPORTED */
png_set_error_fn(png_ptr, error_ptr, error_fn, warn_fn);
- if (user_png_ver)
+ if (user_png_ver != NULL)
{
- i = 0;
+ int found_dots = 0;
+ i = -1;
+
do
{
- if (user_png_ver[i] != png_libpng_ver[i])
+ i++;
+ if (user_png_ver[i] != PNG_LIBPNG_VER_STRING[i])
png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
- } while (png_libpng_ver[i++]);
+ if (user_png_ver[i] == '.')
+ found_dots++;
+ } while (found_dots < 2 && user_png_ver[i] != 0 &&
+ PNG_LIBPNG_VER_STRING[i] != 0);
}
+ else
+ png_ptr->flags |= PNG_FLAG_LIBRARY_MISMATCH;
if (png_ptr->flags & PNG_FLAG_LIBRARY_MISMATCH)
{
@@ -684,8 +692,9 @@ png_write_init_3(png_structpp ptr_ptr, png_const_charp user_png_ver,
png_warning(png_ptr,
"Application uses deprecated png_write_init() and should be recompiled.");
#endif
- }
- } while (png_libpng_ver[i++]);
+ }
+ i++;
+ } while (png_libpng_ver[i] != 0 && user_png_ver[i] != 0);
png_debug(1, "in png_write_init_3");
diff --git a/projects/wince.txt b/projects/wince.txt
index 5f428bbaf..369befbf6 100644
--- a/projects/wince.txt
+++ b/projects/wince.txt
@@ -1,6 +1,6 @@
A set of project files is available for WinCE. Get
-libpng-1.0.61-project-wince.zip from a libpng distribution
+libpng-1.0.62-project-wince.zip from a libpng distribution
site such as http://libpng.sourceforge.net/index.html
Put the zip file in this directory (projects) and then run
-"unzip -a libpng-1.0.61-project-wince.zip"
+"unzip -a libpng-1.0.62-project-wince.zip"
diff --git a/scripts/README.txt b/scripts/README.txt
index d88f83536..14be1a1e2 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,8 +1,8 @@
-Makefiles for libpng version 1.0.61 - February 6, 2014
+Makefiles for libpng version 1.0.62 - February 6, 2014
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng10.so.0.1.0.61)
+ (gcc, creates libpng10.so.0.1.0.62)
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.0.61 - February 6, 2014
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng10.so.0.1.0.61)
+ gcc, creates libpng10.so.0.1.0.62)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.gccmmx => Generic gcc makefile previously using MMX code
@@ -38,14 +38,14 @@ Makefiles for libpng version 1.0.61 - February 6, 2014
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 libpng10.so.0.1.0.61)
+ creates libpng10.so.0.1.0.62)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng10.so.0.1.0.61)
+ creates libpng10.so.0.1.0.62)
makefile.solaris-x86 => Solaris 2.X makefile (gcc, no MMX code,
- creates libpng10.so.0.1.0.61)
+ creates libpng10.so.0.1.0.62)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng10.so.0.1.0.61)
+ creates libpng10.so.0.1.0.62)
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 1913e4581..b82a20251 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.0.61
+version=1.0.62
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 3d83065d4..b2569ba6f 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@ includedir=@includedir@/libpng10
Name: libpng
Description: Loads and saves PNG files
-Version: 1.0.61
+Version: 1.0.62
Libs: -L${libdir} -lpng10
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index af4c7c07b..eced53380 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index a76487f18..31145863a 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index 5e574ac28..4b21a656d 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -23,7 +23,7 @@ LN_SF = ln -f -s
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 64f636c33..333ddf167 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -11,7 +11,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cegcc b/scripts/makefile.cegcc
index cd84d45be..246ad5a2f 100644
--- a/scripts/makefile.cegcc
+++ b/scripts/makefile.cegcc
@@ -23,7 +23,7 @@
VERMAJ = 1
VERMIN = 0
-VERMIC = 61
+VERMIC = 62
VER = $(VERMAJ).$(VERMIN).$(VERMIC)
NAME = libpng
PACKAGE = $(NAME)-$(VER)
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index c59134b8a..434bdf8e0 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -77,7 +77,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng10
PNGMAJ = 0
CYGDLL = 10
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index f2fe20987..f82a8add8 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -22,7 +22,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng10
PNGMAJ = 10
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 9f3312d61..c38c474ad 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 52eaed0ed..b693bbd14 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 2d00c6df7..460d37009 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -17,7 +17,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index bbb58159e..d1ef741f0 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index bb5377ad3..21014c430 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index d67f71bfb..23d89f2bd 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -21,7 +21,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 3c564f8af..9b1e02f12 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 540650e3e..03d70e4a5 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -81,7 +81,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng10
PNGMAJ = 0
MINGDLL = 10
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 8667b2f50..c80e2c341 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng10
LIB= png10
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.0.61
+SHLIB_MINOR= 1.0.62
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 c90a4d398..7ab81d57a 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.0.61
+SHLIB_MINOR= 1.0.62
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.nommx b/scripts/makefile.nommx
index a4f20fdb0..87bbf23ab 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -10,7 +10,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index ef0b547ba..10b02aa17 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.0.61
+SHLIB_MINOR= 1.0.62
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 78f54b563..f514969a6 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 642e4d678..571da26c3 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 45459df4e..0ed93176c 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -9,7 +9,7 @@
# Library name:
LIBNAME=libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index 66d54ec1d..99d451c0e 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -11,7 +11,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng10
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 63750c6d0..f3371b1b0 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 92949a3f3..31db79e4d 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -11,7 +11,7 @@
# Library name:
LIBNAME = libpng10
PNGMAJ = 0
-PNGMIN = 1.0.61
+PNGMIN = 1.0.62
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32
index 1b58300f5..d144ea0f3 100644
--- a/scripts/makefile.vcawin32
+++ b/scripts/makefile.vcawin32
@@ -16,7 +16,7 @@
CC = cl
LD = link
AR = lib
-CFLAGS = -nologo -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib
+CFLAGS = -nologo -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -DPNG_USE_PNGVCRD -MD -O2 -W3 -I..\zlib
LDFLAGS = -nologo
ARFLAGS = -nologo
RM = del
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 3cdfb3904..69f3a35a8 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -16,7 +16,7 @@
CC = cl
LD = link
AR = lib
-CFLAGS = -nologo -DPNG_NO_MMX_CODE -MD -O2 -W3 -I..\zlib
+CFLAGS = -nologo -D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -DPNG_NO_MMX_CODE -MD -O2 -W3 -I..\zlib
LDFLAGS = -nologo
ARFLAGS = -nologo
RM = del
diff --git a/scripts/png32ce.def b/scripts/png32ce.def
index 9ace1b35f..f2a1301ab 100644
--- a/scripts/png32ce.def
+++ b/scripts/png32ce.def
@@ -5,7 +5,7 @@
LIBRARY lpngce
EXPORTS
-;Version 1.0.61
+;Version 1.0.62
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index b115b3d72..f951abf82 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.0.61
+; Version 1.0.62
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index db64ecc0d..b1faee896 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.0.61
+;Version 1.0.62
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3