FCL/sf/mw/qt: comparison src/3rdparty/libpng/pngconf.h

equal deleted inserted replaced

-:93b982ccede2
+:5daf16870df6
 /* pngconf.h - machine configurable file for libpng
 *
-* libpng version 1.2.40 - September 10, 2009
+* libpng version 1.4.0 - January 3, 2010
-* Copyright (c) 1998-2009 Glenn Randers-Pehrson
+* For conditions of distribution and use, see copyright notice in png.h
+* Copyright (c) 1998-2010 Glenn Randers-Pehrson
 * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
 * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
 *
 * This code is released under the libpng license.
 * For conditions of distribution and use, see the disclaimer
 * and license in png.h
+*
 */
 /* Any machine specific code is near the front of this file, so if you
 * are configuring libpng for a machine, you may want to read the section
 * starting here down to where it starts to typedef png_color, png_text,
 */
 #ifndef PNGCONF_H
 #define PNGCONF_H
-#define PNG_1_2_X
+#ifndef PNG_NO_LIMITS_H
+#  include <limits.h>
+#endif
+/* Added at libpng-1.2.9 */
+/* config.h is created by and PNG_CONFIGURE_LIBPNG is set by the "configure" script. */
+#ifdef PNG_CONFIGURE_LIBPNG
+#  ifdef HAVE_CONFIG_H
+#    include "config.h"
+#  endif
+#endif
 /*
+* Added at libpng-1.2.8
+*
 * PNG_USER_CONFIG has to be defined on the compiler command line. This
 * includes the resource compiler for Windows DLL configurations.
 */
 #ifdef PNG_USER_CONFIG
 #  ifndef PNG_USER_PRIVATEBUILD
 #    define PNG_USER_PRIVATEBUILD
 #  endif
-#include "pngusr.h"
+#  include "pngusr.h"
-#endif
-/* PNG_CONFIGURE_LIBPNG is set by the "configure" script. */
-#ifdef PNG_CONFIGURE_LIBPNG
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 #endif
 /*
-* Added at libpng-1.2.8
-*
 * If you create a private DLL you need to define in "pngusr.h" the followings:
 * #define PNG_USER_PRIVATEBUILD <Describes by whom and why this version of
 *        the DLL was built>
 *  e.g. #define PNG_USER_PRIVATEBUILD "Build by MyCompany for xyz reasons."
 * #define PNG_USER_DLLFNAME_POSTFIX <two-letter postfix that serve to
 * - PNG_USER_VERSIONINFO_COMPANYNAME
 * - PNG_USER_VERSIONINFO_LEGALTRADEMARKS
 */
 #ifdef __STDC__
-#ifdef SPECIALBUILD
+#  ifdef SPECIALBUILD
-#  pragma message("PNG_LIBPNG_SPECIALBUILD (and deprecated SPECIALBUILD)\
+#    pragma message("PNG_LIBPNG_SPECIALBUILD (and deprecated SPECIALBUILD)\
 are now LIBPNG reserved macros. Use PNG_USER_PRIVATEBUILD instead.")
-#endif
+#  endif
-#ifdef PRIVATEBUILD
+#  ifdef PRIVATEBUILD
-# pragma message("PRIVATEBUILD is deprecated.\
+#    pragma message("PRIVATEBUILD is deprecated.\
 Use PNG_USER_PRIVATEBUILD instead.")
-# define PNG_USER_PRIVATEBUILD PRIVATEBUILD
+#    define PNG_USER_PRIVATEBUILD PRIVATEBUILD
-#endif
+#  endif
 #endif /* __STDC__ */
+/* End of material added to libpng-1.2.8 */
 #ifndef PNG_VERSION_INFO_ONLY
-/* End of material added to libpng-1.2.8 */
-/* Added at libpng-1.2.19, removed at libpng-1.2.20 because it caused trouble
-Restored at libpng-1.2.21 */
-#if !defined(PNG_NO_WARN_UNINITIALIZED_ROW) && \
-!defined(PNG_WARN_UNINITIALIZED_ROW)
-#  define PNG_WARN_UNINITIALIZED_ROW 1
-#endif
-/* End of material added at libpng-1.2.19/1.2.21 */
 /* This is the size of the compression buffer, and thus the size of
 * an IDAT chunk.  Make this whatever size you feel is best for your
 * machine.  One of these will be allocated per png_struct.  When this
 * is full, it writes the data to the disk, and does some other
 #ifndef PNG_NO_WRITE_SUPPORTED
 #  define PNG_WRITE_SUPPORTED
 #endif
+/* Enabled in 1.4.0. */
+#ifdef PNG_ALLOW_BENIGN_ERRORS
+#  define png_benign_error png_warning
+#  define png_chunk_benign_error png_chunk_warning
+#else
+#  ifndef PNG_BENIGN_ERRORS_SUPPORTED
+#    define png_benign_error png_error
+#    define png_chunk_benign_error png_chunk_error
+#  endif
+#endif
+/* Added at libpng version 1.4.0 */
+#if !defined(PNG_NO_WARNINGS) && !defined(PNG_WARNINGS_SUPPORTED)
+#  define PNG_WARNINGS_SUPPORTED
+#endif
+/* Added at libpng version 1.4.0 */
+#if !defined(PNG_NO_ERROR_TEXT) && !defined(PNG_ERROR_TEXT_SUPPORTED)
+#  define PNG_ERROR_TEXT_SUPPORTED
+#endif
+/* Added at libpng version 1.4.0 */
+#if !defined(PNG_NO_CHECK_cHRM) && !defined(PNG_CHECK_cHRM_SUPPORTED)
+#  define PNG_CHECK_cHRM_SUPPORTED
+#endif
+/* Added at libpng version 1.4.0 */
+#if !defined(PNG_NO_ALIGNED_MEMORY) && !defined(PNG_ALIGNED_MEMORY_SUPPORTED)
+#  define PNG_ALIGNED_MEMORY_SUPPORTED
+#endif
 /* Enabled by default in 1.2.0.  You can disable this if you don't need to
 support PNGs that are embedded in MNG datastreams */
-#if !defined(PNG_1_0_X) && !defined(PNG_NO_MNG_FEATURES)
+#ifndef PNG_NO_MNG_FEATURES
 #  ifndef PNG_MNG_FEATURES_SUPPORTED
 #    define PNG_MNG_FEATURES_SUPPORTED
 #  endif
 #endif
+/* Added at libpng version 1.4.0 */
 #ifndef PNG_NO_FLOATING_POINT_SUPPORTED
 #  ifndef PNG_FLOATING_POINT_SUPPORTED
 #    define PNG_FLOATING_POINT_SUPPORTED
 #  endif
 #endif
+/* Added at libpng-1.4.0beta49 for testing (this test is no longer used
+in libpng and png_calloc() is always present)
+*/
+#define PNG_CALLOC_SUPPORTED
 /* If you are running on a machine where you cannot allocate more
 * than 64K of memory at once, uncomment this.  While libpng will not
 * normally need that much memory in a chunk (unless you load up a very
 * large file), zlib needs to know how big of a chunk it can use, and
 *   of auto-import in binutils, we no longer need to worry about
 *   __declspec(dllexport) / __declspec(dllimport) and friends.  Therefore,
 *   we don't need to worry about PNG_STATIC or ALL_STATIC when it comes
 *   to __declspec() stuff.  However, we DO need to worry about
 *   PNG_BUILD_DLL and PNG_STATIC because those change some defaults
-*   such as CONSOLE_IO and whether GLOBAL_ARRAYS are allowed.
+*   such as CONSOLE_IO.
 */
