update libpng to 1.6.34

1 files changed, 21 insertions, 14 deletions

diff --git a/plugins/AdvaImg/src/LibPNG/png.h b/plugins/AdvaImg/src/LibPNG/png.h
index 4572030c18..62d27ada00 100644
--- a/plugins/AdvaImg/src/LibPNG/png.h
+++ b/plugins/AdvaImg/src/LibPNG/png.h
@@ -1,7 +1,7 @@
 

 /* png.h - header file for PNG reference library

  *

- * libpng version 1.6.31, July 27, 2017

+ * libpng version 1.6.34, September 29, 2017

  *

  * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson

  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)

@@ -12,7 +12,7 @@
  * Authors and maintainers:

  *   libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat

  *   libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger

- *   libpng versions 0.97, January 1998, through 1.6.31, July 27, 2017:

+ *   libpng versions 0.97, January 1998, through 1.6.34, September 29, 2017:

  *     Glenn Randers-Pehrson.

  *   See also "Contributing Authors", below.

  */

@@ -25,7 +25,7 @@
  *

  * This code is released under the libpng license.

  *

- * libpng versions 1.0.7, July 1, 2000 through 1.6.31, July 27, 2017 are

+ * libpng versions 1.0.7, July 1, 2000 through 1.6.34, September 29, 2017 are

  * Copyright (c) 2000-2002, 2004, 2006-2017 Glenn Randers-Pehrson, are

  * derived from libpng-1.0.6, and are distributed according to the same

  * disclaimer and license as libpng-1.0.6 with the following individuals

@@ -209,11 +209,11 @@
  *    ...

  *    1.0.19                  10    10019  10.so.0.19[.0]

  *    ...

- *    1.2.57                  13    10257  12.so.0.57[.0]

+ *    1.2.59                  13    10257  12.so.0.59[.0]

  *    ...

- *    1.5.28                  15    10527  15.so.15.28[.0]

+ *    1.5.30                  15    10527  15.so.15.30[.0]

  *    ...

- *    1.6.31                  16    10631  16.so.16.31[.0]

+ *    1.6.34                  16    10633  16.so.16.34[.0]

  *

  *    Henceforth the source version will match the shared-library major

  *    and minor numbers; the shared-library major version number will be

@@ -241,13 +241,13 @@
  * Y2K compliance in libpng:

  * =========================

  *

- *    July 27, 2017

+ *    September 29, 2017

  *

  *    Since the PNG Development group is an ad-hoc body, we can't make

  *    an official declaration.

  *

  *    This is your unofficial assurance that libpng from version 0.71 and

- *    upward through 1.6.31 are Y2K compliant.  It is my belief that

+ *    upward through 1.6.34 are Y2K compliant.  It is my belief that

  *    earlier versions were also Y2K compliant.

  *

  *    Libpng only has two year fields.  One is a 2-byte unsigned integer

@@ -309,8 +309,8 @@
  */

 

 /* Version information for png.h - this should match the version in png.c */

-#define PNG_LIBPNG_VER_STRING "1.6.31"

-#define PNG_HEADER_VERSION_STRING " libpng version 1.6.31 - July 27, 2017\n"

+#define PNG_LIBPNG_VER_STRING "1.6.34"

+#define PNG_HEADER_VERSION_STRING " libpng version 1.6.34 - September 29, 2017\n"

 

 #define PNG_LIBPNG_VER_SONUM   16

 #define PNG_LIBPNG_VER_DLLNUM  16

@@ -318,7 +318,7 @@
 /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */

 #define PNG_LIBPNG_VER_MAJOR   1

 #define PNG_LIBPNG_VER_MINOR   6

-#define PNG_LIBPNG_VER_RELEASE 31

+#define PNG_LIBPNG_VER_RELEASE 34

 

 /* This should match the numeric part of the final component of

  * PNG_LIBPNG_VER_STRING, omitting any leading zero:

@@ -349,7 +349,7 @@
  * version 1.0.0 was mis-numbered 100 instead of 10000).  From

  * version 1.0.1 it's    xxyyzz, where x=major, y=minor, z=release

  */

-#define PNG_LIBPNG_VER 10631 /* 1.6.31 */

+#define PNG_LIBPNG_VER 10634 /* 1.6.34 */

 

 /* Library configuration: these options cannot be changed after

  * the library has been built.

@@ -459,7 +459,7 @@ extern "C" {
 /* This triggers a compiler error in png.c, if png.c and png.h

  * do not agree upon the version number.

  */

-typedef char* png_libpng_version_1_6_31;

+typedef char* png_libpng_version_1_6_34;

 

 /* Basic control structions.  Read libpng-manual.txt or libpng.3 for more info.

  *

@@ -2014,6 +2014,11 @@ PNG_EXPORT(246, png_uint_32, png_get_eXIf, (png_const_structrp png_ptr,
     png_inforp info_ptr, png_bytep *exif));

 PNG_EXPORT(247, void, png_set_eXIf, (png_const_structrp png_ptr,

     png_inforp info_ptr, const png_bytep exif));

+

+PNG_EXPORT(248, png_uint_32, png_get_eXIf_1, (png_const_structrp png_ptr,

+    png_const_inforp info_ptr, png_uint_32 *num_exif, png_bytep *exif));

+PNG_EXPORT(249, void, png_set_eXIf_1, (png_const_structrp png_ptr,

+    png_inforp info_ptr, const png_uint_32 num_exif, const png_bytep exif));

 #endif

 

 #ifdef PNG_gAMA_SUPPORTED

@@ -2814,6 +2819,8 @@ typedef struct
 #  define PNG_FORMAT_FLAG_AFIRST 0x20U /* alpha channel comes first */

 #endif

 

+#define PNG_FORMAT_FLAG_ASSOCIATED_ALPHA 0x40U /* alpha channel is associated */

+

 /* Commonly used formats have predefined macros.

  *

  * First the single byte (sRGB) formats:

@@ -3259,7 +3266,7 @@ PNG_EXPORT(244, int, png_set_option, (png_structrp png_ptr, int option,
  * one to use is one more than this.)

  */

 #ifdef PNG_EXPORT_LAST_ORDINAL

-  PNG_EXPORT_LAST_ORDINAL(247);

+  PNG_EXPORT_LAST_ORDINAL(249);

 #endif

 

 #ifdef __cplusplus