[master] Bump to version 1.4.6beta04

This commit is contained in:
Glenn Randers-Pehrson
2011-01-15 11:31:34 -06:00
parent d486eb18c5
commit 23c2ea38a6
27 changed files with 58 additions and 60 deletions

6
png.c
View File

@@ -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_6beta03 Your_png_h_is_not_version_1_4_6beta03;
typedef version_1_4_6beta04 Your_png_h_is_not_version_1_4_6beta04;
/* Tells libpng that we have already handled the first "num_bytes" bytes
* of the PNG file signature. If the PNG data is embedded into another
@@ -547,13 +547,13 @@ png_get_copyright(png_structp png_ptr)
#else
#ifdef __STDC__
return ((png_charp) PNG_STRING_NEWLINE \
"libpng version 1.4.6beta03 - January 15, 2011" PNG_STRING_NEWLINE \
"libpng version 1.4.6beta04 - January 15, 2011" 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.6beta03 - January 15, 2011\
return ((png_charp) "libpng version 1.4.6beta04 - January 15, 2011\
Copyright (c) 1998-2010 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.");