-#if defined(__CYGWIN__)
+#ifdef __CYGWIN__
-#  if defined(ALL_STATIC)
+#  ifdef ALL_STATIC
-#    if defined(PNG_BUILD_DLL)
+#    ifdef PNG_BUILD_DLL
 #      undef PNG_BUILD_DLL
 #    endif
-#    if defined(PNG_USE_DLL)
+#    ifdef PNG_USE_DLL
 #      undef PNG_USE_DLL
 #    endif
-#    if defined(PNG_DLL)
+#    ifdef PNG_DLL
 #      undef PNG_DLL
 #    endif
-#    if !defined(PNG_STATIC)
+#    ifndef PNG_STATIC
 #      define PNG_STATIC
 #    endif
 #  else
-#    if defined (PNG_BUILD_DLL)
+#    ifdef PNG_BUILD_DLL
-#      if defined(PNG_STATIC)
+#      ifdef PNG_STATIC
 #        undef PNG_STATIC
 #      endif
-#      if defined(PNG_USE_DLL)
+#      ifdef PNG_USE_DLL
 #        undef PNG_USE_DLL
 #      endif
-#      if !defined(PNG_DLL)
+#      ifndef PNG_DLL
 #        define PNG_DLL
 #      endif
 #    else
-#      if defined(PNG_STATIC)
+#      ifdef PNG_STATIC
-#        if defined(PNG_USE_DLL)
+#        ifdef PNG_USE_DLL
 #          undef PNG_USE_DLL
 #        endif
-#        if defined(PNG_DLL)
+#        ifdef PNG_DLL
 #          undef PNG_DLL
 #        endif
 #      else
-#        if !defined(PNG_USE_DLL)
+#        ifndef PNG_USE_DLL
 #          define PNG_USE_DLL
 #        endif
-#        if !defined(PNG_DLL)
+#        ifndef PNG_DLL
 #          define PNG_DLL
 #        endif
 #      endif
 #    endif
 #  endif
 *
 * #define PNG_NO_CONSOLE_IO
 * #define PNG_NO_STDIO
 */
-#if defined(_WIN32_WCE)
+#if !defined(PNG_NO_STDIO) && !defined(PNG_STDIO_SUPPORTED)
-#  include <windows.h>
+#  define PNG_STDIO_SUPPORTED
-/* Console I/O functions are not supported on WindowsCE */
+#endif
-#  define PNG_NO_CONSOLE_IO
-/* abort() may not be supported on some/all Windows CE platforms */
-#  define PNG_ABORT() exit(-1)
-#  ifdef PNG_DEBUG
-#    undef PNG_DEBUG
-#  endif
-#endif
 #ifdef PNG_BUILD_DLL
-#  ifndef PNG_CONSOLE_IO_SUPPORTED
+#  if !defined(PNG_CONSOLE_IO_SUPPORTED) && !defined(PNG_NO_CONSOLE_IO)
-#    ifndef PNG_NO_CONSOLE_IO
+#    define PNG_NO_CONSOLE_IO
-#      define PNG_NO_CONSOLE_IO
-#    endif
 #  endif
 #endif
 #  ifdef PNG_NO_STDIO
 #    ifndef PNG_NO_CONSOLE_IO
 #      if (PNG_DEBUG > 0)
 #        include <stdio.h>
 #      endif
 #    endif
 #  else
-#    if !defined(_WIN32_WCE)
+#    include <stdio.h>
-/* "stdio.h" functions are not supported on WindowsCE */
+#  endif
-#      include <stdio.h>
-#    endif
+#if !(defined PNG_NO_CONSOLE_IO) && !defined(PNG_CONSOLE_IO_SUPPORTED)
-#  endif
+#  define PNG_CONSOLE_IO_SUPPORTED
+#endif
 /* This macro protects us against machines that don't have function
 * prototypes (ie K&R style headers).  If your compiler does not handle
 * function prototypes, define this macro and use the included ansi2knr.
 * I've always been able to use _NO_PROTO as the indicator, but you may
 #  define PNGARG(arglist) OF(arglist)
 #else
 #ifdef _NO_PROTO
 #  define PNGARG(arglist) ()
-#  ifndef PNG_TYPECAST_NULL
-#     define PNG_TYPECAST_NULL
-#  endif
 #else
 #  define PNGARG(arglist) arglist
 #endif /* _NO_PROTO */
 #endif /* OF */
 #endif /* PNGARG */
 defined(THINK_C) || defined(__SC__) || defined(TARGET_OS_MAC)
 #    define MACOS
 #  endif
 #endif
-/* enough people need this for various reasons to include it here */
+/* Enough people need this for various reasons to include it here */
 #if !defined(MACOS) && !defined(RISCOS) && !defined(_WIN32_WCE)
 #  include <sys/types.h>
 #endif
-#if !defined(PNG_SETJMP_NOT_SUPPORTED) && !defined(PNG_NO_SETJMP_SUPPORTED)
+/* PNG_SETJMP_NOT_SUPPORTED and PNG_NO_SETJMP_SUPPORTED are deprecated. */
+#if !defined(PNG_NO_SETJMP) && \
+!defined(PNG_SETJMP_NOT_SUPPORTED) && !defined(PNG_NO_SETJMP_SUPPORTED)
 #  define PNG_SETJMP_SUPPORTED
 #endif
 #ifdef PNG_SETJMP_SUPPORTED
 /* This is an attempt to force a single setjmp behaviour on Linux.  If
 __dont__ include it again.;
 #      endif
 #    endif /* __linux__ */
 #  endif /* PNG_SKIP_SETJMP_CHECK */
-/* include setjmp.h for error handling */
+/* Include setjmp.h for error handling */
 #  include <setjmp.h>
 #  ifdef __linux__
 #    ifdef PNG_SAVE_BSD_SOURCE
-#      ifndef _BSD_SOURCE
+#      ifdef _BSD_SOURCE
-#        define _BSD_SOURCE
+#        undef _BSD_SOURCE
 #      endif
+#      define _BSD_SOURCE
 #      undef PNG_SAVE_BSD_SOURCE
 #    endif
 #  endif /* __linux__ */
 #endif /* PNG_SETJMP_SUPPORTED */
 #else
 #  include <string.h>
 #endif
 /* Other defines for things like memory and the like can go here.  */
