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

Imported from libpng-1.2.15rc4.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2006-12-26 18:59:57 -06:00
parent f959d3ee7a
commit 6cdefb3cac
46 changed files with 123 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.2.15rc3 - December 25, 2006
Libpng 1.2.15rc4 - December 27, 2006
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,32 +9,32 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
libpng-1.2.15rc3.tar.gz
libpng-1.2.15rc3.tar.bz2
libpng-1.2.15rc4.tar.gz
libpng-1.2.15rc4.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.15rc3-no-config.tar.gz
libpng-1.2.15rc3-no-config.tar.bz2
libpng-1.2.15rc4-no-config.tar.gz
libpng-1.2.15rc4-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp1215r03.zip
lp1215r03.tar.bz2
lp1215r04.zip
lp1215r04.tar.bz2
Project files
libpng-1.2.15rc3-project-netware.zip
libpng-1.2.15rc3-project-wince.zip
libpng-1.2.15rc4-project-netware.zip
libpng-1.2.15rc4-project-wince.zip
Other information:
libpng-1.2.15rc3-README.txt
libpng-1.2.15rc3-KNOWNBUGS.txt
libpng-1.2.15rc3-LICENSE.txt
libpng-1.2.15rc3-Y2K-compliance.txt
libpng-1.2.15rc4-README.txt
libpng-1.2.15rc4-KNOWNBUGS.txt
libpng-1.2.15rc4-LICENSE.txt
libpng-1.2.15rc4-Y2K-compliance.txt
Changes since the last public release (1.2.14):
@ -69,7 +69,11 @@ version 1.2.15rc2 [December 21, 2006]
version 1.2.15rc3 [December 25, 2006]
Fixed shared library numbering error that was intruduced in 1.2.15beta6.
version 1.2.15rc4 [December 27, 2006]
Fixed handling of rgb_to_gray when png_ptr->color.gray isn't set.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
to subscribe) or to glennrp at users.sourceforge.net

3
CHANGES
View File

@ -1671,6 +1671,9 @@ version 1.2.15rc2 [December 21, 2006]
version 1.2.15rc3 [December 25, 2006]
Fixed shared library numbering error that was intruduced in 1.2.15beta6.
version 1.2.15rc4 [December 27, 2006]
Fixed handling of rgb_to_gray when png_ptr->color.gray isn't set.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

