[master] Bump to version 1.2.42rc03

This commit is contained in:
Glenn Randers-Pehrson 2009-12-25 14:20:39 -06:00
parent 9a80a35f4b
commit 8563ac1664
3 changed files with 16 additions and 16 deletions

8
png.c
View File

@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.2.41 [December 23, 2009]
* Last changed in libpng 1.2.41 [December 3, 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.)
@ -17,7 +17,7 @@
#include "png.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_2_42rc02 Your_png_h_is_not_version_1_2_42rc02;
typedef version_1_2_42rc03 Your_png_h_is_not_version_1_2_42rc03;
/* Version information for C files. This had better match the version
* string defined in png.h.
@ -723,13 +723,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.2.42rc02 - December 23, 2009" PNG_STRING_NEWLINE \
"libpng version 1.2.42rc03 - December 25, 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.2.42rc02 - December 23, 2009\
return ((png_charp) "libpng version 1.2.42rc03 - December 25, 2009\
Copyright (c) 1998-2009 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");

22
png.h
View File

@ -1,6 +1,6 @@
/* png.h - header file for PNG reference library
*
* libpng version 1.2.42rc02 - December 23, 2009
* libpng version 1.2.42rc03 - December 25, 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.)
@ -10,7 +10,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.2.42rc02 - December 23, 2009: Glenn
* libpng versions 0.97, January 1998, through 1.2.42rc03 - December 25, 2009: Glenn
* See also "Contributing Authors", below.
*
* Note about libpng version numbers:
@ -251,8 +251,8 @@
* 1.0.51 10 10051 10.so.0.51[.0]
* 1.2.41 13 10241 12.so.0.41[.0]
* 1.2.42beta01-02 13 10242 12.so.0.42[.0]
* 1.2.42rc01 13 10242 12.so.0.42[.0]
* 1.0.51 10 10052 10.so.0.52[.0]
* 1.2.42rc01-03 13 10242 12.so.0.42[.0]
* 1.0.52 10 10052 10.so.0.52[.0]
* 1.2.42 13 10242 12.so.0.42[.0]
*
* Henceforth the source version will match the shared-library major
@ -285,7 +285,7 @@
*
* This code is released under the libpng license.
*
* libpng versions 1.2.6, August 15, 2004, through 1.2.42rc02, December 23, 2009, are
* libpng versions 1.2.6, August 15, 2004, through 1.2.42rc03, December 25, 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:
@ -397,13 +397,13 @@
* Y2K compliance in libpng:
* =========================
*
* December 23, 2009
* December 25, 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.42rc02 are Y2K compliant. It is my belief that earlier
* upward through 1.2.42rc03 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
@ -459,9 +459,9 @@
*/
/* Version information for png.h - this should match the version in png.c */
#define PNG_LIBPNG_VER_STRING "1.2.42rc02"
#define PNG_LIBPNG_VER_STRING "1.2.42rc03"
#define PNG_HEADER_VERSION_STRING \
" libpng version 1.2.42rc02 - December 23, 2009\n"
" libpng version 1.2.42rc03 - December 25, 2009\n"
#define PNG_LIBPNG_VER_SONUM 0
#define PNG_LIBPNG_VER_DLLNUM 13
@ -474,7 +474,7 @@
* PNG_LIBPNG_VER_STRING, omitting any leading zero:
*/
#define PNG_LIBPNG_VER_BUILD 02
#define PNG_LIBPNG_VER_BUILD 03
/* Release Status */
#define PNG_LIBPNG_BUILD_ALPHA 1
@ -1530,7 +1530,7 @@ struct png_struct_def
/* 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_42rc02;
typedef png_structp version_1_2_42rc03;
typedef png_struct FAR * FAR * png_structpp;

View File

@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.2.42rc02 - December 23, 2009
* libpng version 1.2.42rc03 - December 25, 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.)