Imported from libpng-1.2.11beta1.tar

This commit is contained in:
Glenn Randers-Pehrson 2006-05-31 13:06:54 -05:00
parent 78d28c6b96
commit 4db11d5143
43 changed files with 194 additions and 148 deletions

View File

@ -1,53 +1,91 @@
Libpng 1.2.10 - April 23, 2006
Libpng 1.2.11beta1 - May 31, 2006
This is a public release of libpng, intended for use in production codes.
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.
Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
libpng-1.2.10.tar.gz
libpng-1.2.10.tar.bz2
libpng-1.2.11beta1.tar.gz
libpng-1.2.11beta1.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
libpng-1.2.10-no-config.tar.gz
libpng-1.2.10-no-config.tar.bz2
libpng-1.2.11beta1-no-config.tar.gz
libpng-1.2.11beta1-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lpng1210.zip
lpng1210.tar.bz2
lp1211b01.zip
lp1211b01.tar.bz2
Project files
libpng-1.2.10-project-netware.zip
libpng-1.2.10-project-wince.zip
libpng-1.2.11beta1-project-netware.zip
libpng-1.2.11beta1-project-wince.zip
Other information:
libpng-1.2.10-README.txt
libpng-1.2.10-KNOWNBUGS.txt
libpng-1.2.10-LICENSE.txt
libpng-1.2.10-Y2K-compliance.txt
libpng-1.2.11beta1-README.txt
libpng-1.2.11beta1-KNOWNBUGS.txt
libpng-1.2.11beta1-LICENSE.txt
libpng-1.2.11beta1-Y2K-compliance.txt
Changes since the last public release (1.2.9):
version 1.2.10 [April 23, 2006]
Revised Makefile.am to add -DPNG_CONFIGURE_LIBPNG to compile directive,
and modified pngconf.h to include config.h only when PNG_CONFIGURE_LIBPNG
is defined.
version 1.2.10beta1 [April 15, 2006]
Renamed "config.h" to "png_conf.h" and revised Makefile.am to add
-DPNG_BUILDING_LIBPNG to compile directive, and modified pngconf.h
to include png_conf.h only when PNG_BUILDING_LIBPNG is defined.
version 1.2.10beta2 [April 15, 2006]
Manually updated Makefile.in and configure. Changed png_conf.h.in
back to config.h.
version 1.2.10beta3 [April 15, 2006]
Change png_conf.h back to config.h in pngconf.h.
version 1.2.10beta4 [April 16, 2006]
Change PNG_BUILDING_LIBPNG to PNG_CONFIGURE_LIBPNG in config/Makefile*.
version 1.2.10beta5 [April 16, 2006]
Added a configure check for compiling assembler code in pnggccrd.c
version 1.2.10beta6 [April 17, 2006]
Revised the configure check for pnggccrd.c
Moved -DPNG_CONFIGURE_LIBPNG into @LIBPNG_DEFINES@
Added @LIBPNG_DEFINES@ to arguments when building libpng.sym
version 1.2.10beta7 [April 18, 2006]
Change "exec_prefix=$prefix" to "exec_prefix=$(prefix)" in makefiles.
version 1.2.10rc1 [April 19, 2006]
Ensure pngconf.h doesn't define both PNG_USE_PNGGCCRD and PNG_USE_PNGVCRD
Fixed "LN_FS" typo in makefile.sco and makefile.solaris.
version 1.2.10rc2 [April 20, 2006]
Added a backslash between -DPNG_CONFIGURE_LIBPNG and -DPNG_NO_ASSEMBLER_CODE
in configure.ac
Made the configure warning about versioned symbols less arrogant.
version 1.2.10rc3 [April 21, 2006]
Added a note in libpng.txt that png_set_sig_bytes(8) can be used when
writing an embedded PNG without the 8-byte signature.
Revised makefiles and configure to avoid making links to libpng.so.*
version 1.2.10 [May 31, 2006]
Reverted configure to "rc2" state.
version 1.2.11beta1 [May 31, 2006]
scripts/libpng.pc.in contained "configure" style version info and would
not work with makefiles.
The shared-library makefiles were linking to libpng.so.0 instead of
libpng.so.3 compatibility as the library.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit

