[devel] Imported from libpng-1.4.0beta78.tar
diff --git a/INSTALL b/INSTALL
index a291548..32ba799 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-Installing libpng version 1.4.0beta78 - August 28, 2009
+Installing libpng version 1.4.0beta78 - August 31, 2009
On Unix/Linux and similar systems, you can simply type
diff --git a/LICENSE b/LICENSE
index 135b483..feeefac 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,7 +10,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.0beta78, August 28, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta78, August 31, 2009, 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 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-August 28, 2009
+August 31, 2009
diff --git a/README b/README
index 4f8cc40..9807ba3 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.0beta78 - August 28, 2009 (shared library 14.0)
+README for libpng version 1.4.0beta78 - August 31, 2009 (shared library 14.0)
See the note about version numbers near the top of png.h
See INSTALL for instructions on how to install libpng.
diff --git a/contrib/pngminim/decoder/pngusr.h b/contrib/pngminim/decoder/pngusr.h
index 2312a78..d54304d 100644
--- a/contrib/pngminim/decoder/pngusr.h
+++ b/contrib/pngminim/decoder/pngusr.h
@@ -59,7 +59,6 @@
#define PNG_NO_READ_OPT_PLTE
#define PNG_NO_READ_STRIP_ALPHA
#define PNG_NO_READ_oFFs
-#define PNG_NO_WARN_UNINITIALIZED_ROW
#define PNG_NO_WRITE_SUPPORTED
diff --git a/contrib/pngminim/preader/pngusr.h b/contrib/pngminim/preader/pngusr.h
index 7d728c8..2ddae4a 100644
--- a/contrib/pngminim/preader/pngusr.h
+++ b/contrib/pngminim/preader/pngusr.h
@@ -50,7 +50,6 @@
#define PNG_NO_READ_OPT_PLTE
#define PNG_NO_READ_STRIP_ALPHA
#define PNG_NO_READ_oFFs
-#define PNG_NO_WARN_UNINITIALIZED_ROW
#define PNG_NO_WRITE_SUPPORTED
diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c
index 6154ce2..953204b 100644
--- a/contrib/visupng/PngFile.c
+++ b/contrib/visupng/PngFile.c
@@ -35,7 +35,7 @@
{
if(png_ptr)
;
-#ifndef PNG_NO_CONSOLE_IO
+#ifdef PNG_CONSOLE_IO_SUPPORTED
fprintf(stderr, "libpng error: %s\n", msg);
#endif
{
@@ -155,7 +155,7 @@
// initialize the png structure
-#if !defined(PNG_NO_STDIO)
+#ifdef PNG_STDIO_SUPPORTED
png_init_io(png_ptr, pfFile);
#else
png_set_read_fn(png_ptr, (png_voidp)pfFile, png_read_data);
@@ -324,7 +324,7 @@
{
// initialize the png structure
-#if !defined(PNG_NO_STDIO)
+#ifdef PNG_STDIO_SUPPORTED
png_init_io(png_ptr, pfFile);
#else
png_set_write_fn(png_ptr, (png_voidp)pfFile, png_write_data, png_flush);
@@ -395,7 +395,7 @@
return TRUE;
}
-#ifdef PNG_NO_STDIO
+#ifndef PNG_STDIO_SUPPORTED
static void
png_read_data(png_structp png_ptr, png_bytep data, png_size_t length)
diff --git a/contrib/visupng/PngFile.h b/contrib/visupng/PngFile.h
index f695811..dc6bbb4 100644
--- a/contrib/visupng/PngFile.h
+++ b/contrib/visupng/PngFile.h
@@ -22,7 +22,7 @@
BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData,
int iWidth, int iHeight, png_color BkgColor);
-#if defined(PNG_NO_STDIO)
+#ifndef PNG_STDIO_SUPPORTED
static void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length);
static void png_write_data(png_structp png_ptr, png_bytep data, png_size_t length);
static void png_flush(png_structp png_ptr);
diff --git a/libpng-1.4.0beta78.txt b/libpng-1.4.0beta78.txt
index c674f83..8f0807f 100644
--- a/libpng-1.4.0beta78.txt
+++ b/libpng-1.4.0beta78.txt
@@ -1,6 +1,6 @@
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.0beta78 - August 28, 2009
+ libpng version 1.4.0beta78 - August 31, 2009
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -11,7 +11,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.0beta78 - August 28, 2009
+ libpng versions 0.97, January 1998, through 1.4.0beta78 - August 31, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -3172,7 +3172,7 @@
XIII. Y2K Compliance in libpng
-August 28, 2009
+August 31, 2009
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
diff --git a/libpng.3 b/libpng.3
index 15b1497..c24642a 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,4 +1,4 @@
-.TH LIBPNG 3 "August 28, 2009"
+.TH LIBPNG 3 "August 31, 2009"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta78
.SH SYNOPSIS
@@ -809,7 +809,7 @@
.SH LIBPNG.TXT
libpng.txt - A description on how to use and modify libpng
- libpng version 1.4.0beta78 - August 28, 2009
+ libpng version 1.4.0beta78 - August 31, 2009
Updated and distributed by Glenn Randers-Pehrson
<glennrp at users.sourceforge.net>
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -820,7 +820,7 @@
Based on:
- libpng versions 0.97, January 1998, through 1.4.0beta78 - August 28, 2009
+ libpng versions 0.97, January 1998, through 1.4.0beta78 - August 31, 2009
Updated and distributed by Glenn Randers-Pehrson
Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -3981,7 +3981,7 @@
.SH XIII. Y2K Compliance in libpng
-August 28, 2009
+August 31, 2009
Since the PNG Development group is an ad-hoc body, we can't make
an official declaration.
@@ -4211,7 +4211,7 @@
Thanks to Frank J. T. Wojcik for helping with the documentation.
-Libpng version 1.4.0beta78 - August 28, 2009:
+Libpng version 1.4.0beta78 - August 31, 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).
@@ -4234,7 +4234,7 @@
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.4.0beta78, August 28, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta78, August 31, 2009, 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
@@ -4333,7 +4333,7 @@
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
-August 28, 2009
+August 31, 2009
.\" end of man page
diff --git a/libpngpf.3 b/libpngpf.3
index becc9de..5afa8a7 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,4 +1,4 @@
-.TH LIBPNGPF 3 "August 28, 2009"
+.TH LIBPNGPF 3 "August 31, 2009"
.SH NAME
libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta78
(private functions)
diff --git a/png.5 b/png.5
index f0344a8..a7db177 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "August 28, 2009"
+.TH PNG 5 "August 31, 2009"
.SH NAME
png \- Portable Network Graphics (PNG) format
.SH DESCRIPTION
diff --git a/png.h b/png.h
index 1ca9cb8..cf62357 100644
--- a/png.h
+++ b/png.h
@@ -815,9 +815,7 @@
#endif
/* New members added in libpng-1.0.6 */
-#ifdef PNG_FREE_ME_SUPPORTED
png_uint_32 free_me; /* flags items libpng is responsible for freeing */
-#endif
#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED) || \
defined(PNG_HANDLE_AS_UNKNOWN_SUPPORTED)
@@ -1260,9 +1258,7 @@
/* New members added in libpng-1.0.6 */
-#ifdef PNG_FREE_ME_SUPPORTED
png_uint_32 free_me; /* flags items libpng is responsible for freeing */
-#endif
#if defined(PNG_USER_CHUNKS_SUPPORTED)
png_voidp user_chunk_ptr;
@@ -1940,12 +1936,10 @@
/* Free data that was allocated internally */
extern PNG_EXPORT(void,png_free_data) PNGARG((png_structp png_ptr,
png_infop info_ptr, png_uint_32 free_me, int num));
-#ifdef PNG_FREE_ME_SUPPORTED
/* Reassign responsibility for freeing existing data, whether allocated
* by libpng or by the application */
extern PNG_EXPORT(void,png_data_freer) PNGARG((png_structp png_ptr,
png_infop info_ptr, int freer, png_uint_32 mask));
-#endif
/* Assignments for png_data_freer */
#define PNG_DESTROY_WILL_FREE_DATA 1
#define PNG_SET_WILL_FREE_DATA 1
diff --git a/pngconf.h b/pngconf.h
index d384d4e..c2661d8 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -466,10 +466,6 @@
# define PNG_FIXED_POINT_SUPPORTED
#endif
-#ifndef PNG_NO_FREE_ME
-# define PNG_FREE_ME_SUPPORTED
-#endif
-
#ifdef PNG_READ_SUPPORTED
/* PNG_READ_TRANSFORMS_NOT_SUPPORTED is deprecated. */
