mewin/libpng
1
0
Fork 0
mirror of https://git.code.sf.net/p/libpng/code.git synced 2025-07-10 18:04:09 +02:00
Code Issues Projects Releases Wiki Activity

[libpng16] Add palette support to the simplified APIs. This commit

Browse Source 
changes some of the macro definitions in png.h, app code may need
corresponding changes.
This commit is contained in:
John Bowler
2012-01-16 07:48:36 -06:00
committed by Glenn Randers-Pehrson
parent da1c5ca65a
commit 04336ba10f
7 changed files with 276 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
png.c
View File

@@ -14,7 +14,7 @@
#include "pngpriv.h"
/* Generate a compiler error if there is an old png.h in the search path. */
typedef png_libpng_version_1_6_0beta05 Your_png_h_is_not_version_1_6_0beta05;
typedef png_libpng_version_1_6_0beta06 Your_png_h_is_not_version_1_6_0beta06;
/* 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
@@ -762,13 +762,13 @@ png_get_copyright(png_const_structrp png_ptr)
#else
# ifdef __STDC__
return PNG_STRING_NEWLINE \
"libpng version 1.6.0beta05 - January 15, 2012" PNG_STRING_NEWLINE \
"libpng version 1.6.0beta06 - January 16, 2012" PNG_STRING_NEWLINE \
"Copyright (c) 1998-2012 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 "libpng version 1.6.0beta05 - January 15, 2012\
return "libpng version 1.6.0beta06 - January 16, 2012\
Copyright (c) 1998-2012 Glenn Randers-Pehrson\
Copyright (c) 1996-1997 Andreas Dilger\
Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
@@ -3221,7 +3221,7 @@ png_image_error(png_imagep image, png_const_charp error_message)
{
/* Utility to log an error. */
png_safecat(image->message, sizeof image->message, 0, error_message);
image->warning_or_error = 1;
image->warning_or_error |= PNG_IMAGE_ERROR;
png_image_free(image);
return 0;
}