18
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng version 1.2.15rc3 - December 25, 2006
Installing libpng version 1.2.15rc4 - December 27, 2006
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.15rc3" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.2.15rc4" 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.15rc3)
gcc, creates libpng12.so.0.1.2.15rc4)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.15rc3)
(gcc, creates libpng12.so.0.1.2.15rc4)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.15rc3,
(gcc, creates libpng12.so.0.1.2.15rc4,
uses assembler code tuned for Intel MMX platform)
makefile.nommx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.15rc3
(gcc, creates libpng12.so.0.1.2.15rc4
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.15rc3)
creates libpng12.so.0.1.2.15rc4)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.15rc3)
creates libpng12.so.0.1.2.15rc4)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.15rc3)
creates libpng12.so.0.1.2.15rc4)
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.15rc3
Known bugs in libpng version 1.2.15rc4
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.15rc3, December 25, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.2.15rc4, December 27, 2006, are
Copyright (c) 2004, 2006 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
December 25, 2006
December 27, 2006

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.15rc3 - December 25, 2006 (shared library 12.0)
README for libpng version 1.2.15rc4 - December 27, 2006 (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.15rc3)
gcc, creates libpng12.so.0.1.2.15rc4)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.15rc3)
(gcc, creates libpng12.so.0.1.2.15rc4)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.15rc3,
(gcc, creates libpng12.so.0.1.2.15rc4,
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.15rc3)
(gcc, creates libpng12.so.0.1.2.15rc4)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.15rc3)
(gcc, creates libpng12.so.0.1.2.15rc4)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.15rc3)
(gcc, creates libpng12.so.0.1.2.15rc4)
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:
=========================
December 25, 2006
December 27, 2006
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.15rc3 are Y2K compliant. It is my belief that earlier
upward through 1.2.15rc4 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.15rc3.
# Generated by GNU Autoconf 2.61 for libpng 1.2.15rc4.
#
# 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.15rc3'
PACKAGE_STRING='libpng 1.2.15rc3'
PACKAGE_VERSION='1.2.15rc4'
PACKAGE_STRING='libpng 1.2.15rc4'
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.15rc3 to adapt to many kinds of systems.
\`configure' configures libpng 1.2.15rc4 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.15rc3:";;
short | recursive ) echo "Configuration of libpng 1.2.15rc4:";;
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.15rc3
libpng configure 1.2.15rc4
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.15rc3, which was
It was created by libpng $as_me 1.2.15rc4, 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.15rc3'
VERSION='1.2.15rc4'
cat >>confdefs.h <<_ACEOF
@ -2440,7 +2440,7 @@ fi
PNGLIB_VERSION=1.2.15rc3
PNGLIB_VERSION=1.2.15rc4
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=15
@ -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.15rc3, which was
This file was extended by libpng $as_me 1.2.15rc4, 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.15rc3
libpng config.status 1.2.15rc4
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.15rc3], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.2.15rc4], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.2.15rc3
PNGLIB_VERSION=1.2.15rc4
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=15

20
libpng.3
View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "December 25, 2006"
.TH LIBPNG 3 "December 27, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15rc3
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15rc4
.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.15rc3 - December 25, 2006
libpng version 1.2.15rc4 - December 27, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -3327,13 +3327,13 @@ application:
.SH IX. Y2K Compliance in libpng
December 25, 2006
December 27, 2006
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.15rc3 are Y2K compliant. It is my belief that earlier
upward through 1.2.15rc4 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
@ -3507,8 +3507,8 @@ the first widely used release:
1.0.22rc1 10 10022 10.so.0.22[.0]
1.2.14rc1 13 10214 12.so.0.14[.0]
1.2.15beta1-6 13 10215 12.so.0.15[.0]
1.0.23rc1-2 10 10023 10.so.0.23[.0]
1.2.15rc1-2 13 10215 12.so.0.15[.0]
1.0.23rc1-4 10 10023 10.so.0.23[.0]
1.2.15rc1-4 13 10215 12.so.0.15[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@ -3564,7 +3564,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.15rc3 - December 25, 2006:
Libpng version 1.2.15rc4 - December 27, 2006:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -3585,7 +3585,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.15rc3, December 25, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.2.15rc4, December 27, 2006, are
Copyright (c) 2004-2006 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
@ -3684,7 +3684,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
December 25, 2006
December 27, 2006
.\" end of man page

6
libpng.txt
View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.15rc3 - December 25, 2006
libpng version 1.2.15rc4 - December 27, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -2917,13 +2917,13 @@ application:
IX. Y2K Compliance in libpng
December 25, 2006
December 27, 2006
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.15rc3 are Y2K compliant. It is my belief that earlier
upward through 1.2.15rc4 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

4
libpngpf.3
View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "December 25, 2006"
.TH LIBPNGPF 3 "December 27, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15rc3
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.15rc4
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "December 25, 2006"
.TH PNG 5 "December 27, 2006"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION

4
png.c
View File

@ -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_15rc3 Your_png_h_is_not_version_1_2_15rc3;
typedef version_1_2_15rc4 Your_png_h_is_not_version_1_2_15rc4;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@ -701,7 +701,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.15rc3 - December 25, 2006\n\
return ((png_charp) "\n libpng version 1.2.15rc4 - December 27, 2006\n\
Copyright (c) 1998-2006 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");

22
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.15rc3 - December 25, 2006
* libpng version 1.2.15rc4 - December 27, 2006
* Copyright (c) 1998-2006 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.15rc3 - December 25, 2006: Glenn
* libpng versions 0.97, January 1998, through 1.2.15rc4 - December 27, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -135,8 +135,8 @@
* 1.0.22 10 10022 10.so.0.22[.0]
* 1.2.14 13 10214 12.so.0.14[.0]
* 1.2.15beta1-6 13 10215 12.so.0.15[.0]
* 1.0.23rc1-2 10 10023 10.so.0.23[.0]
* 1.2.15rc1-2 13 10215 12.so.0.15[.0]
* 1.0.23rc1-4 10 10023 10.so.0.23[.0]
* 1.2.15rc1-4 13 10215 12.so.0.15[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -166,7 +166,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.15rc3, December 25, 2006, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.15rc4, December 27, 2006, are
* Copyright (c) 2004, 2006 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:
@ -278,13 +278,13 @@
* Y2K compliance in libpng:
* =========================
*
* December 25, 2006
* December 27, 2006
*
* 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.15rc3 are Y2K compliant. It is my belief that earlier
* upward through 1.2.15rc4 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
@ -340,9 +340,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.15rc3"
#define PNG_LIBPNG_VER_STRING "1.2.15rc4"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.15rc3 - December 25, 2006 (header)\n"
" libpng version 1.2.15rc4 - December 27, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -354,7 +354,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 3
#define PNG_LIBPNG_VER_BUILD 4
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -1388,7 +1388,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_2_15rc3;
typedef png_structp version_1_2_15rc4;
typedef png_struct FAR * FAR * png_structpp;

2
pngconf.h
View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.15rc3 - December 25, 2006
* libpng version 1.2.15rc4 - December 27, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2005 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

14
pngrtran.c
View File

@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
* Last changed in libpng 1.2.13 November 13, 2006
* Last changed in libpng 1.2.15 December 31, 2006
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2006 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@ -101,10 +101,16 @@ png_set_background(png_structp png_ptr,
* for the current code, which uses PNG_BACKGROUND_IS_GRAY only to
* decide when to do the png_do_gray_to_rgb() transformation.
*/
if ((need_expand && !(png_ptr->color_type & PNG_COLOR_MASK_COLOR)) ||
(!need_expand && background_color->red == background_color->green &&
background_color->red == background_color->blue))
if ((need_expand && !(png_ptr->color_type & PNG_COLOR_MASK_COLOR)))
{
png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
} else if (!need_expand &&
background_color->red == background_color->green &&
background_color->red == background_color->blue)
{
png_ptr->mode |= PNG_BACKGROUND_IS_GRAY;
png_ptr->background.gray = background_color->red;
}
}
#endif

2
pngtest.c
View File

@ -1547,4 +1547,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_15rc3 your_png_h_is_not_version_1_2_15rc3;
typedef version_1_2_15rc4 your_png_h_is_not_version_1_2_15rc4;

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

@ -8,7 +8,7 @@
# Modeled after libxml-config.
version=1.2.15rc3
version=1.2.15rc4
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.15rc3
Version: 1.2.15rc4
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.15rc3
Version: 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.dec
View File

@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.15rc3
PNGMIN = 1.2.15rc4
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

2
scripts/makefile.elf
View File

@ -12,7 +12,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll

2
scripts/makefile.ne12bsd
View File

@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng12
LIB= png12
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.15rc3
SHLIB_MINOR= 1.2.15rc4
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

@ -13,7 +13,7 @@ INCSDIR=${LOCALBASE}/include/libpng
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.2.15rc3
SHLIB_MINOR= 1.2.15rc4
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

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

2
scripts/makefile.openbsd
View File

@ -7,7 +7,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.2.15rc3
SHLIB_MINOR= 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
PNGMIN = 1.2.15rc4
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:

2
scripts/makefile.so9
View File

@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.15rc3
PNGMIN = 1.2.15rc4
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12

2
scripts/makefile.solaris
View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.15rc3
PNGMIN = 1.2.15rc4
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.15rc3
; Version 1.2.15rc4
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.15rc3
;Version 1.2.15rc4
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3