[libpng16] Imported from libpng-1.6.0rc02.tar
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f7f667..b94dffa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,7 +260,7 @@
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 16.${PNGLIB_RELEASE}.1.6.0rc01
+# VERSION 16.${PNGLIB_RELEASE}.1.6.0rc02
VERSION 16.${PNGLIB_RELEASE}.0
SOVERSION 16
CLEAN_DIRECT_OUTPUT 1)
diff --git a/LICENSE b/LICENSE
index 34fba05..50e6ba7 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.6.0rc01, January 26, 2013, are
+libpng versions 1.2.6, August 15, 2004, through 1.6.0rc02, February 5, 2013, are
Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
@@ -108,4 +108,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-January 26, 2013
+February 5, 2013
diff --git a/README b/README
index dec2ad7..7f2c5ec 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.0rc01 - January 26, 2013 (shared library 16.0)
+README for libpng version 1.6.0rc02 - February 5, 2013 (shared library 16.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
diff --git a/configure.ac b/configure.ac
index 5935685..55fda44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@
dnl Version number stuff here:
-AC_INIT([libpng],[1.6.0rc01],[png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng],[1.6.0rc02],[png-mng-implement@lists.sourceforge.net])
AC_CONFIG_MACRO_DIR([scripts])
# libpng does not follow GNU file name conventions (hence 'foreign')
@@ -37,7 +37,7 @@
dnl AM_PREREQ([1.11.2])
dnl stop configure from automagically running automake
-PNGLIB_VERSION=1.6.0rc01
+PNGLIB_VERSION=1.6.0rc02
PNGLIB_MAJOR=1
PNGLIB_MINOR=6
PNGLIB_RELEASE=0
diff --git a/libpngpf.3 b/libpngpf.3
index 0b28a0f..0fc8a8f 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "January 26, 2013"
+.TH LIBPNGPF 3 "February 5, 2013"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.0rc02
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"
diff --git a/png.5 b/png.5
index 713d382..b571ef7 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "January 26, 2013"
+.TH PNG 5 "February 5, 2013"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index bcb12e3..c4f612a 100644
--- a/png.c
+++ b/png.c
@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_0rc01 Your_png_h_is_not_version_1_6_0rc01;
+typedef png_libpng_version_1_6_0rc02 Your_png_h_is_not_version_1_6_0rc02;
/* 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
@@ -768,13 +768,13 @@
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
- "libpng version 1.6.0rc01 - January 26, 2013" PNG_STRING_NEWLINE \
+ "libpng version 1.6.0rc02 - February 5, 2013" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2013 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \
"Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \
"Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \
PNG_STRING_NEWLINE;
# else
- return "libpng version 1.6.0rc01 - January 26, 2013\
+ return "libpng version 1.6.0rc02 - February 5, 2013\
Copyright (c) 1998-2013 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 60b09bc..40eab7a 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.6.0rc01 - January 26, 2013
+ * libpng version 1.6.0rc02 - February 5, 2013
* 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.)
@@ -11,7 +11,7 @@
* Authors and maintainers:
* libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
* libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- * libpng versions 0.97, January 1998, through 1.6.0rc01 - January 26, 2013: Glenn
+ * libpng versions 0.97, January 1998, through 1.6.0rc02 - February 5, 2013: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -167,7 +167,7 @@
* 1.5.7rc01-03 15 10507 15.so.15.7[.0]
* 1.5.7 15 10507 15.so.15.7[.0]
* 1.6.0beta01-40 16 10600 16.so.16.0[.0]
- * 1.6.0rc01 16 10600 16.so.16.0[.0]
+ * 1.6.0rc01-02 16 10600 16.so.16.0[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -199,7 +199,7 @@
*
* This code is released under the libpng license.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.6.0rc01, January 26, 2013, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.6.0rc02, February 5, 2013, 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:
@@ -311,13 +311,13 @@
* Y2K compliance in libpng:
* =========================
*
- * January 26, 2013
+ * February 5, 2013
*
* 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.6.0rc01 are Y2K compliant. It is my belief that
+ * upward through 1.6.0rc02 are Y2K compliant. It is my belief that
* earlier versions were also Y2K compliant.
*
* Libpng only has two year fields. One is a 2-byte unsigned integer
@@ -377,9 +377,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.6.0rc01"
+#define PNG_LIBPNG_VER_STRING "1.6.0rc02"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.6.0rc01 - January 26, 2013\n"
+ " libpng version 1.6.0rc02 - February 5, 2013\n"
#define PNG_LIBPNG_VER_SONUM 16
#define PNG_LIBPNG_VER_DLLNUM 16
@@ -393,7 +393,7 @@
* 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
@@ -523,7 +523,7 @@
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
-typedef char* png_libpng_version_1_6_0rc01;
+typedef char* png_libpng_version_1_6_0rc02;
/* Basic control structions. Read libpng-manual.txt or libpng.3 for more info.
*
@@ -3203,6 +3203,8 @@
defined(PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED)
PNG_EXPORT(242, void, png_set_check_for_invalid_index,
(png_structrp png_ptr, int allowed));
+PNG_EXPORT(243, void, png_get_palette_max, (png_structp png_ptr,
+ png_const_infop info_ptr));
#endif
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project
@@ -3214,7 +3216,7 @@
* scripts/symbols.def as well.
*/
#ifdef PNG_EXPORT_LAST_ORDINAL
- PNG_EXPORT_LAST_ORDINAL(242);
+ PNG_EXPORT_LAST_ORDINAL(243);
#endif
#ifdef __cplusplus
diff --git a/pngconf.h b/pngconf.h
index d785078..18ab7b4 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.6.0rc01 - January 26, 2013
+ * libpng version 1.6.0rc02 - February 5, 2013
*
* Copyright (c) 1998-2013 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngget.c b/pngget.c
index c2632f5..8f605b3 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1161,4 +1161,15 @@
}
#endif /* ?PNG_IO_STATE_SUPPORTED */
+#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
+int PNGAPI
+png_get_max_palette_index(png_const_structp png_ptr, png_const_infop info_ptr)
+{
+ if (png_ptr != NULL && info_ptr != NULL)
+ return png_ptr->num_palette_max;
+
+ return (-1);
+}
+#endif
+
#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
diff --git a/pngtest.c b/pngtest.c
index be01045..7290741 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1949,4 +1949,4 @@
#endif
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef png_libpng_version_1_6_0rc01 Your_png_h_is_not_version_1_6_0rc01;
+typedef png_libpng_version_1_6_0rc02 Your_png_h_is_not_version_1_6_0rc02;
diff --git a/projects/vstudio/readme.txt b/projects/vstudio/readme.txt
index 07d08f2..3a5a292 100644
--- a/projects/vstudio/readme.txt
+++ b/projects/vstudio/readme.txt
@@ -1,7 +1,7 @@
VisualStudio instructions
-libpng version 1.6.0rc01 - January 26, 2013
+libpng version 1.6.0rc02 - February 5, 2013
Copyright (c) 1998-2010 Glenn Randers-Pehrson
diff --git a/projects/vstudio/zlib.props b/projects/vstudio/zlib.props
index f813683..74c76e0 100644
--- a/projects/vstudio/zlib.props
+++ b/projects/vstudio/zlib.props
@@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source
*
- * libpng version 1.6.0rc01 - January 26, 2013
+ * libpng version 1.6.0rc02 - February 5, 2013
*
* Copyright (c) 1998-2011 Glenn Randers-Pehrson
*
diff --git a/scripts/README.txt b/scripts/README.txt
index 7f48ff6..5e40b25 100644
--- a/scripts/README.txt
+++ b/scripts/README.txt
@@ -1,9 +1,9 @@
-Makefiles for libpng version 1.6.0rc01 - January 26, 2013
+Makefiles for libpng version 1.6.0rc02 - February 5, 2013
pnglibconf.h.prebuilt => Stores configuration settings
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng16.so.16.1.6.0rc01)
+ (gcc, creates libpng16.so.16.1.6.0rc02)
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 libpng16.so.16.1.6.0rc01)
+ (gcc, creates libpng16.so.16.1.6.0rc02)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@@ -35,12 +35,12 @@
makefile.os2 => OS/2 Makefile (gcc and emx, requires libpng.def)
makefile.sco => For SCO OSr5 ELF and Unixware 7 with Native cc
makefile.sggcc => Silicon Graphics (gcc,
- creates libpng16.so.16.1.6.0rc01)
+ creates libpng16.so.16.1.6.0rc02)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng16.so.16.1.6.0rc01)
+ creates libpng16.so.16.1.6.0rc02)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng16.so.16.1.6.0rc01)
+ creates libpng16.so.16.1.6.0rc02)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile
diff --git a/scripts/def.dfn b/scripts/def.dfn
index 3c4dd82..9575e91 100644
--- a/scripts/def.dfn
+++ b/scripts/def.dfn
@@ -25,7 +25,7 @@
S-OS2 CODE PRELOAD MOVEABLE DISCARDABLE-E
S--E
S-EXPORTS-E
-S-;Version 1.6.0rc01-E
+S-;Version 1.6.0rc02-E
/* NOTE: PNG_JOIN is interpreted by the calling script as a signal to
* join the two things on either side, so we can do symbol
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 40fc15c..8238404 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -11,7 +11,7 @@
# Modeled after libxml-config.
-version=1.6.0rc01
+version=1.6.0rc02
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index d9db347..addd0b9 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.6.0rc01
+Version: 1.6.0rc02
Libs: -L${libdir} -lpng16
Cflags: -I${includedir}
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index f3be613..0ab9933 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -17,7 +17,7 @@
LIB= png16
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.6.0rc01
+SHLIB_MINOR= 1.6.0rc02
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 804dd24..3c57600 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -17,7 +17,7 @@
LIB= png
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.0rc01
+SHLIB_MINOR= 1.6.0rc02
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 d93100a..aeaf7e2 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -11,7 +11,7 @@
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 16
-SHLIB_MINOR= 1.6.0rc01
+SHLIB_MINOR= 1.6.0rc02
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt
index 257481c..76461e4 100644
--- a/scripts/pnglibconf.h.prebuilt
+++ b/scripts/pnglibconf.h.prebuilt
@@ -3,7 +3,7 @@
/* pnglibconf.h - library build configuration */
-/* Libpng 1.6.0rc01 - January 26, 2013 */
+/* Libpng 1.6.0rc02 - February 5, 2013 */
/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
