| Index: samples/fx_lpng/lpng_v163/pngconf.h
|
| diff --git a/samples/fx_lpng/lpng_v163/pngconf.h b/samples/fx_lpng/lpng_v163/pngconf.h
|
| index 02f74e2639f2ca13bb677b5a597df366c0e7094b..a7219861bee489bbe7f0960e90c07f4d31ea4138 100644
|
| --- a/samples/fx_lpng/lpng_v163/pngconf.h
|
| +++ b/samples/fx_lpng/lpng_v163/pngconf.h
|
| @@ -24,22 +24,22 @@
|
|
|
| /* To do: Do all of this in scripts/pnglibconf.dfa */
|
| #ifdef PNG_SAFE_LIMITS_SUPPORTED
|
| -# ifdef PNG_USER_WIDTH_MAX
|
| -# undef PNG_USER_WIDTH_MAX
|
| -# define PNG_USER_WIDTH_MAX 1000000L
|
| -# endif
|
| -# ifdef PNG_USER_HEIGHT_MAX
|
| -# undef PNG_USER_HEIGHT_MAX
|
| -# define PNG_USER_HEIGHT_MAX 1000000L
|
| -# endif
|
| -# ifdef PNG_USER_CHUNK_MALLOC_MAX
|
| -# undef PNG_USER_CHUNK_MALLOC_MAX
|
| -# define PNG_USER_CHUNK_MALLOC_MAX 4000000L
|
| -# endif
|
| -# ifdef PNG_USER_CHUNK_CACHE_MAX
|
| -# undef PNG_USER_CHUNK_CACHE_MAX
|
| -# define PNG_USER_CHUNK_CACHE_MAX 128
|
| -# endif
|
| +#ifdef PNG_USER_WIDTH_MAX
|
| +#undef PNG_USER_WIDTH_MAX
|
| +#define PNG_USER_WIDTH_MAX 1000000L
|
| +#endif
|
| +#ifdef PNG_USER_HEIGHT_MAX
|
| +#undef PNG_USER_HEIGHT_MAX
|
| +#define PNG_USER_HEIGHT_MAX 1000000L
|
| +#endif
|
| +#ifdef PNG_USER_CHUNK_MALLOC_MAX
|
| +#undef PNG_USER_CHUNK_MALLOC_MAX
|
| +#define PNG_USER_CHUNK_MALLOC_MAX 4000000L
|
| +#endif
|
| +#ifdef PNG_USER_CHUNK_CACHE_MAX
|
| +#undef PNG_USER_CHUNK_CACHE_MAX
|
| +#define PNG_USER_CHUNK_CACHE_MAX 128
|
| +#endif
|
| #endif
|
|
|
| #ifndef PNG_BUILDING_SYMBOL_TABLE /* else includes may cause problems */
|
| @@ -63,18 +63,18 @@
|
| */
|
|
|
| #ifdef PNG_STDIO_SUPPORTED
|
| - /* Required for the definition of FILE: */
|
| -# include <stdio.h>
|
| +/* Required for the definition of FILE: */
|
| +#include <stdio.h>
|
| #endif
|
|
|
| #ifdef PNG_SETJMP_SUPPORTED
|
| - /* Required for the definition of jmp_buf and the declaration of longjmp: */
|
| -# include <setjmp.h>
|
| +/* Required for the definition of jmp_buf and the declaration of longjmp: */
|
| +#include <setjmp.h>
|
| #endif
|
|
|
| #ifdef PNG_CONVERT_tIME_SUPPORTED
|
| - /* Required for struct tm: */
|
| -# include <time.h>
|
| +/* Required for struct tm: */
|
| +#include <time.h>
|
| #endif
|
|
|
| #endif /* PNG_BUILDING_SYMBOL_TABLE */
|
| @@ -92,12 +92,12 @@
|
| * built into the library the macro implementation is forced on.
|
| */
|
| #ifndef PNG_READ_INT_FUNCTIONS_SUPPORTED
|
| -# define PNG_USE_READ_MACROS
|
| +#define PNG_USE_READ_MACROS
|
| #endif
|
| #if !defined(PNG_NO_USE_READ_MACROS) && !defined(PNG_USE_READ_MACROS)
|
| -# if PNG_DEFAULT_READ_MACROS
|
| -# define PNG_USE_READ_MACROS
|
| -# endif
|
| +#if PNG_DEFAULT_READ_MACROS
|
| +#define PNG_USE_READ_MACROS
|
| +#endif
|
| #endif
|
|
|
| /* COMPILER SPECIFIC OPTIONS.
|
| @@ -113,7 +113,7 @@
|
| * prototypes. It is not required for modern C compilers.
|
| */
|
| #ifndef PNGARG
|
| -# define PNGARG(arglist) arglist
|
| +#define PNGARG(arglist) arglist
|
| #endif
|
|
|
| /* Function calling conventions.
|
| @@ -202,85 +202,85 @@
|
| * compiler-specific macros to the values required to change the calling
|
| * conventions of the various functions.
|
| */
|
| -#if defined(_Windows) || defined(_WINDOWS) || defined(WIN32) ||\
|
| +#if defined(_Windows) || defined(_WINDOWS) || defined(WIN32) || \
|
| defined(_WIN32) || defined(__WIN32__) || defined(__CYGWIN__)
|
| - /* Windows system (DOS doesn't support DLLs). Includes builds under Cygwin or
|
| - * MinGW on any architecture currently supported by Windows. Also includes
|
| - * Watcom builds but these need special treatment because they are not
|
| - * compatible with GCC or Visual C because of different calling conventions.
|
| - */
|
| -# if PNG_API_RULE == 2
|
| - /* If this line results in an error, either because __watcall is not
|
| - * understood or because of a redefine just below you cannot use *this*
|
| - * build of the library with the compiler you are using. *This* build was
|
| - * build using Watcom and applications must also be built using Watcom!
|
| - */
|
| -# define PNGCAPI __watcall
|
| -# endif
|
| -
|
| -# if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 800))
|
| -# define PNGCAPI __cdecl
|
| -# if PNG_API_RULE == 1
|
| - /* If this line results in an error __stdcall is not understood and
|
| - * PNG_API_RULE should not have been set to '1'.
|
| - */
|
| -# define PNGAPI __stdcall
|
| -# endif
|
| -# else
|
| - /* An older compiler, or one not detected (erroneously) above,
|
| - * if necessary override on the command line to get the correct
|
| - * variants for the compiler.
|
| - */
|
| -# ifndef PNGCAPI
|
| -# define PNGCAPI _cdecl
|
| -# endif
|
| -# if PNG_API_RULE == 1 && !defined(PNGAPI)
|
| -# define PNGAPI _stdcall
|
| -# endif
|
| -# endif /* compiler/api */
|
| -
|
| - /* NOTE: PNGCBAPI always defaults to PNGCAPI. */
|
| -
|
| -# if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
|
| -# error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
|
| -# endif
|
| -
|
| -# if (defined(_MSC_VER) && _MSC_VER < 800) ||\
|
| - (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
|
| - /* older Borland and MSC
|
| - * compilers used '__export' and required this to be after
|
| - * the type.
|
| - */
|
| -# ifndef PNG_EXPORT_TYPE
|
| -# define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
|
| -# endif
|
| -# define PNG_DLL_EXPORT __export
|
| -# else /* newer compiler */
|
| -# define PNG_DLL_EXPORT __declspec(dllexport)
|
| -# ifndef PNG_DLL_IMPORT
|
| -# define PNG_DLL_IMPORT __declspec(dllimport)
|
| -# endif
|
| -# endif /* compiler */
|
| +/* Windows system (DOS doesn't support DLLs). Includes builds under Cygwin or
|
| + * MinGW on any architecture currently supported by Windows. Also includes
|
| + * Watcom builds but these need special treatment because they are not
|
| + * compatible with GCC or Visual C because of different calling conventions.
|
| + */
|
| +#if PNG_API_RULE == 2
|
| +/* If this line results in an error, either because __watcall is not
|
| + * understood or because of a redefine just below you cannot use *this*
|
| + * build of the library with the compiler you are using. *This* build was
|
| + * build using Watcom and applications must also be built using Watcom!
|
| + */
|
| +#define PNGCAPI __watcall
|
| +#endif
|
| +
|
| +#if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER >= 800))
|
| +#define PNGCAPI __cdecl
|
| +#if PNG_API_RULE == 1
|
| +/* If this line results in an error __stdcall is not understood and
|
| + * PNG_API_RULE should not have been set to '1'.
|
| + */
|
| +#define PNGAPI __stdcall
|
| +#endif
|
| +#else
|
| +/* An older compiler, or one not detected (erroneously) above,
|
| + * if necessary override on the command line to get the correct
|
| + * variants for the compiler.
|
| + */
|
| +#ifndef PNGCAPI
|
| +#define PNGCAPI _cdecl
|
| +#endif
|
| +#if PNG_API_RULE == 1 && !defined(PNGAPI)
|
| +#define PNGAPI _stdcall
|
| +#endif
|
| +#endif /* compiler/api */
|
| +
|
| +/* NOTE: PNGCBAPI always defaults to PNGCAPI. */
|
| +
|
| +#if defined(PNGAPI) && !defined(PNG_USER_PRIVATEBUILD)
|
| +#error "PNG_USER_PRIVATEBUILD must be defined if PNGAPI is changed"
|
| +#endif
|
| +
|
| +#if (defined(_MSC_VER) && _MSC_VER < 800) || \
|
| + (defined(__BORLANDC__) && __BORLANDC__ < 0x500)
|
| +/* older Borland and MSC
|
| + * compilers used '__export' and required this to be after
|
| + * the type.
|
| + */
|
| +#ifndef PNG_EXPORT_TYPE
|
| +#define PNG_EXPORT_TYPE(type) type PNG_IMPEXP
|
| +#endif
|
| +#define PNG_DLL_EXPORT __export
|
| +#else /* newer compiler */
|
| +#define PNG_DLL_EXPORT __declspec(dllexport)
|
| +#ifndef PNG_DLL_IMPORT
|
| +#define PNG_DLL_IMPORT __declspec(dllimport)
|
| +#endif
|
| +#endif /* compiler */
|
|
|
| #else /* !Windows */
|
| -# if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
|
| -# define PNGAPI _System
|
| -# else /* !Windows/x86 && !OS/2 */
|
| - /* Use the defaults, or define PNG*API on the command line (but
|
| - * this will have to be done for every compile!)
|
| - */
|
| -# endif /* other system, !OS/2 */
|
| +#if (defined(__IBMC__) || defined(__IBMCPP__)) && defined(__OS2__)
|
| +#define PNGAPI _System
|
| +#else /* !Windows/x86 && !OS/2 */
|
| +/* Use the defaults, or define PNG*API on the command line (but
|
| + * this will have to be done for every compile!)
|
| + */
|
| +#endif /* other system, !OS/2 */
|
| #endif /* !Windows/x86 */
|
|
|
| /* Now do all the defaulting . */
|
| #ifndef PNGCAPI
|
| -# define PNGCAPI
|
| +#define PNGCAPI
|
| #endif
|
| #ifndef PNGCBAPI
|
| -# define PNGCBAPI PNGCAPI
|
| +#define PNGCBAPI PNGCAPI
|
| #endif
|
| #ifndef PNGAPI
|
| -# define PNGAPI PNGCAPI
|
| +#define PNGAPI PNGCAPI
|
| #endif
|
|
|
| /* PNG_IMPEXP may be set on the compilation system command line or (if not set)
|
| @@ -288,14 +288,14 @@
|
| * using the library) it is set here.
|
| */
|
| #ifndef PNG_IMPEXP
|
| -# if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
|
| - /* This forces use of a DLL, disallowing static linking */
|
| -# define PNG_IMPEXP PNG_DLL_IMPORT
|
| -# endif
|
| +#if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)
|
| +/* This forces use of a DLL, disallowing static linking */
|
| +#define PNG_IMPEXP PNG_DLL_IMPORT
|
| +#endif
|
|
|
| -# ifndef PNG_IMPEXP
|
| -# define PNG_IMPEXP
|
| -# endif
|
| +#ifndef PNG_IMPEXP
|
| +#define PNG_IMPEXP
|
| +#endif
|
| #endif
|
|
|
| /* In 1.5.2 the definition of PNG_FUNCTION has been changed to always treat
|
| @@ -306,22 +306,22 @@
|
| * a storage class (this is unlikely.)
|
| */
|
| #ifndef PNG_FUNCTION
|
| -# define PNG_FUNCTION(type, name, args, attributes) attributes type name args
|
| +#define PNG_FUNCTION(type, name, args, attributes) attributes type name args
|
| #endif
|
|
|
| #ifndef PNG_EXPORT_TYPE
|
| -# define PNG_EXPORT_TYPE(type) PNG_IMPEXP type
|
| +#define PNG_EXPORT_TYPE(type) PNG_IMPEXP type
|
| #endif
|
|
|
| - /* The ordinal value is only relevant when preprocessing png.h for symbol
|
| - * table entries, so we discard it here. See the .dfn files in the
|
| - * scripts directory.
|
| - */
|
| +/* The ordinal value is only relevant when preprocessing png.h for symbol
|
| + * table entries, so we discard it here. See the .dfn files in the
|
| + * scripts directory.
|
| + */
|
| #ifndef PNG_EXPORTA
|
|
|
| -# define PNG_EXPORTA(ordinal, type, name, args, attributes)\
|
| - PNG_FUNCTION(PNG_EXPORT_TYPE(type),(PNGAPI name),PNGARG(args), \
|
| - extern attributes)
|
| +#define PNG_EXPORTA(ordinal, type, name, args, attributes) \
|
| + PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \
|
| + extern attributes)
|
| #endif
|
|
|
| /* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,
|
| @@ -329,16 +329,16 @@
|
| */
|
| #define PNG_EMPTY /*empty list*/
|
|
|
| -#define PNG_EXPORT(ordinal, type, name, args)\
|
| - PNG_EXPORTA(ordinal, type, name, args, PNG_EMPTY)
|
| +#define PNG_EXPORT(ordinal, type, name, args) \
|
| + PNG_EXPORTA(ordinal, type, name, args, PNG_EMPTY)
|
|
|
| /* Use PNG_REMOVED to comment out a removed interface. */
|
| #ifndef PNG_REMOVED
|
| -# define PNG_REMOVED(ordinal, type, name, args, attributes)
|
| +#define PNG_REMOVED(ordinal, type, name, args, attributes)
|
| #endif
|
|
|
| #ifndef PNG_CALLBACK
|
| -# define PNG_CALLBACK(type, name, args) type (PNGCBAPI name) PNGARG(args)
|
| +#define PNG_CALLBACK(type, name, args) type(PNGCBAPI name) PNGARG(args)
|
| #endif
|
|
|
| /* Support for compiler specific function attributes. These are used
|
| @@ -349,112 +349,111 @@
|
| */
|
|
|
| #ifndef PNG_NO_PEDANTIC_WARNINGS
|
| -# ifndef PNG_PEDANTIC_WARNINGS_SUPPORTED
|
| -# define PNG_PEDANTIC_WARNINGS_SUPPORTED
|
| -# endif
|
| +#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. Disabling these removes the warnings but may also produce
|
| - * less efficient code.
|
| - */
|
| -# if defined(__GNUC__)
|
| -# ifndef PNG_USE_RESULT
|
| -# define PNG_USE_RESULT __attribute__((__warn_unused_result__))
|
| -# endif
|
| -# ifndef PNG_NORETURN
|
| -# define PNG_NORETURN __attribute__((__noreturn__))
|
| -# endif
|
| -# if __GNUC__ >= 3
|
| -# ifndef PNG_ALLOCATED
|
| -# define PNG_ALLOCATED __attribute__((__malloc__))
|
| -# endif
|
| -# ifndef PNG_DEPRECATED
|
| -# define PNG_DEPRECATED __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
|
| -# if ((__GNUC__ != 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1))
|
| -# ifndef PNG_RESTRICT
|
| -# define PNG_RESTRICT __restrict
|
| -# endif
|
| -# endif /* __GNUC__ == 3.0 */
|
| -# endif /* __GNUC__ >= 3 */
|
| -
|
| -# elif defined(_MSC_VER) && (_MSC_VER >= 1300)
|
| -# ifndef PNG_USE_RESULT
|
| -# define PNG_USE_RESULT /* not supported */
|
| -# endif
|
| -# ifndef PNG_NORETURN
|
| -# define PNG_NORETURN __declspec(noreturn)
|
| -# endif
|
| -# ifndef PNG_ALLOCATED
|
| -# if (_MSC_VER >= 1400)
|
| -# define PNG_ALLOCATED __declspec(restrict)
|
| -# endif
|
| -# endif
|
| -# ifndef PNG_DEPRECATED
|
| -# define PNG_DEPRECATED __declspec(deprecated)
|
| -# endif
|
| -# ifndef PNG_PRIVATE
|
| -# define PNG_PRIVATE __declspec(deprecated)
|
| -# endif
|
| -# ifndef PNG_RESTRICT
|
| -# if (_MSC_VER >= 1400)
|
| -# define PNG_RESTRICT __restrict
|
| -# endif
|
| -# endif
|
| -
|
| -# elif defined(__WATCOMC__)
|
| -# ifndef PNG_RESTRICT
|
| -# define PNG_RESTRICT __restrict
|
| -# endif
|
| -# endif /* _MSC_VER */
|
| +/* 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. Disabling these removes the warnings but may also produce
|
| + * less efficient code.
|
| + */
|
| +#if defined(__GNUC__)
|
| +#ifndef PNG_USE_RESULT
|
| +#define PNG_USE_RESULT __attribute__((__warn_unused_result__))
|
| +#endif
|
| +#ifndef PNG_NORETURN
|
| +#define PNG_NORETURN __attribute__((__noreturn__))
|
| +#endif
|
| +#if __GNUC__ >= 3
|
| +#ifndef PNG_ALLOCATED
|
| +#define PNG_ALLOCATED __attribute__((__malloc__))
|
| +#endif
|
| +#ifndef PNG_DEPRECATED
|
| +#define PNG_DEPRECATED __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
|
| +#if ((__GNUC__ != 3) || !defined(__GNUC_MINOR__) || (__GNUC_MINOR__ >= 1))
|
| +#ifndef PNG_RESTRICT
|
| +#define PNG_RESTRICT __restrict
|
| +#endif
|
| +#endif /* __GNUC__ == 3.0 */
|
| +#endif /* __GNUC__ >= 3 */
|
| +
|
| +#elif defined(_MSC_VER) && (_MSC_VER >= 1300)
|
| +#ifndef PNG_USE_RESULT
|
| +#define PNG_USE_RESULT /* not supported */
|
| +#endif
|
| +#ifndef PNG_NORETURN
|
| +#define PNG_NORETURN __declspec(noreturn)
|
| +#endif
|
| +#ifndef PNG_ALLOCATED
|
| +#if (_MSC_VER >= 1400)
|
| +#define PNG_ALLOCATED __declspec(restrict)
|
| +#endif
|
| +#endif
|
| +#ifndef PNG_DEPRECATED
|
| +#define PNG_DEPRECATED __declspec(deprecated)
|
| +#endif
|
| +#ifndef PNG_PRIVATE
|
| +#define PNG_PRIVATE __declspec(deprecated)
|
| +#endif
|
| +#ifndef PNG_RESTRICT
|
| +#if (_MSC_VER >= 1400)
|
| +#define PNG_RESTRICT __restrict
|
| +#endif
|
| +#endif
|
| +
|
| +#elif defined(__WATCOMC__)
|
| +#ifndef PNG_RESTRICT
|
| +#define PNG_RESTRICT __restrict
|
| +#endif
|
| +#endif /* _MSC_VER */
|
| #endif /* PNG_PEDANTIC_WARNINGS */
|
|
|
| #ifndef PNG_DEPRECATED
|
| -# define PNG_DEPRECATED /* Use of this function is 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 */
|
| +#define PNG_USE_RESULT /* The result of this function must be checked */
|
| #endif
|
| #ifndef PNG_NORETURN
|
| -# define PNG_NORETURN /* This function does not return */
|
| +#define PNG_NORETURN /* This function does not return */
|
| #endif
|
| #ifndef PNG_ALLOCATED
|
| -# define PNG_ALLOCATED /* The result of the function is new memory */
|
| +#define PNG_ALLOCATED /* The result of the function is new memory */
|
| #endif
|
| #ifndef PNG_PRIVATE
|
| -# define PNG_PRIVATE /* This is a private libpng function */
|
| +#define PNG_PRIVATE /* This is a private libpng function */
|
| #endif
|
| #ifndef PNG_RESTRICT
|
| -# define PNG_RESTRICT /* The C99 "restrict" feature */
|
| +#define PNG_RESTRICT /* The C99 "restrict" feature */
|
| +#endif
|
| +#ifndef PNG_FP_EXPORT /* A floating point API. */
|
| +#ifdef PNG_FLOATING_POINT_SUPPORTED
|
| +#define PNG_FP_EXPORT(ordinal, type, name, args) \
|
| + PNG_EXPORT(ordinal, type, name, args);
|
| +#else /* No floating point APIs */
|
| +#define PNG_FP_EXPORT(ordinal, type, name, args)
|
| +#endif
|
| #endif
|
| -#ifndef PNG_FP_EXPORT /* A floating point API. */
|
| -# ifdef PNG_FLOATING_POINT_SUPPORTED
|
| -# define PNG_FP_EXPORT(ordinal, type, name, args)\
|
| - PNG_EXPORT(ordinal, type, name, args);
|
| -# else /* No floating point APIs */
|
| -# define PNG_FP_EXPORT(ordinal, type, name, args)
|
| -# endif
|
| +#ifndef PNG_FIXED_EXPORT /* A fixed point API. */
|
| +#ifdef PNG_FIXED_POINT_SUPPORTED
|
| +#define PNG_FIXED_EXPORT(ordinal, type, name, args) \
|
| + PNG_EXPORT(ordinal, type, name, args);
|
| +#else /* No fixed point APIs */
|
| +#define PNG_FIXED_EXPORT(ordinal, type, name, args)
|
| #endif
|
| -#ifndef PNG_FIXED_EXPORT /* A fixed point API. */
|
| -# ifdef PNG_FIXED_POINT_SUPPORTED
|
| -# define PNG_FIXED_EXPORT(ordinal, type, name, args)\
|
| - PNG_EXPORT(ordinal, type, name, args);
|
| -# else /* No fixed point APIs */
|
| -# define PNG_FIXED_EXPORT(ordinal, type, name, args)
|
| -# endif
|
| #endif
|
|
|
| #ifndef PNG_BUILDING_SYMBOL_TABLE
|
| @@ -473,41 +472,41 @@
|
| * standard.
|
| */
|
| #if CHAR_BIT == 8 && UCHAR_MAX == 255
|
| - typedef unsigned char png_byte;
|
| +typedef unsigned char png_byte;
|
| #else
|
| -# error "libpng requires 8 bit bytes"
|
| +#error "libpng requires 8 bit bytes"
|
| #endif
|
|
|
| #if INT_MIN == -32768 && INT_MAX == 32767
|
| - typedef int png_int_16;
|
| +typedef int png_int_16;
|
| #elif SHRT_MIN == -32768 && SHRT_MAX == 32767
|
| - typedef short png_int_16;
|
| +typedef short png_int_16;
|
| #else
|
| -# error "libpng requires a signed 16 bit type"
|
| +#error "libpng requires a signed 16 bit type"
|
| #endif
|
|
|
| #if UINT_MAX == 65535
|
| - typedef unsigned int png_uint_16;
|
| +typedef unsigned int png_uint_16;
|
| #elif USHRT_MAX == 65535
|
| - typedef unsigned short png_uint_16;
|
| +typedef unsigned short png_uint_16;
|
| #else
|
| -# error "libpng requires an unsigned 16 bit type"
|
| +#error "libpng requires an unsigned 16 bit type"
|
| #endif
|
|
|
| #if INT_MIN < -2147483646 && INT_MAX > 2147483646
|
| - typedef int png_int_32;
|
| +typedef int png_int_32;
|
| #elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646
|
| - typedef long int png_int_32;
|
| +typedef long int png_int_32;
|
| #else
|
| -# error "libpng requires a signed 32 bit (or more) type"
|
| +#error "libpng requires a signed 32 bit (or more) type"
|
| #endif
|
|
|
| #if UINT_MAX > 4294967294
|
| - typedef unsigned int png_uint_32;
|
| +typedef unsigned int png_uint_32;
|
| #elif ULONG_MAX > 4294967294
|
| - typedef unsigned long int png_uint_32;
|
| +typedef unsigned long int png_uint_32;
|
| #else
|
| -# error "libpng requires an unsigned 32 bit (or more) type"
|
| +#error "libpng requires an unsigned 32 bit (or more) type"
|
| #endif
|
|
|
| /* Prior to 1.6.0 it was possible to disable the use of size_t, 1.6.0, however,
|
| @@ -522,14 +521,14 @@ typedef ptrdiff_t png_ptrdiff_t;
|
| * direct application control of this through png_set_user_limits().
|
| */
|
| #ifndef PNG_SMALL_SIZE_T
|
| - /* Compiler specific tests for systems where size_t is known to be less than
|
| - * 32 bits (some of these systems may no longer work because of the lack of
|
| - * 'far' support; see above.)
|
| - */
|
| -# if (defined(__TURBOC__) && !defined(__FLAT__)) ||\
|
| - (defined(_MSC_VER) && defined(MAXSEG_64K))
|
| -# define PNG_SMALL_SIZE_T
|
| -# endif
|
| +/* Compiler specific tests for systems where size_t is known to be less than
|
| + * 32 bits (some of these systems may no longer work because of the lack of
|
| + * 'far' support; see above.)
|
| + */
|
| +#if (defined(__TURBOC__) && !defined(__FLAT__)) || \
|
| + (defined(_MSC_VER) && defined(MAXSEG_64K))
|
| +#define PNG_SMALL_SIZE_T
|
| +#endif
|
| #endif
|
|
|
| /* png_alloc_size_t is guaranteed to be no smaller than png_size_t, and no
|
| @@ -546,9 +545,9 @@ typedef ptrdiff_t png_ptrdiff_t;
|
| * 4294967295 - i.e. less than the maximum value of png_uint_32.
|
| */
|
| #ifdef PNG_SMALL_SIZE_T
|
| - typedef png_uint_32 png_alloc_size_t;
|
| +typedef png_uint_32 png_alloc_size_t;
|
| #else
|
| - typedef png_size_t png_alloc_size_t;
|
| +typedef png_size_t png_alloc_size_t;
|
| #endif
|
|
|
| /* Prior to 1.6.0 libpng offered limited support for Microsoft C compiler
|
| @@ -568,49 +567,49 @@ typedef ptrdiff_t png_ptrdiff_t;
|
| typedef png_int_32 png_fixed_point;
|
|
|
| /* Add typedefs for pointers */
|
| -typedef void * png_voidp;
|
| -typedef const void * png_const_voidp;
|
| -typedef png_byte * png_bytep;
|
| -typedef const png_byte * png_const_bytep;
|
| -typedef png_uint_32 * png_uint_32p;
|
| -typedef const png_uint_32 * png_const_uint_32p;
|
| -typedef png_int_32 * png_int_32p;
|
| -typedef const png_int_32 * png_const_int_32p;
|
| -typedef png_uint_16 * png_uint_16p;
|
| -typedef const png_uint_16 * png_const_uint_16p;
|
| -typedef png_int_16 * png_int_16p;
|
| -typedef const png_int_16 * png_const_int_16p;
|
| -typedef char * png_charp;
|
| -typedef const char * png_const_charp;
|
| -typedef png_fixed_point * png_fixed_point_p;
|
| -typedef const png_fixed_point * png_const_fixed_point_p;
|
| -typedef png_size_t * png_size_tp;
|
| -typedef const png_size_t * png_const_size_tp;
|
| +typedef void* png_voidp;
|
| +typedef const void* png_const_voidp;
|
| +typedef png_byte* png_bytep;
|
| +typedef const png_byte* png_const_bytep;
|
| +typedef png_uint_32* png_uint_32p;
|
| +typedef const png_uint_32* png_const_uint_32p;
|
| +typedef png_int_32* png_int_32p;
|
| +typedef const png_int_32* png_const_int_32p;
|
| +typedef png_uint_16* png_uint_16p;
|
| +typedef const png_uint_16* png_const_uint_16p;
|
| +typedef png_int_16* png_int_16p;
|
| +typedef const png_int_16* png_const_int_16p;
|
| +typedef char* png_charp;
|
| +typedef const char* png_const_charp;
|
| +typedef png_fixed_point* png_fixed_point_p;
|
| +typedef const png_fixed_point* png_const_fixed_point_p;
|
| +typedef png_size_t* png_size_tp;
|
| +typedef const png_size_t* png_const_size_tp;
|
|
|
| #ifdef PNG_STDIO_SUPPORTED
|
| -typedef FILE * png_FILE_p;
|
| +typedef FILE* png_FILE_p;
|
| #endif
|
|
|
| #ifdef PNG_FLOATING_POINT_SUPPORTED
|
| -typedef double * png_doublep;
|
| -typedef const double * png_const_doublep;
|
| +typedef double* png_doublep;
|
| +typedef const double* png_const_doublep;
|
| #endif
|
|
|
| /* Pointers to pointers; i.e. arrays */
|
| -typedef png_byte * * png_bytepp;
|
| -typedef png_uint_32 * * png_uint_32pp;
|
| -typedef png_int_32 * * png_int_32pp;
|
| -typedef png_uint_16 * * png_uint_16pp;
|
| -typedef png_int_16 * * png_int_16pp;
|
| -typedef const char * * png_const_charpp;
|
| -typedef char * * png_charpp;
|
| -typedef png_fixed_point * * png_fixed_point_pp;
|
| +typedef png_byte** png_bytepp;
|
| +typedef png_uint_32** png_uint_32pp;
|
| +typedef png_int_32** png_int_32pp;
|
| +typedef png_uint_16** png_uint_16pp;
|
| +typedef png_int_16** png_int_16pp;
|
| +typedef const char** png_const_charpp;
|
| +typedef char** png_charpp;
|
| +typedef png_fixed_point** png_fixed_point_pp;
|
| #ifdef PNG_FLOATING_POINT_SUPPORTED
|
| -typedef double * * png_doublepp;
|
| +typedef double** png_doublepp;
|
| #endif
|
|
|
| /* Pointers to pointers to pointers; i.e., pointer to array */
|
| -typedef char * * * png_charppp;
|
| +typedef char*** png_charppp;
|
|
|
| #endif /* PNG_BUILDING_SYMBOL_TABLE */
|
|
|
|
|