[libpng15] Always set the "safe" limits in pngconf.h when SAFE_LIMITS is

even if pnglibconf.h has been edited to remove the limits.
This commit is contained in:
Glenn Randers-Pehrson 2012-02-23 23:06:07 -06:00
parent 97b6ad1c06
commit f97ed91ead

View File

@ -26,20 +26,23 @@
#ifdef PNG_SAFE_LIMITS_SUPPORTED
# ifdef PNG_USER_WIDTH_MAX
# undef PNG_USER_WIDTH_MAX
# define PNG_USER_WIDTH_MAX 1000000L
# endif
# define PNG_USER_WIDTH_MAX 1000000L
# ifdef PNG_USER_HEIGHT_MAX
# undef PNG_USER_HEIGHT_MAX
# define PNG_USER_HEIGHT_MAX 1000000L
# endif
# define PNG_USER_HEIGHT_MAX 1000000L
# ifdef PNG_USER_CHUNK_MALLOC_MAX
# undef PNG_USER_CHUNK_MALLOC_MAX
# define PNG_USER_CHUNK_MALLOC_MAX 4000000L
# endif
# define PNG_USER_CHUNK_MALLOC_MAX 4000000L
# ifdef PNG_USER_CHUNK_CACHE_MAX
# undef PNG_USER_CHUNK_CACHE_MAX
# define PNG_USER_CHUNK_CACHE_MAX 128
# endif
# define PNG_USER_CHUNK_CACHE_MAX 128
#endif
#ifndef PNG_BUILDING_SYMBOL_TABLE