-#ifdef PNG_INTERNAL
-#include <stdlib.h>
-/* The functions exported by PNG_EXTERN are PNG_INTERNAL functions, which
-* aren't usually used outside the library (as far as I know), so it is
-* debatable if they should be exported at all.  In the future, when it is
-* possible to have run-time registry of chunk-handling functions, some of
-* these will be made available again.
-#define PNG_EXTERN extern
-*/
-#define PNG_EXTERN
-/* Other defines specific to compilers can go here.  Try to keep
-* them inside an appropriate ifdef/endif pair for portability.
-*/
-#if defined(PNG_FLOATING_POINT_SUPPORTED)
-#  if defined(MACOS)
-/* We need to check that <math.h> hasn't already been included earlier
-* as it seems it doesn't agree with <fp.h>, yet we should really use
-* <fp.h> if possible.
-*/
-#    if !defined(__MATH_H__) && !defined(__MATH_H) && !defined(__cmath__)
-#      include <fp.h>
-#    endif
-#  else
-#    include <math.h>
-#  endif
-#  if defined(_AMIGA) && defined(__SASC) && defined(_M68881)
-/* Amiga SAS/C: We must include builtin FPU functions when compiling using
-* MATH=68881
-*/
-#    include <m68881.h>
-#  endif
-#endif
-/* Codewarrior on NT has linking problems without this. */
-#if (defined(__MWERKS__) && defined(WIN32)) || defined(__STDC__)
-#  define PNG_ALWAYS_EXTERN
-#endif
-/* This provides the non-ANSI (far) memory allocation routines. */
-#if defined(__TURBOC__) && defined(__MSDOS__)
-#  include <mem.h>
-#  include <alloc.h>
-#endif
-/* I have no idea why is this necessary... */
-#if defined(_MSC_VER) && (defined(WIN32) || defined(_Windows) || \
-defined(_WINDOWS) || defined(_WIN32) || defined(__WIN32__))
-#  include <malloc.h>
-#endif
 /* This controls how fine the dithering gets.  As this allocates
 * a largish chunk of memory (32K), those who are not as concerned
 * with dithering quality can decrease some or all of these.
 */
 */
 #ifndef PNG_GAMMA_THRESHOLD
 #  define PNG_GAMMA_THRESHOLD 0.05
 #endif
-#endif /* PNG_INTERNAL */
 /* The following uses const char * instead of char * for error
 * and warning message functions, so some compilers won't complain.
 * If you do not want to use const, define PNG_NO_CONST here.
 */
-#ifndef PNG_NO_CONST
+#ifndef PNG_CONST
-#  define PNG_CONST const
+#  ifndef PNG_NO_CONST
-#else
+#    define PNG_CONST const
-#  define PNG_CONST
+#  else
+#    define PNG_CONST
+#  endif
 #endif
 /* The following defines give you the ability to remove code from the
 * library that you will not be using.  I wish I could figure out how to
 * automate this, but I can't do that without making it seriously hard
 */
 /* Any features you will not be using can be undef'ed here */
 /* GR-P, 0.96a: Set "*TRANSFORMS_SUPPORTED as default but allow user
-* to turn it off with "*TRANSFORMS_NOT_SUPPORTED" or *PNG_NO_*_TRANSFORMS
+* to turn it off with PNG_NO_READ|WRITE_TRANSFORMS on the compile line,
-* on the compile line, then pick and choose which ones to define without
+* then pick and choose which ones to define without having to edit this
-* having to edit this file. It is safe to use the *TRANSFORMS_NOT_SUPPORTED
+* file. It is safe to use the PNG_NO_READ|WRITE_TRANSFORMS
 * if you only want to have a png-compliant reader/writer but don't need
 * any of the extra transformations.  This saves about 80 kbytes in a
 * typical installation of the library. (PNG_NO_* form added in version
-* 1.0.1c, for consistency)
+* 1.0.1c, for consistency; PNG_*_TRANSFORMS_NOT_SUPPORTED deprecated in
-*/
+* 1.4.0)
+*/
-/* The size of the png_text structure changed in libpng-1.0.6 when
-* iTXt support was added.  iTXt support was turned off by default through
-* libpng-1.2.x, to support old apps that malloc the png_text structure
-* instead of calling png_set_text() and letting libpng malloc it.  It
-* will be turned on by default in libpng-1.4.0.
-*/
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-#  ifndef PNG_NO_iTXt_SUPPORTED
-#    define PNG_NO_iTXt_SUPPORTED
-#  endif
-#  ifndef PNG_NO_READ_iTXt
-#    define PNG_NO_READ_iTXt
-#  endif
-#  ifndef PNG_NO_WRITE_iTXt
-#    define PNG_NO_WRITE_iTXt
-#  endif
-#endif
-#if !defined(PNG_NO_iTXt_SUPPORTED)
-#  if !defined(PNG_READ_iTXt_SUPPORTED) && !defined(PNG_NO_READ_iTXt)
-#    define PNG_READ_iTXt
-#  endif
-#  if !defined(PNG_WRITE_iTXt_SUPPORTED) && !defined(PNG_NO_WRITE_iTXt)
-#    define PNG_WRITE_iTXt
-#  endif
-#endif
-/* The following support, added after version 1.0.0, can be turned off here en
-* masse by defining PNG_LEGACY_SUPPORTED in case you need binary compatibility
-* with old applications that require the length of png_struct and png_info
-* to remain unchanged.
-*/
-#ifdef PNG_LEGACY_SUPPORTED
-#  define PNG_NO_FREE_ME
-#  define PNG_NO_READ_UNKNOWN_CHUNKS
-#  define PNG_NO_WRITE_UNKNOWN_CHUNKS
-#  define PNG_NO_HANDLE_AS_UNKNOWN
-#  define PNG_NO_READ_USER_CHUNKS
-#  define PNG_NO_READ_iCCP
-#  define PNG_NO_WRITE_iCCP
-#  define PNG_NO_READ_iTXt
-#  define PNG_NO_WRITE_iTXt
-#  define PNG_NO_READ_sCAL
-#  define PNG_NO_WRITE_sCAL
-#  define PNG_NO_READ_sPLT
-#  define PNG_NO_WRITE_sPLT
-#  define PNG_NO_INFO_IMAGE
-#  define PNG_NO_READ_RGB_TO_GRAY
-#  define PNG_NO_READ_USER_TRANSFORM
-#  define PNG_NO_WRITE_USER_TRANSFORM
-#  define PNG_NO_USER_MEM
-#  define PNG_NO_READ_EMPTY_PLTE
-#  define PNG_NO_MNG_FEATURES
-#  define PNG_NO_FIXED_POINT_SUPPORTED
-#endif
 /* Ignore attempt to turn off both floating and fixed point support */
 #if !defined(PNG_FLOATING_POINT_SUPPORTED) || \
 !defined(PNG_NO_FIXED_POINT_SUPPORTED)
 #  define PNG_FIXED_POINT_SUPPORTED
 #endif
-#ifndef PNG_NO_FREE_ME
-#  define PNG_FREE_ME_SUPPORTED
-#endif
 #ifdef PNG_READ_SUPPORTED
+/* PNG_READ_TRANSFORMS_NOT_SUPPORTED is deprecated. */
 #if !defined(PNG_READ_TRANSFORMS_NOT_SUPPORTED) && \
 !defined(PNG_NO_READ_TRANSFORMS)
 #  define PNG_READ_TRANSFORMS_SUPPORTED
 #endif
 #    define PNG_READ_PACKSWAP_SUPPORTED
 #  endif
 #  ifndef PNG_NO_READ_INVERT
 #    define PNG_READ_INVERT_SUPPORTED
 #  endif
+#if 0 /* removed from libpng-1.4.0 */
 #  ifndef PNG_NO_READ_DITHER
 #    define PNG_READ_DITHER_SUPPORTED
 #  endif
+#endif /* 0 */
 #  ifndef PNG_NO_READ_BACKGROUND
 #    define PNG_READ_BACKGROUND_SUPPORTED
 #  endif
 #  ifndef PNG_NO_READ_16_TO_8
 #    define PNG_READ_16_TO_8_SUPPORTED
 #  ifndef PNG_NO_READ_RGB_TO_GRAY
 #    define PNG_READ_RGB_TO_GRAY_SUPPORTED
 #  endif
 #endif /* PNG_READ_TRANSFORMS_SUPPORTED */
+/* PNG_PROGRESSIVE_READ_NOT_SUPPORTED is deprecated. */
 #if !defined(PNG_NO_PROGRESSIVE_READ) && \
-!defined(PNG_PROGRESSIVE_READ_SUPPORTED) /* if you don't do progressive   */
+!defined(PNG_PROGRESSIVE_READ_NOT_SUPPORTED)  /* if you don't do progressive */
-#  define PNG_PROGRESSIVE_READ_SUPPORTED  /* reading.  This is not talking */
+#  define PNG_PROGRESSIVE_READ_SUPPORTED     /* reading.  This is not talking */
-#endif                            /* about interlacing capability!  You'll */
+#endif                               /* about interlacing capability!  You'll */
-/* still have interlacing unless you change the following line: */
+/* still have interlacing unless you change the following define: */
-#define PNG_READ_INTERLACING_SUPPORTED /* required in PNG-compliant decoders */
+#define PNG_READ_INTERLACING_SUPPORTED /* required for PNG-compliant decoders */
+/* PNG_NO_SEQUENTIAL_READ_SUPPORTED is deprecated. */
+#if !defined(PNG_NO_SEQUENTIAL_READ) && \
+!defined(PNG_SEQUENTIAL_READ_SUPPORTED) && \
+!defined(PNG_NO_SEQUENTIAL_READ_SUPPORTED)
+#  define PNG_SEQUENTIAL_READ_SUPPORTED
+#endif
 #ifndef PNG_NO_READ_COMPOSITE_NODIV
 #  ifndef PNG_NO_READ_COMPOSITED_NODIV  /* libpng-1.0.x misspelling */
-#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED  /* well tested on Intel, SGI */
+#    define PNG_READ_COMPOSITE_NODIV_SUPPORTED   /* well tested on Intel, SGI */
 #  endif
 #endif
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#if !defined(PNG_NO_GET_INT_32) || defined(PNG_READ_oFFS_SUPPORTED) || \
-/* Deprecated, will be removed from version 2.0.0.
+defined(PNG_READ_pCAL_SUPPORTED)
-Use PNG_MNG_FEATURES_SUPPORTED instead. */
+#  ifndef PNG_GET_INT_32_SUPPORTED
-#ifndef PNG_NO_READ_EMPTY_PLTE
+#    define PNG_GET_INT_32_SUPPORTED
-#  define PNG_READ_EMPTY_PLTE_SUPPORTED
+#  endif
-#endif
 #endif
 #endif /* PNG_READ_SUPPORTED */
 #ifdef PNG_WRITE_SUPPORTED
-# if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \
+/* PNG_WRITE_TRANSFORMS_NOT_SUPPORTED is deprecated. */
+#if !defined(PNG_WRITE_TRANSFORMS_NOT_SUPPORTED) && \
 !defined(PNG_NO_WRITE_TRANSFORMS)
 #  define PNG_WRITE_TRANSFORMS_SUPPORTED
 #endif
 #ifdef PNG_WRITE_TRANSFORMS_SUPPORTED
 #  endif
 #endif /* PNG_WRITE_TRANSFORMS_SUPPORTED */
 #if !defined(PNG_NO_WRITE_INTERLACING_SUPPORTED) && \
 !defined(PNG_WRITE_INTERLACING_SUPPORTED)
-#define PNG_WRITE_INTERLACING_SUPPORTED  /* not required for PNG-compliant
+/* This is not required for PNG-compliant encoders, but can cause
-encoders, but can cause trouble
+* trouble if left undefined
-if left undefined */
+*/
+#  define PNG_WRITE_INTERLACING_SUPPORTED
 #endif
 #if !defined(PNG_NO_WRITE_WEIGHTED_FILTER) && \
 !defined(PNG_WRITE_WEIGHTED_FILTER) && \
 defined(PNG_FLOATING_POINT_SUPPORTED)
 #ifndef PNG_NO_WRITE_FLUSH
 #  define PNG_WRITE_FLUSH_SUPPORTED
 #endif
-#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
+#if !defined(PNG_NO_SAVE_INT_32) || defined(PNG_WRITE_oFFS_SUPPORTED) || \
-/* Deprecated, see PNG_MNG_FEATURES_SUPPORTED, above */
+defined(PNG_WRITE_pCAL_SUPPORTED)
-#ifndef PNG_NO_WRITE_EMPTY_PLTE
+#  ifndef PNG_SAVE_INT_32_SUPPORTED
-#  define PNG_WRITE_EMPTY_PLTE_SUPPORTED
+#    define PNG_SAVE_INT_32_SUPPORTED
-#endif
+#  endif
 #endif
 #endif /* PNG_WRITE_SUPPORTED */
-#ifndef PNG_1_0_X
+#define PNG_NO_ERROR_NUMBERS
-#  ifndef PNG_NO_ERROR_NUMBERS
-#    define PNG_ERROR_NUMBERS_SUPPORTED
-#  endif
-#endif /* PNG_1_0_X */
 #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
 defined(PNG_WRITE_USER_TRANSFORM_SUPPORTED)
 #  ifndef PNG_NO_USER_TRANSFORM_PTR
 #    define PNG_USER_TRANSFORM_PTR_SUPPORTED
 #  endif
 #endif
-#ifndef PNG_NO_STDIO
+#if defined(PNG_STDIO_SUPPORTED) && !defined(PNG_TIME_RFC1123_SUPPORTED)
 #  define PNG_TIME_RFC1123_SUPPORTED
 #endif
 /* This adds extra functions in pngget.c for accessing data from the
 * info pointer (added in version 0.99)
 */
 #if !defined(PNG_NO_EASY_ACCESS) && !defined(PNG_EASY_ACCESS_SUPPORTED)
 #  define PNG_EASY_ACCESS_SUPPORTED
 #endif
-/* PNG_ASSEMBLER_CODE was enabled by default in version 1.2.0
+/* Added at libpng-1.2.0 */
-* and removed from version 1.2.20.  The following will be removed
-* from libpng-1.4.0
-*/
-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_OPTIMIZED_CODE)
-#  ifndef PNG_OPTIMIZED_CODE_SUPPORTED
-#    define PNG_OPTIMIZED_CODE_SUPPORTED
-#  endif
-#endif
-#if defined(PNG_READ_SUPPORTED) && !defined(PNG_NO_ASSEMBLER_CODE)
-#  ifndef PNG_ASSEMBLER_CODE_SUPPORTED
-#    define PNG_ASSEMBLER_CODE_SUPPORTED
-#  endif
-#  if defined(__GNUC__) && defined(__x86_64__) && (__GNUC__ < 4)
-/* work around 64-bit gcc compiler bugs in gcc-3.x */
-#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
-#      define PNG_NO_MMX_CODE
-#    endif
-#  endif
-#  if defined(__APPLE__)
-#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
-#      define PNG_NO_MMX_CODE
-#    endif
-#  endif
-#  if (defined(__MWERKS__) && ((__MWERKS__ < 0x0900) || macintosh))
-#    if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
-#      define PNG_NO_MMX_CODE
-#    endif
-#  endif
-#  if !defined(PNG_MMX_CODE_SUPPORTED) && !defined(PNG_NO_MMX_CODE)
-#    define PNG_MMX_CODE_SUPPORTED
-#  endif
-#endif
-/* end of obsolete code to be removed from libpng-1.4.0 */
-#if !defined(PNG_1_0_X)
 #if !defined(PNG_NO_USER_MEM) && !defined(PNG_USER_MEM_SUPPORTED)
 #  define PNG_USER_MEM_SUPPORTED
 #endif
-#endif /* PNG_1_0_X */
 /* Added at libpng-1.2.6 */
-#if !defined(PNG_1_0_X)
 #ifndef PNG_SET_USER_LIMITS_SUPPORTED
-#if !defined(PNG_NO_SET_USER_LIMITS) && !defined(PNG_SET_USER_LIMITS_SUPPORTED)
+#  ifndef PNG_NO_SET_USER_LIMITS
-#  define PNG_SET_USER_LIMITS_SUPPORTED
+#    define PNG_SET_USER_LIMITS_SUPPORTED
-#endif
+#  endif
 #endif
-#endif /* PNG_1_0_X */
+/* Added at libpng-1.0.16 and 1.2.6.  To accept all valid PNGs no matter
-/* Added at libpng-1.0.16 and 1.2.6.  To accept all valid PNGS no matter
 * how large, set these limits to 0x7fffffffL
 */
 #ifndef PNG_USER_WIDTH_MAX
 #  define PNG_USER_WIDTH_MAX 1000000L
 #endif
 #ifndef PNG_USER_HEIGHT_MAX
 #  define PNG_USER_HEIGHT_MAX 1000000L
 #endif
-/* Added at libpng-1.2.34 and 1.4.0 */
+/* Added at libpng-1.4.0 */
+#ifndef PNG_USER_CHUNK_CACHE_MAX
+#  define PNG_USER_CHUNK_CACHE_MAX 0x7fffffffL
+#endif
+/* Added at libpng-1.4.0 */
+#if !defined(PNG_NO_IO_STATE) && !defined(PNG_IO_STATE_SUPPORTED)
+#  define PNG_IO_STATE_SUPPORTED
+#endif
+#ifndef PNG_LITERAL_SHARP
+#  define PNG_LITERAL_SHARP 0x23
+#endif
+#ifndef PNG_LITERAL_LEFT_SQUARE_BRACKET
+#  define PNG_LITERAL_LEFT_SQUARE_BRACKET 0x5b
+#endif
+#ifndef PNG_LITERAL_RIGHT_SQUARE_BRACKET
+#  define PNG_LITERAL_RIGHT_SQUARE_BRACKET 0x5d
+#endif
 #ifndef PNG_STRING_NEWLINE
 #define PNG_STRING_NEWLINE "\n"
 #endif
 /* These are currently experimental features, define them if you want */
-/* very little testing */
+/* Very little testing */
 /*
 #ifdef PNG_READ_SUPPORTED
 #  ifndef PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
 #    define PNG_READ_16_TO_8_ACCURATE_SCALE_SUPPORTED
 #  endif
 #ifndef PNG_READ_BIG_ENDIAN_SUPPORTED
 #  define PNG_READ_BIG_ENDIAN_SUPPORTED
 #endif
 */
-/* Buggy compilers (e.g., gcc 2.7.2.2) need this */
+#if !defined(PNG_NO_USE_READ_MACROS) && !defined(PNG_USE_READ_MACROS)
-/*
+#  define PNG_USE_READ_MACROS
-#define PNG_NO_POINTER_INDEXING
+#endif
-*/
+/* Buggy compilers (e.g., gcc 2.7.2.2) need PNG_NO_POINTER_INDEXING */
-/* These functions are turned off by default, as they will be phased out. */
-/*
+#if !defined(PNG_NO_POINTER_INDEXING) && \
-#define  PNG_USELESS_TESTS_SUPPORTED
+!defined(PNG_POINTER_INDEXING_SUPPORTED)
-#define  PNG_CORRECT_PALETTE_SUPPORTED
+#  define PNG_POINTER_INDEXING_SUPPORTED
-*/
+#endif
 /* Any chunks you are not interested in, you can undef here.  The
 * ones that allocate memory may be expecially important (hIST,
 * tEXt, zTXt, tRNS, pCAL).  Others will just save time and make png_info
 * a bit smaller.
 */
+/* The size of the png_text structure changed in libpng-1.0.6 when
+* iTXt support was added.  iTXt support was turned off by default through
+* libpng-1.2.x, to support old apps that malloc the png_text structure
+* instead of calling png_set_text() and letting libpng malloc it.  It
+* was turned on by default in libpng-1.4.0.
+*/
+/* PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated. */
 #if defined(PNG_READ_SUPPORTED) && \
 !defined(PNG_READ_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
 !defined(PNG_NO_READ_ANCILLARY_CHUNKS)
 #  define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
 #endif
+/* PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED is deprecated. */
 #if defined(PNG_WRITE_SUPPORTED) && \
 !defined(PNG_WRITE_ANCILLARY_CHUNKS_NOT_SUPPORTED) && \
 !defined(PNG_NO_WRITE_ANCILLARY_CHUNKS)
 #  define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
 #endif
 #ifdef PNG_NO_READ_TEXT
 #  define PNG_NO_READ_iTXt
 #  define PNG_NO_READ_tEXt
 #  define PNG_NO_READ_zTXt
 #endif
 #ifndef PNG_NO_READ_bKGD
 #  define PNG_READ_bKGD_SUPPORTED
 #  define PNG_bKGD_SUPPORTED
 #endif
 #ifndef PNG_NO_READ_cHRM
 #  endif
 #  ifdef PNG_NO_HANDLE_AS_UNKNOWN
 #    undef PNG_NO_HANDLE_AS_UNKNOWN
 #  endif
 #endif
 #ifndef PNG_NO_HANDLE_AS_UNKNOWN
 #  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #  endif
 #endif
 #  ifndef PNG_TEXT_SUPPORTED
 #    define PNG_TEXT_SUPPORTED
 #  endif
 #endif
+#ifdef PNG_WRITE_tIME_SUPPORTED
+#  ifndef PNG_NO_CONVERT_tIME
+#    ifndef _WIN32_WCE
+/*   The "tm" structure is not supported on WindowsCE */
+#      ifndef PNG_CONVERT_tIME_SUPPORTED
+#        define PNG_CONVERT_tIME_SUPPORTED
+#      endif
+#   endif
+#  endif
+#endif
 #endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
+#if !defined(PNG_NO_WRITE_FILTER) && !defined(PNG_WRITE_FILTER_SUPPORTED)
+#  define PNG_WRITE_FILTER_SUPPORTED
+#endif
 #ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS
 #  define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
 #  ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
 #    define PNG_UNKNOWN_CHUNKS_SUPPORTED
 #  endif
 #endif
 #ifndef PNG_NO_HANDLE_AS_UNKNOWN
 #  ifndef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #    define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
 #  endif
 #endif
 */
 #ifndef PNG_NO_INFO_IMAGE
 #  define PNG_INFO_IMAGE_SUPPORTED
 #endif
-/* need the time information for reading tIME chunks */
+/* Need the time information for converting tIME chunks */
-#if defined(PNG_tIME_SUPPORTED)
+#ifdef PNG_CONVERT_tIME_SUPPORTED
-#  if !defined(_WIN32_WCE)
 /* "time.h" functions are not supported on WindowsCE */
 #    include <time.h>
-#  endif
 #endif
 /* Some typedefs to get us started.  These should be safe on most of the
 * common platforms.  The typedefs should be at least as large as the
 * numbers suggest (a png_uint_32 must be at least 32 bits long), but they
 * don't have to be exactly that size.  Some compilers dislike passing
 * unsigned shorts as function parameters, so you may be better off using
-* unsigned int for png_uint_16.  Likewise, for 64-bit systems, you may
+* unsigned int for png_uint_16.
-* want to have unsigned int for png_uint_32 instead of unsigned long.
+*/
-*/
+#if defined(INT_MAX) && (INT_MAX > 0x7ffffffeL)
+typedef unsigned int png_uint_32;
+typedef int png_int_32;
+#else
 typedef unsigned long png_uint_32;
 typedef long png_int_32;
+#endif
 typedef unsigned short png_uint_16;
 typedef short png_int_16;
 typedef unsigned char png_byte;
-/* This is usually size_t.  It is typedef'ed just in case you need it to
+#ifdef PNG_NO_SIZE_T
-change (I'm not sure if you will or not, so I thought I'd be safe) */
+typedef unsigned int png_size_t;
-#ifdef PNG_SIZE_T
-typedef PNG_SIZE_T png_size_t;
-#  define png_sizeof(x) png_convert_size(sizeof(x))
 #else
 typedef size_t png_size_t;
-#  define png_sizeof(x) sizeof(x)
+#endif
-#endif
+#define png_sizeof(x) sizeof(x)
 /* The following is needed for medium model support.  It cannot be in the
-* PNG_INTERNAL section.  Needs modification for other compilers besides
+* pngpriv.h header.  Needs modification for other compilers besides
 * MSC.  Model independent support declares all arrays and pointers to be
 * large using the far keyword.  The zlib version used must also support
 * model independent data.  As of version zlib 1.0.4, the necessary changes
 * have been made in zlib.  The USE_FAR_KEYWORD define triggers other
 * changes that are needed. (Tim Wegner)
 */
 /* Separate compiler dependencies (problem here is that zlib.h always
-defines FAR. (SJT) */
+* defines FAR. (SJT)
+*/
 #ifdef __BORLANDC__
 #  if defined(__LARGE__) || defined(__HUGE__) || defined(__COMPACT__)
 #    define LDATA 1
 #  else
 #    define LDATA 0
 * FAR.  The Watcom compiler defines both __MEDIUM__ and M_I86MM,
 * making reliance oncertain keywords suspect. (SJT)
 */
 /* MSC Medium model */
-#if defined(FAR)
+#ifdef FAR
-#  if defined(M_I86MM)
+#  ifdef M_I86MM
 #    define USE_FAR_KEYWORD
 #    define FARDATA FAR
 #    include <dos.h>
 #  endif
 #endif
 typedef PNG_CONST char  FAR * png_const_charp;
 typedef char            FAR * png_charp;
 typedef png_fixed_point FAR * png_fixed_point_p;
 #ifndef PNG_NO_STDIO
-#if defined(_WIN32_WCE)
-typedef HANDLE                png_FILE_p;
-#else
 typedef FILE                * png_FILE_p;
-#endif
 #endif
 #ifdef PNG_FLOATING_POINT_SUPPORTED
 typedef double          FAR * png_doublep;
 #endif
 #endif
 /* Pointers to pointers to pointers; i.e., pointer to array */
 typedef char            FAR * FAR * FAR * png_charppp;
-#if defined(PNG_1_0_X) || defined(PNG_1_2_X)
+/* Define PNG_BUILD_DLL if the module being built is a Windows
-/* SPC -  Is this stuff deprecated? */
-/* It'll be removed as of libpng-1.4.0 - GR-P */
-/* libpng typedefs for types in zlib. If zlib changes
-* or another compression library is used, then change these.
-* Eliminates need to change all the source files.
-*/
-typedef charf *         png_zcharp;
-typedef charf * FAR *   png_zcharpp;
-typedef z_stream FAR *  png_zstreamp;
-#endif /* (PNG_1_0_X) || defined(PNG_1_2_X) */
-/*
-* Define PNG_BUILD_DLL if the module being built is a Windows
 * LIBPNG DLL.
 *
 * Define PNG_USE_DLL if you want to *link* to the Windows LIBPNG DLL.
 * It is equivalent to Microsoft predefined macro _DLL that is
 * automatically defined when you compile using the share
 */
 #if !defined(PNG_DLL) && (defined(PNG_BUILD_DLL) || defined(PNG_USE_DLL))
 #  define PNG_DLL
 #endif
-/* If CYGWIN, then disallow GLOBAL ARRAYS unless building a static lib.
-* When building a static lib, default to no GLOBAL ARRAYS, but allow
+#ifdef __CYGWIN__
-* command-line override
-*/
-#if defined(__CYGWIN__)
-#  if !defined(PNG_STATIC)
-#    if defined(PNG_USE_GLOBAL_ARRAYS)
-#      undef PNG_USE_GLOBAL_ARRAYS
-#    endif
-#    if !defined(PNG_USE_LOCAL_ARRAYS)
-#      define PNG_USE_LOCAL_ARRAYS
-#    endif
-#  else
-#    if defined(PNG_USE_LOCAL_ARRAYS) || defined(PNG_NO_GLOBAL_ARRAYS)
-#      if defined(PNG_USE_GLOBAL_ARRAYS)
-#        undef PNG_USE_GLOBAL_ARRAYS
-#      endif
-#    endif
-#  endif
-#  if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
-#    define PNG_USE_LOCAL_ARRAYS
-#  endif
-#endif
-/* Do not use global arrays (helps with building DLL's)
-* They are no longer used in libpng itself, since version 1.0.5c,
-* but might be required for some pre-1.0.5c applications.
-*/
-#if !defined(PNG_USE_LOCAL_ARRAYS) && !defined(PNG_USE_GLOBAL_ARRAYS)
-#  if defined(PNG_NO_GLOBAL_ARRAYS) || \
-(defined(__GNUC__) && defined(PNG_DLL)) || defined(_MSC_VER)
-#    define PNG_USE_LOCAL_ARRAYS
-#  else
-#    define PNG_USE_GLOBAL_ARRAYS
-#  endif
-#endif
-#if defined(__CYGWIN__)
 #  undef PNGAPI
 #  define PNGAPI __cdecl
 #  undef PNG_IMPEXP
 #  define PNG_IMPEXP
 #endif
+#define PNG_USE_LOCAL_ARRAYS /* Not used in libpng, defined for legacy apps */
 /* If you define PNGAPI, e.g., with compiler option "-DPNGAPI=__stdcall",
 * you may get warnings regarding the linkage of png_zalloc and png_zfree.
 * Don't ignore those warnings; you must also reset the default calling
 * convention in your compiler to match your PNGAPI, and you must build
 #  if !defined(PNG_IMPEXP) && (!defined(PNG_DLL) || \
 0 /* WINCOMPILER_WITH_NO_SUPPORT_FOR_DECLIMPEXP */)
 #     define PNG_IMPEXP
 #  endif
-#  if !defined(PNG_IMPEXP)
+#  ifndef PNG_IMPEXP
-#     define PNG_EXPORT_TYPE1(type,symbol)  PNG_IMPEXP type PNGAPI symbol
+#    define PNG_EXPORT_TYPE1(type,symbol)  PNG_IMPEXP type PNGAPI symbol
-#     define PNG_EXPORT_TYPE2(type,symbol)  type PNG_IMPEXP PNGAPI symbol
+#    define PNG_EXPORT_TYPE2(type,symbol)  type PNG_IMPEXP PNGAPI symbol
 /* Borland/Microsoft */
-#     if defined(_MSC_VER) || defined(__BORLANDC__)
+#    if defined(_MSC_VER) || defined(__BORLANDC__)
-#        if (_MSC_VER >= 800) || (__BORLANDC__ >= 0x500)
+#      if (_MSC_VER >= 800) || (__BORLANDC__ >= 0x500)
-#           define PNG_EXPORT PNG_EXPORT_TYPE1
+#         define PNG_EXPORT PNG_EXPORT_TYPE1
-#        else
+#      else
-#           define PNG_EXPORT PNG_EXPORT_TYPE2
+#         define PNG_EXPORT PNG_EXPORT_TYPE2
-#           if defined(PNG_BUILD_DLL)
+#         ifdef PNG_BUILD_DLL
-#              define PNG_IMPEXP __export
+#            define PNG_IMPEXP __export
-#           else
+#         else
-#              define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in
+#            define PNG_IMPEXP /*__import */ /* doesn't exist AFAIK in VC++ */
-VC++ */
+#         endif                              /* Exists in Borland C++ for
-#           endif                             /* Exists in Borland C++ for
+C++ classes (== huge) */
-C++ classes (== huge) */
+#      endif
-#        endif
+#    endif
-#     endif
+#    ifndef PNG_IMPEXP
-#     if !defined(PNG_IMPEXP)
+#      ifdef PNG_BUILD_DLL
-#        if defined(PNG_BUILD_DLL)
+#        define PNG_IMPEXP __declspec(dllexport)
-#           define PNG_IMPEXP __declspec(dllexport)
+#      else
-#        else
+#        define PNG_IMPEXP __declspec(dllimport)
-#           define PNG_IMPEXP __declspec(dllimport)
+#      endif
-#        endif
+#    endif
-#     endif
 #  endif  /* PNG_IMPEXP */
 #else /* !(DLL || non-cygwin WINDOWS) */
 #   if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
-#      ifndef PNGAPI
+#     ifndef PNGAPI
-#         define PNGAPI _System
+#       define PNGAPI _System
-#      endif
+#     endif
 #   else
-#      if 0 /* ... other platforms, with other meanings */
+#     if 0 /* ... other platforms, with other meanings */
-#      endif
+#     endif
 #   endif
 #   if !defined(PNG_IMPEXP)
 #       include <qconfig.h>
 #       if defined(QT_VISIBILITY_AVAILABLE)
 #ifdef PNG_BUILDSYMS
 #  ifndef PNG_EXPORT
 #    define PNG_EXPORT(type,symbol) PNG_FUNCTION_EXPORT symbol END
 #  endif
-#  ifdef PNG_USE_GLOBAL_ARRAYS
-#    ifndef PNG_EXPORT_VAR
-#      define PNG_EXPORT_VAR(type) PNG_DATA_EXPORT
-#    endif
-#  endif
 #endif
 #ifndef PNG_EXPORT
 #  define PNG_EXPORT(type,symbol) PNG_IMPEXP type PNGAPI symbol
 #endif
-#ifdef PNG_USE_GLOBAL_ARRAYS
+/* Support for compiler specific function attributes.  These are used
-#  ifndef PNG_EXPORT_VAR
+* so that where compiler support is available incorrect use of API
-#    define PNG_EXPORT_VAR(type) extern PNG_IMPEXP type
+* functions in png.h will generate compiler warnings.
-#  endif
+*
-#endif
+* Added at libpng-1.2.41.
+*/
-/* User may want to use these so they are not in PNG_INTERNAL. Any library
-* functions that are passed far data must be model independent.
+#ifndef PNG_NO_PEDANTIC_WARNINGS
-*/
+#  ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
+#    define PNG_PEDANTIC_WARNINGS_SUPPORTED
+#  endif
+#endif
+#ifdef PNG_PEDANTIC_WARNINGS_SUPPORTED
+/* Support for compiler specific function attributes.  These are used
+* so that where compiler support is available incorrect use of API
+* functions in png.h will generate compiler warnings.  Added at libpng
+* version 1.2.41.
+*/
+#  ifdef __GNUC__
+#    ifndef PNG_USE_RESULT
+#      define PNG_USE_RESULT __attribute__((__warn_unused_result__))
+#    endif
+#    ifndef PNG_NORETURN
+#      define PNG_NORETURN   __attribute__((__noreturn__))
+#    endif
+#    ifndef PNG_ALLOCATED
+#      define PNG_ALLOCATED  __attribute__((__malloc__))
+#    endif
+/* This specifically protects structure members that should only be
+* accessed from within the library, therefore should be empty during
+* a library build.
+*/
+#    ifndef PNG_DEPRECATED
+#      define PNG_DEPRECATED __attribute__((__deprecated__))
+#    endif
+#    ifndef PNG_DEPSTRUCT
+#      define PNG_DEPSTRUCT  __attribute__((__deprecated__))
+#    endif
+#    ifndef PNG_PRIVATE
+#      if 0 /* Doesn't work so we use deprecated instead*/
+#        define PNG_PRIVATE \
+__attribute__((warning("This function is not exported by libpng.")))
+#      else
+#        define PNG_PRIVATE \
+__attribute__((__deprecated__))
+#      endif
+#    endif /* PNG_PRIVATE */
+#  endif /* __GNUC__ */
+#endif /* PNG_PEDANTIC_WARNINGS */
+#ifndef PNG_DEPRECATED
+#  define PNG_DEPRECATED  /* Use of this function is deprecated */
+#endif
+#ifndef PNG_USE_RESULT
+#  define PNG_USE_RESULT  /* The result of this function must be checked */
+#endif
+#ifndef PNG_NORETURN
+#  define PNG_NORETURN    /* This function does not return */
+#endif
+#ifndef PNG_ALLOCATED
+#  define PNG_ALLOCATED   /* The result of the function is new memory */
+#endif
+#ifndef PNG_DEPSTRUCT
+#  define PNG_DEPSTRUCT   /* Access to this struct member is deprecated */
+#endif
+#ifndef PNG_PRIVATE
+#  define PNG_PRIVATE     /* This is a private libpng function */
+#endif
+/* Users may want to use these so they are not private.  Any library
+* functions that are passed far data must be model-independent.
+*/
+/* memory model/platform independent fns */
 #ifndef PNG_ABORT
