minecraft-pi-reborn/libpng
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Imported from libpng-1.2.17rc2.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2007-05-09 08:56:59 -05:00
parent 3148c65323
commit e8f6605642
50 changed files with 180 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.2.17rc1 - May 4, 2007
Libpng 1.2.17rc2 - May 9, 2007
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,36 +9,36 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
libpng-1.2.17rc1.tar.gz
libpng-1.2.17rc1.tar.bz2
libpng-1.2.17rc2.tar.gz
libpng-1.2.17rc2.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.17rc1-no-config.tar.gz
libpng-1.2.17rc1-no-config.tar.bz2
libpng-1.2.17rc2-no-config.tar.gz
libpng-1.2.17rc2-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1217r01.zip
lp1217r01.tar.bz2
lp1217r02.zip
lp1217r02.tar.bz2
Project files
libpng-1.2.17rc1-project-netware.zip
libpng-1.2.17rc1-project-wince.zip
libpng-1.2.17rc2-project-netware.zip
libpng-1.2.17rc2-project-wince.zip
Other information:
libpng-1.2.17rc1-README.txt
libpng-1.2.17rc1-KNOWNBUGS.txt
libpng-1.2.17rc1-LICENSE.txt
libpng-1.2.17rc1-Y2K-compliance.txt
libpng-1.2.17rc2-README.txt
libpng-1.2.17rc2-KNOWNBUGS.txt
libpng-1.2.17rc2-LICENSE.txt
libpng-1.2.17rc2-Y2K-compliance.txt
Changes since the last public release (1.2.16):
version 1.2.17beta1 [May 4, 2007]
version 1.2.17beta1 [May 9, 2007]
Revised scripts/CMakeLists.txt to install both shared and static libraries.
Deleted a redundant line from pngset.c.
@ -49,9 +49,18 @@ version 1.2.17beta2 [April 26, 2007]
Added "const" to some array declarations.
Mention examples of libpng usage in the libpng*.txt and libpng.3 documents.
version 1.2.17rc1 [May 4, 2007]
version 1.2.17rc1 [May 5, 2007]
No changes.
version 1.2.17rc2 [May 9, 2007]
Moved several PNG_HAVE_* macros out of PNG_INTERNAL because applications
calling set_unknown_chunk_location() need them.
Changed transformation flag from PNG_EXPAND_tRNS to PNG_EXPAND in
png_set_expand_gray_1_2_4_to_8().
Added png_ptr->unknown_chunk to hold working unknown chunk data, so it
can be free'ed in case of error. Revised unknown chunk handling in
pngrutil.c and pngpread.c to use this structure.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

9
CHANGES
View File

@ -1704,6 +1704,15 @@ version 1.2.17beta2 [April 26, 2007]
version 1.2.17rc1 [May 4, 2007]
No changes.
version 1.2.17rc2 [May 9, 2007]
Moved several PNG_HAVE_* macros out of PNG_INTERNAL because applications
calling set_unknown_chunk_location() need them.
Changed transformation flag from PNG_EXPAND_tRNS to PNG_EXPAND in
png_set_expand_gray_1_2_4_to_8().
Added png_ptr->unknown_chunk to hold working unknown chunk data, so it
can be free'ed in case of error. Revised unknown chunk handling in
pngrutil.c and pngpread.c to use this structure.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

18
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng version 1.2.17rc1 - May 4, 2007
Installing libpng version 1.2.17rc2 - May 9, 2007
On Unix/Linux and similar systems, you can simply type
@ -44,7 +44,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.2.17rc1" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.2.17rc2" 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,14 +101,14 @@ include
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.17rc1)
gcc, creates libpng12.so.0.1.2.17rc2)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.17rc1)
(gcc, creates libpng12.so.0.1.2.17rc2)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.17rc1,
(gcc, creates libpng12.so.0.1.2.17rc2,
uses assembler code tuned for Intel MMX platform)
makefile.nommx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.17rc1
(gcc, creates libpng12.so.0.1.2.17rc2
does not use Intel MMX assembler code)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
@ -131,12 +131,12 @@ include
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.17rc1)
creates libpng12.so.0.1.2.17rc2)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.17rc1)
creates libpng12.so.0.1.2.17rc2)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.17rc1)
creates libpng12.so.0.1.2.17rc2)
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

2
KNOWNBUG
View File

@ -1,5 +1,5 @@
Known bugs in libpng version 1.2.17rc1
Known bugs in libpng version 1.2.17rc2
1. April 22, 2001: pnggccrd.c has been reported to crash on NetBSD when
reading interlaced PNG files, when assembler code is enabled but running

4
LICENSE
View File

@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.2.17rc1, May 4, 2007, are
libpng versions 1.2.6, August 15, 2004, through 1.2.17rc2, May 9, 2007, are
Copyright (c) 2004, 2006-2007 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
@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
May 4, 2007
May 9, 2007

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.17rc1 - May 4, 2007 (shared library 12.0)
README for libpng version 1.2.17rc2 - May 9, 2007 (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.
@ -190,11 +190,11 @@ Files in this distribution:
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.17rc1)
gcc, creates libpng12.so.0.1.2.17rc2)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.17rc1)
(gcc, creates libpng12.so.0.1.2.17rc2)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.17rc1,
(gcc, creates libpng12.so.0.1.2.17rc2,
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
@ -216,12 +216,12 @@ Files in this distribution:
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
(gcc, creates libpng12.so.0.1.2.17rc1)
(gcc, creates libpng12.so.0.1.2.17rc2)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.17rc1)
(gcc, creates libpng12.so.0.1.2.17rc2)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.17rc1)
(gcc, creates libpng12.so.0.1.2.17rc2)
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

4
Y2KINFO
View File

@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
May 4, 2007
May 9, 2007
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.2.17rc1 are Y2K compliant. It is my belief that earlier
upward through 1.2.17rc2 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

