[devel] Imported from libpng-1.5.0beta25.tarv1.5.0beta25

1 files changed, 12 insertions, 12 deletions

diff --git a/png.h b/png.h
index 079a41289..e1d18ce46 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.5.0beta24 - May 7, 2010
+ * libpng version 1.5.0beta25 - June 18, 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.0beta24 - May 7, 2010: Glenn
+ *   libpng versions 0.97, January 1998, through 1.5.0beta25 - June 18, 2010: Glenn
  *   See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -138,7 +138,7 @@
  *    1.4.1rc01               14    10401  14.so.14.1[.0]
  *    1.4.1beta04-12          14    10401  14.so.14.1[.0]
  *    1.4.1                   14    10401  14.so.14.1[.0]
- *    1.5.0beta01-23          15    10500  15.so.15.0[.0]
+ *    1.5.0beta01-25          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
@@ -170,7 +170,7 @@
  *
  * This code is released under the libpng license.
  *
- * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta24, May 7, 2010, are
+ * libpng versions 1.2.6, August 15, 2004, through 1.5.0beta25, June 18, 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:
@@ -242,8 +242,8 @@
  *
  *   1. The origin of this source code must not be misrepresented.
  *
- *   2. Altered versions must be plainly marked as such and
- *   must not be misrepresented as being the original source.
+ *   2. Altered versions must be plainly marked as such and must not
+ *      be misrepresented as being the original source.
  *
  *   3. This Copyright notice may not be removed or altered from
  *      any source or altered source distribution.
@@ -282,13 +282,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    May 7, 2010
+ *    June 18, 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.0beta24 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.5.0beta25 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
@@ -344,9 +344,9 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.5.0beta24"
+#define PNG_LIBPNG_VER_STRING "1.5.0beta25"
 #define PNG_HEADER_VERSION_STRING \
-     " libpng version 1.5.0beta24 - May 7, 2010\n"
+     " libpng version 1.5.0beta25 - June 18, 2010\n"
 
 #define PNG_LIBPNG_VER_SONUM   15
 #define PNG_LIBPNG_VER_DLLNUM  15
@@ -359,7 +359,7 @@
  * PNG_LIBPNG_VER_STRING, omitting any leading zero:
  */
 
-#define PNG_LIBPNG_VER_BUILD  24
+#define PNG_LIBPNG_VER_BUILD  25
 
 /* Release Status */
 #define PNG_LIBPNG_BUILD_ALPHA    1
@@ -834,7 +834,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_0beta24;
+typedef png_structp version_1_5_0beta25;
 
 typedef png_struct FAR * FAR * png_structpp;