AdvaImg: LibPNG lib updated to 1.6.29

1 files changed, 36 insertions, 56 deletions

diff --git a/plugins/AdvaImg/src/LibPNG/pngconf.h b/plugins/AdvaImg/src/LibPNG/pngconf.h
index 3337455324..3fd29eb246 100644
--- a/plugins/AdvaImg/src/LibPNG/pngconf.h
+++ b/plugins/AdvaImg/src/LibPNG/pngconf.h
@@ -1,9 +1,9 @@
 

 /* pngconf.h - machine configurable file for libpng

  *

- * libpng version 1.6.17, March 26, 2015

+ * libpng version 1.6.29, March 16, 2017

  *

- * Copyright (c) 1998-2015 Glenn Randers-Pehrson

+ * Copyright (c) 1998-2002,2004,2006-2016 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.)

  *

@@ -20,26 +20,6 @@
 #ifndef PNGCONF_H

 #define PNGCONF_H

 

-/* 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

-#  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 /* else includes may cause problems */

 

 /* From libpng 1.6.0 libpng requires an ANSI X3.159-1989 ("ISOC90") compliant C

@@ -83,7 +63,7 @@
  */

 #define PNG_CONST const /* backward compatibility only */

 

-/* This controls optimization of the reading of 16 and 32 bit values

+/* This controls optimization of the reading of 16-bit and 32-bit values

  * from PNG files.  It can be set on a per-app-file basis - it

  * just changes whether a macro is used when the function is called.

  * The library builder sets the default; if read functions are not

@@ -208,27 +188,27 @@
    * 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!

-     */

+   /* 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'.

-        */

+   /* 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.

-     */

+   /* 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

@@ -245,10 +225,10 @@
 

 #  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.

-     */

+   /* 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

@@ -264,9 +244,9 @@
 #  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!)

-     */

+   /* 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 */

 

@@ -287,7 +267,7 @@
  */

 #ifndef PNG_IMPEXP

 #  if defined(PNG_USE_DLL) && defined(PNG_DLL_IMPORT)

-     /* This forces use of a DLL, disallowing static linking */

+   /* This forces use of a DLL, disallowing static linking */

 #    define PNG_IMPEXP PNG_DLL_IMPORT

 #  endif

 

@@ -315,11 +295,11 @@
     * 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)

+#ifndef PNG_EXPORTA

+#  define PNG_EXPORTA(ordinal, type, name, args, attributes) \

+      PNG_FUNCTION(PNG_EXPORT_TYPE(type), (PNGAPI name), PNGARG(args), \

+      PNG_LINKAGE_API attributes)

 #endif

 

 /* ANSI-C (C90) does not permit a macro to be invoked with an empty argument,

@@ -327,7 +307,7 @@
  */

 #define PNG_EMPTY /*empty list*/

 

-#define PNG_EXPORT(ordinal, type, name, args)\

+#define PNG_EXPORT(ordinal, type, name, args) \

    PNG_EXPORTA(ordinal, type, name, args, PNG_EMPTY)

 

 /* Use PNG_REMOVED to comment out a removed interface. */

@@ -360,7 +340,7 @@
    * less efficient code.

    */

 #  if defined(__clang__) && defined(__has_attribute)

-     /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */

+   /* Clang defines both __clang__ and __GNUC__. Check __clang__ first. */

 #    if !defined(PNG_USE_RESULT) && __has_attribute(__warn_unused_result__)

 #      define PNG_USE_RESULT __attribute__((__warn_unused_result__))

 #    endif

@@ -500,7 +480,7 @@
 #if CHAR_BIT == 8 && UCHAR_MAX == 255

    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

@@ -508,7 +488,7 @@
 #elif SHRT_MIN == -32768 && SHRT_MAX == 32767

    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

@@ -516,7 +496,7 @@
 #elif USHRT_MAX == 65535

    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

@@ -524,15 +504,15 @@
 #elif LONG_MIN < -2147483646 && LONG_MAX > 2147483646

    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

+#if UINT_MAX > 4294967294U

    typedef unsigned int png_uint_32;

-#elif ULONG_MAX > 4294967294

+#elif ULONG_MAX > 4294967294U

    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,