AuroraMiddleware/libpng
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[devel] Imported from libpng-1.5.0beta29.tar

Browse Source
This commit is contained in:
Glenn Randers-Pehrson 2010-06-21 12:28:05 -05:00
parent 57d9617964
commit 5feb87cd0e
58 changed files with 234 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
ANNOUNCE
View File

@ -1,5 +1,5 @@
Libpng 1.5.0beta28 - June 20, 2010
Libpng 1.5.0beta29 - June 21, 2010
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,20 +9,20 @@ Files available for download:
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
1.5.0beta28.tar.xz (LZMA-compressed, recommended)
1.5.0beta28.tar.gz
1.5.0beta28.tar.bz2
1.5.0beta29.tar.xz (LZMA-compressed, recommended)
1.5.0beta29.tar.gz
1.5.0beta29.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
lp150b28.zip
lp150b28.7z
lp150b29.zip
lp150b29.7z
Other information:
1.5.0beta28-README.txt
1.5.0beta28-LICENSE.txt
1.5.0beta29-README.txt
1.5.0beta29-LICENSE.txt
Changes since the last public release (1.4.1):
@ -225,21 +225,25 @@ version 1.5.0beta24 [May 7, 2010]
offset of the png_ptr->rowbuf pointer into png_ptr->big_row_buf.
Added more blank lines for readability.
version 1.5.0beta25 [June 20, 2010]
version 1.5.0beta25 [June 21, 2010]
In pngpread.c: png_push_have_row() add check for new_row > height
Removed the now-redundant check for out-of-bounds new_row from example.c
version 1.5.0beta26 [June 18, 2010]
In pngpread.c: png_push_process_row() add check for too many rows.
version 1.5.0beta27 [June 20, 2010]
version 1.5.0beta27 [June 18, 2010]
Removed the check added in beta25 as it is now redundant.
version 1.5.0beta28 [June 20, 2010]
version 1.5.0beta28 [June 19, 2010]
Rewrote png_process_IDAT_data to consistently treat extra data as warnings
and handle end conditions more cleanly.
Removed the new (beta26) check in png_push_process_row().
version 1.5.0beta29 [June 21, 2010]
Revised scripts/options.awk to work on Sunos (but still doesn't work)
Added comment to options.awk and contrib/pngminim/*/makefile to try nawk.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net:
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

5
CHANGES
View File

@ -2722,6 +2722,11 @@ version 1.5.0beta28 [June 20, 2010]
and handle end conditions more cleanly.
Removed the new (beta26) check in png_push_process_row().
version 1.5.0beta29 [June 21, 2010]
Revised scripts/options.awk to work on Sunos (but still doesn't work)
Added comment to options.awk and contrib/pngminim/*/makefile to try nawk.
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement

2
CMakeLists.txt
View File

@ -207,7 +207,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libpng-config.in
# SET UP LINKS
if(PNG_SHARED)
set_target_properties(${PNG_LIB_NAME} PROPERTIES
# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta28
# VERSION 15.${PNGLIB_RELEASE}.1.5.0beta29
VERSION 15.${PNGLIB_RELEASE}.0
SOVERSION 15
CLEAN_DIRECT_OUTPUT 1)

4
INSTALL
View File

@ -1,5 +1,5 @@
Installing libpng version 1.5.0beta28 - June 20, 2010
Installing libpng version 1.5.0beta29 - June 21, 2010
On Unix/Linux and similar systems, you can simply type
@ -46,7 +46,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.5.0beta28" or "libpng15" and "zlib-1.2.3"
might be called "libpng-1.5.0beta29" or "libpng15" and "zlib-1.2.3"
or "zlib123") so that you have directories called "zlib" and "libpng".
Your directory structure should look like this:

4
LICENSE
View File

@ -10,7 +10,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.5.0beta28, June 20, 2010, are
libpng versions 1.2.6, August 15, 2004, through 1.5.0beta29, June 21, 2010, 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
@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
June 20, 2010
June 21, 2010

2
README
View File

@ -1,4 +1,4 @@
README for libpng version 1.5.0beta28 - June 20, 2010 (shared library 15.0)
README for libpng version 1.5.0beta29 - June 21, 2010 (shared library 15.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.

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.65 for libpng 1.5.0beta28.
# Generated by GNU Autoconf 2.65 for libpng 1.5.0beta29.
#
# Report bugs to <png-mng-implement@lists.sourceforge.net>.
#
@ -701,8 +701,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libpng'
PACKAGE_TARNAME='libpng'
PACKAGE_VERSION='1.5.0beta28'
PACKAGE_STRING='libpng 1.5.0beta28'
PACKAGE_VERSION='1.5.0beta29'
PACKAGE_STRING='libpng 1.5.0beta29'
PACKAGE_BUGREPORT='png-mng-implement@lists.sourceforge.net'
PACKAGE_URL=''
@ -1432,7 +1432,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.5.0beta28 to adapt to many kinds of systems.
\`configure' configures libpng 1.5.0beta29 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1502,7 +1502,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libpng 1.5.0beta28:";;
short | recursive ) echo "Configuration of libpng 1.5.0beta29:";;
esac
cat <<\_ACEOF
@ -1607,7 +1607,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libpng configure 1.5.0beta28
libpng configure 1.5.0beta29
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@ -2032,7 +2032,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.5.0beta28, which was
It was created by libpng $as_me 1.5.0beta29, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@ -2840,7 +2840,7 @@ fi
# Define the identity of the package.
PACKAGE='libpng'
VERSION='1.5.0beta28'
VERSION='1.5.0beta29'
cat >>confdefs.h <<_ACEOF
@ -2904,7 +2904,7 @@ fi
PNGLIB_VERSION=1.5.0beta28
PNGLIB_VERSION=1.5.0beta29
PNGLIB_MAJOR=1
PNGLIB_MINOR=5
PNGLIB_RELEASE=0
@ -12119,7 +12119,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.5.0beta28, which was
This file was extended by libpng $as_me 1.5.0beta29, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -12185,7 +12185,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libpng config.status 1.5.0beta28
libpng config.status 1.5.0beta29
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"

4
configure.ac
View File

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

3
contrib/pngminim/decoder/makefile
View File

@ -6,6 +6,9 @@ CC=gcc
LD=$(CC)
STRIP=strip
# If awk fails try
# make AWK=nawk
RM=rm -f
COPY=cp

3
contrib/pngminim/encoder/makefile
View File

@ -6,6 +6,9 @@ CC=gcc
LD=$(CC)
STRIP=strip
# If awk fails try
# make AWK=nawk
RM=rm -f
COPY=cp

3
contrib/pngminim/preader/makefile
View File

@ -6,6 +6,9 @@ CC=gcc
LD=$(CC)
STRIP=strip
# If awk fails try
# make AWK=nawk
RM=rm -f
COPY=cp

2
example.c
View File

@ -2,7 +2,7 @@
#if 0 /* in case someone actually tries to compile this */
/* example.c - an example of using libpng
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* This file has been placed in the public domain by the authors.
* Maintained 1998-2010 Glenn Randers-Pehrson
* Maintained 1996, 1997 Andreas Dilger)

10
libpng-1.5.0beta28.txt → libpng-1.5.0beta29.txt
View File

@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
libpng version 1.5.0beta28 - June 20, 2010
libpng version 1.5.0beta29 - June 21, 2010
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -11,7 +11,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.5.0beta28 - June 20, 2010
libpng versions 0.97, January 1998, through 1.5.0beta29 - June 21, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -906,7 +906,7 @@ things.
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
added. It expands the sample depth without changing tRNS to alpha.
As of libpng version 1.5.0beta28, not all possible expansions are supported.
As of libpng version 1.5.0beta29, not all possible expansions are supported.
In the following table, the 01 means grayscale with depth<8, 31 means
indexed with depth<8, other numerals represent the color type, "T" means
@ -3301,13 +3301,13 @@ Other rules can be inferred by inspecting the libpng source.
XIII. Y2K Compliance in libpng
June 20, 2010
June 21, 2010
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.5.0beta28 are Y2K compliant. It is my belief that earlier
upward through 1.5.0beta29 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

22
libpng.3
View File

@ -1,6 +1,6 @@
.TH LIBPNG 3 "June 20, 2010"
.TH LIBPNG 3 "June 21, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta28
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta29
.SH SYNOPSIS
\fI\fB
@ -789,7 +789,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.5.0beta28 - June 20, 2010
libpng version 1.5.0beta29 - June 21, 2010
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -800,7 +800,7 @@ libpng.txt - A description on how to use and modify libpng
Based on:
libpng versions 0.97, January 1998, through 1.5.0beta28 - June 20, 2010
libpng versions 0.97, January 1998, through 1.5.0beta29 - June 21, 2010
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@ -1695,7 +1695,7 @@ things.
As of libpng version 1.2.9, png_set_expand_gray_1_2_4_to_8() was
added. It expands the sample depth without changing tRNS to alpha.
As of libpng version 1.5.0beta28, not all possible expansions are supported.
As of libpng version 1.5.0beta29, not all possible expansions are supported.
In the following table, the 01 means grayscale with depth<8, 31 means
indexed with depth<8, other numerals represent the color type, "T" means
@ -4090,13 +4090,13 @@ Other rules can be inferred by inspecting the libpng source.
.SH XIII. Y2K Compliance in libpng
June 20, 2010
June 21, 2010
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.5.0beta28 are Y2K compliant. It is my belief that earlier
upward through 1.5.0beta29 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
@ -4275,7 +4275,7 @@ the first widely used release:
1.4.1 14 10401 14.so.14.1[.0]
1.4.2 14 10402 14.so.14.2[.0]
1.4.3 14 10403 14.so.14.3[.0]
1.5.0beta01-28 15 10500 15.so.15.0[.0]
1.5.0beta01-29 15 10500 15.so.15.0[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@ -4332,7 +4332,7 @@ possible without all of you.
Thanks to Frank J. T. Wojcik for helping with the documentation.
Libpng version 1.5.0beta28 - June 20, 2010:
Libpng version 1.5.0beta29 - June 21, 2010:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@ -4355,7 +4355,7 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.5.0beta28, June 20, 2010, are
libpng versions 1.2.6, August 15, 2004, through 1.5.0beta29, June 21, 2010, 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
@ -4454,7 +4454,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
June 20, 2010
June 21, 2010
.\" end of man page

4
libpngpf.3
View File

@ -1,6 +1,6 @@
.TH LIBPNGPF 3 "June 20, 2010"
.TH LIBPNGPF 3 "June 21, 2010"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta28
libpng \- Portable Network Graphics (PNG) Reference Library 1.5.0beta29
(private functions)
.SH SYNOPSIS
\fB#include \fI"pngpriv.h"

2
png.5
View File

@ -1,4 +1,4 @@
.TH PNG 5 "June 20, 2010"
.TH PNG 5 "June 21, 2010"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION

8
png.c
View File

@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)
@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_5_0beta28 Your_png_h_is_not_version_1_5_0beta28;
typedef version_1_5_0beta29 Your_png_h_is_not_version_1_5_0beta29;
/* Version information for C files. This had better match the version
* string defined in png.h.
@ -560,13 +560,13 @@ png_get_copyright(png_structp png_ptr)
#else
# ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.5.0beta28 - June 20, 2010" PNG_STRING_NEWLINE \
"libpng version 1.5.0beta29 - June 21, 2010" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.5.0beta28 - June 20, 2010\
return ((png_charp) "libpng version 1.5.0beta29 - June 21, 2010\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");

20
png.h
View File

@ -1,7 +1,7 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.5.0beta28 - June 20, 2010
* libpng version 1.5.0beta29 - June 21, 2010
* Copyright (c) 1998-2010 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.5.0beta28 - June 20, 2010: Glenn
* libpng versions 0.97, January 1998, through 1.5.0beta29 - June 21, 2010: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -140,7 +140,7 @@
* 1.4.1 14 10401 14.so.14.1[.0]
* 1.4.2 14 10402 14.so.14.2[.0]
* 1.4.3 14 10403 14.so.14.3[.0]
* 1.5.0beta01-28 15 10500 15.so.15.0[.0]
* 1.5.0beta01-29 15 10500 15.so.15.0[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@ -172,7 +172,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.5.0beta28, June 20, 2010, are
* libpng versions 1.2.6, August 15, 2004, through 1.5.0beta29, June 21, 2010, are
* Copyright (c) 2004, 2006-2010 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:
@ -284,13 +284,13 @@
* Y2K compliance in libpng:
* =========================
*
* June 20, 2010
* June 21, 2010
*
* 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.5.0beta28 are Y2K compliant. It is my belief that earlier
* upward through 1.5.0beta29 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
@ -346,9 +346,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.5.0beta28"
#define PNG_LIBPNG_VER_STRING "1.5.0beta29"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.5.0beta28 - June 20, 2010\n"
" libpng version 1.5.0beta29 - June 21, 2010\n"
#define PNG_LIBPNG_VER_SONUM 15
#define PNG_LIBPNG_VER_DLLNUM 15
@ -361,7 +361,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 28
#define PNG_LIBPNG_VER_BUILD 29
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -836,7 +836,7 @@ typedef PNG_CALLBACK(void, *png_free_ptr, (png_structp, png_voidp),);
/* 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_5_0beta28;
typedef png_structp version_1_5_0beta29;
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.5.0beta28 - June 20, 2010
* libpng version 1.5.0beta29 - June 21, 2010
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngdebug.h
View File

@ -5,7 +5,7 @@
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* Last changed in libpng version 1.5.0 - June 20, 2010
* Last changed in libpng version 1.5.0 - June 21, 2010
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer

2
pngerror.c
View File

@ -1,7 +1,7 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngget.c
View File

@ -1,7 +1,7 @@
/* pngget.c - retrieval of values from info struct
*
* Last changed in libpng 1.4.1 [June 20, 2010]
* Last changed in libpng 1.4.1 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pnginfo.h
View File

@ -5,7 +5,7 @@
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* Last changed in libpng version 1.5.0 - June 20, 2010
* Last changed in libpng version 1.5.0 - June 21, 2010
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer

2
pngmem.c
View File

@ -1,7 +1,7 @@
/* pngmem.c - stub functions for memory allocation
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

19
pngpread.c
View File

@ -1,7 +1,7 @@
/* pngpread.c - read a png file in push mode
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)
@ -842,7 +842,7 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
/* This routine must process all the data it has been given
* before returning, calling the row callback as required to
* handle the uncomrpessed results.
* handle the uncompressed results.
*/
png_ptr->zstream.next_in = buffer;
png_ptr->zstream.avail_in = (uInt)buffer_length;
@ -857,7 +857,7 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
/* We have data for zlib, but we must check that zlib
* has somewhere to put the results. It doesn't matter
* if we don't expect any results - it may be the input
* if we don't expect any results -- it may be the input
* data is just the LZ end code.
*/
if (!(png_ptr->zstream.avail_out > 0))
@ -865,6 +865,7 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
png_ptr->zstream.avail_out =
(uInt) PNG_ROWBYTES(png_ptr->pixel_depth,
png_ptr->iwidth) + 1;
png_ptr->zstream.next_out = png_ptr->row_buf;
}
@ -888,9 +889,10 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
*/
if (png_ptr->row_number >= png_ptr->num_rows ||
png_ptr->pass > 6)
png_warning(png_ptr, "Truncated compressed data");
png_warning(png_ptr, "Truncated compressed data in IDAT");
else
png_error(png_ptr, "Decompression error");
png_error(png_ptr, "Decompression error in IDAT");
/* Skip the check on unprocessed input */
return;
@ -907,9 +909,10 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
png_ptr->pass > 6)
{
/* Extra data. */
png_warning(png_ptr, "Extra compressed data");
png_warning(png_ptr, "Extra compressed data in IDAT");
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
/* Do not more proecessing, skip the unprocessed
/* Do no more processing; skip the unprocessed
* input check below.
*/
return;
@ -930,7 +933,7 @@ png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,
* after the zlib end code.
*/
if (png_ptr->zstream.avail_in > 0)
png_warning(png_ptr, "Extra compression data");
png_warning(png_ptr, "Extra compression data in IDAT");
}
void /* PRIVATE */

2
pngpriv.h
View File

@ -1,7 +1,7 @@
/* pngpriv.h - private declarations for use inside libpng
*
* libpng version 1.5.0beta28 - June 20, 2010
* libpng version 1.5.0beta29 - June 21, 2010
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

2
pngread.c
View File

@ -1,7 +1,7 @@
/* pngread.c - read a PNG file
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngrio.c
View File

@ -1,7 +1,7 @@
/* pngrio.c - functions for data input
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngrtran.c
View File

@ -1,7 +1,7 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngrutil.c
View File

@ -1,7 +1,7 @@
/* pngrutil.c - utilities to read a PNG file
*
* Last changed in libpng 1.4.1 [June 20, 2010]
* Last changed in libpng 1.4.1 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngset.c
View File

@ -1,7 +1,7 @@
/* pngset.c - storage of image information into info struct
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngstruct.h
View File

@ -5,7 +5,7 @@
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
* (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
*
* Last changed in libpng version 1.5.0 - June 20, 2010
* Last changed in libpng version 1.5.0 - June 21, 2010
*
* This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer

4
pngtest.c
View File

@ -1,7 +1,7 @@
/* pngtest.c - a simple test program to test libpng
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)
@ -1716,4 +1716,4 @@ main(int argc, char *argv[])
}
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_5_0beta28 your_png_h_is_not_version_1_5_0beta28;
typedef version_1_5_0beta29 your_png_h_is_not_version_1_5_0beta29;

2
pngtrans.c
View File

@ -1,7 +1,7 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngwio.c
View File

@ -1,7 +1,7 @@
/* pngwio.c - functions for data output
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngwrite.c
View File

@ -1,7 +1,7 @@
/* pngwrite.c - general routines to write a PNG file
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngwtran.c
View File

@ -1,7 +1,7 @@
/* pngwtran.c - transforms the data in a row for PNG writers
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
pngwutil.c
View File

@ -1,7 +1,7 @@
/* pngwutil.c - utilities to write a PNG file
*
* Last changed in libpng 1.5.0 [June 20, 2010]
* Last changed in libpng 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 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.)

2
projects/vstudio/readme.txt
View File

@ -1,7 +1,7 @@
VisualStudio instructions
libpng version 1.5.0beta28 - June 20, 2010
libpng version 1.5.0beta29 - June 21, 2010
Copyright (c) 1998-2010 Glenn Randers-Pehrson

2
projects/vstudio/zlib.props
View File

@ -2,7 +2,7 @@
<!--
* zlib.props - location of zlib source and build
*
* libpng version 1.5.0beta28 - June 20, 2010
* libpng version 1.5.0beta29 - June 21, 2010
*
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*

12
scripts/README.txt
View File

@ -1,9 +1,9 @@
Makefiles for libpng version 1.5.0beta28 - June 20, 2010
Makefiles for libpng version 1.5.0beta29 - June 21, 2010
pnglibconf.h => Stores configuration settings
makefile.linux => Linux/ELF makefile
(gcc, creates libpng15.so.15.1.5.0beta28)
(gcc, creates libpng15.so.15.1.5.0beta29)
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 @@ pnglibconf.h => Stores configuration settings
makefile.dec => DEC Alpha UNIX makefile
makefile.dj2 => DJGPP 2 makefile
makefile.elf => Linux/ELF makefile symbol versioning,
gcc, creates libpng15.so.15.1.5.0beta28)
gcc, creates libpng15.so.15.1.5.0beta29)
makefile.freebsd => FreeBSD makefile
makefile.gcc => Generic gcc makefile
makefile.hpgcc => HPUX makefile using gcc
@ -35,12 +35,12 @@ pnglibconf.h => Stores configuration settings
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 libpng15.so.15.1.5.0beta28)
creates libpng15.so.15.1.5.0beta29)
makefile.sgi => Silicon Graphics IRIX makefile (cc, creates static lib)
makefile.solaris => Solaris 2.X makefile (gcc,
creates libpng15.so.15.1.5.0beta28)
creates libpng15.so.15.1.5.0beta29)
makefile.so9 => Solaris 9 makefile (gcc,
creates libpng15.so.15.1.5.0beta28)
creates libpng15.so.15.1.5.0beta29)
makefile.std => Generic UNIX makefile (cc, creates static libpng.a)
makefile.sunos => Sun makefile
makefile.32sunu => Sun Ultra 32-bit makefile

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

@ -11,7 +11,7 @@
# Modeled after libxml-config.
version=1.5.0beta28
version=1.5.0beta29
prefix=""
libdir=""
libs=""

2
scripts/libpng.pc.in
View File

@ -5,6 +5,6 @@ includedir=@includedir@/libpng15
Name: libpng
Description: Loads and saves PNG files
Version: 1.5.0beta28
Version: 1.5.0beta29
Libs: -L${libdir} -lpng15
Cflags: -I${includedir}

2
scripts/makefile.ne12bsd
View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include/libpng15
LIB= png15
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.5.0beta28
SHLIB_MINOR= 1.5.0beta29
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

2
scripts/makefile.netbsd
View File

@ -17,7 +17,7 @@ INCSDIR=${LOCALBASE}/include
LIB= png
SHLIB_MAJOR= 3
SHLIB_MINOR= 1.5.0beta28
SHLIB_MINOR= 1.5.0beta29
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

2
scripts/makefile.openbsd
View File

@ -11,7 +11,7 @@ LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
SHLIB_MINOR= 1.5.0beta28
SHLIB_MINOR= 1.5.0beta29
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \

76
scripts/options.awk
View File

@ -1,7 +1,7 @@
#!/bin/awk -f
# scripts/options.awk - library build configuration control
#
# last changed in libpng version 1.5.0 - June 20, 2010
# last changed in libpng version 1.5.0 - June 21, 2010
#
# Copyright (c) 1998-2010 Glenn Randers-Pehrson
#
@ -24,6 +24,8 @@
# everything=off Causes all options to be disabled by default
# everything=on Causes all options to be enabled by default
#
# If awk fails on your platform, try nawk instead.
#
# These options may also be specified in the original input file (and
# are copied to the preprocessed file).
@ -85,6 +87,7 @@ pre == -1{
# Preprocessing - this just copies the input file with lines
# that need preprocessing (just chunk at present) expanded
# The bare "pre" instead of "pre != 0" crashes under Sunos awk
pre && $1 != "chunk"{
print >out
next
@ -124,7 +127,8 @@ $1 ~ /^#/ || $0 ~ /^[ ]*$/{
# the preceding 'com' removed
$1 == "com"{
if (NF > 1) {
sub(/^[ ]*com[ ]*/, "")
# sub(/^[ ]*com[ ]*/, "")
$1 = ""
print comment, $0, cend >out
} else
print start end >out
@ -196,9 +200,7 @@ $1 == "option" && NF >= 2{
key = ""
if (onoff != $(i)) {
# on or off can zap disabled or enabled:
if (onoff == "" ||
(onoff == "disabled" || onoff == "enabled") &&
($(i) == "on" || $(i) == "off")) {
if (onoff == "" || (onoff == "disabled" || onoff == "enabled") && ($(i) == "on" || $(i) == "off")) {
# It's easy to mis-spell the option when turning it
# on or off, so warn about it here:
if (onoff == "" && ($(i) == "on" || $(i) == "off")) {
@ -247,7 +249,7 @@ $1 == "option" && NF >= 2{
# option WRITE_NAME enables NAME
# [option WRITE_NAME off]
pre && $1 == "chunk" && NF >= 2{
pre != 0 && $1 == "chunk" && NF >= 2{
# 'chunk' is handled on the first pass by writing appropriate
# 'option' lines into the intermediate file.
onoff = ""
@ -278,12 +280,8 @@ pre && $1 == "chunk" && NF >= 2{
if (i > NF) {
# Output new 'option' lines to the intermediate file (out)
print "option READ_" $2,
"requires READ_ANCILLARY_CHUNKS" reqread,
"enables", $2, onoff >out
print "option WRITE_" $2,
"requires WRITE_ANCILLARY_CHUNKS" reqwrite,
"enables", $2, onoff >out
print "option READ_" $2, "requires READ_ANCILLARY_CHUNKS" reqread, "enables", $2, onoff >out
print "option WRITE_" $2, "requires WRITE_ANCILLARY_CHUNKS" reqwrite, "enables", $2, onoff >out
next
}
# Else hit the error handler below - bad line format!
@ -367,7 +365,8 @@ $1 == "=" && NF == 3{
# @ removed.
$1 ~ /^@/{
sub(/^[ ]*@/, "")
# sub(/^[ ]*@/, "")
$1 = substr($1, 2)
print >out
next
}
@ -406,8 +405,9 @@ END{
if (pre) {
# Record the variables
print "deb =", deb
if (everything != "")
if (everything != "") {
print "everything =", everything
}
print "logunsupported =", logunsupported
exit 0
}
@ -426,8 +426,9 @@ END{
for (i in setting) if (!doneset[i]) {
nreqs = split(setting[i], r)
if (nreqs > 0) {
for (j=1; j<=nreqs; ++j) if (!doneset[r[j]])
for (j=1; j<=nreqs; ++j) if (!doneset[r[j]]) {
break
}
if (j<=nreqs) {
finished = 0
continue # try a different setting
@ -441,15 +442,17 @@ END{
print "/* setting: ", i >out
print " * requires:" setting[i] >out
print " * default: ", defaults[i], "*/" >out
if (defaults[i] == "") # no default, only check if defined
if (defaults[i] == "") { # no default, only check if defined
print "#ifdef PNG_" i >out
}
for (j=1; j<=nreqs; ++j) {
print "# ifndef PNG_" r[j] >out
print error, i, "requires", r[j] end >out
print "# endif" >out
}
if (defaults[i] != "") # default handling
if (defaults[i] != "") { # default handling
print "#ifdef PNG_" i >out
}
print def i, "PNG_" i end >out
if (defaults[i] != "") {
print "#else /*default*/" >out
@ -466,8 +469,9 @@ END{
if (!finished && !movement) {
print "setting: loop or missing setting in 'requires', cannot process:"
for (i in setting) if (!doneset[i])
for (i in setting) if (!doneset[i]) {
print " setting", i, "requires" setting[i]
}
exit 1
}
}
@ -527,8 +531,9 @@ END{
# Error out if we have to turn 'on' an 'off' option or vice versa.
npending = 0
for (opt in option) if (opt != "") {
if (option[opt] == "on" || option[opt] == "off")
if (option[opt] == "on" || option[opt] == "off") {
pending[++npending] = opt
}
}
err = 0 # set on error
@ -573,8 +578,9 @@ END{
for (i in option) if (!done[i]) {
nreqs = split(tree[i], r)
if (nreqs > 0) {
for (j=1; j<=nreqs; ++j) if (!done[r[j]])
for (j=1; j<=nreqs; ++j) if (!done[r[j]]) {
break
}
if (j<=nreqs) {
finished = 0
continue # next option
@ -613,8 +619,9 @@ END{
# this error appears in the final output if something
# was switched 'on' but the processing above to force
# the requires did not work
if (option[i] == "on")
if (option[i] == "on") {
print error, i, "requires", r[j] end >out
}
print "#endif" >out
}
@ -634,8 +641,9 @@ END{
# There is no checking above for this, because we
# don't know which 'if' to choose, so whine about
# it here:
if (option[i] == "on")
if (option[i] == "on") {
print error, i, "needs one of:", iffs[i] end >out
}
print "#endif" >out
}
@ -650,16 +658,15 @@ END{
print "# undef PNG_not_enabled /*" r[j] "*/" >out
# Oops, probably not intended (should be factored
# out by the checks above).
if (option[i] == "off")
if (option[i] == "off") {
print error, i, "enabled by:", r[j] end >out
}
print "#endif" >out
}
print "# ifndef PNG_" i "_SUPPORTED /*!command line*/" >out
print "# ifdef PNG_not_enabled /*!enabled*/" >out
if (option[i] == "off" ||
option[i] == "disabled" && everything != "on" ||
option[i] == "enabled" && everything == "off") {
if (option[i] == "off" || option[i] == "disabled" && everything != "on" || option[i] == "enabled" && everything == "off") {
print "# undef PNG_on /*default off*/" >out
} else {
print "# ifdef PNG_NO_" i >out
@ -679,18 +686,21 @@ END{
# If PNG_on is still set the option should be defined in
# pnglibconf.h
print "# ifdef PNG_on" >out
if (i ~ /^fail_/)
if (i ~ /^fail_/) {
print error, i, "is on: enabled by:" iffs[i] enabledby[i] ", requires" requires[i] end >out
else if (i !~ /^ok_/)
} else if (i !~ /^ok_/) {
print def i sup >out
}
print "# endif /* definition */" >out
print "#endif /*requires, if*/" >out
if (logunsupported || i ~ /^ok_/) {
print "#ifndef PNG_on" >out
if (logunsupported)
if (logunsupported) {
print und i une >out
if (i ~ /^ok_/)
}
if (i ~ /^ok_/) {
print error, i, "not enabled: requires:" requires[i] ", enabled by:" iffs[i] enabledby[i] end >out
}
print "#endif" >out
}
@ -703,8 +713,9 @@ END{
for (i in option) if (!done[i]) {
print " option", i, "depends on" tree[i], "needs:"
nreqs = split(tree[i], r)
if (nreqs > 0) for (j=1; j<=nreqs; ++j) if (!done[r[j]])
if (nreqs > 0) for (j=1; j<=nreqs; ++j) if (!done[r[j]]) {
print " " r[j]
}
}
exit 1
}
@ -712,6 +723,7 @@ END{
print comment, "end of options", cend >out
# Regular end - everything looks ok
if (protect != "")
if (protect != "") {
print start "#endif", cx, protect, "*/" end >out
}
}

29
scripts/options.patch Normal file
View File

@ -0,0 +1,29 @@
diff -u pnglibconf.mak{.orig,}
--- pnglibconf.mak.orig 2010-06-21 09:38:08.000000000 -0700
+++ pnglibconf.mak 2010-06-21 09:43:34.000000000 -0700
@@ -5,8 +5,13 @@
# how to automate the build of pnglibconf.h from scripts/pnglibconf.dfa
# given 'awk' and 'sed'
-# Override as appropriate:
-AWK = awk
+# Override as appropriate, these definitions can be overridden on
+# the make command line (AWK='nawk' for example).
+AWK = gawk
+AWK = mawk
+AWK = nawk
+AWK = one-true-awk
+AWK = awk # Crashes on SunOS 5.10 - use 'nawk'
SED = sed
CPP = $(CC) -E
COPY = cp
@@ -36,6 +41,8 @@
pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk
$(DELETE) $@ dfn1.out dfn2.out
+ $(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2
+ $(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2
$(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out\
$(srcdir)/scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
$(AWK) -f $(srcdir)/scripts/options.awk out=dfn2.out dfn1.out 1>&2
jbowler@marsco:~/src/libpng/libpng-1.5.0beta28/scripts$

2
scripts/pnglibconf.dfa
View File

@ -6,7 +6,7 @@
#
com pnglibconf.h - library build configuration
com
com libpng version PNGLIB_VERSION - last changed on June 20, 2010
com libpng version PNGLIB_VERSION - last changed on June 21, 2010
com
com Copyright (c) 1998-2010 Glenn Randers-Pehrson
com

4
scripts/pnglibconf.h
View File

@ -1,7 +1,7 @@
/* libpng-1.5.0beta28 STANDARD API DEFINITION */
/* libpng-1.5.0beta29 STANDARD API DEFINITION */
/* pnglibconf.h - library build configuration */
/* last changed in libpng version 1.5.0 - June 20, 2010 */
/* last changed in libpng version 1.5.0 - June 21, 2010 */
/* Copyright (c) 1998-2010 Glenn Randers-Pehrson */

11
scripts/pnglibconf.mak
View File

@ -5,8 +5,13 @@
# how to automate the build of pnglibconf.h from scripts/pnglibconf.dfa
# given 'awk' and 'sed'
# Override as appropriate:
AWK = awk
# Override as appropriate, these definitions can be overridden on
# the make command line (AWK='nawk' for example).
AWK = gawk
AWK = mawk
AWK = nawk
AWK = one-true-awk
AWK = awk # Crashes on SunOS 5.10 - use 'nawk'
SED = sed
CPP = $(CC) -E
COPY = cp
@ -36,6 +41,8 @@ pnglibconf.h: pnglibconf.dfn
pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk
$(DELETE) $@ dfn1.out dfn2.out
$(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2
$(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2
$(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out\
$(srcdir)/scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
$(AWK) -f $(srcdir)/scripts/options.awk out=dfn2.out dfn1.out 1>&2

17
scripts/pnglibconf.mak.rej Normal file
View File

@ -0,0 +1,17 @@
***************
*** 36,41 ****
pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk
$(DELETE) $@ dfn1.out dfn2.out
$(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out\
$(srcdir)/scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
$(AWK) -f $(srcdir)/scripts/options.awk out=dfn2.out dfn1.out 1>&2
--- 41,48 ----
pnglibconf.dfn: $(srcdir)/scripts/pnglibconf.dfa $(srcdir)/scripts/options.awk
$(DELETE) $@ dfn1.out dfn2.out
+ $(ECHO) "Calling $(AWK) from scripts/pnglibconf.mak" >&2
+ $(ECHO) "If 'awk' crashes try a better awk (e.g. AWK='nawk')" >&2
$(AWK) -f $(srcdir)/scripts/options.awk out=dfn1.out\
$(srcdir)/scripts/pnglibconf.dfa $(DFA_XTRA) 1>&2
$(AWK) -f $(srcdir)/scripts/options.awk out=dfn2.out dfn1.out 1>&2

2
scripts/pngwin.def
View File

@ -11,7 +11,7 @@ LIBRARY
;OS2 CODE PRELOAD MOVEABLE DISCARDABLE
EXPORTS
;Version 1.5.0beta28
;Version 1.5.0beta29
png_access_version_number @1
png_set_sig_bytes @2
png_sig_cmp @3

2
scripts/pngwin.dfn
View File

@ -1,7 +1,7 @@
/* pngwin.dfn - define format of pngwin.def
*
* Last changed in libpng version 1.5.0 [June 20, 2010]
* Last changed in libpng version 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.

2
scripts/sym.dfn
View File

@ -1,7 +1,7 @@
/* sym.dfn - define format of libpng.sym
*
* Last changed in libpng version 1.5.0 [June 20, 2010]
* Last changed in libpng version 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.

2
scripts/symbols.def
View File

@ -5,7 +5,7 @@
LIBRARY
EXPORTS
;Version 1.5.0beta28
;Version 1.5.0beta29
png_access_version_number @1
png_set_sig_bytes @2
png_sig_cmp @3

2
scripts/symbols.dfn
View File

@ -1,7 +1,7 @@
/* symbols.dfn - find all exported symbols
*
* Last changed in libpng version 1.5.0 [June 20, 2010]
* Last changed in libpng version 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.

2
scripts/vers.dfn
View File

@ -1,7 +1,7 @@
/* vers.dfn - define format of libpng.vers
*
* Last changed in libpng version 1.5.0 [June 20, 2010]
* Last changed in libpng version 1.5.0 [June 21, 2010]
* Copyright (c) 1998-2010 Glenn Randers-Pehrson
*
* This code is released under the libpng license.