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] Fixed inconsistencies in png.h and pnglibconf.dfa

Browse Source
This commit is contained in:
John Bowler
2013-02-10 17:49:25 -06:00
committed by Glenn Randers-Pehrson
parent 88c5a2a068
commit 6db8e4dd11
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
png.h
View File

@@ -3199,14 +3199,14 @@ PNG_EXPORT(240, int, png_image_write_to_stdio, (png_imagep image, FILE *file,
* END OF SIMPLIFIED API * END OF SIMPLIFIED API
******************************************************************************/ ******************************************************************************/
#if defined(PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED) #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
PNG_EXPORT(242, void, png_set_check_for_invalid_index, PNG_EXPORT(242, void, png_set_check_for_invalid_index,
(png_structrp png_ptr, int allowed)); (png_structrp png_ptr, int allowed));
#if defined(PNG_GET_PALETTE_MAX_SUPPORTED) # ifdef PNG_GET_PALETTE_MAX_SUPPORTED
PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr, PNG_EXPORT(243, int, png_get_palette_max, (png_const_structp png_ptr,
png_const_infop info_ptr)); png_const_infop info_ptr));
#endif # endif
#endif #endif /* CHECK_FOR_INVALID_INDEX */
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project /* Maintainer: Put new public prototypes here ^, in libpng.3, and project
* defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt

4
pngget.c
View File

@@ -1162,7 +1162,7 @@ png_get_io_chunk_type (png_const_structrp png_ptr)
#endif /* ?PNG_IO_STATE_SUPPORTED */ #endif /* ?PNG_IO_STATE_SUPPORTED */
#ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED #ifdef PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
#ifdef PNG_GET_PALETTE_MAX_SUPPORTED # ifdef PNG_GET_PALETTE_MAX_SUPPORTED
int PNGAPI int PNGAPI
png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr) png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
{ {
@@ -1171,7 +1171,7 @@ png_get_palette_max(png_const_structp png_ptr, png_const_infop info_ptr)
return (-1); return (-1);
} }
#endif # endif
#endif #endif
#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */

7
scripts/pnglibconf.dfa
View File

@@ -778,10 +778,9 @@ option READ_CHECK_FOR_INVALID_INDEX requires READ CHECK_FOR_INVALID_INDEX
option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE CHECK_FOR_INVALID_INDEX option WRITE_CHECK_FOR_INVALID_INDEX requires WRITE CHECK_FOR_INVALID_INDEX
# added at libpng-1.5.15 # added at libpng-1.5.15
option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX option GET_PALETTE_MAX enables READ_GET_PALETTE_MAX WRITE_GET_PALETTE_MAX
option GET_PALETTE_MAX enables WRITE_GET_PALETTE_MAX option READ_GET_PALETTE_MAX requires READ_CHECK_FOR_INVALID_INDEX disabled
option READ_GET_PALETTE_MAX requires READ_CHECK_FOR_INVALID_INDEX option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX disabled
option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX
# Simplified API options (added at libpng-1.6.0) # Simplified API options (added at libpng-1.6.0)
# Read: # Read: