[libpng17] Fix typo, indentation of #ifdef PNG_GET_PALETTE_MAX_SUPPORTED

in png.h and pnglibconf.dfa
This commit is contained in:
Glenn Randers-Pehrson 2013-02-10 16:57:38 -06:00
parent e9760e5e95
commit 9f0d36c85f
3 changed files with 8 additions and 11 deletions

8
png.h
View File

@ -3204,15 +3204,13 @@ 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_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED) || \ #if defined(PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED)
defined(PNG_WRITE_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_READ_GET_PALETTE_MAX_SUPPORTED) || \ # if defined(PNG_GET_PALETTE_MAX_SUPPORTED)
defined(PNG_READ_GET_PALETTE_MAX_SUPPORTED)
PNG_EXPORT(243, int, png_get_palette_max, (png_const_structrp png_ptr, PNG_EXPORT(243, int, png_get_palette_max, (png_const_structrp png_ptr,
png_const_inforp info_ptr)); png_const_inforp info_ptr));
#endif # endif
#endif #endif
/* Maintainer: Put new public prototypes here ^, in libpng.3, and project /* Maintainer: Put new public prototypes here ^, in libpng.3, and project

View File

@ -1163,7 +1163,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_structrp png_ptr, png_const_inforp info_ptr) png_get_palette_max(png_const_structrp png_ptr, png_const_inforp info_ptr)
{ {
@ -1172,7 +1172,7 @@ png_get_palette_max(png_const_structrp png_ptr, png_const_inforp info_ptr)
return (-1); return (-1);
} }
#endif # endif
#endif #endif
#endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */ #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */

View File

@ -813,10 +813,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
option READ_GET_PALETTE_MAX requires CHECK_FOR_INVALID_INDEX option WRITE_GET_PALETTE_MAX requires WRITE_CHECK_FOR_INVALID_INDEX
option WRITE_GET_PALETTE_MAX requires CHECK_FOR_INVALID_INDEX
# Simplified API options (added at libpng-1.6.0) # Simplified API options (added at libpng-1.6.0)
# Read: # Read: