[libpng15] Revised the SAFE_LIMITS feature to be the same as the feature in

libpng16.  Added information about the new limits in the manual.
This commit is contained in:
Glenn Randers-Pehrson
2012-02-24 16:54:12 -06:00
parent b27c862b14
commit 65de519c4a
9 changed files with 94 additions and 92 deletions

View File

@@ -1,7 +1,7 @@
/* pngconf.h - machine configurable file for libpng
*
* libpng version 1.5.10beta02 - February 24, 2012
* libpng version 1.5.10beta01 - February 24, 2012
*
* Copyright (c) 1998-2012 Glenn Randers-Pehrson
* (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -22,29 +22,6 @@
#ifndef PNGCONF_H
#define PNGCONF_H
/* Feature added at libpng-1.5.10 */
#ifdef PNG_SAFE_LIMITS_SUPPORTED
# ifdef PNG_USER_WIDTH_MAX
# undef PNG_USER_WIDTH_MAX
# endif
# define PNG_USER_WIDTH_MAX 1000000L
# ifdef PNG_USER_HEIGHT_MAX
# undef PNG_USER_HEIGHT_MAX
# endif
# define PNG_USER_HEIGHT_MAX 1000000L
# ifdef PNG_USER_CHUNK_MALLOC_MAX
# undef PNG_USER_CHUNK_MALLOC_MAX
# endif
# define PNG_USER_CHUNK_MALLOC_MAX 4000000L
# ifdef PNG_USER_CHUNK_CACHE_MAX
# undef PNG_USER_CHUNK_CACHE_MAX
# endif
# define PNG_USER_CHUNK_CACHE_MAX 128
#endif
#ifndef PNG_BUILDING_SYMBOL_TABLE
/* PNG_NO_LIMITS_H may be used to turn off the use of the standard C
* definition file for machine specific limits, this may impact the