Imported from libpng-1.2.35beta02.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index af4beff..96bad9d 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.35beta01 - February 4, 2009
+Libpng 1.2.35beta02 - February 4, 2009
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.
@@ -9,104 +9,47 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.2.35beta01.tar.gz
- libpng-1.2.35beta01.tar.lzma
+ libpng-1.2.35beta02.tar.gz
+ libpng-1.2.35beta02.tar.lzma
(Get the lzma codec from <http://tukaani.org/lzma>).
- libpng-1.2.35beta01.tar.bz2
+ libpng-1.2.35beta02.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.2.35beta01-no-config.tar.gz
- libpng-1.2.35beta01-no-config.tar.lzma
- libpng-1.2.35beta01-no-config.tar.bz2
+ libpng-1.2.35beta02-no-config.tar.gz
+ libpng-1.2.35beta02-no-config.tar.lzma
+ libpng-1.2.35beta02-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1235b01.zip
- lp1235b01.7z
- lp1235b01.tar.bz2
+ lp1235b02.zip
+ lp1235b02.7z
+ lp1235b02.tar.bz2
Project files
- libpng-1.2.35beta01-project-netware.zip
- libpng-1.2.35beta01-project-wince.zip
+ libpng-1.2.35beta02-project-netware.zip
+ libpng-1.2.35beta02-project-wince.zip
Other information:
- libpng-1.2.35beta01-README.txt
- libpng-1.2.35beta01-KNOWNBUGS.txt
- libpng-1.2.35beta01-LICENSE.txt
- libpng-1.2.35beta01-Y2K-compliance.txt
- libpng-1.2.35beta01-[previous version]-diff.txt
+ libpng-1.2.35beta02-README.txt
+ libpng-1.2.35beta02-KNOWNBUGS.txt
+ libpng-1.2.35beta02-LICENSE.txt
+ libpng-1.2.35beta02-Y2K-compliance.txt
+ libpng-1.2.35beta02-[previous version]-diff.txt
-Changes since the last public release (1.2.32):
+Changes since the last public release (1.2.34):
-version 1.2.33beta01 [October 6, 2008]
- Revised makefile.darwin to fix shared library numbering.
- Change png_set_gray_1_2_4_to_8() to png_set_expand_gray_1_2_4_to_8()
- in example.c (debian bug report)
-
-version 1.2.33rc01 [October 15, 2008]
- No changes.
-
-version 1.0.41rc01, version 1.2.33rc02 [October 23, 2008]
- Changed remaining "key" to "png_ptr->chunkdata" in png_handle_tTXt()
- to avoid memory leak after memory failure while reading tEXt chunk.`
-
-version 1.2.33 [October 31, 2008]
- No changes.
-
-version 1.2.34beta01 [November 27, 2008]
- Revised png_warning() to write its message on standard output by default
- when warning_fn is NULL. This was the behavior prior to libpng-1.2.9beta9.
- Fixed string vs pointer-to-string error in png_check_keyword().
- Added png_check_cHRM_fixed() in png.c and moved checking from pngget.c,
- pngrutil.c, and pngwrite.c, and eliminated floating point cHRM checking.
- Added check for zero-area RGB cHRM triange in png_check_cHRM_fixed().
- In png_check_cHRM_fixed(), ensure white_y is > 0, and removed redundant
- check for all-zero coordinates that is detected by the triangle check.
- Revised png_warning() to write its message on standard output by default
- when warning_fn is NULL.
-
-version 1.2.34beta02 [November 28, 2008]
- Corrected off-by-one error in bKGD validity check in png_write_bKGD()
- and in png_handle_bKGD().
-
-version 1.2.34beta03 [February 4, 2009]
- Revised bKGD validity check to use >= x instead of > x + 1
- Merged with png_debug from libpng-1.4.0 to remove newlines.
-
-version 1.2.34beta03 [December 1, 2008]
- Revised bKGD validity check to use >= x instead of > x + 1
- Merged with png_debug from libpng-1.4.0 to remove newlines.
-
-version 1.2.34beta04 [December 2, 2008]
- More merging with png_debug from libpng-1.4.0 to remove newlines.
-
-version 1.2.34beta05 [December 5, 2008]
- Removed redundant check for key==NULL before calling png_check_keyword()
- to ensure that new_key gets initialized and removed extra warning
- (Arvan Pritchard).
-
-version 1.2.34beta06 [December 9, 2008]
- In png_write_png(), respect the placement of the filler bytes in an earlier
- call to png_set_filler() (Jim Barry).
-
-version 1.2.34beta07 [December 10, 2008]
- Undid previous change and added PNG_TRANSFORM_STRIP_FILLER_BEFORE and
- PNG_TRANSFORM_STRIP_FILLER_AFTER conditionals and deprecated
- PNG_TRANSFORM_STRIP_FILLER (Jim Barry).
-
-version 1.0.42rc01, 1.2.34rc01 [December 11, 2008]
- No changes.
-
-version 1.0.42, 1.2.34 [February 4, 2009]
- No changes.
version 1.2.35beta01 [February 4, 2009]
- Zero out all arrays of pointers after png_malloc(). (Tavis Ormandy)
+ Zero out some arrays of pointers after png_malloc(). (Tavis Ormandy)
+
+version 1.2.35beta02 [February 4, 2009]
+ Zero out more arrays of pointers after png_malloc()
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
diff --git a/CHANGES b/CHANGES
index d8506a9..7d00922 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2308,7 +2308,10 @@
No changes.
version 1.2.35beta01 [February 4, 2009]
- Zero out all arrays of pointers after png_malloc(). (Tavis Ormandy)
+ Zero out some arrays of pointers after png_malloc(). (Tavis Ormandy)
+
+version 1.2.35beta02 [February 4, 2009]
+ Zero out more arrays of pointers after png_malloc()
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/INSTALL b/INSTALL
index 918b461..64f648c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.35beta01 - February 4, 2009
+Installing libpng version 1.2.35beta02 - February 4, 2009
On Unix/Linux and similar systems, you can simply type
@@ -44,7 +44,7 @@
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.2.35beta01" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.35beta02" or "lpng109" and "zlib-1.2.1"
or "zlib121") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:
@@ -101,9 +101,9 @@
CMakeLists.txt => "cmake" script
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.35beta01)
+ gcc, creates libpng12.so.0.1.2.35beta02)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.35beta01)
+ (gcc, creates libpng12.so.0.1.2.35beta02)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -125,14 +125,14 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng12.so.0.1.2.35beta01)
+ creates libpng12.so.0.1.2.35beta02)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.35beta01)
+ creates libpng12.so.0.1.2.35beta02)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
- creates libpng12.so.0.1.2.35beta01)
+ creates libpng12.so.0.1.2.35beta02)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.35beta01)
+ creates libpng12.so.0.1.2.35beta02)
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/KNOWNBUG b/KNOWNBUG
index afaa30b..1a6e46c 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.35beta01
+Known bugs in libpng version 1.2.35beta02
1. February 23, 2006: The custom makefiles don't build libpng with -lz.
diff --git a/LICENSE b/LICENSE
index 8d00805..d0ff2fe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.35beta01, February 4, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.35beta02, February 4, 2009, 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/Makefile.am b/Makefile.am
index 4534651..760139a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.2.35beta01.txt pngvcrd.c
+ example.c libpng-1.2.35beta02.txt pngvcrd.c
CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
diff --git a/Makefile.in b/Makefile.in
index 55daa86..e286c41 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -331,7 +331,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.2.35beta01.txt pngvcrd.c
+ example.c libpng-1.2.35beta02.txt pngvcrd.c
CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
diff --git a/README b/README
index 02f1038..978df95 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.35beta01 - February 4, 2009 (shared library 12.0)
+README for libpng version 1.2.35beta02 - February 4, 2009 (shared library 12.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
@@ -194,11 +194,11 @@
descrip.mms => VMS makefile for MMS or MMK
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
- gcc, creates libpng12.so.0.1.2.35beta01)
+ gcc, creates libpng12.so.0.1.2.35beta02)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.35beta01)
+ (gcc, creates libpng12.so.0.1.2.35beta02)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.35beta01,
+ (gcc, creates libpng12.so.0.1.2.35beta02,
uses assembler code tuned for Intel MMX platform)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@@ -220,12 +220,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng12.so.0.1.2.35beta01)
+ (gcc, creates libpng12.so.0.1.2.35beta02)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.35beta01)
+ (gcc, creates libpng12.so.0.1.2.35beta02)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.35beta01)
+ (gcc, creates libpng12.so.0.1.2.35beta02)
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 a94b9a8..936fce5 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.2.35beta01 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.35beta02 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 05271df..c99155b 100755
--- a/configure
+++ b/configure
Binary files differ
diff --git a/configure.ac b/configure.ac
index fa1eb6e..e2532e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.35beta01], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.35beta02], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.35beta01
+PNGLIB_VERSION=1.2.35beta02
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=35
diff --git a/libpng-1.2.35beta01.txt b/libpng-1.2.35beta02.txt
similarity index 99%
rename from libpng-1.2.35beta01.txt
rename to libpng-1.2.35beta02.txt
index 35a358d..771b461 100644
--- a/libpng-1.2.35beta01.txt
+++ b/libpng-1.2.35beta02.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.35beta01 - February 4, 2009
+ libpng version 1.2.35beta02 - February 4, 2009
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -9,7 +9,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.2.35beta01 - February 4, 2009
+ libpng versions 0.97, January 1998, through 1.2.35beta02 - February 4, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -2860,7 +2860,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.35beta01 are Y2K compliant. It is my belief that earlier
+upward through 1.2.35beta02 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 f3cdc4a..19d544b 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
.TH LIBPNG 3 "February 4, 2009"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.35beta01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.35beta02
.SH SYNOPSIS
\fI\fB
@@ -821,7 +821,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.35beta01 - February 4, 2009
+ libpng version 1.2.35beta02 - February 4, 2009
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -830,7 +830,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.2.35beta01 - February 4, 2009
+ libpng versions 0.97, January 1998, through 1.2.35beta02 - February 4, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2008 Glenn Randers-Pehrson
@@ -3681,7 +3681,7 @@
an official declaration.
This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.2.35beta01 are Y2K compliant. It is my belief that earlier
+upward through 1.2.35beta02 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
@@ -3938,7 +3938,7 @@
1.2.34rc01 13 10234 12.so.0.34[.0]
1.0.42 10 10042 10.so.0.42[.0]
1.2.34 13 10234 12.so.0.34[.0]
- 1.2.34beta01 13 10235 12.so.0.35[.0]
+ 1.2.35beta01-02 13 10235 12.so.0.35[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -3994,7 +3994,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.35beta01 - February 4, 2009:
+Libpng version 1.2.35beta02 - February 4, 2009:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4015,7 +4015,7 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.35beta01, February 4, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.2.35beta02, February 4, 2009, 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 32c8092..8fbe20b 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "February 4, 2009"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.35beta01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.35beta02
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.c b/png.c
index 19fbe02..0543bce 100644
--- a/png.c
+++ b/png.c
@@ -13,7 +13,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_35beta01 Your_png_h_is_not_version_1_2_35beta01;
+typedef version_1_2_35beta02 Your_png_h_is_not_version_1_2_35beta02;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -694,7 +694,7 @@
png_get_copyright(png_structp png_ptr)
{
png_ptr = png_ptr; /* silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.2.35beta01 - February 4, 2009\n\
+ return ((png_charp) "\n libpng version 1.2.35beta02 - February 4, 2009\n\
Copyright (c) 1998-2008 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
diff --git a/png.h b/png.h
index 6c4e30f..450c2f8 100644
--- a/png.h
+++ b/png.h
@@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.35beta01 - February 4, 2009
+ * libpng version 1.2.35beta02 - February 4, 2009
* Copyright (c) 1998-2009 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.)
@@ -8,7 +8,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.2.35beta01 - February 4, 2009: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.35beta02 - February 4, 2009: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -217,7 +217,7 @@
* 1.2.34rc01 13 10234 12.so.0.34[.0]
* 1.0.42 10 10042 10.so.0.42[.0]
* 1.2.34 13 10234 12.so.0.34[.0]
- * 1.2.35beta01 13 10235 12.so.0.35[.0]
+ * 1.2.35beta01-02 13 10235 12.so.0.35[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -247,7 +247,7 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.35beta01, February 4, 2009, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.35beta02, February 4, 2009, 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:
@@ -365,7 +365,7 @@
* an official declaration.
*
* This is your unofficial assurance that libpng from version 0.71 and
- * upward through 1.2.35beta01 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.35beta02 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
@@ -421,9 +421,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.35beta01"
+#define PNG_LIBPNG_VER_STRING "1.2.35beta02"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.35beta01 - February 4, 2009\n"
+ " libpng version 1.2.35beta02 - February 4, 2009\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -435,7 +435,7 @@
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
-#define PNG_LIBPNG_VER_BUILD 01
+#define PNG_LIBPNG_VER_BUILD 02
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1483,7 +1483,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_2_35beta01;
+typedef png_structp version_1_2_35beta02;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index e4a5cc0..fcc3230 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.35beta01 - February 4, 2009
+ * libpng version 1.2.35beta02 - February 4, 2009
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index 6f9c6fe..0d2f12f 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -4134,6 +4134,9 @@
png_uint_32 last, max;
for (i = 0; i < num; i++)
+ png_ptr->gamma_16_table[i] = NULL;
+
+ for (i = 0; i < num; i++)
{
png_ptr->gamma_16_table[i] = (png_uint_16p)png_malloc(png_ptr,
(png_uint_32)(256 * png_sizeof(png_uint_16)));
@@ -4189,6 +4192,9 @@
(png_uint_32)(num * png_sizeof(png_uint_16p )));
for (i = 0; i < num; i++)
+ png_ptr->gamma_16_to_1[i] = NULL;
+
+ for (i = 0; i < num; i++)
{
png_ptr->gamma_16_to_1[i] = (png_uint_16p)png_malloc(png_ptr,
(png_uint_32)(256 * png_sizeof(png_uint_16)));
diff --git a/pngtest.c b/pngtest.c
index c963a9e..9d3e7c9 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1685,4 +1685,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_35beta01 your_png_h_is_not_version_1_2_35beta01;
+typedef version_1_2_35beta02 your_png_h_is_not_version_1_2_35beta02;
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index f63ab70..649cd63 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -169,7 +169,7 @@
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 0.${PNGLIB_RELEASE}.1.2.35beta01
+# VERSION 0.${PNGLIB_RELEASE}.1.2.35beta02
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 1fbecfa..046b21b 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -8,7 +8,7 @@
# Modeled after libxml-config.
-version=1.2.35beta01
+version=1.2.35beta02
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index 4e9aba4..b60f86f 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.2.35beta01
+Version: 1.2.35beta02
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 7f0985b..2522b7c 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index f03547d..ff1989e 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index b40eb42..f4f9c88 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -20,7 +20,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index 9784ad1..abcd8da 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 96ec27d..30e5c52 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -74,7 +74,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 24d4fd4..e10b774 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -19,7 +19,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 12
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 40bc7b9..3a8f2ca 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index a5fdd91..f62b3e9 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -13,7 +13,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index 1360a6e..d0883bc 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -14,7 +14,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index aefa226..bd13074 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 19cf4bd..4a12ec2 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index 4d63b92..51a1e69 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -18,7 +18,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 0d3b5aa..3eac63f 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -7,7 +7,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index 14cd540..1554b85 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -74,7 +74,7 @@
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index f9c0d11..5da574e 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -14,7 +14,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.35beta01
+SHLIB_MINOR= 1.2.35beta02
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 c317a4a..89a0026 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -14,7 +14,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.35beta01
+SHLIB_MINOR= 1.2.35beta02
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 dd2c3b4..fdfb08a 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -7,7 +7,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index b59769e..df0a6c3 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -8,7 +8,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.35beta01
+SHLIB_MINOR= 1.2.35beta02
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 3999a5c..6ebfa66 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 4b674cc..c06d5d0 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 7595d20..337d25f 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index aa5be40..a556e75 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index d747e2f..1061fab 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 5b27120..2d389ed 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.35beta01
+PNGMIN = 1.2.35beta02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 1117571..76c0064 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.35beta01
+; Version 1.2.35beta02
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index 9baf5c0..4bfaaf6 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.35beta01
+;Version 1.2.35beta02
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