10
CHANGES
View File

@ -1480,7 +1480,7 @@ version 1.2.9beta5 [March 4, 2006]
Restored scripts/makefile.elf which was inadvertently deleted.
version 1.2.9beta6 [March 6, 2006]
Fixed typo (10) in configuration files.
Fixed typo (11) in configuration files.
version 1.2.9beta7 [March 7, 2006]
Removed libpng.vers and libpng.sym from libpng12_la_SOURCES in Makefile.am
@ -1562,9 +1562,15 @@ version 1.2.10rc3 [April 21, 2006]
writing an embedded PNG without the 8-byte signature.
Revised makefiles and configure to avoid making links to libpng.so.*
version 1.2.10 [April 23, 2006]
version 1.2.10 [May 31, 2006]
Reverted configure to "rc2" state.
version 1.2.11beta1 [May 31, 2006]
scripts/libpng.pc.in contained "configure" style version info and would
not work with makefiles.
The shared-library makefiles were linking to libpng.so.0 instead of
libpng.so.3 compatibility as the library.
version 1.4.0beta1 [future]
Enabled iTXt support (changes png_struct, thus requires so-number change).
Removed deprecated functions png_read_init, png_write_init, png_info_init,

16
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng version 1.2.10 - April 23, 2006
Installing libpng version 1.2.11beta1 - May 31, 2006
On Unix/Linux and similar systems, you can simply type
@ -29,7 +29,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.10" or "lpng109" and "zlib-1.2.1"
might be called "libpng-1.2.11beta1" 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:
@ -85,11 +85,11 @@ include
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng12.so.0.1.2.10)
gcc, creates libpng12.so.0.1.2.11beta1)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.10)
(gcc, creates libpng12.so.0.1.2.11beta1)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.10,
(gcc, creates libpng12.so.0.1.2.11beta1,
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
@ -112,12 +112,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.10)
creates libpng12.so.0.1.2.11beta1)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng12.so.0.1.2.10)
creates libpng12.so.0.1.2.11beta1)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng12.so.0.1.2.10)
creates libpng12.so.0.1.2.11beta1)
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

View File

@ -1,5 +1,5 @@
Known bugs in libpng version 1.2.10
Known bugs in libpng version 1.2.11beta1
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

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.10, April 23, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.2.11beta1, May 31, 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
April 23, 2006
May 31, 2006

