diff --git a/ANNOUNCE b/ANNOUNCE index 4710f3410..6a8d8e5f4 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,5 +1,5 @@ -Libpng 1.5.15beta08 - March 1, 2013 +Libpng 1.5.15beta08 - March 2, 2013 This is not intended to be a public release. It will be replaced within a few weeks by a public version or by another test version. @@ -68,8 +68,19 @@ Version 1.5.15beta07 [February 27, 2013] Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble with CRLF line endings. -Version 1.5.15beta08 [March 1, 2013] +Version 1.5.15beta08 [March 2, 2013] Avoid a possible memory leak in contrib/gregbook/readpng.c + Made the _SUPPORTED macro definitions consistent. The change made in + libpng15 to #define *_SUPPORTED 1, to match the use of -D*_SUPPORTED + (which means -D*_SUPPORTED=1) and avoid compiler warnings from GCC was made + inconsistently and causes problems as a result, also some additions in + pnglibconf.h.prebuilt were inconsistent (omitting the 1). This changes 1.5 + back to the scheme used both before (1.4) and after (1.6). This might cause + some build scripts to issue warnings, and might, in the extreme, cause some + applications to fail (but they would fail anyway against 1.6). It seems + safer to go for consistency, given the change in 1.6, not correctness here, + particularly as 'make check' currently warns anyway on the symbols.dfn check + because of the inconsistencies. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/CHANGES b/CHANGES index 612f0c741..c5ebb69a4 100644 --- a/CHANGES +++ b/CHANGES @@ -4026,8 +4026,19 @@ Version 1.5.15beta07 [February 27, 2013] Revised scripts/dfn.awk to work with the buggy MSYS awk that has trouble with CRLF line endings. -Version 1.5.15beta08 [March 1, 2013] +Version 1.5.15beta08 [March 2, 2013] Avoid a possible memory leak in contrib/gregbook/readpng.c + Made the _SUPPORTED macro definitions consistent. The change made in + libpng15 to #define *_SUPPORTED 1, to match the use of -D*_SUPPORTED + (which means -D*_SUPPORTED=1) and avoid compiler warnings from GCC was made + inconsistently and causes problems as a result, also some additions in + pnglibconf.h.prebuilt were inconsistent (omitting the 1). This changes 1.5 + back to the scheme used both before (1.4) and after (1.6). This might cause + some build scripts to issue warnings, and might, in the extreme, cause some + applications to fail (but they would fail anyway against 1.6). It seems + safer to go for consistency, given the change in 1.6, not correctness here, + particularly as 'make check' currently warns anyway on the symbols.dfn check + because of the inconsistencies. Send comments/corrections/commendations to png-mng-implement at lists.sf.net (subscription required; visit diff --git a/configure.ac b/configure.ac index 5ecf68237..07487baa3 100644 --- a/configure.ac +++ b/configure.ac @@ -178,7 +178,7 @@ AC_ARG_ENABLE([arm-neon], AC_DEFINE([PNG_FILTER_OPTIMIZATIONS], [png_init_filter_functions_neon], [ARM NEON filter initialization function]) - AC_DEFINE([PNG_ALIGNED_MEMORY_SUPPORTED], [1], + AC_DEFINE([PNG_ALIGNED_MEMORY_SUPPORTED], [], [Align row buffers]) if test "${enableval}" = "always"; then AC_DEFINE([PNG_NO_ARM_NEON_CHECK], [], diff --git a/scripts/options.awk b/scripts/options.awk index 4b8a419b3..c3ead226e 100755 --- a/scripts/options.awk +++ b/scripts/options.awk @@ -53,7 +53,7 @@ BEGIN{ comment=start "/*" # Comment start cend="*/" end # Comment end def=start "#define PNG_" # Arbitrary define - sup="_SUPPORTED 1" end # end supported option + sup="_SUPPORTED" end # end supported option und=comment "#undef PNG_" # Unsupported option une="_SUPPORTED" cend # end unsupported option error=start "ERROR:" # error message, terminate with 'end' diff --git a/scripts/pnglibconf.h.prebuilt b/scripts/pnglibconf.h.prebuilt index cbb82c0b9..7c2e82935 100644 --- a/scripts/pnglibconf.h.prebuilt +++ b/scripts/pnglibconf.h.prebuilt @@ -3,7 +3,7 @@ /* pnglibconf.h - library build configuration */ -/* Libpng 1.5.15beta08 - February 27, 2013 */ +/* Libpng 1.5.15beta08 - March 2, 2013 */ /* Copyright (c) 1998-2012 Glenn Randers-Pehrson */ @@ -35,157 +35,157 @@ #define PNG_sCAL_PRECISION 5 /* end of settings */ /* options */ -#define PNG_16BIT_SUPPORTED 1 +#define PNG_16BIT_SUPPORTED #define PNG_ALIGNED_MEMORY_SUPPORTED #define PNG_ARM_NEON_CHECK_SUPPORTED -#define PNG_BENIGN_ERRORS_SUPPORTED 1 -#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED 1 -#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED 1 -#define PNG_CHECK_cHRM_SUPPORTED 1 -#define PNG_CONSOLE_IO_SUPPORTED 1 -#define PNG_CONVERT_tIME_SUPPORTED 1 -#define PNG_EASY_ACCESS_SUPPORTED 1 +#define PNG_BENIGN_ERRORS_SUPPORTED +#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED +#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED +#define PNG_CHECK_cHRM_SUPPORTED +#define PNG_CONSOLE_IO_SUPPORTED +#define PNG_CONVERT_tIME_SUPPORTED +#define PNG_EASY_ACCESS_SUPPORTED /*#undef PNG_ERROR_NUMBERS_SUPPORTED*/ -#define PNG_ERROR_TEXT_SUPPORTED 1 -#define PNG_FIXED_POINT_SUPPORTED 1 -#define PNG_FLOATING_ARITHMETIC_SUPPORTED 1 -#define PNG_FLOATING_POINT_SUPPORTED 1 -#define PNG_GET_PALETTE_MAX_SUPPORTED 1 -#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED 1 -#define PNG_INCH_CONVERSIONS_SUPPORTED 1 -#define PNG_INFO_IMAGE_SUPPORTED 1 -#define PNG_IO_STATE_SUPPORTED 1 -#define PNG_MNG_FEATURES_SUPPORTED 1 -#define PNG_POINTER_INDEXING_SUPPORTED 1 -#define PNG_PROGRESSIVE_READ_SUPPORTED 1 -#define PNG_READ_16BIT_SUPPORTED 1 -#define PNG_READ_ALPHA_MODE_SUPPORTED 1 -#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED 1 -#define PNG_READ_BACKGROUND_SUPPORTED 1 -#define PNG_READ_BGR_SUPPORTED 1 -#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED 1 -#define PNG_READ_COMPOSITE_NODIV_SUPPORTED 1 -#define PNG_READ_COMPRESSED_TEXT_SUPPORTED 1 -#define PNG_READ_EXPAND_16_SUPPORTED 1 -#define PNG_READ_EXPAND_SUPPORTED 1 -#define PNG_READ_FILLER_SUPPORTED 1 -#define PNG_READ_GAMMA_SUPPORTED 1 -#define PNG_READ_GET_PALETTE_MAX_SUPPORTED 1 -#define PNG_READ_GRAY_TO_RGB_SUPPORTED 1 -#define PNG_READ_INTERLACING_SUPPORTED 1 -#define PNG_READ_INT_FUNCTIONS_SUPPORTED 1 -#define PNG_READ_INVERT_ALPHA_SUPPORTED 1 -#define PNG_READ_INVERT_SUPPORTED 1 -#define PNG_READ_OPT_PLTE_SUPPORTED 1 -#define PNG_READ_PACKSWAP_SUPPORTED 1 -#define PNG_READ_PACK_SUPPORTED 1 -#define PNG_READ_QUANTIZE_SUPPORTED 1 -#define PNG_READ_RGB_TO_GRAY_SUPPORTED 1 -#define PNG_READ_SCALE_16_TO_8_SUPPORTED 1 -#define PNG_READ_SHIFT_SUPPORTED 1 -#define PNG_READ_STRIP_16_TO_8_SUPPORTED 1 -#define PNG_READ_STRIP_ALPHA_SUPPORTED 1 -#define PNG_READ_SUPPORTED 1 -#define PNG_READ_SWAP_ALPHA_SUPPORTED 1 -#define PNG_READ_SWAP_SUPPORTED 1 -#define PNG_READ_TEXT_SUPPORTED 1 -#define PNG_READ_TRANSFORMS_SUPPORTED 1 -#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED 1 -#define PNG_READ_USER_CHUNKS_SUPPORTED 1 -#define PNG_READ_USER_TRANSFORM_SUPPORTED 1 -#define PNG_READ_bKGD_SUPPORTED 1 -#define PNG_READ_cHRM_SUPPORTED 1 -#define PNG_READ_gAMA_SUPPORTED 1 -#define PNG_READ_hIST_SUPPORTED 1 -#define PNG_READ_iCCP_SUPPORTED 1 -#define PNG_READ_iTXt_SUPPORTED 1 -#define PNG_READ_oFFs_SUPPORTED 1 -#define PNG_READ_pCAL_SUPPORTED 1 -#define PNG_READ_pHYs_SUPPORTED 1 -#define PNG_READ_sBIT_SUPPORTED 1 -#define PNG_READ_sCAL_SUPPORTED 1 -#define PNG_READ_sPLT_SUPPORTED 1 -#define PNG_READ_sRGB_SUPPORTED 1 -#define PNG_READ_tEXt_SUPPORTED 1 -#define PNG_READ_tIME_SUPPORTED 1 -#define PNG_READ_tRNS_SUPPORTED 1 -#define PNG_READ_zTXt_SUPPORTED 1 +#define PNG_ERROR_TEXT_SUPPORTED +#define PNG_FIXED_POINT_SUPPORTED +#define PNG_FLOATING_ARITHMETIC_SUPPORTED +#define PNG_FLOATING_POINT_SUPPORTED +#define PNG_GET_PALETTE_MAX_SUPPORTED +#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED +#define PNG_INCH_CONVERSIONS_SUPPORTED +#define PNG_INFO_IMAGE_SUPPORTED +#define PNG_IO_STATE_SUPPORTED +#define PNG_MNG_FEATURES_SUPPORTED +#define PNG_POINTER_INDEXING_SUPPORTED +#define PNG_PROGRESSIVE_READ_SUPPORTED +#define PNG_READ_16BIT_SUPPORTED +#define PNG_READ_ALPHA_MODE_SUPPORTED +#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED +#define PNG_READ_BACKGROUND_SUPPORTED +#define PNG_READ_BGR_SUPPORTED +#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED +#define PNG_READ_COMPOSITE_NODIV_SUPPORTED +#define PNG_READ_COMPRESSED_TEXT_SUPPORTED +#define PNG_READ_EXPAND_16_SUPPORTED +#define PNG_READ_EXPAND_SUPPORTED +#define PNG_READ_FILLER_SUPPORTED +#define PNG_READ_GAMMA_SUPPORTED +#define PNG_READ_GET_PALETTE_MAX_SUPPORTED +#define PNG_READ_GRAY_TO_RGB_SUPPORTED +#define PNG_READ_INTERLACING_SUPPORTED +#define PNG_READ_INT_FUNCTIONS_SUPPORTED +#define PNG_READ_INVERT_ALPHA_SUPPORTED +#define PNG_READ_INVERT_SUPPORTED +#define PNG_READ_OPT_PLTE_SUPPORTED +#define PNG_READ_PACKSWAP_SUPPORTED +#define PNG_READ_PACK_SUPPORTED +#define PNG_READ_QUANTIZE_SUPPORTED +#define PNG_READ_RGB_TO_GRAY_SUPPORTED +#define PNG_READ_SCALE_16_TO_8_SUPPORTED +#define PNG_READ_SHIFT_SUPPORTED +#define PNG_READ_STRIP_16_TO_8_SUPPORTED +#define PNG_READ_STRIP_ALPHA_SUPPORTED +#define PNG_READ_SUPPORTED +#define PNG_READ_SWAP_ALPHA_SUPPORTED +#define PNG_READ_SWAP_SUPPORTED +#define PNG_READ_TEXT_SUPPORTED +#define PNG_READ_TRANSFORMS_SUPPORTED +#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_READ_USER_CHUNKS_SUPPORTED +#define PNG_READ_USER_TRANSFORM_SUPPORTED +#define PNG_READ_bKGD_SUPPORTED +#define PNG_READ_cHRM_SUPPORTED +#define PNG_READ_gAMA_SUPPORTED +#define PNG_READ_hIST_SUPPORTED +#define PNG_READ_iCCP_SUPPORTED +#define PNG_READ_iTXt_SUPPORTED +#define PNG_READ_oFFs_SUPPORTED +#define PNG_READ_pCAL_SUPPORTED +#define PNG_READ_pHYs_SUPPORTED +#define PNG_READ_sBIT_SUPPORTED +#define PNG_READ_sCAL_SUPPORTED +#define PNG_READ_sPLT_SUPPORTED +#define PNG_READ_sRGB_SUPPORTED +#define PNG_READ_tEXt_SUPPORTED +#define PNG_READ_tIME_SUPPORTED +#define PNG_READ_tRNS_SUPPORTED +#define PNG_READ_zTXt_SUPPORTED /*#undef PNG_SAFE_LIMITS_SUPPORTED*/ -#define PNG_SAVE_INT_32_SUPPORTED 1 -#define PNG_SEQUENTIAL_READ_SUPPORTED 1 -#define PNG_SETJMP_SUPPORTED 1 -#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED 1 -#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED 1 -#define PNG_SET_USER_LIMITS_SUPPORTED 1 -#define PNG_STDIO_SUPPORTED 1 -#define PNG_TEXT_SUPPORTED 1 -#define PNG_TIME_RFC1123_SUPPORTED 1 -#define PNG_UNKNOWN_CHUNKS_SUPPORTED 1 -#define PNG_USER_CHUNKS_SUPPORTED 1 -#define PNG_USER_LIMITS_SUPPORTED 1 -#define PNG_USER_MEM_SUPPORTED 1 -#define PNG_USER_TRANSFORM_INFO_SUPPORTED 1 -#define PNG_USER_TRANSFORM_PTR_SUPPORTED 1 -#define PNG_WARNINGS_SUPPORTED 1 -#define PNG_WRITE_16BIT_SUPPORTED 1 -#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED 1 -#define PNG_WRITE_BGR_SUPPORTED 1 -#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED 1 -#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED 1 -#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED 1 -#define PNG_WRITE_FILLER_SUPPORTED 1 -#define PNG_WRITE_FILTER_SUPPORTED 1 -#define PNG_WRITE_FLUSH_SUPPORTED 1 -#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED 1 -#define PNG_WRITE_INTERLACING_SUPPORTED 1 -#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED 1 -#define PNG_WRITE_INVERT_ALPHA_SUPPORTED 1 -#define PNG_WRITE_INVERT_SUPPORTED 1 -#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED 1 -#define PNG_WRITE_PACKSWAP_SUPPORTED 1 -#define PNG_WRITE_PACK_SUPPORTED 1 -#define PNG_WRITE_SHIFT_SUPPORTED 1 -#define PNG_WRITE_SUPPORTED 1 -#define PNG_WRITE_SWAP_ALPHA_SUPPORTED 1 -#define PNG_WRITE_SWAP_SUPPORTED 1 -#define PNG_WRITE_TEXT_SUPPORTED 1 -#define PNG_WRITE_TRANSFORMS_SUPPORTED 1 -#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED 1 -#define PNG_WRITE_USER_TRANSFORM_SUPPORTED 1 -#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED 1 -#define PNG_WRITE_bKGD_SUPPORTED 1 -#define PNG_WRITE_cHRM_SUPPORTED 1 -#define PNG_WRITE_gAMA_SUPPORTED 1 -#define PNG_WRITE_hIST_SUPPORTED 1 -#define PNG_WRITE_iCCP_SUPPORTED 1 -#define PNG_WRITE_iTXt_SUPPORTED 1 -#define PNG_WRITE_oFFs_SUPPORTED 1 -#define PNG_WRITE_pCAL_SUPPORTED 1 -#define PNG_WRITE_pHYs_SUPPORTED 1 -#define PNG_WRITE_sBIT_SUPPORTED 1 -#define PNG_WRITE_sCAL_SUPPORTED 1 -#define PNG_WRITE_sPLT_SUPPORTED 1 -#define PNG_WRITE_sRGB_SUPPORTED 1 -#define PNG_WRITE_tEXt_SUPPORTED 1 -#define PNG_WRITE_tIME_SUPPORTED 1 -#define PNG_WRITE_tRNS_SUPPORTED 1 -#define PNG_WRITE_zTXt_SUPPORTED 1 -#define PNG_bKGD_SUPPORTED 1 -#define PNG_cHRM_SUPPORTED 1 -#define PNG_gAMA_SUPPORTED 1 -#define PNG_hIST_SUPPORTED 1 -#define PNG_iCCP_SUPPORTED 1 -#define PNG_iTXt_SUPPORTED 1 -#define PNG_oFFs_SUPPORTED 1 -#define PNG_pCAL_SUPPORTED 1 -#define PNG_pHYs_SUPPORTED 1 -#define PNG_sBIT_SUPPORTED 1 -#define PNG_sCAL_SUPPORTED 1 -#define PNG_sPLT_SUPPORTED 1 -#define PNG_sRGB_SUPPORTED 1 -#define PNG_tEXt_SUPPORTED 1 -#define PNG_tIME_SUPPORTED 1 -#define PNG_tRNS_SUPPORTED 1 -#define PNG_zTXt_SUPPORTED 1 +#define PNG_SAVE_INT_32_SUPPORTED +#define PNG_SEQUENTIAL_READ_SUPPORTED +#define PNG_SETJMP_SUPPORTED +#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED +#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED +#define PNG_SET_USER_LIMITS_SUPPORTED +#define PNG_STDIO_SUPPORTED +#define PNG_TEXT_SUPPORTED +#define PNG_TIME_RFC1123_SUPPORTED +#define PNG_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_USER_CHUNKS_SUPPORTED +#define PNG_USER_LIMITS_SUPPORTED +#define PNG_USER_MEM_SUPPORTED +#define PNG_USER_TRANSFORM_INFO_SUPPORTED +#define PNG_USER_TRANSFORM_PTR_SUPPORTED +#define PNG_WARNINGS_SUPPORTED +#define PNG_WRITE_16BIT_SUPPORTED +#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED +#define PNG_WRITE_BGR_SUPPORTED +#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED +#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED +#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED +#define PNG_WRITE_FILLER_SUPPORTED +#define PNG_WRITE_FILTER_SUPPORTED +#define PNG_WRITE_FLUSH_SUPPORTED +#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED +#define PNG_WRITE_INTERLACING_SUPPORTED +#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED +#define PNG_WRITE_INVERT_ALPHA_SUPPORTED +#define PNG_WRITE_INVERT_SUPPORTED +#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED +#define PNG_WRITE_PACKSWAP_SUPPORTED +#define PNG_WRITE_PACK_SUPPORTED +#define PNG_WRITE_SHIFT_SUPPORTED +#define PNG_WRITE_SUPPORTED +#define PNG_WRITE_SWAP_ALPHA_SUPPORTED +#define PNG_WRITE_SWAP_SUPPORTED +#define PNG_WRITE_TEXT_SUPPORTED +#define PNG_WRITE_TRANSFORMS_SUPPORTED +#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED +#define PNG_WRITE_USER_TRANSFORM_SUPPORTED +#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED +#define PNG_WRITE_bKGD_SUPPORTED +#define PNG_WRITE_cHRM_SUPPORTED +#define PNG_WRITE_gAMA_SUPPORTED +#define PNG_WRITE_hIST_SUPPORTED +#define PNG_WRITE_iCCP_SUPPORTED +#define PNG_WRITE_iTXt_SUPPORTED +#define PNG_WRITE_oFFs_SUPPORTED +#define PNG_WRITE_pCAL_SUPPORTED +#define PNG_WRITE_pHYs_SUPPORTED +#define PNG_WRITE_sBIT_SUPPORTED +#define PNG_WRITE_sCAL_SUPPORTED +#define PNG_WRITE_sPLT_SUPPORTED +#define PNG_WRITE_sRGB_SUPPORTED +#define PNG_WRITE_tEXt_SUPPORTED +#define PNG_WRITE_tIME_SUPPORTED +#define PNG_WRITE_tRNS_SUPPORTED +#define PNG_WRITE_zTXt_SUPPORTED +#define PNG_bKGD_SUPPORTED +#define PNG_cHRM_SUPPORTED +#define PNG_gAMA_SUPPORTED +#define PNG_hIST_SUPPORTED +#define PNG_iCCP_SUPPORTED +#define PNG_iTXt_SUPPORTED +#define PNG_oFFs_SUPPORTED +#define PNG_pCAL_SUPPORTED +#define PNG_pHYs_SUPPORTED +#define PNG_sBIT_SUPPORTED +#define PNG_sCAL_SUPPORTED +#define PNG_sPLT_SUPPORTED +#define PNG_sRGB_SUPPORTED +#define PNG_tEXt_SUPPORTED +#define PNG_tIME_SUPPORTED +#define PNG_tRNS_SUPPORTED +#define PNG_zTXt_SUPPORTED /* end of options */ #endif /* PNGLCONF_H */