[master] Imported from libpng-1.4.2rc01.tar

This commit is contained in:
Glenn Randers-Pehrson
2010-04-10 06:40:53 -05:00
parent 398c212955
commit 0f544f62d6
39 changed files with 97 additions and 97 deletions

8
png.c
View File

@@ -1,7 +1,7 @@
/* png.c - location for general purpose libpng functions
*
* Last changed in libpng 1.4.1 [April 1, 2010]
* Last changed in libpng 1.4.1 [April 10, 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.)
@@ -17,7 +17,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef version_1_4_2beta02 Your_png_h_is_not_version_1_4_2beta02;
typedef version_1_4_2rc01 Your_png_h_is_not_version_1_4_2rc01;
/* Version information for C files. This had better match the version
* string defined in png.h.
@@ -551,13 +551,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.4.2beta02 - April 1, 2010" PNG_STRING_NEWLINE \
"libpng version 1.4.2rc01 - April 10, 2010" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2010 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.2beta02 - April 1, 2010\
return ((png_charp) "libpng version 1.4.2rc01 - April 10, 2010\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");