Imported from libpng-1.4.0beta56.tar

1d024050 · Glenn Randers-Pehrson · 4db4affb · 1d024050 · 1d024050 · 1d024050
28 changed file
--- a/ANNOUNCE
+++ b/ANNOUNCE

-Libpng 1.4.0beta56 - April 15, 2009
+Libpng 1.4.0beta56 - April 20, 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.
@@ -430,7 +430,11 @@ version 1.4.0beta55 [April 15, 2009]
  Simplified error handling in pngread.c and pngwrite.c by putting
    the new png_read_cleanup() and png_write_cleanup() functions inline.

-version 1.4.0beta56 [April 15, 2009]
+version 1.4.0beta56 [April 20, 2009]
+  Renamed "user_chunk_data" to "my_user_chunk_data" in pngtest.c to suppress
+    "shadowed declaration" warning from gcc-4.3.3.
+  Renamed "gamma" to "png_gamma" in pngset.c to avoid "shadowed declaration"
+    warning about a global "gamma" variable in math.h on some platforms.

 version 1.4.0betaN [future]
  Build shared libraries with -lz and sometimes -lm.

--- a/CHANGES
+++ b/CHANGES
@@ -2106,7 +2106,11 @@ version 1.4.0beta55 [April 15, 2009]
  Simplified error handling in pngread.c and pngwrite.c by putting
    the new png_read_cleanup() and png_write_cleanup() functions inline.

-version 1.4.0beta56 [April 15, 2009]
+version 1.4.0beta56 [April 20, 2009]
+  Renamed "user_chunk_data" to "my_user_chunk_data" in pngtest.c to suppress
+    "shadowed declaration" warning from gcc-4.3.3.
+  Renamed "gamma" to "png_gamma" in pngset.c to avoid "shadowed declaration"
+    warning about a global "gamma" variable in math.h on some platforms.

 version 1.4.0betaN [future]
  Build shared libraries with -lz and sometimes -lm.

--- a/INSTALL
+++ b/INSTALL

-Installing libpng version 1.4.0beta56 - April 15, 2009
+Installing libpng version 1.4.0beta56 - April 20, 2009

 On Unix/Linux and similar systems, you can simply type


--- a/LICENSE
+++ b/LICENSE
@@ -8,7 +8,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.

-libpng versions 1.2.6, August 15, 2004, through 1.4.0beta56, April 15, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta56, April 20, 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
@@ -106,4 +106,4 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-April 15, 2009
+April 20, 2009
--- a/README
+++ b/README
-README for libpng version 1.4.0beta56 - April 15, 2009 (shared library 14.0)
+README for libpng version 1.4.0beta56 - April 20, 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.

--- a/example.c
+++ b/example.c
@@ -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.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 2009]
 * This file has been placed in the public domain by the authors.
 * Maintained 1998-2009 Glenn Randers-Pehrson
 * Maintained 1996, 1997 Andreas Dilger)

--- a/libpng-1.4.0beta56.txt
+++ b/libpng-1.4.0beta56.txt
--- a/libpng.3
+++ b/libpng.3
-.TH LIBPNG 3 "April 15, 2009"
+.TH LIBPNG 3 "April 20, 2009"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta56
 .SH SYNOPSIS
@@ -809,7 +809,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.4.0beta56 - April 15, 2009
+ libpng version 1.4.0beta56 - April 20, 2009
 Updated and distributed by Glenn Randers-Pehrson
 <glennrp at users.sourceforge.net>
 Copyright (c) 1998-2009 Glenn Randers-Pehrson
@@ -818,7 +818,7 @@ libpng.txt - A description on how to use and modify libpng

 Based on:

- libpng versions 0.97, January 1998, through 1.4.0beta56 - April 15, 2009
+ libpng versions 0.97, January 1998, through 1.4.0beta56 - April 20, 2009
 Updated and distributed by Glenn Randers-Pehrson
 Copyright (c) 1998-2009 Glenn Randers-Pehrson

@@ -3854,7 +3854,7 @@ We removed the trailing '.' from the warning and error messages.

 .SH X. Y2K Compliance in libpng

-April 15, 2009
+April 20, 2009

 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
@@ -4084,7 +4084,7 @@ possible without all of you.

 Thanks to Frank J. T. Wojcik for helping with the documentation.

-Libpng version 1.4.0beta56 - April 15, 2009:
+Libpng version 1.4.0beta56 - April 20, 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).

@@ -4105,7 +4105,7 @@ included in the libpng distribution, the latter shall prevail.)
 If you modify libpng you may insert additional notices immediately following
 this sentence.

-libpng versions 1.2.6, August 15, 2004, through 1.4.0beta56, April 15, 2009, are
+libpng versions 1.2.6, August 15, 2004, through 1.4.0beta56, April 20, 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
@@ -4204,7 +4204,7 @@ certification mark of the Open Source Initiative.

 Glenn Randers-Pehrson
 glennrp at users.sourceforge.net
-April 15, 2009
+April 20, 2009

 .\" end of man page

--- a/libpngpf.3
+++ b/libpngpf.3
-.TH LIBPNGPF 3 "April 15, 2009"
+.TH LIBPNGPF 3 "April 20, 2009"
 .SH NAME
 libpng \- Portable Network Graphics (PNG) Reference Library 1.4.0beta56
 (private functions)

--- a/png.5
+++ b/png.5
-.TH PNG 5 "April 15, 2009"
+.TH PNG 5 "April 20, 2009"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION

--- a/png.c
+++ b/png.c

 /* png.c - location for general purpose libpng functions
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)
@@ -641,13 +641,13 @@ png_get_copyright(png_structp png_ptr)
 #else
 #ifdef __STDC__
   return ((png_charp) PNG_STRING_NEWLINE \
-     "libpng version x 1.4.0beta56 - April 15, 2009" PNG_STRING_NEWLINE \
+     "libpng version x 1.4.0beta56 - April 20, 2009" PNG_STRING_NEWLINE \
     "Copyright (c) 1998-2009 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.4.0beta56 - April 15, 2009\
+      return ((png_charp) "libpng version 1.4.0beta56 - April 20, 2009\
      Copyright (c) 1998-2009 Glenn Randers-Pehrson\
      Copyright (c) 1996-1997 Andreas Dilger\
      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");

--- a/png.h
+++ b/png.h

 /* png.h - header file for PNG reference library
 *
- * libpng version 1.4.0beta56 - April 15, 2009
+ * libpng version 1.4.0beta56 - April 20, 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.)
@@ -9,7 +9,7 @@
 * Authors and maintainers:
 *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
 *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.4.0beta56 - April 15, 2009: Glenn
+ *  libpng versions 0.97, January 1998, through 1.4.0beta56 - April 20, 2009: Glenn
 *  See also "Contributing Authors", below.
 *
 * Note about libpng version numbers:
@@ -157,7 +157,7 @@
 * If you modify libpng you may insert additional notices immediately following
 * this sentence.
 *
- * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta56, April 15, 2009, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.4.0beta56, April 20, 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:
@@ -333,7 +333,7 @@
 /* Version information for png.h - this should match the version in png.c */
 #define PNG_LIBPNG_VER_STRING "1.4.0beta56"
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.4.0beta56 - April 15, 2009\n"
+   " libpng version 1.4.0beta56 - April 20, 2009\n"

 #define PNG_LIBPNG_VER_SONUM   14
 #define PNG_LIBPNG_VER_DLLNUM  14

--- a/pngconf.h
+++ b/pngconf.h

 /* pngconf.h - machine configurable file for libpng
 *
- * libpng version 1.4.0beta56 - April 15, 2009
+ * libpng version 1.4.0beta56 - April 20, 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)

--- a/pngerror.c
+++ b/pngerror.c

 /* pngerror.c - stub functions for i/o and memory allocation
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngget.c
+++ b/pngget.c

 /* pngget.c - retrieval of values from info struct
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngmem.c
+++ b/pngmem.c

 /* pngmem.c - stub functions for memory allocation
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngpread.c
+++ b/pngpread.c

 /* pngpread.c - read a png file in push mode
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngpriv.h
+++ b/pngpriv.h

 /* pngpriv.h - private declarations for use inside libpng
 *
- * libpng version 1.4.0beta56 - April 15, 2009
+ * libpng version 1.4.0beta56 - April 20, 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)

--- a/pngread.c
+++ b/pngread.c

 /* pngread.c - read a PNG file
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngrio.c
+++ b/pngrio.c

 /* pngrio.c - functions for data input
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngrtran.c
+++ b/pngrtran.c

 /* pngrtran.c - transforms the data in a row for PNG readers
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngrutil.c
+++ b/pngrutil.c

 /* pngrutil.c - utilities to read a PNG file
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngtest.c
+++ b/pngtest.c

 /* pngtest.c - a simple test program to test libpng
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)
@@ -563,7 +563,7 @@ static int read_user_chunk_callback(png_struct *png_ptr,
   png_unknown_chunkp chunk)
 {
  png_uint_32
-    *user_chunk_data;
+    *my_user_chunk_data;

  /* Return one of the following: */
     /* return (-n);  chunk had an error */
@@ -586,8 +586,8 @@ static int read_user_chunk_callback(png_struct *png_ptr,
         return (-1); /* Error return */
       if (chunk->data[0] != 0 && chunk->data[0] != 1)
          return (-1);  /* Invalid mode */
-       user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
-       user_chunk_data[0]=chunk->data[0]+1;
+       my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
+       my_user_chunk_data[0]=chunk->data[0]+1;
       return (1);
     }
  if (chunk->name[0] != 118 || chunk->name[1] != 112 ||    /* v  p */
@@ -599,11 +599,11 @@ static int read_user_chunk_callback(png_struct *png_ptr,
  if (chunk->size != 9)
    return (-1); /* Error return */

-  user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);
+  my_user_chunk_data=(png_uint_32 *) png_get_user_chunk_ptr(png_ptr);

-  user_chunk_data[1]=png_get_uint_31(png_ptr, chunk->data);
-  user_chunk_data[2]=png_get_uint_31(png_ptr, chunk->data + 4);
-  user_chunk_data[3]=(png_uint_32)chunk->data[8];
+  my_user_chunk_data[1]=png_get_uint_31(png_ptr, chunk->data);
+  my_user_chunk_data[2]=png_get_uint_31(png_ptr, chunk->data + 4);
+  my_user_chunk_data[3]=(png_uint_32)chunk->data[8];

  return (1);


--- a/pngtrans.c
+++ b/pngtrans.c

 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngwio.c
+++ b/pngwio.c

 /* pngwio.c - functions for data output
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngwrite.c
+++ b/pngwrite.c

 /* pngwrite.c - general routines to write a PNG file
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngwtran.c
+++ b/pngwtran.c

 /* pngwtran.c - transforms the data in a row for PNG writers
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)

--- a/pngwutil.c
+++ b/pngwutil.c

 /* pngwutil.c - utilities to write a PNG file
 *
- * Last changed in libpng 1.4.0 [April 15, 2009]
+ * Last changed in libpng 1.4.0 [April 20, 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)