-#  define PNG_ABORT() abort()
+#  if defined(_WINDOWS_) || defined(_WIN32_WCE)
-#endif
+#     define PNG_ABORT() ExitProcess(0)
+#  else
-#ifdef PNG_SETJMP_SUPPORTED
+#     define PNG_ABORT() abort()
-#  define png_jmpbuf(png_ptr) ((png_ptr)->jmpbuf)
+#  endif
-#else
+#endif
-#  define png_jmpbuf(png_ptr) \
-(LIBPNG_WAS_COMPILED_WITH__PNG_SETJMP_NOT_SUPPORTED)
+#ifdef USE_FAR_KEYWORD
-#endif
+/* Use this to make far-to-near assignments */
-#if defined(USE_FAR_KEYWORD)  /* memory model independent fns */
-/* use this to make far-to-near assignments */
 #  define CHECK   1
 #  define NOCHECK 0
 #  define CVT_PTR(ptr) (png_far_to_near(png_ptr,ptr,CHECK))
 #  define CVT_PTR_NOCHECK(ptr) (png_far_to_near(png_ptr,ptr,NOCHECK))
-#  define png_snprintf _fsnprintf   /* Added to v 1.2.19 */
+#  define png_strcpy  _fstrcpy
+#  define png_strncpy _fstrncpy   /* Added to v 1.2.6 */
 #  define png_strlen  _fstrlen
 #  define png_memcmp  _fmemcmp    /* SJT: added */
 #  define png_memcpy  _fmemcpy
 #  define png_memset  _fmemset
-#else /* use the usual functions */
+#  define png_sprintf sprintf
-#  define CVT_PTR(ptr)         (ptr)
+#else
-#  define CVT_PTR_NOCHECK(ptr) (ptr)
+#  ifdef _WINDOWS_  /* Favor Windows over C runtime fns */
-#  ifndef PNG_NO_SNPRINTF
+#    define CVT_PTR(ptr)         (ptr)
-#    ifdef _MSC_VER
+#    define CVT_PTR_NOCHECK(ptr) (ptr)
-#      define png_snprintf _snprintf   /* Added to v 1.2.19 */
+#    define png_strcpy  lstrcpyA
-#      define png_snprintf2 _snprintf
+#    define png_strncpy lstrcpynA
-#      define png_snprintf6 _snprintf
+#    define png_strlen  lstrlenA
+#    define png_memcmp  memcmp
+#    define png_memcpy  CopyMemory
+#    define png_memset  memset
+#    define png_sprintf wsprintfA
+#  else
+#    define CVT_PTR(ptr)         (ptr)
+#    define CVT_PTR_NOCHECK(ptr) (ptr)
+#    define png_strcpy  strcpy
+#    define png_strncpy strncpy     /* Added to v 1.2.6 */
+#    define png_strlen  strlen
+#    define png_memcmp  memcmp      /* SJT: added */
+#    define png_memcpy  memcpy
+#    define png_memset  memset
+#    define png_sprintf sprintf
+#    ifndef PNG_NO_SNPRINTF
+#      ifdef _MSC_VER
+#        define png_snprintf _snprintf   /* Added to v 1.2.19 */
+#        define png_snprintf2 _snprintf
+#        define png_snprintf6 _snprintf
+#      else
+#        define png_snprintf snprintf   /* Added to v 1.2.19 */
+#        define png_snprintf2 snprintf
+#        define png_snprintf6 snprintf
+#      endif
 #    else
-#      define png_snprintf snprintf   /* Added to v 1.2.19 */
+/* You don't have or don't want to use snprintf().  Caution: Using
-#      define png_snprintf2 snprintf
+* sprintf instead of snprintf exposes your application to accidental
-#      define png_snprintf6 snprintf
+* or malevolent buffer overflows.  If you don't have snprintf()
-#    endif
+* as a general rule you should provide one (you can get one from
+* Portable OpenSSH).
+*/
+#      define png_snprintf(s1,n,fmt,x1) sprintf(s1,fmt,x1)
+#      define png_snprintf2(s1,n,fmt,x1,x2) sprintf(s1,fmt,x1,x2)
+#      define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \
+sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)
+#    endif
+#  endif
+#endif
+/* png_alloc_size_t is guaranteed to be no smaller than png_size_t,
+* and no smaller than png_uint_32.  Casts from png_size_t or png_uint_32
+* to png_alloc_size_t are not necessary; in fact, it is recommended
+* not to use them at all so that the compiler can complain when something
+* turns out to be problematic.
+* Casts in the other direction (from png_alloc_size_t to png_size_t or
+* png_uint_32) should be explicitly applied; however, we do not expect
+* to encounter practical situations that require such conversions.
+*/
+#if defined(__TURBOC__) && !defined(__FLAT__)
+#  define  png_mem_alloc farmalloc
+#  define  png_mem_free  farfree
+typedef unsigned long png_alloc_size_t;
+#else
+#  if defined(_MSC_VER) && defined(MAXSEG_64K)
+#    define  png_mem_alloc(s) halloc(s, 1)
+#    define  png_mem_free     hfree
+typedef unsigned long    png_alloc_size_t;
 #  else
-/* You don't have or don't want to use snprintf().  Caution: Using
+#    if defined(_WINDOWS_) && (!defined(INT_MAX) || INT_MAX <= 0x7ffffffeL)
-* sprintf instead of snprintf exposes your application to accidental
+#      define  png_mem_alloc(s) HeapAlloc(GetProcessHeap(), 0, s)
-* or malevolent buffer overflows.  If you don't have snprintf()
+#      define  png_mem_free(p)  HeapFree(GetProcessHeap(), 0, p)
-* as a general rule you should provide one (you can get one from
+typedef DWORD            png_alloc_size_t;
-* Portable OpenSSH). */
+#    else
-#    define png_snprintf(s1,n,fmt,x1) sprintf(s1,fmt,x1)
+#      define  png_mem_alloc malloc
-#    define png_snprintf2(s1,n,fmt,x1,x2) sprintf(s1,fmt,x1,x2)
+#      define  png_mem_free  free
-#    define png_snprintf6(s1,n,fmt,x1,x2,x3,x4,x5,x6) \
+typedef png_size_t    png_alloc_size_t;
-sprintf(s1,fmt,x1,x2,x3,x4,x5,x6)
+#    endif
 #  endif
-#  define png_strlen  strlen
+#endif
-#  define png_memcmp  memcmp      /* SJT: added */
+/* End of memory model/platform independent support */
-#  define png_memcpy  memcpy
-#  define png_memset  memset
-#endif
-/* End of memory model independent support */
 /* Just a little check that someone hasn't tried to define something
 * contradictory.
 */
 #if (PNG_ZBUF_SIZE > 65536L) && defined(PNG_MAX_MALLOC_64K)
 #  undef PNG_ZBUF_SIZE
 #  define PNG_ZBUF_SIZE 65536L
 #endif
 /* Added at libpng-1.2.8 */
 #endif /* PNG_VERSION_INFO_ONLY */
 #endif /* PNGCONF_H */

branch	GCC_SURGE
changeset 31	5daf16870df6
parent 30	5dc02b23752f