22
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for libpng 1.2.17rc1.
# Generated by GNU Autoconf 2.61 for libpng 1.2.17rc2.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.2.17rc1'
PACKAGE_STRING='libpng 1.2.17rc1'
PACKAGE_VERSION='1.2.17rc2'
PACKAGE_STRING='libpng 1.2.17rc2'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@ -1405,7 +1405,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.2.17rc1 to adapt to many kinds of systems.
\`configure' configures libpng 1.2.17rc2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1475,7 +1475,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.2.17rc1:";;
short | recursive ) echo "Configuration of libpng 1.2.17rc2:";;
esac
cat <<\_ACEOF
@ -1585,7 +1585,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.2.17rc1
libpng configure 1.2.17rc2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@ -1599,7 +1599,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.2.17rc1, which was
It was created by libpng $as_me 1.2.17rc2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@ -2269,7 +2269,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.2.17rc1'
VERSION='1.2.17rc2'
cat >>confdefs.h <<_ACEOF
@ -2440,7 +2440,7 @@ fi
PNGLIB_VERSION=1.2.17rc1
PNGLIB_VERSION=1.2.17rc2
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=17
@ -21119,7 +21119,7 @@ exec 6>&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.2.17rc1, which was
This file was extended by libpng $as_me 1.2.17rc2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -21172,7 +21172,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libpng config.status 1.2.17rc1
libpng config.status 1.2.17rc2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

4
configure.ac
View File

@ -18,12 +18,12 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.2.17rc1], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.2.17rc2], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.2.17rc1
PNGLIB_VERSION=1.2.17rc2
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=17

6
libpng-1.2.17rc1.txt → libpng-1.2.17rc2.txt
View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.17rc1 - May 4, 2007
libpng version 1.2.17rc2 - May 9, 2007
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -2921,13 +2921,13 @@ application:
IX. Y2K Compliance in libpng
May 4, 2007
May 9, 2007
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.2.17rc1 are Y2K compliant. It is my belief that earlier
upward through 1.2.17rc2 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

20
libpng.3
View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "May 4, 2007"
.TH LIBPNG 3 "May 9, 2007"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17rc1
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17rc2
.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.2.17rc1 - May 4, 2007
libpng version 1.2.17rc2 - May 9, 2007
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -3331,13 +3331,13 @@ application:
.SH IX. Y2K Compliance in libpng
May 4, 2007
May 9, 2007
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.2.17rc1 are Y2K compliant. It is my belief that earlier
upward through 1.2.17rc2 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
@ -3520,8 +3520,8 @@ the first widely used release:
1.0.24 10 10024 10.so.0.24[.0]
1.2.16 13 10216 12.so.0.16[.0]
1.2.17beta1-2 13 10217 12.so.0.17[.0]
1.0.25rc1 10 10025 10.so.0.25[.0]
1.2.17rc1 13 10217 12.so.0.17[.0]
1.0.25rc1-2 10 10025 10.so.0.25[.0]
1.2.17rc1-2 13 10217 12.so.0.17[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@ -3577,7 +3577,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.17rc1 - May 4, 2007:
Libpng version 1.2.17rc2 - May 9, 2007:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -3598,7 +3598,7 @@ included in the libpng distribution, the latter shall prevail.)
If you modify libpng you may insert additional notices immediately following
this sentence.
libpng versions 1.2.6, August 15, 2004, through 1.2.17rc1, May 4, 2007, are
libpng versions 1.2.6, August 15, 2004, through 1.2.17rc2, May 9, 2007, are
Copyright (c) 2004,2006-2007 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
@ -3697,7 +3697,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
May 4, 2007
May 9, 2007
.\" end of man page

4
libpngpf.3
View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "May 4, 2007"
.TH LIBPNGPF 3 "May 9, 2007"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17rc1
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.17rc2
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "May 4, 2007"
.TH PNG 5 "May 9, 2007"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION

11
png.c
View File

@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.2.15 January 5, 2007
* Last changed in libpng 1.2.17 May 9, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -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_17rc1 Your_png_h_is_not_version_1_2_17rc1;
typedef version_1_2_17rc2 Your_png_h_is_not_version_1_2_17rc2;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@ -490,6 +490,11 @@ if (mask & PNG_FREE_SPLT)
#endif
#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
if(png_ptr->unknown_chunk.data)
{
png_free(png_ptr, png_ptr->unknown_chunk.data);
png_ptr->unknown_chunk.data = NULL;
}
#ifdef PNG_FREE_ME_SUPPORTED
if ((mask & PNG_FREE_UNKN) & info_ptr->free_me)
#else
@ -701,7 +706,7 @@ png_charp PNGAPI
png_get_copyright(png_structp png_ptr)
{
if (&png_ptr != NULL) /* silence compiler warning about unused png_ptr */
return ((png_charp) "\n libpng version 1.2.17rc1 - May 4, 2007\n\
return ((png_charp) "\n libpng version 1.2.17rc2 - May 9, 2007\n\
Copyright (c) 1998-2007 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");

40
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.17rc1 - May 4, 2007
* libpng version 1.2.17rc2 - May 9, 2007
* Copyright (c) 1998-2007 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.)
@ -9,7 +9,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.17rc1 - May 4, 2007: Glenn
* libpng versions 0.97, January 1998, through 1.2.17rc2 - May 9, 2007: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -144,8 +144,8 @@
* 1.0.24 10 10024 10.so.0.24[.0]
* 1.2.16 13 10216 12.so.0.16[.0]
* 1.2.17beta1-2 13 10217 12.so.0.17[.0]
* 1.0.25rc1 10 10025 10.so.0.25[.0]
* 1.2.17rc1 13 10217 12.so.0.17[.0]
* 1.0.25rc1-2 10 10025 10.so.0.25[.0]
* 1.2.17rc1-2 13 10217 12.so.0.17[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -175,7 +175,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.17rc1, May 4, 2007, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.17rc2, May 9, 2007, are
* Copyright (c) 2004, 2006-2007 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:
@ -287,13 +287,13 @@
* Y2K compliance in libpng:
* =========================
*
* May 4, 2007
* May 9, 2007
*
* 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.2.17rc1 are Y2K compliant. It is my belief that earlier
* upward through 1.2.17rc2 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
@ -349,9 +349,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.17rc1"
#define PNG_LIBPNG_VER_STRING "1.2.17rc2"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.17rc1 - May 4, 2007 (header)\n"
" libpng version 1.2.17rc2 - May 9, 2007 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -363,7 +363,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 1
#define PNG_LIBPNG_VER_BUILD 2
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -1391,13 +1391,18 @@ struct png_struct_def
png_uint_32 user_height_max;
#endif
/* New member added in libpng-1.0.25 and 1.2.17 */
#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
/* storage for unknown chunk that the library doesn't recognize. */
png_unknown_chunk unknown_chunk;
#endif
};
/* 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_17rc1;
typedef png_structp version_1_2_17rc2;
typedef png_struct FAR * FAR * png_structpp;
@ -2393,7 +2398,7 @@ extern PNG_EXPORT(void,png_set_sCAL_s) PNGARG((png_structp png_ptr,
handling or default unknown chunk handling is not desired. Any chunks not
listed will be handled in the default manner. The IHDR and IEND chunks
must not be listed.
keep = 0: follow default behavour
keep = 0: follow default behaviour
= 1: do not keep
= 2: keep only if safe-to-copy
= 3: keep even if unsafe-to-copy
@ -2674,16 +2679,21 @@ extern PNG_EXPORT(void,png_save_uint_16)
* be found in the files where the functions are located.
*/
#if defined(PNG_INTERNAL)
/* Various modes of operation. Note that after an init, mode is set to
* zero automatically when the structure is created.
/* Various modes of operation, that are visible to applications because
* they are used for unknown chunk location.
*/
#define PNG_HAVE_IHDR 0x01
#define PNG_HAVE_PLTE 0x02
#define PNG_HAVE_IDAT 0x04
#define PNG_AFTER_IDAT 0x08 /* Have complete zlib datastream */
#define PNG_HAVE_IEND 0x10
#if defined(PNG_INTERNAL)
/* More modes of operation. Note that after an init, mode is set to
* zero automatically when the structure is created.
*/
#define PNG_HAVE_gAMA 0x20
#define PNG_HAVE_cHRM 0x40
#define PNG_HAVE_sRGB 0x80

2
pngconf.h
View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.17rc1 - May 4, 2007
* libpng version 1.2.17rc2 - May 9, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

30
pngpread.c
View File

@ -1,9 +1,9 @@
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.2.13 November 13, 2006
* Last changed in libpng 1.2.17 May 9, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* Copyright (c) 1998-2007 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.)
*/
@ -1488,8 +1488,6 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
#if defined(PNG_READ_UNKNOWN_CHUNKS_SUPPORTED)
if (png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS)
{
png_unknown_chunk chunk;
#ifdef PNG_MAX_MALLOC_64K
if (length > (png_uint_32)65535L)
{
@ -1498,28 +1496,32 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
length = (png_uint_32)65535L;
}
#endif
png_strcpy((png_charp)chunk.name, (png_charp)png_ptr->chunk_name);
chunk.data = (png_bytep)png_malloc(png_ptr, length);
png_crc_read(png_ptr, chunk.data, length);
chunk.size = length;
png_strcpy((png_charp)png_ptr->unknown_chunk.name,
(png_charp)png_ptr->chunk_name);
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
png_ptr->unknown_chunk.size = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
if(png_ptr->read_user_chunk_fn != NULL)
{
/* callback to user unknown chunk handler */
if ((*(png_ptr->read_user_chunk_fn)) (png_ptr, &chunk) <= 0)
int ret;
ret = (*(png_ptr->read_user_chunk_fn))
(png_ptr, &png_ptr->unknown_chunk);
if (ret < 0)
png_chunk_error(png_ptr, "error in user chunk");
if (ret == 0)
{
if (!(png_ptr->chunk_name[0] & 0x20))
if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
PNG_HANDLE_CHUNK_ALWAYS)
png_chunk_error(png_ptr, "unknown critical chunk");
}
png_set_unknown_chunks(png_ptr, info_ptr, &chunk, 1);
}
else
#endif
png_set_unknown_chunks(png_ptr, info_ptr, &chunk, 1);
png_free(png_ptr, chunk.data);
png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
png_free(png_ptr, png_ptr->unknown_chunk.data);
png_ptr->unknown_chunk.data = NULL;
}
else
#endif

2
pngrtran.c
View File

@ -583,7 +583,7 @@ png_set_expand_gray_1_2_4_to_8(png_structp png_ptr)
{
png_debug(1, "in png_set_expand_gray_1_2_4_to_8\n");
if(png_ptr == NULL) return;
png_ptr->transformations |= PNG_EXPAND_tRNS;
png_ptr->transformations |= PNG_EXPAND;
}
#endif

30
pngrutil.c
View File

@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.2.15 January 5, 2007
* Last changed in libpng 1.2.17 May 9, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -2173,8 +2173,6 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
if ((png_ptr->flags & PNG_FLAG_KEEP_UNKNOWN_CHUNKS) ||
(png_ptr->read_user_chunk_fn != NULL))
{
png_unknown_chunk chunk;
#ifdef PNG_MAX_MALLOC_64K
if (length > (png_uint_32)65535L)
{
@ -2183,30 +2181,32 @@ png_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
length = (png_uint_32)65535L;
}
#endif
png_strcpy((png_charp)chunk.name, (png_charp)png_ptr->chunk_name);
chunk.data = (png_bytep)png_malloc(png_ptr, length);
chunk.size = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)chunk.data, length);
png_strcpy((png_charp)png_ptr->unknown_chunk.name,
(png_charp)png_ptr->chunk_name);
png_ptr->unknown_chunk.data = (png_bytep)png_malloc(png_ptr, length);
png_ptr->unknown_chunk.size = (png_size_t)length;
png_crc_read(png_ptr, (png_bytep)png_ptr->unknown_chunk.data, length);
#if defined(PNG_READ_USER_CHUNKS_SUPPORTED)
if(png_ptr->read_user_chunk_fn != NULL)
{
/* callback to user unknown chunk handler */
if ((*(png_ptr->read_user_chunk_fn)) (png_ptr, &chunk) <= 0)
int ret;
ret = (*(png_ptr->read_user_chunk_fn))
(png_ptr, &png_ptr->unknown_chunk);
if (ret < 0)
png_chunk_error(png_ptr, "error in user chunk");
if (ret == 0)
{
if (!(png_ptr->chunk_name[0] & 0x20))
if(png_handle_as_unknown(png_ptr, png_ptr->chunk_name) !=
PNG_HANDLE_CHUNK_ALWAYS)
{
png_free(png_ptr, chunk.data);
png_chunk_error(png_ptr, "unknown critical chunk");
}
png_set_unknown_chunks(png_ptr, info_ptr, &chunk, 1);
}
}
else
#endif
png_set_unknown_chunks(png_ptr, info_ptr, &chunk, 1);
png_free(png_ptr, chunk.data);
png_set_unknown_chunks(png_ptr, info_ptr, &png_ptr->unknown_chunk, 1);
png_free(png_ptr, png_ptr->unknown_chunk.data);
png_ptr->unknown_chunk.data = NULL;
}
else
#endif

2
pngset.c
View File

@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
* Last changed in libpng 1.2.17 May 4, 2007
* Last changed in libpng 1.2.17 May 9, 2007
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2007 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngtest.c
View File

@ -1551,4 +1551,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_17rc1 your_png_h_is_not_version_1_2_17rc1;
typedef version_1_2_17rc2 your_png_h_is_not_version_1_2_17rc2;

2
scripts/CMakeLists.txt
View File

@ -179,7 +179,7 @@ configure_file(${PNG_SOURCE_DIR}/scripts/libpng-config.in
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 0.${PNGLIB_RELEASE}.1.2.17rc1
# VERSION 0.${PNGLIB_RELEASE}.1.2.17rc2
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)

2
scripts/libpng-config-head.in
View File

@ -8,7 +8,7 @@
# Modeled after libxml-config.
version=1.2.17rc1
version=1.2.17rc2
prefix=""
libdir=""
libs=""

2
scripts/libpng.pc-configure.in
View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
Version: 1.2.17rc1
Version: 1.2.17rc2
Libs: -L${libdir} -lpng12
Cflags: -I${includedir} @LIBPNG_NO_MMX@

2
scripts/libpng.pc.in
View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
Version: 1.2.17rc1
Version: 1.2.17rc2
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}

2
scripts/makefile.32sunu
View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.64sunu
View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.aix
View File

@ -20,7 +20,7 @@ LN_SF = ln -f -s
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local

2
scripts/makefile.beos
View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.cygwin
View File

@ -80,7 +80,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll

2
scripts/makefile.darwin
View File

@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.dec
View File

@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

2
scripts/makefile.elf
View File

@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.gcmmx
View File

@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.hp64
View File

@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.hpgcc
View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.hpux
View File

@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.linux
View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.mingw
View File

@ -76,7 +76,7 @@ CFLAGS= $(strip $(MINGW_CCFLAGS) $(addprefix -I,$(ZLIBINC)) \
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll

2
scripts/makefile.ne12bsd
View File

@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.17rc1
SHLIB_MINOR= 1.2.17rc2
SRCS= pnggccrd.c 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

2
scripts/makefile.netbsd
View File

@ -14,7 +14,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.17rc1
SHLIB_MINOR= 1.2.17rc2
SRCS= pnggccrd.c 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

2
scripts/makefile.nommx
View File

@ -7,7 +7,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.openbsd
View File

@ -8,7 +8,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.17rc1
SHLIB_MINOR= 1.2.17rc2
LIB= png
SRCS= png.c pngerror.c pnggccrd.c pngget.c pngmem.c pngpread.c \

2
scripts/makefile.sco
View File

@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.sggcc
View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.sgi
View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.so9
View File

@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

2
scripts/makefile.solaris
View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.17rc1
PNGMIN = 1.2.17rc2
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/pngos2.def
View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.2.17rc1
; Version 1.2.17rc2
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"

2
scripts/pngw32.def
View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.2.17rc1
;Version 1.2.17rc2
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3