[master] Imported from libpng-1.2.38rc02.tar
diff --git a/ANNOUNCE b/ANNOUNCE
index 42a7109..a95454f 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,5 +1,5 @@
-Libpng 1.2.38rc01 - June 24, 2009
+Libpng 1.2.38rc02 - June 29, 2009
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,37 +9,37 @@
Source files with LF line endings (for Unix/Linux) and with a
"configure" script
- libpng-1.2.38rc01.tar.gz
- libpng-1.2.38rc01.tar.lzma
+ libpng-1.2.38rc02.tar.gz
+ libpng-1.2.38rc02.tar.lzma
(Get the lzma codec from <http://tukaani.org/lzma>).
- libpng-1.2.38rc01.tar.bz2
+ libpng-1.2.38rc02.tar.bz2
Source files with LF line endings (for Unix/Linux) without the
"configure" script
- libpng-1.2.38rc01-no-config.tar.gz
- libpng-1.2.38rc01-no-config.tar.lzma
- libpng-1.2.38rc01-no-config.tar.bz2
+ libpng-1.2.38rc02-no-config.tar.gz
+ libpng-1.2.38rc02-no-config.tar.lzma
+ libpng-1.2.38rc02-no-config.tar.bz2
Source files with CRLF line endings (for Windows), without the
"configure" script
- lp1238r01.zip
- lp1238r01.7z
- lp1238r01.tar.bz2
+ lp1238r02.zip
+ lp1238r02.7z
+ lp1238r02.tar.bz2
Project files
- libpng-1.2.38rc01-project-netware.zip
- libpng-1.2.38rc01-project-wince.zip
+ libpng-1.2.38rc02-project-netware.zip
+ libpng-1.2.38rc02-project-wince.zip
Other information:
- libpng-1.2.38rc01-README.txt
- libpng-1.2.38rc01-KNOWNBUGS.txt
- libpng-1.2.38rc01-LICENSE.txt
- libpng-1.2.38rc01-Y2K-compliance.txt
- libpng-1.2.38rc01-[previous version]-diff.txt
+ libpng-1.2.38rc02-README.txt
+ libpng-1.2.38rc02-KNOWNBUGS.txt
+ libpng-1.2.38rc02-LICENSE.txt
+ libpng-1.2.38rc02-Y2K-compliance.txt
+ libpng-1.2.38rc02-[previous version]-diff.txt
Changes since the last public release (1.2.36):
@@ -95,6 +95,10 @@
version 1.2.38rc01 [June 24, 2009]
No changes.
+version 1.2.38rc02 [June 29, 2009]
+ Added a reference to the libpng license in each source file.
+
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
diff --git a/CHANGES b/CHANGES
index 9102e83..7ec782c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2422,6 +2422,9 @@
version 1.2.38rc01 [June 24, 2009]
No changes.
+version 1.2.38rc02 [June 29, 2009]
+ Added a reference to the libpng license in each source file.
+
Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit
https://lists.sourceforge.net/lists/listinfo/png-mng-implement
diff --git a/INSTALL b/INSTALL
index e05ee4d..b9a904c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.2.38rc01 - June 24, 2009
+Installing libpng version 1.2.38rc02 - June 29, 2009
On Unix/Linux and similar systems, you can simply type
@@ -44,7 +44,7 @@
correspond to the version of zlib that's installed.
You can rename the directories that you downloaded (they
-might be called "libpng-1.2.38rc01" or "lpng109" and "zlib-1.2.1"
+might be called "libpng-1.2.38rc02" 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,9 +101,9 @@
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.38rc01)
+ gcc, creates libpng12.so.0.1.2.38rc02)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.38rc01)
+ (gcc, creates libpng12.so.0.1.2.38rc02)
makefile.gcc => Generic makefile (gcc, creates static libpng.a)
makefile.knr => Archaic UNIX Makefile that converts files with
ansi2knr (Requires ansi2knr.c from
@@ -125,14 +125,14 @@
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.38rc01)
+ creates libpng12.so.0.1.2.38rc02)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile (gcc,
- creates libpng12.so.0.1.2.38rc01)
+ creates libpng12.so.0.1.2.38rc02)
makefile.solaris-x86 => Solaris/intelMMX 2.X makefile (gcc,
- creates libpng12.so.0.1.2.38rc01)
+ creates libpng12.so.0.1.2.38rc02)
makefile.so9 => Solaris 9 makefile (gcc,
- creates libpng12.so.0.1.2.38rc01)
+ creates libpng12.so.0.1.2.38rc02)
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
diff --git a/KNOWNBUG b/KNOWNBUG
index a8336d4..902e6aa 100644
--- a/KNOWNBUG
+++ b/KNOWNBUG
@@ -1,5 +1,5 @@
-Known bugs in libpng version 1.2.38rc01
+Known bugs in libpng version 1.2.38rc02
1. February 23, 2006: The custom makefiles don't build libpng with -lz.
diff --git a/LICENSE b/LICENSE
index 18bebe4..21ebc0c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,9 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.38rc01, June 24, 2009, are
+This code is released under the libpng license.
+
+libpng versions 1.2.6, August 15, 2004, through 1.2.38rc02, June 29, 2009, are
Copyright (c) 2004, 2006-2009 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 +108,4 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-June 24, 2009
+June 29, 2009
diff --git a/Makefile.am b/Makefile.am
index 8132bc5..5265fa1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,7 +86,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.2.38rc01.txt pngvcrd.c
+ example.c libpng-1.2.38rc02.txt pngvcrd.c
CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
diff --git a/Makefile.in b/Makefile.in
index 287beef..4fe8993 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -333,7 +333,7 @@
${srcdir}/contrib/pngsuite/* \
${srcdir}/contrib/visupng/* \
$(TESTS) \
- example.c libpng-1.2.38rc01.txt pngvcrd.c
+ example.c libpng-1.2.38rc02.txt pngvcrd.c
CLEANFILES = pngout.png libpng12.pc libpng12-config libpng.vers \
libpng.sym
diff --git a/README b/README
index c5f6a79..ecb65db 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.2.38rc01 - June 24, 2009 (shared library 12.0)
+README for libpng version 1.2.38rc02 - June 29, 2009 (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.
@@ -194,11 +194,11 @@
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.38rc01)
+ gcc, creates libpng12.so.0.1.2.38rc02)
makefile.linux => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.38rc01)
+ (gcc, creates libpng12.so.0.1.2.38rc02)
makefile.gcmmx => Linux/ELF makefile
- (gcc, creates libpng12.so.0.1.2.38rc01,
+ (gcc, creates libpng12.so.0.1.2.38rc02,
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
@@ -220,12 +220,12 @@
makefile.openbsd => OpenBSD makefile
makefile.sgi => Silicon Graphics IRIX (cc, creates static lib)
makefile.sggcc => Silicon Graphics
- (gcc, creates libpng12.so.0.1.2.38rc01)
+ (gcc, creates libpng12.so.0.1.2.38rc02)
makefile.sunos => Sun makefile
makefile.solaris => Solaris 2.X makefile
- (gcc, creates libpng12.so.0.1.2.38rc01)
+ (gcc, creates libpng12.so.0.1.2.38rc02)
makefile.so9 => Solaris 9 makefile
- (gcc, creates libpng12.so.0.1.2.38rc01)
+ (gcc, creates libpng12.so.0.1.2.38rc02)
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
diff --git a/TODO b/TODO
index a5f6395..face765 100644
--- a/TODO
+++ b/TODO
@@ -22,3 +22,4 @@
Use greater precision when changing to linear gamma for compositing against
background and doing rgb-to-gray transformation.
Investigate pre-incremented loop counters and other loop constructions.
+Add interpolated method of handling interlacing.
diff --git a/Y2KINFO b/Y2KINFO
index dff1b84..416142a 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
Y2K compliance in libpng:
=========================
- June 24, 2009
+ June 29, 2009
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.38rc01 are Y2K compliant. It is my belief that earlier
+ upward through 1.2.38rc02 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
diff --git a/configure b/configure
index abf57e3..512df1a 100755
--- a/configure
+++ b/configure
Binary files differ
diff --git a/configure.ac b/configure.ac
index 2be8b2f..df84dd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,12 +18,12 @@
dnl Version number stuff here:
-AC_INIT([libpng], [1.2.38rc01], [png-mng-implement@lists.sourceforge.net])
+AC_INIT([libpng], [1.2.38rc02], [png-mng-implement@lists.sourceforge.net])
AM_INIT_AUTOMAKE
dnl stop configure from automagically running automake
AM_MAINTAINER_MODE
-PNGLIB_VERSION=1.2.38rc01
+PNGLIB_VERSION=1.2.38rc02
PNGLIB_MAJOR=1
PNGLIB_MINOR=2
PNGLIB_RELEASE=38
diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h
index e4e3b19..4502c30 100644
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -1,6 +1,11 @@
/* minrdpngconf.h: headers to make a minimal png-read-only library
- * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 2007 Glenn Randers-Pehrson
+ *
+ * Copyright (c) 2007, 2009 Glenn Randers-Pehrson
+ *
+ * This code is released under the zlib/libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
*/
diff --git a/contrib/pngminim/encoder/pngusr.h b/contrib/pngminim/encoder/pngusr.h
index 65953c6..9f58c98 100644
--- a/contrib/pngminim/encoder/pngusr.h
+++ b/contrib/pngminim/encoder/pngusr.h
@@ -1,6 +1,11 @@
/* minwrpngconf.h: headers to make a minimal png-write-only library
- * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 2007 Glenn Randers-Pehrson
+ *
+ * Copyright (c) 2007, 2009 Glenn Randers-Pehrson
+ *
+ * This code is released under the zlib/libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
*/
diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h
index f3b0038..b9269a8 100644
--- a/contrib/pngminim/preader/pngusr.h
+++ b/contrib/pngminim/preader/pngusr.h
@@ -1,11 +1,16 @@
/* minrdpngconf.h: headers to make a minimal png-read-only library
- * For conditions of distribution and use, see copyright notice in png.h
- * Copyright (c) 2007 Glenn Randers-Pehrson
+ *
+ * Copyright (c) 2009 Glenn Randers-Pehrson
+ *
+ * This code is released under the zlib/libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* Derived from pngcrush.h, Copyright 1998-2007, Glenn Randers-Pehrson
*/
-#ifndef MINRDPNGCONF_H
-#define MINRDPNGCONF_H
+#ifndef MINPRDPNGCONF_H
+#define MINPRDPNGCONF_H
#define PNG_NO_GLOBAL_ARRAYS
@@ -60,4 +65,4 @@
#define PNG_NO_ERROR_NUMBERS
#define PNG_NO_EASY_ACCESS
-#endif /* MINRDPNGCONF_H */
+#endif /* MINPRDPNGCONF_H */
diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c
index 959afe9..b5e1259 100644
--- a/contrib/visupng/PngFile.c
+++ b/contrib/visupng/PngFile.c
@@ -2,8 +2,11 @@
// PNGFILE.C -- Image File Functions
//-------------------------------------
-// Copyright 2000, Willem van Schaik. For conditions of distribution and
-// use, see the copyright/license/disclaimer notice in png.h
+// Copyright 2000, Willem van Schaik.
+//
+// This code is released under the libpng license.
+// For conditions of distribution and use, see the
+// copyright/license/disclaimer notice in png.h
#include <windows.h>
#include <commdlg.h>
diff --git a/contrib/visupng/README.txt b/contrib/visupng/README.txt
index 4a753d8..deee654 100644
--- a/contrib/visupng/README.txt
+++ b/contrib/visupng/README.txt
@@ -1,8 +1,11 @@
Microsoft Developer Studio Build File, Format Version 6.00 for VisualPng
------------------------------------------------------------------------
-Copyright 2000, Willem van Schaik. For conditions of distribution and
-use, see the copyright/license/disclaimer notice in png.h
+Copyright 2000, Willem van Schaik.
+
+This code is released under the libpng license.
+For conditions of distribution and use, see the
+copyright/license/disclaimer notice in png.h
As a PNG .dll demo VisualPng is finished. More features would only hinder
the program's objective. However, further extensions (like support for other
diff --git a/contrib/visupng/VisualPng.c b/contrib/visupng/VisualPng.c
index f2cf6ee..1192384 100644
--- a/contrib/visupng/VisualPng.c
+++ b/contrib/visupng/VisualPng.c
@@ -2,8 +2,11 @@
// VisualPng.C -- Shows a PNG image
//------------------------------------
-// Copyright 2000, Willem van Schaik. For conditions of distribution and
-// use, see the copyright/license/disclaimer notice in png.h
+// Copyright 2000, Willem van Schaik.
+//
+// This code is released under the libpng license.
+// For conditions of distribution and use, see the
+// copyright/license/disclaimer notice in png.h
// switches
diff --git a/libpng-1.2.38rc01.txt b/libpng-1.2.38rc02.txt
similarity index 99%
rename from libpng-1.2.38rc01.txt
rename to libpng-1.2.38rc02.txt
index 076dfd8..d50897d 100644
--- a/libpng-1.2.38rc01.txt
+++ b/libpng-1.2.38rc02.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.38rc01 - June 24, 2009
+ libpng version 1.2.38rc02 - June 29, 2009
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -9,7 +9,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.2.38rc01 - June 24, 2009
+ libpng versions 0.97, January 1998, through 1.2.38rc02 - June 29, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -3047,13 +3047,13 @@
XIII. Y2K Compliance in libpng
-June 24, 2009
+June 29, 2009
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.38rc01 are Y2K compliant. It is my belief that earlier
+upward through 1.2.38rc02 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
diff --git a/libpng.3 b/libpng.3
index f27cf07..59e16c3 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "June 24, 2009"
+.TH LIBPNG 3 "June 29, 2009"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.38rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.38rc02
.SH SYNOPSIS
\fI\fB
@@ -821,7 +821,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.2.38rc01 - June 24, 2009
+ libpng version 1.2.38rc02 - June 29, 2009
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -830,7 +830,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.2.38rc01 - June 24, 2009
+ libpng versions 0.97, January 1998, through 1.2.38rc02 - June 29, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -3868,13 +3868,13 @@
.SH XIII. Y2K Compliance in libpng
-June 24, 2009
+June 29, 2009
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.38rc01 are Y2K compliant. It is my belief that earlier
+upward through 1.2.38rc02 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
@@ -4146,7 +4146,7 @@
1.2.45 10 10045 12.so.0.45[.0]
1.0.46 10 10046 10.so.0.46[.0]
1.2.38beta01 13 10238 12.so.0.38[.0]
- 1.2.38rc01 13 10238 12.so.0.38[.0]
+ 1.2.38rc01-02 13 10238 12.so.0.38[.0]
Henceforth the source version will match the shared-library minor
and patch numbers; the shared-library major version number will be
@@ -4202,7 +4202,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.2.38rc01 - June 24, 2009:
+Libpng version 1.2.38rc02 - June 29, 2009:
Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).
@@ -4223,7 +4223,9 @@
If you modify libpng you may insert additional notices immediately following
this sentence.
-libpng versions 1.2.6, August 15, 2004, through 1.2.38rc01, June 24, 2009, are
+This code is released under the libpng license.
+
+libpng versions 1.2.6, August 15, 2004, through 1.2.38rc02, June 29, 2009, are
Copyright (c) 2004,2006-2008 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
@@ -4322,7 +4324,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-June 24, 2009
+June 29, 2009
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index b17b73f..ff58e62 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "June 24, 2009"
+.TH LIBPNGPF 3 "June 29, 2009"
.SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.2.38rc01
+libpng \- Portable Network Graphics (PNG) Reference Library 1.2.38rc02
(private functions)
.SH SYNOPSIS
\fB#include <png.h>\fP
diff --git a/png.5 b/png.5
index 8a30b45..9c6c7bd 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "June 24, 2009"
+.TH PNG 5 "June 29, 2009"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.c b/png.c
index fad1c3a..c077834 100644
--- a/png.c
+++ b/png.c
@@ -2,10 +2,13 @@
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
*/
#define PNG_INTERNAL
@@ -13,7 +16,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_38rc01 Your_png_h_is_not_version_1_2_38rc01;
+typedef version_1_2_38rc02 Your_png_h_is_not_version_1_2_38rc02;
/* Version information for C files. This had better match the version
* string defined in png.h. */
@@ -702,7 +705,7 @@
png_get_copyright(png_structp png_ptr)
{
png_ptr = png_ptr; /* Silence compiler warning about unused png_ptr */
- return ((png_charp) "\n libpng version 1.2.38rc01 - June 24, 2009\n\
+ return ((png_charp) "\n libpng version 1.2.38rc02 - June 29, 2009\n\
Copyright (c) 1998-2009 Glenn Randers-Pehrson\n\
Copyright (c) 1996-1997 Andreas Dilger\n\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\n");
diff --git a/png.h b/png.h
index 16d8b3f..e7433f6 100644
--- a/png.h
+++ b/png.h
@@ -1,14 +1,16 @@
/* png.h - header file for PNG reference library
*
- * libpng version 1.2.38rc01 - June 24, 2009
+ * libpng version 1.2.38rc02 - June 29, 2009
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license (See LICENSE, below)
+ *
* 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.38rc01 - June 24, 2009: Glenn
+ * libpng versions 0.97, January 1998, through 1.2.38rc02 - June 29, 2009: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@@ -232,7 +234,7 @@
* 1.2.45 10 10045 12.so.0.45[.0]
* 1.0.46 10 10046 10.so.0.46[.0]
* 1.2.38beta01 13 10238 12.so.0.38[.0]
- * 1.2.38rc01 13 10238 12.so.0.38[.0]
+ * 1.2.38rc01-02 13 10238 12.so.0.38[.0]
*
* Henceforth the source version will match the shared-library major
* and minor numbers; the shared-library major version number will be
@@ -262,7 +264,9 @@
* If you modify libpng you may insert additional notices immediately following
* this sentence.
*
- * libpng versions 1.2.6, August 15, 2004, through 1.2.38rc01, June 24, 2009, are
+ * This code is released under the libpng license.
+ *
+ * libpng versions 1.2.6, August 15, 2004, through 1.2.38rc02, June 29, 2009, are
* Copyright (c) 2004, 2006-2009 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:
@@ -374,13 +378,13 @@
* Y2K compliance in libpng:
* =========================
*
- * June 24, 2009
+ * June 29, 2009
*
* 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.38rc01 are Y2K compliant. It is my belief that earlier
+ * upward through 1.2.38rc02 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
@@ -436,9 +440,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.2.38rc01"
+#define PNG_LIBPNG_VER_STRING "1.2.38rc02"
#define PNG_HEADER_VERSION_STRING \
- " libpng version 1.2.38rc01 - June 24, 2009\n"
+ " libpng version 1.2.38rc02 - June 29, 2009\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@@ -451,7 +455,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
-#define PNG_LIBPNG_VER_BUILD 01
+#define PNG_LIBPNG_VER_BUILD 02
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@@ -1503,7 +1507,7 @@
/* 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_38rc01;
+typedef png_structp version_1_2_38rc02;
typedef png_struct FAR * FAR * png_structpp;
diff --git a/pngconf.h b/pngconf.h
index 38ffe31..99466ce 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
- * libpng version 1.2.38rc01 - June 24, 2009
+ * libpng version 1.2.38rc02 - June 29, 2009
* For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngerror.c b/pngerror.c
index 71a2e53..d68416b 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -2,11 +2,14 @@
/* pngerror.c - stub functions for i/o and memory allocation
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* This file provides a location for all error handling. Users who
* need special error handling are expected to write replacement functions
* and use png_set_error_fn() to use those functions. See the instructions
diff --git a/pngget.c b/pngget.c
index 40283c3..38e4f9e 100644
--- a/pngget.c
+++ b/pngget.c
@@ -2,10 +2,14 @@
/* pngget.c - retrieval of values from info struct
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
*/
#define PNG_INTERNAL
diff --git a/pngmem.c b/pngmem.c
index d1999b6..e190cc3 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -2,11 +2,14 @@
/* pngmem.c - stub functions for memory allocation
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* This file provides a location for all memory allocation. Users who
* need special memory handling are expected to supply replacement
* functions for png_malloc() and png_free(), and to use
diff --git a/pngpread.c b/pngpread.c
index 1dcfea6..ebc091c 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,11 +1,14 @@
/* pngpread.c - read a png file in push mode
*
- * Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
+ * Last changed in libpng 1.2.37 [June 29, 2009]
* Copyright (c) 1998-2009 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.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
*/
#define PNG_INTERNAL
@@ -1387,7 +1390,7 @@
tmp = text;
text = (png_charp)png_malloc(png_ptr, text_size +
- (png_uint_32)(png_ptr->zbuf_size
+ (png_uint_32)(png_ptr->zbuf_size
- png_ptr->zstream.avail_out + 1));
png_memcpy(text, tmp, text_size);
@@ -1609,7 +1612,7 @@
}
#endif
png_memcpy((png_charp)png_ptr->unknown_chunk.name,
- (png_charp)png_ptr->chunk_name,
+ (png_charp)png_ptr->chunk_name,
png_sizeof(png_ptr->unknown_chunk.name));
png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name) - 1]
= '\0';
diff --git a/pngread.c b/pngread.c
index 601d14e..a4cbb3e 100644
--- a/pngread.c
+++ b/pngread.c
@@ -2,11 +2,14 @@
/* pngread.c - read a PNG file
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* This file contains routines that an application calls directly to
* read a PNG file or stream.
*/
diff --git a/pngrio.c b/pngrio.c
index 2c8e6a7..2267bca 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -2,11 +2,14 @@
/* pngrio.c - functions for data input
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* This file provides a location for all input. Users who need
* special handling are expected to write a function that has the same
* arguments as this and performs a similar function, but that possibly
diff --git a/pngrtran.c b/pngrtran.c
index aacc21d..5cad3df 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,12 +1,15 @@
/* pngrtran.c - transforms the data in a row for PNG readers
*
- * Last changed in libpng 1.2.38 [June 24, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
+ * Last changed in libpng 1.2.38 [June 29, 2009]
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* This file contains functions optionally called by an application
* in order to tell libpng how to handle data when reading a PNG.
* Transformations that are used in both reading and writing are
@@ -714,8 +717,8 @@
#endif
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
- defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
- defined(PNG_LEGACY_SUPPORTED)
+ defined(PNG_LEGACY_SUPPORTED) || \
+ defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
void PNGAPI
png_set_read_user_transform_fn(png_structp png_ptr, png_user_transform_ptr
read_user_transform_fn)
diff --git a/pngrutil.c b/pngrutil.c
index 94dd571..958e00d 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,12 +1,15 @@
/* pngrutil.c - utilities to read a PNG file
*
- * Last changed in libpng 1.2.38 [June 24, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
+ * Last changed in libpng 1.2.38 [June 29, 2009]
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* This file contains routines that are only called from within
* libpng itself during the course of reading an image.
*/
diff --git a/pngset.c b/pngset.c
index 0f7ac97..9be0f9b 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,12 +1,15 @@
/* pngset.c - storage of image information into info struct
*
- * Last changed in libpng 1.2.38 [June 24, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
+ * Last changed in libpng 1.2.38 [June 29, 2009]
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* The functions here are used during reads to store data from the file
* into the info struct, and during writes to store application data
* into the info struct for writing into the file. This abstracts the
diff --git a/pngtest.c b/pngtest.c
index f2676e6..b358fcf 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -2,11 +2,14 @@
/* pngtest.c - a simple test program to test libpng
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* This program reads in a PNG image, writes it out again, and then
* compares the two files. If the files are identical, this shows that
* the basic chunk handling, filtering, and (de)compression code is working
@@ -1686,4 +1689,4 @@
}
/* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_2_38rc01 your_png_h_is_not_version_1_2_38rc01;
+typedef version_1_2_38rc02 your_png_h_is_not_version_1_2_38rc02;
diff --git a/pngtrans.c b/pngtrans.c
index f221f54..6e1870c 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -2,10 +2,13 @@
/* pngtrans.c - transforms the data in a row (used by both readers and writers)
*
* Last changed in libpng 1.2.36 [May 14, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
*/
#define PNG_INTERNAL
@@ -634,8 +637,8 @@
#endif /* PNG_READ_BGR_SUPPORTED or PNG_WRITE_BGR_SUPPORTED */
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
- defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED) || \
- defined(PNG_LEGACY_SUPPORTED)
+ defined(PNG_LEGACY_SUPPORTED) || \
+ defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
void PNGAPI
png_set_user_transform_info(png_structp png_ptr, png_voidp
user_transform_ptr, int user_transform_depth, int user_transform_channels)
diff --git a/pngwio.c b/pngwio.c
index 740b71d..f77b2db 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -2,11 +2,14 @@
/* pngwio.c - functions for data output
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
*
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
+ *
* This file provides a location for all output. Users who need
* special handling are expected to write functions that have the same
* arguments as these and perform similar functions, but that possibly
diff --git a/pngwrite.c b/pngwrite.c
index bd6263c..0987612 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -2,10 +2,13 @@
/* pngwrite.c - general routines to write a PNG file
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
*/
/* Get internal access to png.h */
diff --git a/pngwtran.c b/pngwtran.c
index ac56339..88a7d3c 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -2,10 +2,13 @@
/* pngwtran.c - transforms the data in a row for PNG writers
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
*/
#define PNG_INTERNAL
diff --git a/pngwutil.c b/pngwutil.c
index 5adfe3b..cd0d3d3 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -2,10 +2,13 @@
/* pngwutil.c - utilities to write a PNG file
*
* Last changed in libpng 1.2.37 [June 4, 2009]
- * For conditions of distribution and use, see copyright notice in png.h
* Copyright (c) 1998-2009 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.)
+ *
+ * This code is released under the libpng license.
+ * For conditions of distribution and use, see the disclaimer
+ * and license in png.h
*/
#define PNG_INTERNAL
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 85933f2..59e22c7 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -2,7 +2,10 @@
project(PNG)
# Copyright (C) 2007 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
set(PNGLIB_MAJOR 1)
set(PNGLIB_MINOR 2)
@@ -169,7 +172,7 @@
# SET UP LINKS
set_target_properties(${PNG_LIB_NAME} PROPERTIES
-# VERSION 0.${PNGLIB_RELEASE}.1.2.38rc01
+# VERSION 0.${PNGLIB_RELEASE}.1.2.38rc02
VERSION 0.${PNGLIB_RELEASE}.0
SOVERSION 0
CLEAN_DIRECT_OUTPUT 1)
diff --git a/scripts/libpng-config-head.in b/scripts/libpng-config-head.in
index 740167f..46e210b 100755
--- a/scripts/libpng-config-head.in
+++ b/scripts/libpng-config-head.in
@@ -4,11 +4,14 @@
# provides configuration info for libpng.
# Copyright (C) 2002 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Modeled after libxml-config.
-version=1.2.38rc01
+version=1.2.38rc02
prefix=""
libdir=""
libs=""
diff --git a/scripts/libpng-config.in b/scripts/libpng-config.in
index 2f475be..7ae7d50 100755
--- a/scripts/libpng-config.in
+++ b/scripts/libpng-config.in
@@ -4,7 +4,10 @@
# provides configuration info for libpng.
# Copyright (C) 2002, 2004, 2006, 2007 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Modeled after libxml-config.
diff --git a/scripts/libpng.icc b/scripts/libpng.icc
index f9c51af..6635963 100644
--- a/scripts/libpng.icc
+++ b/scripts/libpng.icc
@@ -1,13 +1,16 @@
// Project file for libpng (static)
// IBM VisualAge/C++ version 4.0 or later
// Copyright (C) 2000 Cosmin Truta
-// For conditions of distribution and use, see copyright notice in png.h
+//
+// This code is released under the libpng license.
+// For conditions of distribution and use, see the disclaimer
+// and license in png.h
+//
// Notes:
// All modules are compiled in C mode
// Tested with IBM VAC++ 4.0 under Win32
// Expected to work with IBM VAC++ 4.0 or later under OS/2 and Win32
// Can be easily adapted for IBM VAC++ 4.0 or later under AIX
-// For conditions of distribution and use, see copyright notice in png.h
option incl(searchpath, "../zlib"), opt(level, "2"),
link(libsearchpath, "../zlib")
diff --git a/scripts/libpng.pc.in b/scripts/libpng.pc.in
index c549a98..87b8d51 100644
--- a/scripts/libpng.pc.in
+++ b/scripts/libpng.pc.in
@@ -5,6 +5,6 @@
Name: libpng
Description: Loads and saves PNG files
-Version: 1.2.38rc01
+Version: 1.2.38rc02
Libs: -L${libdir} -lpng12
Cflags: -I${includedir}
diff --git a/scripts/makefile.32sunu b/scripts/makefile.32sunu
index 37f686e..1b740be 100644
--- a/scripts/makefile.32sunu
+++ b/scripts/makefile.32sunu
@@ -3,12 +3,15 @@
# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.64sunu b/scripts/makefile.64sunu
index b8203cb..8ffdd45 100644
--- a/scripts/makefile.64sunu
+++ b/scripts/makefile.64sunu
@@ -3,12 +3,15 @@
# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.aix b/scripts/makefile.aix
index e32c770..ff0ba46 100644
--- a/scripts/makefile.aix
+++ b/scripts/makefile.aix
@@ -3,7 +3,10 @@
# Copyright (C) 2000 Cosmin Truta
# Copyright (C) 2000 Marc O. Gloor (AIX support added, from makefile.gcc)
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Location of the zlib library and include files
ZLIBINC = ../zlib
@@ -20,7 +23,7 @@
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
prefix=/usr/local
diff --git a/scripts/makefile.amiga b/scripts/makefile.amiga
index 79cb424..50977c7 100644
--- a/scripts/makefile.amiga
+++ b/scripts/makefile.amiga
@@ -1,7 +1,10 @@
# Commodore Amiga Makefile
# makefile for libpng and SAS C V6.5x compiler
# Copyright (C) 1995-2000 Wolf Faust
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
#
# Note: Use #define PNG_READ_BIG_ENDIAN_SUPPORTED in pngconf.h
#
diff --git a/scripts/makefile.atari b/scripts/makefile.atari
index 9566d5d..944337d 100644
--- a/scripts/makefile.atari
+++ b/scripts/makefile.atari
@@ -1,8 +1,12 @@
# makefile for libpng
# Copyright (C) 2002 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
-# modified for LC56/ATARI assumes libz.lib is in same dir and uses default
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
+# Modified for LC56/ATARI assumes libz.lib is in same dir and uses default
# rules for library management
#
CFLAGS=-I..\zlib -O
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index f2d41e6..c466fe0 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -3,12 +3,15 @@
# Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson
# Copyright (C) 1999 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.cygwin b/scripts/makefile.cygwin
index 6c0b5b1..458bc7e 100644
--- a/scripts/makefile.cygwin
+++ b/scripts/makefile.cygwin
@@ -7,7 +7,10 @@
# and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:
# Copyright (C) 1998-2000 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# This makefile intends to support building outside the src directory
# if desired. When invoking it, specify an argument to SRCDIR on the
@@ -74,7 +77,7 @@
LIBNAME = libpng12
PNGMAJ = 0
CYGDLL = 12
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=cygpng$(CYGDLL).dll
diff --git a/scripts/makefile.darwin b/scripts/makefile.darwin
index 1e8ce8a..9c17793 100644
--- a/scripts/makefile.darwin
+++ b/scripts/makefile.darwin
@@ -4,7 +4,10 @@
# derived from makefile.linux:
# Copyright (C) 1998, 1999 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
prefix=/usr/local
@@ -19,7 +22,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 12
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index f6277bc..24a7499 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -1,11 +1,14 @@
# makefile for libpng on DEC Alpha Unix
# Copyright (C) 2000-2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.dj2 b/scripts/makefile.dj2
index ac6ffd8..28821a4 100644
--- a/scripts/makefile.dj2
+++ b/scripts/makefile.dj2
@@ -1,7 +1,10 @@
# DJGPP (DOS gcc) makefile for libpng
# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# where make install will put libpng.a and png.h
#prefix=/usr/local
diff --git a/scripts/makefile.elf b/scripts/makefile.elf
index 87ac91a..bb87ad1 100644
--- a/scripts/makefile.elf
+++ b/scripts/makefile.elf
@@ -2,7 +2,10 @@
# Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs
# and Glenn Randers-Pehrson
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Modified for Debian by Junichi Uekawa and Josselin Mouette
# Major modifications are:
@@ -13,7 +16,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.freebsd b/scripts/makefile.freebsd
index f10f1e6..d9df1ee 100644
--- a/scripts/makefile.freebsd
+++ b/scripts/makefile.freebsd
@@ -1,6 +1,9 @@
# makefile for libpng under FreeBSD
# Copyright (C) 2002, 2007, 2009 Glenn Randers-Pehrson and Andrey A. Chernov
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
PREFIX?= /usr/local
SHLIB_VER?= 5
diff --git a/scripts/makefile.gcc b/scripts/makefile.gcc
index 83aec8b..d1fb867 100644
--- a/scripts/makefile.gcc
+++ b/scripts/makefile.gcc
@@ -2,7 +2,10 @@
# Copyright (C) 2008 Glenn Randers-Pehrson
# Copyright (C) 2000 Cosmin Truta
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Location of the zlib library and include files
ZLIBINC = ../zlib
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index f7a0b25..e3078d8 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -3,7 +3,10 @@
# Copyright 2002, 2006, 2008 Greg Roelofs and Glenn Randers-Pehrson
# Copyright 1998-2001 Greg Roelofs
# Copyright 1996-1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# CAUTION: Do not use this makefile with gcc versions 2.7.2.2 and earlier.
@@ -14,7 +17,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hp64 b/scripts/makefile.hp64
index 313431f..abd800e 100644
--- a/scripts/makefile.hp64
+++ b/scripts/makefile.hp64
@@ -2,7 +2,10 @@
# Copyright (C) 1999-2002, 2006, 2009 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42
# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Where the zlib library and include files are located
ZLIBLIB=/opt/zlib/lib
@@ -18,7 +21,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpgcc b/scripts/makefile.hpgcc
index 71fd93c..0e7cc4a 100644
--- a/scripts/makefile.hpgcc
+++ b/scripts/makefile.hpgcc
@@ -3,12 +3,15 @@
# Copyright (C) 2001, Laurent faillie
# Copyright (C) 1998, 1999 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index e686cb7..c2b7f69 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -2,7 +2,10 @@
# Copyright (C) 1999-2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42
# contributed by Jim Rice and updated by Chris Schleicher, Hewlett Packard
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Where the zlib library and include files are located
ZLIBLIB=/opt/zlib/lib
@@ -18,7 +21,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.ibmc b/scripts/makefile.ibmc
index cd8af79..35d7f56 100644
--- a/scripts/makefile.ibmc
+++ b/scripts/makefile.ibmc
@@ -2,7 +2,11 @@
# IBM C version 3.x for Win32 and OS/2
# Copyright (C) 2006 Glenn Randers-Pehrson
# Copyright (C) 2000 Cosmin Truta
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
# Notes:
# Derived from makefile.std
# All modules are compiled in C mode
diff --git a/scripts/makefile.intel b/scripts/makefile.intel
index 5c29e51..88a2957 100644
--- a/scripts/makefile.intel
+++ b/scripts/makefile.intel
@@ -4,7 +4,10 @@
# Copyright (C) 2006 Glenn Randers-Pehrson
# Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
# copyright 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# To use, do "nmake /f scripts\makefile.intel"
diff --git a/scripts/makefile.knr b/scripts/makefile.knr
index 0d17359..7b46585 100644
--- a/scripts/makefile.knr
+++ b/scripts/makefile.knr
@@ -1,7 +1,10 @@
# makefile for libpng
# Copyright (C) 2002, 2006, 2009 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# This makefile requires the file ansi2knr.c, which you can get
# from the Ghostscript ftp site at ftp://ftp.cs.wisc.edu/ghost/
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 712bde0..9f20ffb 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -2,12 +2,15 @@
# Copyright (C) 1998, 1999, 2002, 2006, 2008 Greg Roelofs and
# Glenn Randers-Pehrson
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.mingw b/scripts/makefile.mingw
index b73eab6..6dee14a 100644
--- a/scripts/makefile.mingw
+++ b/scripts/makefile.mingw
@@ -3,13 +3,16 @@
# of the library, and builds two copies of pngtest: one
# statically linked and one dynamically linked.
#
-# Built from makefile.cygwin
# Copyright (C) 2002, 2006, 2008 Soren Anderson, Charles Wilson,
# and Glenn Randers-Pehrson, based on makefile for linux-elf w/mmx by:
# Copyright (C) 1998-2000, 2007 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
+# Built from makefile.cygwin
# This makefile intends to support building outside the src directory
# if desired. When invoking it, specify an argument to SRCDIR on the
@@ -74,7 +77,7 @@
LIBNAME = libpng12
PNGMAJ = 0
MINGDLL = 12
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
SHAREDLIB=libpng$(MINGDLL).dll
diff --git a/scripts/makefile.mips b/scripts/makefile.mips
index 5bf9cf9..0e7484f 100644
--- a/scripts/makefile.mips
+++ b/scripts/makefile.mips
@@ -1,7 +1,10 @@
# makefile for libpng
# Copyright (C) Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# where make install puts libpng.a and png.h
prefix=/usr/local
diff --git a/scripts/makefile.msc b/scripts/makefile.msc
index 89a2c4a..ab95ff8 100644
--- a/scripts/makefile.msc
+++ b/scripts/makefile.msc
@@ -1,7 +1,11 @@
# makefile for libpng
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# Copyright (C) 2006, 2009 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# -------- Microsoft C 5.1 and later, does not use assembler code --------
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd
index 1d46ad1..30b821f 100644
--- a/scripts/makefile.ne12bsd
+++ b/scripts/makefile.ne12bsd
@@ -3,7 +3,10 @@
# make includes && make install
# Copyright (C) 2002 Patrick R.L. Welche
# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# You should also run makefile.netbsd
@@ -14,7 +17,7 @@
LIB= png12
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.38rc01
+SHLIB_MINOR= 1.2.38rc02
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.netbsd b/scripts/makefile.netbsd
index bc8b705..83cf98a 100644
--- a/scripts/makefile.netbsd
+++ b/scripts/makefile.netbsd
@@ -3,7 +3,10 @@
# make includes && make install
# Copyright (C) 2002 Patrick R.L. Welche
# Copyright (C) 2007, 2009 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# You should also run makefile.ne0bsd
@@ -14,7 +17,7 @@
LIB= png
SHLIB_MAJOR= 3
-SHLIB_MINOR= 1.2.38rc01
+SHLIB_MINOR= 1.2.38rc02
SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
pngwtran.c pngmem.c pngerror.c pngpread.c
diff --git a/scripts/makefile.nommx b/scripts/makefile.nommx
index 0c9eda2..56f2b4d 100644
--- a/scripts/makefile.nommx
+++ b/scripts/makefile.nommx
@@ -2,12 +2,15 @@
# Copyright (C) 1998, 1999, 2002, 2006-2008 Greg Roelofs and
# Glenn Randers-Pehrson
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.openbsd b/scripts/makefile.openbsd
index 77e7128..7444f0a 100644
--- a/scripts/makefile.openbsd
+++ b/scripts/makefile.openbsd
@@ -1,14 +1,17 @@
# makefile for libpng
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
# Copyright (C) 2007-2008 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
PREFIX?= /usr/local
LIBDIR= ${PREFIX}/lib
MANDIR= ${PREFIX}/man/cat
SHLIB_MAJOR= 0
-SHLIB_MINOR= 1.2.38rc01
+SHLIB_MINOR= 1.2.38rc02
LIB= png
SRCS= png.c pngerror.c pngget.c pngmem.c pngpread.c \
diff --git a/scripts/makefile.os2 b/scripts/makefile.os2
index 92cfcee..2df76ad 100644
--- a/scripts/makefile.os2
+++ b/scripts/makefile.os2
@@ -1,5 +1,8 @@
# makefile for libpng on OS/2 with gcc
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Related files: pngos2.def
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index 07c2248..6d74207 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -4,12 +4,15 @@
# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 048d1e5..fcd56b1 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -1,12 +1,15 @@
# makefile for libpng.a and libpng12.so, SGI IRIX with 'cc'
# Copyright (C) 2001-2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.sgi b/scripts/makefile.sgi
index 212716e..1946e24 100644
--- a/scripts/makefile.sgi
+++ b/scripts/makefile.sgi
@@ -1,12 +1,15 @@
# makefile for libpng.a and libpng12.so, SGI IRIX with 'cc'
# Copyright (C) 2001-2002, 2006, 2007 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME=libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.so9 b/scripts/makefile.so9
index f56c587..d18351c 100644
--- a/scripts/makefile.so9
+++ b/scripts/makefile.so9
@@ -4,11 +4,14 @@
# Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson
# Copyright (C) 1998-2001 Greg Roelofs
# Copyright (C) 1996-1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
LIBNAME = libpng12
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index a67e5bb..c5ee474 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -3,12 +3,15 @@
# Contributed by William L. Sebok, based on makefile.linux
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index e27a0ab..069b042 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -3,12 +3,15 @@
# Contributed by William L. Sebok, based on makefile.linux
# Copyright (C) 1998 Greg Roelofs
# Copyright (C) 1996, 1997 Andreas Dilger
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.38rc01
+PNGMIN = 1.2.38rc02
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
diff --git a/scripts/makefile.std b/scripts/makefile.std
index de665e6..bb5268a 100644
--- a/scripts/makefile.std
+++ b/scripts/makefile.std
@@ -1,7 +1,10 @@
# makefile for libpng
# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# where make install puts libpng.a and png.h
prefix=/usr/local
diff --git a/scripts/makefile.sunos b/scripts/makefile.sunos
index 0f0a226..31dff77 100644
--- a/scripts/makefile.sunos
+++ b/scripts/makefile.sunos
@@ -1,7 +1,10 @@
# makefile for libpng
# Copyright (C) 2002, 2006 Glenn Randers-Pehrson
# Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# where make install puts libpng.a and png.h
prefix=/usr/local
diff --git a/scripts/makefile.vcawin32 b/scripts/makefile.vcawin32
index 0966711..0b89d84 100644
--- a/scripts/makefile.vcawin32
+++ b/scripts/makefile.vcawin32
@@ -1,7 +1,11 @@
# makefile for libpng
# Copyright (C) 2006,2009 Glenn Randers-Pehrson
# Copyright (C) 1998 Tim Wegner
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# To use, do "nmake /f scripts\makefile.vcawin32"
diff --git a/scripts/makefile.vcwin32 b/scripts/makefile.vcwin32
index 8184232..8cd806a 100644
--- a/scripts/makefile.vcwin32
+++ b/scripts/makefile.vcwin32
@@ -1,7 +1,11 @@
# makefile for libpng
# Copyright (C) 1998 Tim Wegner
# Copyright (C) 2006,2009 Glenn Randers-Pehrson
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
+
# Assumes that zlib.lib, zconf.h, and zlib.h have been copied to ..\zlib
# To use, do "nmake /f scripts\makefile.vcwin32"
diff --git a/scripts/makefile.watcom b/scripts/makefile.watcom
index 5e860fc..bbfeeeb 100644
--- a/scripts/makefile.watcom
+++ b/scripts/makefile.watcom
@@ -3,7 +3,10 @@
# Copyright (C) 2000, Pawel Mrochen, based on makefile.msc which is
# copyright 1995 Guy Eric Schalnat, Group 42, Inc.
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
# To use, do "wmake /f scripts\makefile.watcom"
diff --git a/scripts/pngos2.def b/scripts/pngos2.def
index 00f8e1d..f8c14cc 100644
--- a/scripts/pngos2.def
+++ b/scripts/pngos2.def
@@ -2,7 +2,7 @@
; PNG.LIB module definition file for OS/2
;----------------------------------------
-; Version 1.2.38rc01
+; Version 1.2.38rc02
LIBRARY PNG
DESCRIPTION "PNG image compression library for OS/2"
diff --git a/scripts/pngw32.def b/scripts/pngw32.def
index bf6de86..cd05019 100644
--- a/scripts/pngw32.def
+++ b/scripts/pngw32.def
@@ -5,7 +5,7 @@
LIBRARY
EXPORTS
-;Version 1.2.38rc01
+;Version 1.2.38rc02
png_build_grayscale_palette @1
png_check_sig @2
png_chunk_error @3
diff --git a/scripts/smakefile.ppc b/scripts/smakefile.ppc
index e5c0278..91df6c1 100644
--- a/scripts/smakefile.ppc
+++ b/scripts/smakefile.ppc
@@ -1,7 +1,10 @@
# Amiga powerUP (TM) Makefile
# makefile for libpng and SAS C V6.58/7.00 PPC compiler
# Copyright (C) 1998 by Andreas R. Kleinert
-# For conditions of distribution and use, see copyright notice in png.h
+
+# This code is released under the libpng license.
+# For conditions of distribution and use, see the disclaimer
+# and license in png.h
CC = scppc
CFLAGS = NOSTKCHK NOSINT OPTIMIZE OPTGO OPTPEEP OPTINLOCAL OPTINL IDIR /zlib \