14
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.2.10 - April 23, 2006 (shared library 12.0)
README for libpng version 1.2.11beta1 - May 31, 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.10)
gcc, creates libpng12.so.0.1.2.11beta1)
makefile.linux => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.10)
(gcc, creates libpng12.so.0.1.2.11beta1)
makefile.gcmmx => Linux/ELF makefile
(gcc, creates libpng12.so.0.1.2.10,
(gcc, creates libpng12.so.0.1.2.11beta1,
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.10)
(gcc, creates libpng12.so.0.1.2.11beta1)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
(gcc, creates libpng12.so.0.1.2.10)
(gcc, creates libpng12.so.0.1.2.11beta1)
makefile.so9 => Solaris 9 makefile
(gcc, creates libpng12.so.0.1.2.10)
(gcc, creates libpng12.so.0.1.2.11beta1)
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

View File

@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
April 23, 2006
May 31, 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.10 are Y2K compliant. It is my belief that earlier
upward through 1.2.11beta1 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

24
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for libpng 1.2.10.
# Generated by GNU Autoconf 2.59 for libpng 1.2.11beta1.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.2.10'
PACKAGE_STRING='libpng 1.2.10'
PACKAGE_VERSION='1.2.11beta1'
PACKAGE_STRING='libpng 1.2.11beta1'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
ac_unique_file="pngget.c"
@ -954,7 +954,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.10 to adapt to many kinds of systems.
\`configure' configures libpng 1.2.11beta1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1020,7 +1020,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.2.10:";;
short | recursive ) echo "Configuration of libpng 1.2.11beta1:";;
esac
cat <<\_ACEOF
@ -1167,7 +1167,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.2.10
libpng configure 1.2.11beta1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -1181,7 +1181,7 @@ cat >&5 <<_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.10, which was
It was created by libpng $as_me 1.2.11beta1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1824,7 +1824,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.2.10'
VERSION='1.2.11beta1'
cat >>confdefs.h <<_ACEOF
@ -1979,9 +1979,9 @@ fi
PNGLIB_VERSION=1.2.10
PNGLIB_VERSION=1.2.11beta1
PNGLIB_MAJOR=12
PNGLIB_MINOR=10
PNGLIB_MINOR=11
@ -20681,7 +20681,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by libpng $as_me 1.2.10, which was
This file was extended by libpng $as_me 1.2.11beta1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -20744,7 +20744,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
libpng config.status 1.2.10
libpng config.status 1.2.11beta1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -18,14 +18,14 @@ AC_PREREQ(2.59)
dnl Version number stuff here:
AC_INIT([libpng], [1.2.10], [png-mng-implement@lists.sourceforge.net])
AC_INIT([libpng], [1.2.11beta1], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
PNGLIB_VERSION=1.2.10
PNGLIB_VERSION=1.2.11beta1
PNGLIB_MAJOR=12
PNGLIB_MINOR=10
PNGLIB_MINOR=11
dnl End of version number stuff

View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "April 23, 2006"
.TH LIBPNG 3 "May 31, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta1
.SH SYNOPSIS
\fI\fB
@ -821,7 +821,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.10 - April 23, 2006
libpng version 1.2.11beta1 - May 31, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -3644,7 +3644,7 @@ defined:
#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
&& defined(PNG_THREAD_UNSAFE_OK)
/* Disable thread-unsafe features of pnggccrd */
if (png_access_version() >= 10200)
if (png_access_version_number() >= 10200)
{
png_uint_32 mmx_disable_mask = 0;
png_uint_32 asm_flags;
@ -3738,13 +3738,13 @@ application:
.SH IX. Y2K Compliance in libpng
April 23, 2006
May 31, 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.10 are Y2K compliant. It is my belief that earlier
upward through 1.2.11beta1 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
@ -3904,6 +3904,7 @@ the first widely used release:
1.2.10beta1-8 13 10210 12.so.0.10[.0]
1.2.10rc1-3 13 10210 12.so.0.10[.0]
1.2.10 13 10210 12.so.0.10[.0]
1.2.11beta1 13 10211 12.so.0.11[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@ -3959,7 +3960,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.2.10 - April 23, 2006:
Libpng version 1.2.11beta1 - May 31, 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).
@ -3980,7 +3981,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.10, April 23, 2006, are
libpng versions 1.2.6, August 15, 2004, through 1.2.11beta1, May 31, 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
@ -4079,7 +4080,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
April 23, 2006
May 31, 2006
.\" end of man page

View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.2.10 - April 23, 2006
libpng version 1.2.11beta1 - May 31, 2006
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2005 Glenn Randers-Pehrson
@ -2823,7 +2823,7 @@ defined:
#if defined(PNG_USE_PNGGCCRD) && defined(PNG_ASSEMBLER_CODE_SUPPORTED) \
&& defined(PNG_THREAD_UNSAFE_OK)
/* Disable thread-unsafe features of pnggccrd */
if (png_access_version() >= 10200)
if (png_access_version_number() >= 10200)
{
png_uint_32 mmx_disable_mask = 0;
png_uint_32 asm_flags;
@ -2917,13 +2917,13 @@ application:
IX. Y2K Compliance in libpng
April 23, 2006
May 31, 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.10 are Y2K compliant. It is my belief that earlier
upward through 1.2.11beta1 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

View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "April 23, 2006"
.TH LIBPNGPF 3 "May 31, 2006"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.10
libpng \- Portable Network Graphics (PNG) Reference Library 1.2.11beta1
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "April 23, 2006"
.TH PNG 5 "May 31, 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_10 Your_png_h_is_not_version_1_2_10;
typedef version_1_2_11beta1 Your_png_h_is_not_version_1_2_11beta1;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@ -693,7 +693,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.10 - April 23, 2006\n\
return ((png_charp) "\n libpng version 1.2.11beta1 - May 31, 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");

25
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.10 - April 23, 2006
* libpng version 1.2.11beta1 - May 31, 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.10 - April 23, 2006: Glenn
* libpng versions 0.97, January 1998, through 1.2.11beta1 - May 31, 2006: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -119,6 +119,7 @@
* 1.2.10beta1-8 13 10210 12.so.0.10[.0]
* 1.2.10rc1-3 13 10210 12.so.0.10[.0]
* 1.2.10 13 10210 12.so.0.10[.0]
* 1.2.11beta1 13 10211 12.so.0.11[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -148,7 +149,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.10, April 23, 2006, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.11beta1, May 31, 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:
@ -260,13 +261,13 @@
* Y2K compliance in libpng:
* =========================
*
* April 23, 2006
* May 31, 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.10 are Y2K compliant. It is my belief that earlier
* upward through 1.2.11beta1 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
@ -322,9 +323,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.10"
#define PNG_LIBPNG_VER_STRING "1.2.11beta1"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.10 - April 23, 2006 (header)\n"
" libpng version 1.2.11beta1 - May 31, 2006 (header)\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -332,11 +333,11 @@
/* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */
#define PNG_LIBPNG_VER_MAJOR 1
#define PNG_LIBPNG_VER_MINOR 2
#define PNG_LIBPNG_VER_RELEASE 10
#define PNG_LIBPNG_VER_RELEASE 11
/* This should match the numeric part of the final component of
* PNG_LIBPNG_VER_STRING, omitting any leading zero: */
#define PNG_LIBPNG_VER_BUILD 0
#define PNG_LIBPNG_VER_BUILD 1
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -353,14 +354,14 @@
#define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with
PNG_LIBPNG_BUILD_PRIVATE */
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE
#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA
/* Careful here. At one time, Guy wanted to use 082, but that would be octal.
* We must not include leading zeros.
* Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only
* version 1.0.0 was mis-numbered 100 instead of 10000). From
* version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release */
#define PNG_LIBPNG_VER 10210 /* 1.2.10 */
#define PNG_LIBPNG_VER 10211 /* 1.2.11 */
#ifndef PNG_VERSION_INFO_ONLY
/* include the compression library's header */
@ -1366,7 +1367,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_10;
typedef png_structp version_1_2_11beta1;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.10 - April 23, 2006
* libpng version 1.2.11beta1 - May 31, 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)

View File

@ -1549,4 +1549,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_10 your_png_h_is_not_version_1_2_10;
typedef version_1_2_11beta1 your_png_h_is_not_version_1_2_11beta1;

View File

@ -8,7 +8,7 @@
# Modeled after libxml-config.
version=1.2.10
version=1.2.11beta1
prefix=""
libdir=""
libs=""

View File

@ -1,10 +1,10 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@/libpng@PNGLIB_MAJOR@
includedir=@includedir@/libpng12
Name: libpng
Description: Loads and saves PNG files
Version: @PNGLIB_VERSION@
Libs: -L${libdir} -lpng@PNGLIB_MAJOR@
Version: 1.2.11beta1
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -16,8 +16,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
CC=cc

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -16,8 +16,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
CC=cc

View File

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

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -16,8 +16,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
CC=gcc

View File

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

View File

@ -19,7 +19,7 @@ ZLIBINC=../zlib
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -27,8 +27,8 @@ LIBSO=$(LIBNAME).dylib
LIBSOMAJ=$(LIBNAME).$(PNGMAJ).dylib
LIBSOVER=$(LIBNAME).$(PNGVER).dylib
OLDSO=libpng.dylib
OLDSOMAJ=libpng.0.dylib
OLDSOVER=libpng.0.$(PNGMIN).dylib
OLDSOMAJ=libpng..dylib
OLDSOVER=libpng..$(PNGMIN).dylib
# Utilities:
CC=cc

View File

@ -5,7 +5,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@ -14,8 +14,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
AR_RC=ar rc

View File

@ -6,13 +6,13 @@
# Modified for Debian by Junichi Uekawa and Josselin Mouette
# Major modifications are:
# * link libpng explicitly with libz and libm
# * $(OLDSO).%OLDSONUM% is a symlink rather than a different library
# * $(OLDSO). is a symlink rather than a different library
# * versioned symbols
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -20,8 +20,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
AR_RC=ar rc

View File

@ -16,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -24,8 +24,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
CC = gcc

View File

@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -26,8 +26,8 @@ LIBSO=$(LIBNAME).sl
LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
LIBSOVER=$(LIBNAME).sl.$(PNGVER)
OLDSO=libpng.sl
OLDSOMAJ=libpng.sl.0
OLDSOVER=libpng.sl.0.$(PNGMIN)
OLDSOMAJ=libpng.sl.
OLDSOVER=libpng.sl..$(PNGMIN)
# Utilities:
AR_RC=ar rc

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -16,8 +16,8 @@ LIBSO=$(LIBNAME).sl
LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
LIBSOVER=$(LIBNAME).sl.$(PNGVER)
OLDSO=libpng.sl
OLDSOMAJ=libpng.sl.0
OLDSOVER=libpng.sl.0.$(PNGMIN)
OLDSOMAJ=libpng.sl.
OLDSOVER=libpng.sl..$(PNGMIN)
# Utilities:
CC=gcc

View File

@ -18,7 +18,7 @@ ZLIBINC=/opt/zlib/include
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -26,8 +26,8 @@ LIBSO=$(LIBNAME).sl
LIBSOMAJ=$(LIBNAME).sl.$(PNGMAJ)
LIBSOVER=$(LIBNAME).sl.$(PNGVER)
OLDSO=libpng.sl
OLDSOMAJ=libpng.sl.0
OLDSOVER=libpng.sl.0.$(PNGMIN)
OLDSOMAJ=libpng.sl.
OLDSOVER=libpng.sl..$(PNGMIN)
# Utilities:
AR_RC=ar rc

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -14,8 +14,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
AR_RC=ar rc

View File

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

View File

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

View File

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

View File

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

View File

@ -9,7 +9,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -17,8 +17,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
CC=cc

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -14,8 +14,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
AR_RC=ar rc

View File

@ -6,7 +6,7 @@
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -14,8 +14,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
AR_RC=ar rc

View File

@ -8,7 +8,7 @@
# Library name:
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
@ -17,8 +17,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
# gcc 2.95 doesn't work.

View File

@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
PNGMIN = 1.2.10
PNGMIN = 1.2.11beta1
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@ -16,8 +16,8 @@ LIBSO=$(LIBNAME).so
LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
LIBSOVER=$(LIBNAME).so.$(PNGVER)
OLDSO=libpng.so
OLDSOMAJ=libpng.so.0
OLDSOVER=libpng.so.0.$(PNGMIN)
OLDSOMAJ=libpng.so.
OLDSOVER=libpng.so..$(PNGMIN)
# Utilities:
AR_RC=ar rc

View File

@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
; Version 1.2.10
; Version 1.2.11beta1
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"

View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.2.10
;Version 1.2.11beta1
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3