libpng update (by Mataes)

git-svn-id: http://svn.miranda-ng.org/main/trunk@11602 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

15 files changed, 353 insertions, 319 deletions

diff --git a/plugins/AdvaImg/src/LibPNG/ANNOUNCE b/plugins/AdvaImg/src/LibPNG/ANNOUNCE
index 29b40b432d..b0331df548 100644
--- a/plugins/AdvaImg/src/LibPNG/ANNOUNCE
+++ b/plugins/AdvaImg/src/LibPNG/ANNOUNCE
@@ -1,4 +1,4 @@
-Libpng 1.6.15 - November 20, 2014

+Libpng 1.6.16 - December 22, 2014

 

 This is a public release of libpng, intended for use in production codes.

 

@@ -7,55 +7,30 @@ Files available for download:
 Source files with LF line endings (for Unix/Linux) and with a

 "configure" script

 

-   libpng-1.6.15.tar.xz (LZMA-compressed, recommended)

-   libpng-1.6.15.tar.gz

+   libpng-1.6.16.tar.xz (LZMA-compressed, recommended)

+   libpng-1.6.16.tar.gz

 

 Source files with CRLF line endings (for Windows), without the

 "configure" script

 

-   lpng1615.7z  (LZMA-compressed, recommended)

-   lpng1615.zip

+   lpng1616.7z  (LZMA-compressed, recommended)

+   lpng1616.zip

 

 Other information:

 

-   libpng-1.6.15-README.txt

-   libpng-1.6.15-LICENSE.txt

-   libpng-1.6.15-*.asc (armored detached GPG signatures)

-

-Changes since the last public release (1.6.14):

-  Changed "if (!x)" to "if (x == 0)" and "if (x)" to "if (x != 0)"

-  Simplified png_free_data().

-  Added missing "ptr = NULL" after some instances of png_free().

-  Made a one-line revision to configure.ac to support ARM on aarch64

-    (bug report by Marcin Juszkiewicz, fix by John Bowler).

-  Avoid out-of-bounds memory access in png_user_version_check().

-  Simplified and future-proofed png_user_version_check().

-  Fixed GCC unsigned int->float warnings. Various versions of GCC

-    seem to generate warnings when an unsigned value is implicitly

-    converted to double. This is probably a GCC bug but this change

-    avoids the issue by explicitly converting to (int) where safe.

-  Free all allocated memory in pngimage. The file buffer cache was left

-    allocated at the end of the program, harmless but it causes memory

-    leak reports from clang.

-  Fixed array size calculations to avoid warnings. At various points

-    in the code the number of elements in an array is calculated using

-    sizeof.  This generates a compile time constant of type (size_t) which

-    is then typically assigned to an (unsigned int) or (int). Some versions

-    of GCC on 64-bit systems warn about the apparent narrowing, even though

-    the same compiler does apparently generate the correct, in-range,

-    numeric constant.  This adds appropriate, safe, casts to make the

-    warnings go away.

-  Removed #ifdef PNG_16BIT_SUPPORTED/#endif around png_product2(); it is

-    needed by png_reciprocal2().

-  Added #ifdef PNG_16BIT_SUPPORTED/#endif around png_log16bit() and

-    png_do_swap().

-  Changed all "#endif /* PNG_FEATURE_SUPPORTED */" to "#endif /* FEATURE */"

-  The macros passed in the command line to Borland make were ignored if

-    similarly-named macros were already defined in makefiles. This behavior

-    is different from POSIX make and other make programs.  Surround the

-    macro definitions with ifndef guards (Cosmin).

-  Added "-D_CRT_SECURE_NO_WARNINGS" to CFLAGS in scripts/makefile.vcwin32.

-  Removed the obsolete $ARCH variable from scripts/makefile.darwin.

+   libpng-1.6.16-README.txt

+   libpng-1.6.16-LICENSE.txt

+   libpng-1.6.16-*.asc (armored detached GPG signatures)

+

+Changes since the last public release (1.6.15):

+  Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that

+    don't do alignment correctly.

+  Revised Makefile.am and scripts/*.dfn to work with MinGW/MSYS;

+    renamed scripts/*.dfn to scripts/*.c (Bob Friesenhahn and John Bowler).

+  Quiet a "comparison always true" warning in pngstest.c (John Bowler).

+  Restored a test on width that was removed from png.c at libpng-1.6.9

+    (Bug report by Alex Eubanks).

+  Fixed an overflow in png_combine_row with very wide interlaced images.

 

 Send comments/corrections/commendations to png-mng-implement at lists.sf.net

 (subscription required; visit

diff --git a/plugins/AdvaImg/src/LibPNG/CHANGES b/plugins/AdvaImg/src/LibPNG/CHANGES
index 689ef9f55b..7488f99700 100644
--- a/plugins/AdvaImg/src/LibPNG/CHANGES
+++ b/plugins/AdvaImg/src/LibPNG/CHANGES
@@ -5097,6 +5097,33 @@ Version 1.6.15rc03 [November 16, 2014]
   Removed the obsolete $ARCH variable from scripts/makefile.darwin.

 

 Version 1.6.15 [November 20, 2014]

+  No changes.

+

+Version 1.6.16beta01 [December 14, 2014]

+  Added ".align 2" to arm/filter_neon.S to support old GAS assemblers that

+    don't do alignment correctly.

+  Revised Makefile.am and scripts/symbols.dfn to work with MinGW/MSYS

+    (Bob Friesenhahn).

+

+Version 1.6.16beta02 [December 15, 2014]

+  Revised Makefile.am and scripts/*.dfn again to work with MinGW/MSYS;

+    renamed scripts/*.dfn to scripts/*.c (John Bowler).

+

+Version 1.6.16beta03 [December 21, 2014]

+  Quiet a "comparison always true" warning in pngstest.c (John Bowler).

+

+Version 1.6.16rc01 [December 21, 2014]

+  Restored a test on width that was removed from png.c at libpng-1.6.9

+    (Bug report by Alex Eubanks).

+

+Version 1.6.16rc02 [December 21, 2014]

+  Undid the update to pngrutil.c in 1.6.16rc01.

+

+Version 1.6.16rc03 [December 21, 2014]

+  Fixed an overflow in png_combine_row with very wide interlaced images.

+

+Version 1.6.16 [December 22, 2014]

+  No changes.

 

 Send comments/corrections/commendations to png-mng-implement at lists.sf.net

 (subscription required; visit

diff --git a/plugins/AdvaImg/src/LibPNG/LICENSE b/plugins/AdvaImg/src/LibPNG/LICENSE
index 1bd7e37d16..eec9c179e7 100644
--- a/plugins/AdvaImg/src/LibPNG/LICENSE
+++ b/plugins/AdvaImg/src/LibPNG/LICENSE
@@ -10,7 +10,7 @@ this sentence.
 

 This code is released under the libpng license.

 

-libpng versions 1.2.6, August 15, 2004, through 1.6.15, November 20, 2014, are

+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are

 Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are

 distributed according to the same disclaimer and license as libpng-1.2.5

 with the following individual added to the list of Contributing Authors

@@ -108,4 +108,4 @@ certification mark of the Open Source Initiative.
 

 Glenn Randers-Pehrson

 glennrp at users.sourceforge.net

-November 20, 2014

+December 22, 2014

diff --git a/plugins/AdvaImg/src/LibPNG/README b/plugins/AdvaImg/src/LibPNG/README
index 165cbeafe5..d0527552e9 100644
--- a/plugins/AdvaImg/src/LibPNG/README
+++ b/plugins/AdvaImg/src/LibPNG/README
@@ -1,4 +1,4 @@
-README for libpng version 1.6.15 - November 20, 2014 (shared library 16.0)

+README for libpng version 1.6.16 - December 22, 2014 (shared library 16.0)

 See the note about version numbers near the top of png.h

 

 See INSTALL for instructions on how to install libpng.

diff --git a/plugins/AdvaImg/src/LibPNG/configure b/plugins/AdvaImg/src/LibPNG/configure
index df9cf05404..c33452b533 100644
--- a/plugins/AdvaImg/src/LibPNG/configure
+++ b/plugins/AdvaImg/src/LibPNG/configure
@@ -1,14 +1,14 @@
 

 echo "

   There is no \"configure\" script in this distribution (*.zip or *.7z) of

-  libpng-1.6.15.

+  libpng-1.6.16.

 

   Instead, please copy the appropriate makefile for your system from the

   \"scripts\" directory.  Read the INSTALL file for more details.

 

   Update, July 2004: you can get a \"configure\" based distribution

   from the libpng distribution sites.  Download the file

-  libpng-1.6.15.tar.gz, libpng-1.6.15.tar.xz, or libpng-1.6.15.tar.bz2

+  libpng-1.6.16.tar.gz, libpng-1.6.16.tar.xz, or libpng-1.6.16.tar.bz2

 

   If the line endings in the files look funny, which is likely to be the

   case if you were trying to run \"configure\" on a Linux machine, you may

diff --git a/plugins/AdvaImg/src/LibPNG/libpng-manual.txt b/plugins/AdvaImg/src/LibPNG/libpng-manual.txt
index cd867155bf..06f7774fb3 100644
--- a/plugins/AdvaImg/src/LibPNG/libpng-manual.txt
+++ b/plugins/AdvaImg/src/LibPNG/libpng-manual.txt
@@ -1,6 +1,6 @@
 libpng-manual.txt - A description on how to use and modify libpng

 

- libpng version 1.6.15 - November 20, 2014

+ libpng version 1.6.16 - December 22, 2014

  Updated and distributed by Glenn Randers-Pehrson

  <glennrp at users.sourceforge.net>

  Copyright (c) 1998-2014 Glenn Randers-Pehrson

@@ -11,7 +11,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 

  Based on:

 

- libpng versions 0.97, January 1998, through 1.6.15 - November 20, 2014

+ libpng versions 0.97, January 1998, through 1.6.16 - December 22, 2014

  Updated and distributed by Glenn Randers-Pehrson

  Copyright (c) 1998-2014 Glenn Randers-Pehrson

 

@@ -648,15 +648,12 @@ User limits
 

 The PNG specification allows the width and height of an image to be as

 large as 2^31-1 (0x7fffffff), or about 2.147 billion rows and columns.

-Since very few applications really need to process such large images,

-we have imposed an arbitrary 1-million limit on rows and columns.

 Larger images will be rejected immediately with a png_error() call. If

-you wish to change this limit, you can use

+you wish to reduce these limits, you can use

 

    png_set_user_limits(png_ptr, width_max, height_max);

 

-to set your own limits, or use width_max = height_max = 0x7fffffffL

-to allow all valid dimensions (libpng may reject some very large images

+to set your own limits (libpng may reject some very wide images

 anyway because of potential buffer overflow conditions).

 

 You should put this statement after you create the PNG structure and

@@ -5037,8 +5034,8 @@ where "rp" indicates a "restricted pointer".
 Error detection in some chunks has improved; in particular the iCCP chunk

 reader now does pretty complete validation of the basic format.  Some bad

 profiles that were previously accepted are now accepted with a warning or

-rejected, depending upon the png_set_benign_errors() setting, in particular the

-very old broken Microsoft/HP 3144-byte sRGB profile.  Starting with

+rejected, depending upon the png_set_benign_errors() setting, in particular

+the very old broken Microsoft/HP 3144-byte sRGB profile.  Starting with

 libpng-1.6.11, recognizing and checking sRGB profiles can be avoided by

 means of

 

@@ -5048,8 +5045,8 @@ means of
            PNG_OPTION_ON);

     #endif

 

-It's not a good idea to do this if you are using the "simplified API",

-which needs to be able to recognize an sRGB profile conveyed via the iCCP

+It's not a good idea to do this if you are using the new "simplified API",

+which needs to be able to recognize sRGB profiles conveyed via the iCCP

 chunk.

 

 The PNG spec requirement that only grayscale profiles may appear in images

@@ -5277,13 +5274,13 @@ Other rules can be inferred by inspecting the libpng source.
 

 XVI. Y2K Compliance in libpng

 

-November 20, 2014

+December 22, 2014

 

 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.15 are Y2K compliant.  It is my belief that earlier

+upward through 1.6.16 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

diff --git a/plugins/AdvaImg/src/LibPNG/libpng.3 b/plugins/AdvaImg/src/LibPNG/libpng.3
index 143bbc9bf1..24c7d772cf 100644
--- a/plugins/AdvaImg/src/LibPNG/libpng.3
+++ b/plugins/AdvaImg/src/LibPNG/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "November 20, 2014"

+.TH LIBPNG 3 "December 22, 2014"

 .SH NAME

-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15

+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.16

 .SH SYNOPSIS

 \fB

 #include <png.h>\fP

@@ -504,7 +504,7 @@ Following is a copy of the libpng-manual.txt file that accompanies libpng.
 .SH LIBPNG.TXT

 libpng-manual.txt - A description on how to use and modify libpng

 

- libpng version 1.6.15 - November 20, 2014

+ libpng version 1.6.16 - December 22, 2014

  Updated and distributed by Glenn Randers-Pehrson

  <glennrp at users.sourceforge.net>

  Copyright (c) 1998-2014 Glenn Randers-Pehrson

@@ -515,7 +515,7 @@ libpng-manual.txt - A description on how to use and modify libpng
 

  Based on:

 

- libpng versions 0.97, January 1998, through 1.6.15 - November 20, 2014

+ libpng versions 0.97, January 1998, through 1.6.16 - December 22, 2014

  Updated and distributed by Glenn Randers-Pehrson

  Copyright (c) 1998-2014 Glenn Randers-Pehrson

 

@@ -1152,15 +1152,12 @@ callback function:
 

 The PNG specification allows the width and height of an image to be as

 large as 2^(31\-1 (0x7fffffff), or about 2.147 billion rows and columns.

-Since very few applications really need to process such large images,

-we have imposed an arbitrary 1-million limit on rows and columns.

 Larger images will be rejected immediately with a png_error() call. If

-you wish to change this limit, you can use

+you wish to reduce these limits, you can use

 

    png_set_user_limits(png_ptr, width_max, height_max);

 

-to set your own limits, or use width_max = height_max = 0x7fffffffL

-to allow all valid dimensions (libpng may reject some very large images

+to set your own limits (libpng may reject some very wide images

 anyway because of potential buffer overflow conditions).

 

 You should put this statement after you create the PNG structure and

@@ -5541,8 +5538,8 @@ where "rp" indicates a "restricted pointer".
 Error detection in some chunks has improved; in particular the iCCP chunk

 reader now does pretty complete validation of the basic format.  Some bad

 profiles that were previously accepted are now accepted with a warning or

-rejected, depending upon the png_set_benign_errors() setting, in particular the

-very old broken Microsoft/HP 3144-byte sRGB profile.  Starting with

+rejected, depending upon the png_set_benign_errors() setting, in particular

+the very old broken Microsoft/HP 3144-byte sRGB profile.  Starting with

 libpng-1.6.11, recognizing and checking sRGB profiles can be avoided by

 means of

 

@@ -5552,8 +5549,8 @@ means of
            PNG_OPTION_ON);

     #endif

 

-It's not a good idea to do this if you are using the "simplified API",

-which needs to be able to recognize an sRGB profile conveyed via the iCCP

+It's not a good idea to do this if you are using the new "simplified API",

+which needs to be able to recognize sRGB profiles conveyed via the iCCP

 chunk.

 

 The PNG spec requirement that only grayscale profiles may appear in images

@@ -5781,13 +5778,13 @@ Other rules can be inferred by inspecting the libpng source.
 

 .SH XVI. Y2K Compliance in libpng

 

-November 20, 2014

+December 22, 2014

 

 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.15 are Y2K compliant.  It is my belief that earlier

+upward through 1.6.16 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

@@ -6036,6 +6033,9 @@ the first widely used release:
  1.6.15beta01-08     16    10615  16.so.16.15[.0]

  1.6.15rc01-03       16    10615  16.so.16.15[.0]

  1.6.15              16    10615  16.so.16.15[.0]

+ 1.6.16beta01-03     16    10616  16.so.16.16[.0]

+ 1.6.16rc01-02       16    10616  16.so.16.16[.0]

+ 1.6.16              16    10616  16.so.16.16[.0]

 

 Henceforth the source version will match the shared-library minor

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

@@ -6092,7 +6092,7 @@ possible without all of you.
 

 Thanks to Frank J. T. Wojcik for helping with the documentation.

 

-Libpng version 1.6.15 - November 20, 2014:

+Libpng version 1.6.16 - December 22, 2014:

 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.

 Currently maintained by Glenn Randers-Pehrson (glennrp at users.sourceforge.net).

 

@@ -6115,7 +6115,7 @@ this sentence.
 

 This code is released under the libpng license.

 

-libpng versions 1.2.6, August 15, 2004, through 1.6.15, November 20, 2014, are

+libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are

 Copyright (c) 2004,2006-2014 Glenn Randers-Pehrson, and are

 distributed according to the same disclaimer and license as libpng-1.2.5

 with the following individual added to the list of Contributing Authors

@@ -6214,7 +6214,7 @@ certification mark of the Open Source Initiative.
 

 Glenn Randers-Pehrson

 glennrp at users.sourceforge.net

-November 20, 2014

+December 22, 2014

 

 .\" end of man page

 

diff --git a/plugins/AdvaImg/src/LibPNG/libpngpf.3 b/plugins/AdvaImg/src/LibPNG/libpngpf.3
index a77a08e20a..ec1d12b69a 100644
--- a/plugins/AdvaImg/src/LibPNG/libpngpf.3
+++ b/plugins/AdvaImg/src/LibPNG/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "November 20, 2014"

+.TH LIBPNGPF 3 "December 22, 2014"

 .SH NAME

-libpng \- Portable Network Graphics (PNG) Reference Library 1.6.15

+libpng \- Portable Network Graphics (PNG) Reference Library 1.6.16

 (private functions)

 .SH SYNOPSIS

 \fB#include \fI"pngpriv.h"

diff --git a/plugins/AdvaImg/src/LibPNG/png.5 b/plugins/AdvaImg/src/LibPNG/png.5
index fa1e46985f..879b3f7576 100644
--- a/plugins/AdvaImg/src/LibPNG/png.5
+++ b/plugins/AdvaImg/src/LibPNG/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "November 20, 2014"

+.TH PNG 5 "December 22, 2014"

 .SH NAME

 png \- Portable Network Graphics (PNG) format

 .SH DESCRIPTION

diff --git a/plugins/AdvaImg/src/LibPNG/png.c b/plugins/AdvaImg/src/LibPNG/png.c
index f0f0f94c5c..94f2e9a3f1 100644
--- a/plugins/AdvaImg/src/LibPNG/png.c
+++ b/plugins/AdvaImg/src/LibPNG/png.c
@@ -1,7 +1,7 @@
 

 /* png.c - location for general purpose libpng functions

  *

- * Last changed in libpng 1.6.15 [November 20, 2014]

+ * Last changed in libpng 1.6.16 [December 22, 2014]

  * Copyright (c) 1998-2014 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.)

@@ -14,7 +14,7 @@
 #include "pngpriv.h"

 

 /* Generate a compiler error if there is an old png.h in the search path. */

-typedef png_libpng_version_1_6_15 Your_png_h_is_not_version_1_6_15;

+typedef png_libpng_version_1_6_16 Your_png_h_is_not_version_1_6_16;

 

 /* Tells libpng that we have already handled the first "num_bytes" bytes

  * of the PNG file signature.  If the PNG data is embedded into another

@@ -769,13 +769,13 @@ png_get_copyright(png_const_structrp png_ptr)
 #else

 #  ifdef __STDC__

    return PNG_STRING_NEWLINE \

-     "libpng version 1.6.15 - November 20, 2014" PNG_STRING_NEWLINE \

+     "libpng version 1.6.16 - December 22, 2014" PNG_STRING_NEWLINE \

      "Copyright (c) 1998-2014 Glenn Randers-Pehrson" PNG_STRING_NEWLINE \

      "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \

      "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \

      PNG_STRING_NEWLINE;

 #  else

-      return "libpng version 1.6.15 - November 20, 2014\

+      return "libpng version 1.6.16 - December 22, 2014\

       Copyright (c) 1998-2014 Glenn Randers-Pehrson\

       Copyright (c) 1996-1997 Andreas Dilger\

       Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";

@@ -1075,7 +1075,7 @@ png_colorspace_set_gamma(png_const_structrp png_ptr,
    png_colorspacerp colorspace, png_fixed_point gAMA)

 {

    /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't

-    * occur.  Since the fixed point representation is assymetrical it is

+    * occur.  Since the fixed point representation is asymetrical it is

     * possible for 1/gamma to overflow the limit of 21474 and this means the

     * gamma value must be at least 5/100000 and hence at most 20000.0.  For

     * safety the limits here are a little narrower.  The values are 0.00016 to

@@ -1324,7 +1324,7 @@ png_XYZ_from_xy(png_XYZ *XYZ, const png_xy *xy)
     * (1/white-y), so we can immediately see that as white-y approaches 0 the

     * accuracy inherent in the cHRM chunk drops off substantially.

     *

-    * libpng arithmetic: a simple invertion of the above equations

+    * libpng arithmetic: a simple inversion of the above equations

     * ------------------------------------------------------------

     *

     *    white_scale = 1/white-y

@@ -1817,7 +1817,7 @@ png_icc_profile_error(png_const_structrp png_ptr, png_colorspacerp colorspace,
    PNG_UNUSED(pos)

 

    /* This is recoverable, but make it unconditionally an app_error on write to

-    * avoid writing invalid ICC profiles into PNG files.  (I.e.  we handle them

+    * avoid writing invalid ICC profiles into PNG files (i.e., we handle them

     * on read, with a warning, but on write unless the app turns off

     * application errors the PNG won't be written.)

     */

@@ -1836,7 +1836,7 @@ png_colorspace_set_sRGB(png_const_structrp png_ptr, png_colorspacerp colorspace,
    /* sRGB sets known gamma, end points and (from the chunk) intent. */

    /* IMPORTANT: these are not necessarily the values found in an ICC profile

     * because ICC profiles store values adapted to a D50 environment; it is

-    * expected that the ICC profile mediaWhitePointTag will be D50, see the

+    * expected that the ICC profile mediaWhitePointTag will be D50; see the

     * checks and code elsewhere to understand this better.

     *

     * These XYZ values, which are accurate to 5dp, produce rgb to gray

@@ -2461,6 +2461,17 @@ png_colorspace_set_rgb_coefficients(png_structrp png_ptr)
 

 #endif /* COLORSPACE */

 

+#ifdef __GNUC__

+/* This exists solely to work round a warning from GNU C. */

+static int /* PRIVATE */

+png_gt(size_t a, size_t b)

+{

+    return a > b;

+}

+#else

+#   define png_gt(a,b) ((a) > (b))

+#endif

+

 void /* PRIVATE */

 png_check_IHDR(png_const_structrp png_ptr,

    png_uint_32 width, png_uint_32 height, int bit_depth,

@@ -2480,6 +2491,28 @@ png_check_IHDR(png_const_structrp png_ptr,
       png_warning(png_ptr, "Invalid image width in IHDR");

       error = 1;

    }

+

+   else if (png_gt(width,

+                   (PNG_SIZE_MAX >> 3) /* 8-byte RGBA pixels */

+                   - 48                /* big_row_buf hack */

+                   - 1                 /* filter byte */

+                   - 7*8               /* rounding width to multiple of 8 pix */

+                   - 8))               /* extra max_pixel_depth pad */

+   {

+      /* The size of the row must be within the limits of this architecture.

+       * Because the read code can perform arbitrary transformations the

+       * maximum size is checked here.  Because the code in png_read_start_row

+       * adds extra space "for safety's sake" in several places a conservative

+       * limit is used here.

+       *

+       * NOTE: it would be far better to check the size that is actually used,

+       * but the effect in the real world is minor and the changes are more

+       * extensive, therefore much more dangerous and much more difficult to

+       * write in a way that avoids compiler warnings.

+       */

+      png_warning(png_ptr, "Image width is too large for this architecture");

+      error = 1;

+   }

    else

    {

 #     ifdef PNG_SET_USER_LIMITS_SUPPORTED

diff --git a/plugins/AdvaImg/src/LibPNG/png.h b/plugins/AdvaImg/src/LibPNG/png.h
index 731816665e..2a3590e2dd 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.15, November 20, 2014

+ * libpng version 1.6.16, December 22, 2014

  * Copyright (c) 1998-2014 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.)

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

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

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

- *   libpng versions 0.97, January 1998, through 1.6.15, November 20, 2014: Glenn

+ *   libpng versions 0.97, January 1998, through 1.6.16, December 22, 2014: Glenn

  *   See also "Contributing Authors", below.

  *

  * Note about libpng version numbers:

@@ -209,6 +209,9 @@
  *    1.6.15beta01-08         16    10615  16.so.16.15[.0]

  *    1.6.15rc01-03           16    10615  16.so.16.15[.0]

  *    1.6.15                  16    10615  16.so.16.15[.0]

+ *    1.6.16beta01-03         16    10616  16.so.16.16[.0]

+ *    1.6.16rc01-02           16    10616  16.so.16.16[.0]

+ *    1.6.16                  16    10616  16.so.16.16[.0]

  *

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

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

@@ -240,7 +243,7 @@
  *

  * This code is released under the libpng license.

  *

- * libpng versions 1.2.6, August 15, 2004, through 1.6.15, November 20, 2014, are

+ * libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are

  * Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are

  * distributed according to the same disclaimer and license as libpng-1.2.5

  * with the following individual added to the list of Contributing Authors:

@@ -352,13 +355,13 @@
  * Y2K compliance in libpng:

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

  *

- *    November 20, 2014

+ *    December 22, 2014

  *

  *    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.15 are Y2K compliant.  It is my belief that

+ *    upward through 1.6.16 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

@@ -420,9 +423,9 @@
  */

 

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

-#define PNG_LIBPNG_VER_STRING "1.6.15"

+#define PNG_LIBPNG_VER_STRING "1.6.16"

 #define PNG_HEADER_VERSION_STRING \

-     " libpng version 1.6.15 - November 20, 2014\n"

+     " libpng version 1.6.16 - December 22, 2014\n"

 

 #define PNG_LIBPNG_VER_SONUM   16

 #define PNG_LIBPNG_VER_DLLNUM  16

@@ -430,7 +433,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 15

+#define PNG_LIBPNG_VER_RELEASE 16

 

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

  * PNG_LIBPNG_VER_STRING, omitting any leading zero:

@@ -461,7 +464,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 10615 /* 1.6.15 */

+#define PNG_LIBPNG_VER 10616 /* 1.6.16 */

 

 /* Library configuration: these options cannot be changed after

  * the library has been built.

@@ -566,7 +569,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_15;

+typedef char* png_libpng_version_1_6_16;

 

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

  *

diff --git a/plugins/AdvaImg/src/LibPNG/pngconf.h b/plugins/AdvaImg/src/LibPNG/pngconf.h
index db9ed4839d..9453915e4c 100644
--- a/plugins/AdvaImg/src/LibPNG/pngconf.h
+++ b/plugins/AdvaImg/src/LibPNG/pngconf.h
@@ -1,7 +1,7 @@
 

 /* pngconf.h - machine configurable file for libpng

  *

- * libpng version 1.6.15,November 20, 2014

+ * libpng version 1.6.16,December 22, 2014

  *

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

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

diff --git a/plugins/AdvaImg/src/LibPNG/pnglibconf.h b/plugins/AdvaImg/src/LibPNG/pnglibconf.h
index 1894e2daeb..ed16adb359 100644
--- a/plugins/AdvaImg/src/LibPNG/pnglibconf.h
+++ b/plugins/AdvaImg/src/LibPNG/pnglibconf.h
@@ -1,211 +1,210 @@
-/* libpng 1.6.1 STANDARD API DEFINITION */
-
-/* pnglibconf.h - library build configuration */
-
-/* Libpng version 1.6.1 - March 28, 2013 */
-
-/* Copyright (c) 1998-2013 Glenn Randers-Pehrson */
-
-/* This code is released under the libpng license. */
-/* For conditions of distribution and use, see the disclaimer */
-/* and license in png.h */
-
-/* pnglibconf.h */
-/* Machine generated file: DO NOT EDIT */
-/* Derived from: scripts/pnglibconf.dfa */
-#ifndef PNGLCONF_H
-#define PNGLCONF_H
-/* options */
-#define PNG_16BIT_SUPPORTED
-#define PNG_ALIGNED_MEMORY_SUPPORTED
-/*#undef PNG_ARM_NEON_API_SUPPORTED*/
-/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
-/*#undef PNG_ARM_NEON_SUPPORTED*/
-#define PNG_BENIGN_ERRORS_SUPPORTED
-#define PNG_BENIGN_READ_ERRORS_SUPPORTED
-/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
-#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
-#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_COLORSPACE_SUPPORTED
-#define PNG_CONSOLE_IO_SUPPORTED
-#define PNG_CONVERT_tIME_SUPPORTED
-#define PNG_EASY_ACCESS_SUPPORTED
-/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
-#define PNG_ERROR_TEXT_SUPPORTED
-#define PNG_FIXED_POINT_SUPPORTED
-#define PNG_FLOATING_ARITHMETIC_SUPPORTED
-#define PNG_FLOATING_POINT_SUPPORTED
-#define PNG_FORMAT_AFIRST_SUPPORTED
-#define PNG_FORMAT_BGR_SUPPORTED
-#define PNG_GAMMA_SUPPORTED
-#define PNG_GET_PALETTE_MAX_SUPPORTED
-#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
-#define PNG_INCH_CONVERSIONS_SUPPORTED
-#define PNG_INFO_IMAGE_SUPPORTED
-#define PNG_IO_STATE_SUPPORTED
-#define PNG_MNG_FEATURES_SUPPORTED
-#define PNG_POINTER_INDEXING_SUPPORTED
-#define PNG_PROGRESSIVE_READ_SUPPORTED
-#define PNG_READ_16BIT_SUPPORTED
-#define PNG_READ_ALPHA_MODE_SUPPORTED
-#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_READ_BACKGROUND_SUPPORTED
-#define PNG_READ_BGR_SUPPORTED
-#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
-#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
-#define PNG_READ_EXPAND_16_SUPPORTED
-#define PNG_READ_EXPAND_SUPPORTED
-#define PNG_READ_FILLER_SUPPORTED
-#define PNG_READ_GAMMA_SUPPORTED
-#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
-#define PNG_READ_GRAY_TO_RGB_SUPPORTED
-#define PNG_READ_INTERLACING_SUPPORTED
-#define PNG_READ_INT_FUNCTIONS_SUPPORTED
-#define PNG_READ_INVERT_ALPHA_SUPPORTED
-#define PNG_READ_INVERT_SUPPORTED
-#define PNG_READ_OPT_PLTE_SUPPORTED
-#define PNG_READ_PACKSWAP_SUPPORTED
-#define PNG_READ_PACK_SUPPORTED
-#define PNG_READ_QUANTIZE_SUPPORTED
-#define PNG_READ_RGB_TO_GRAY_SUPPORTED
-#define PNG_READ_SCALE_16_TO_8_SUPPORTED
-#define PNG_READ_SHIFT_SUPPORTED
-#define PNG_READ_STRIP_16_TO_8_SUPPORTED
-#define PNG_READ_STRIP_ALPHA_SUPPORTED
-#define PNG_READ_SUPPORTED
-#define PNG_READ_SWAP_ALPHA_SUPPORTED
-#define PNG_READ_SWAP_SUPPORTED
-#define PNG_READ_TEXT_SUPPORTED
-#define PNG_READ_TRANSFORMS_SUPPORTED
-#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_READ_USER_CHUNKS_SUPPORTED
-#define PNG_READ_USER_TRANSFORM_SUPPORTED
-#define PNG_READ_bKGD_SUPPORTED
-#define PNG_READ_cHRM_SUPPORTED
-#define PNG_READ_gAMA_SUPPORTED
-#define PNG_READ_hIST_SUPPORTED
-#define PNG_READ_iCCP_SUPPORTED
-#define PNG_READ_iTXt_SUPPORTED
-#define PNG_READ_oFFs_SUPPORTED
-#define PNG_READ_pCAL_SUPPORTED
-#define PNG_READ_pHYs_SUPPORTED
-#define PNG_READ_sBIT_SUPPORTED
-#define PNG_READ_sCAL_SUPPORTED
-#define PNG_READ_sPLT_SUPPORTED
-#define PNG_READ_sRGB_SUPPORTED
-#define PNG_READ_tEXt_SUPPORTED
-#define PNG_READ_tIME_SUPPORTED
-#define PNG_READ_tRNS_SUPPORTED
-#define PNG_READ_zTXt_SUPPORTED
-/*#undef PNG_SAFE_LIMITS_SUPPORTED*/
-#define PNG_SAVE_INT_32_SUPPORTED
-#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SEQUENTIAL_READ_SUPPORTED
-#define PNG_SETJMP_SUPPORTED
-#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED
-#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED
-/*#undef PNG_SET_OPTION_SUPPORTED*/
-#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_SET_USER_LIMITS_SUPPORTED
-#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_READ_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
-#define PNG_SIMPLIFIED_WRITE_SUPPORTED
-#define PNG_STDIO_SUPPORTED
-#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_TEXT_SUPPORTED
-#define PNG_TIME_RFC1123_SUPPORTED
-#define PNG_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_USER_CHUNKS_SUPPORTED
-#define PNG_USER_LIMITS_SUPPORTED
-#define PNG_USER_MEM_SUPPORTED
-#define PNG_USER_TRANSFORM_INFO_SUPPORTED
-#define PNG_USER_TRANSFORM_PTR_SUPPORTED
-#define PNG_WARNINGS_SUPPORTED
-#define PNG_WRITE_16BIT_SUPPORTED
-#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
-#define PNG_WRITE_BGR_SUPPORTED
-#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
-#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
-#define PNG_WRITE_FILLER_SUPPORTED
-#define PNG_WRITE_FILTER_SUPPORTED
-#define PNG_WRITE_FLUSH_SUPPORTED
-#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
-#define PNG_WRITE_INTERLACING_SUPPORTED
-#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
-#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
-#define PNG_WRITE_INVERT_SUPPORTED
-#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
-#define PNG_WRITE_PACKSWAP_SUPPORTED
-#define PNG_WRITE_PACK_SUPPORTED
-#define PNG_WRITE_SHIFT_SUPPORTED
-#define PNG_WRITE_SUPPORTED
-#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
-#define PNG_WRITE_SWAP_SUPPORTED
-#define PNG_WRITE_TEXT_SUPPORTED
-#define PNG_WRITE_TRANSFORMS_SUPPORTED
-#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
-#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
-#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-#define PNG_WRITE_bKGD_SUPPORTED
-#define PNG_WRITE_cHRM_SUPPORTED
-#define PNG_WRITE_gAMA_SUPPORTED
-#define PNG_WRITE_hIST_SUPPORTED
-#define PNG_WRITE_iCCP_SUPPORTED
-#define PNG_WRITE_iTXt_SUPPORTED
-#define PNG_WRITE_oFFs_SUPPORTED
-#define PNG_WRITE_pCAL_SUPPORTED
-#define PNG_WRITE_pHYs_SUPPORTED
-#define PNG_WRITE_sBIT_SUPPORTED
-#define PNG_WRITE_sCAL_SUPPORTED
-#define PNG_WRITE_sPLT_SUPPORTED
-#define PNG_WRITE_sRGB_SUPPORTED
-#define PNG_WRITE_tEXt_SUPPORTED
-#define PNG_WRITE_tIME_SUPPORTED
-#define PNG_WRITE_tRNS_SUPPORTED
-#define PNG_WRITE_zTXt_SUPPORTED
-#define PNG_bKGD_SUPPORTED
-#define PNG_cHRM_SUPPORTED
-#define PNG_gAMA_SUPPORTED
-#define PNG_hIST_SUPPORTED
-#define PNG_iCCP_SUPPORTED
-#define PNG_iTXt_SUPPORTED
-#define PNG_oFFs_SUPPORTED
-#define PNG_pCAL_SUPPORTED
-#define PNG_pHYs_SUPPORTED
-#define PNG_sBIT_SUPPORTED
-#define PNG_sCAL_SUPPORTED
-#define PNG_sPLT_SUPPORTED
-#define PNG_sRGB_SUPPORTED
-#define PNG_tEXt_SUPPORTED
-#define PNG_tIME_SUPPORTED
-#define PNG_tRNS_SUPPORTED
-#define PNG_zTXt_SUPPORTED
-/* end of options */
-/* settings */
-#define PNG_API_RULE 0
-#define PNG_CALLOC_SUPPORTED
-#define PNG_COST_SHIFT 3
-#define PNG_DEFAULT_READ_MACROS 1
-#define PNG_GAMMA_THRESHOLD_FIXED 5000
-#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
-#define PNG_INFLATE_BUF_SIZE 1024
-#define PNG_MAX_GAMMA_8 11
-#define PNG_QUANTIZE_BLUE_BITS 5
-#define PNG_QUANTIZE_GREEN_BITS 5
-#define PNG_QUANTIZE_RED_BITS 5
-#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
-#define PNG_WEIGHT_SHIFT 8
-#define PNG_ZBUF_SIZE 8192
-#define PNG_Z_DEFAULT_COMPRESSION (-1)
-#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
-#define PNG_Z_DEFAULT_STRATEGY 1
-#define PNG_sCAL_PRECISION 5
-#define PNG_sRGB_PROFILE_CHECKS 2
-/* end of settings */
-#endif /* PNGLCONF_H */
+/* libpng 1.6.16 STANDARD API DEFINITION */

+

+/* pnglibconf.h - library build configuration */

+

+/* Libpng version 1.6.16 - December 22, 2014 */

+

+/* Copyright (c) 1998-2014 Glenn Randers-Pehrson */

+

+/* This code is released under the libpng license. */

+/* For conditions of distribution and use, see the disclaimer */

+/* and license in png.h */

+

+/* pnglibconf.h */

+/* Machine generated file: DO NOT EDIT */

+/* Derived from: scripts/pnglibconf.dfa */

+#ifndef PNGLCONF_H

+#define PNGLCONF_H

+/* options */

+#define PNG_16BIT_SUPPORTED

+#define PNG_ALIGNED_MEMORY_SUPPORTED

+/*#undef PNG_ARM_NEON_API_SUPPORTED*/

+/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/

+#define PNG_BENIGN_ERRORS_SUPPORTED

+#define PNG_BENIGN_READ_ERRORS_SUPPORTED

+/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/

+#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED

+#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED

+#define PNG_COLORSPACE_SUPPORTED

+#define PNG_CONSOLE_IO_SUPPORTED

+#define PNG_CONVERT_tIME_SUPPORTED

+#define PNG_EASY_ACCESS_SUPPORTED

+/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/

+#define PNG_ERROR_TEXT_SUPPORTED

+#define PNG_FIXED_POINT_SUPPORTED

+#define PNG_FLOATING_ARITHMETIC_SUPPORTED

+#define PNG_FLOATING_POINT_SUPPORTED

+#define PNG_FORMAT_AFIRST_SUPPORTED

+#define PNG_FORMAT_BGR_SUPPORTED

+#define PNG_GAMMA_SUPPORTED

+#define PNG_GET_PALETTE_MAX_SUPPORTED

+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED

+#define PNG_INCH_CONVERSIONS_SUPPORTED

+#define PNG_INFO_IMAGE_SUPPORTED

+#define PNG_IO_STATE_SUPPORTED

+#define PNG_MNG_FEATURES_SUPPORTED

+#define PNG_POINTER_INDEXING_SUPPORTED

+#define PNG_PROGRESSIVE_READ_SUPPORTED

+#define PNG_READ_16BIT_SUPPORTED

+#define PNG_READ_ALPHA_MODE_SUPPORTED

+#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED

+#define PNG_READ_BACKGROUND_SUPPORTED

+#define PNG_READ_BGR_SUPPORTED

+#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED

+#define PNG_READ_COMPOSITE_NODIV_SUPPORTED

+#define PNG_READ_COMPRESSED_TEXT_SUPPORTED

+#define PNG_READ_EXPAND_16_SUPPORTED

+#define PNG_READ_EXPAND_SUPPORTED

+#define PNG_READ_FILLER_SUPPORTED

+#define PNG_READ_GAMMA_SUPPORTED

+#define PNG_READ_GET_PALETTE_MAX_SUPPORTED

+#define PNG_READ_GRAY_TO_RGB_SUPPORTED

+#define PNG_READ_INTERLACING_SUPPORTED

+#define PNG_READ_INT_FUNCTIONS_SUPPORTED

+#define PNG_READ_INVERT_ALPHA_SUPPORTED

+#define PNG_READ_INVERT_SUPPORTED

+#define PNG_READ_OPT_PLTE_SUPPORTED

+#define PNG_READ_PACKSWAP_SUPPORTED

+#define PNG_READ_PACK_SUPPORTED

+#define PNG_READ_QUANTIZE_SUPPORTED

+#define PNG_READ_RGB_TO_GRAY_SUPPORTED

+#define PNG_READ_SCALE_16_TO_8_SUPPORTED

+#define PNG_READ_SHIFT_SUPPORTED

+#define PNG_READ_STRIP_16_TO_8_SUPPORTED

+#define PNG_READ_STRIP_ALPHA_SUPPORTED

+#define PNG_READ_SUPPORTED

+#define PNG_READ_SWAP_ALPHA_SUPPORTED

+#define PNG_READ_SWAP_SUPPORTED

+#define PNG_READ_TEXT_SUPPORTED

+#define PNG_READ_TRANSFORMS_SUPPORTED

+#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED

+#define PNG_READ_USER_CHUNKS_SUPPORTED

+#define PNG_READ_USER_TRANSFORM_SUPPORTED

+#define PNG_READ_bKGD_SUPPORTED

+#define PNG_READ_cHRM_SUPPORTED

+#define PNG_READ_gAMA_SUPPORTED

+#define PNG_READ_hIST_SUPPORTED

+#define PNG_READ_iCCP_SUPPORTED

+#define PNG_READ_iTXt_SUPPORTED

+#define PNG_READ_oFFs_SUPPORTED

+#define PNG_READ_pCAL_SUPPORTED

+#define PNG_READ_pHYs_SUPPORTED

+#define PNG_READ_sBIT_SUPPORTED

+#define PNG_READ_sCAL_SUPPORTED

+#define PNG_READ_sPLT_SUPPORTED

+#define PNG_READ_sRGB_SUPPORTED

+#define PNG_READ_tEXt_SUPPORTED

+#define PNG_READ_tIME_SUPPORTED

+#define PNG_READ_tRNS_SUPPORTED

+#define PNG_READ_zTXt_SUPPORTED

+/*#undef PNG_SAFE_LIMITS_SUPPORTED*/

+#define PNG_SAVE_INT_32_SUPPORTED

+#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED

+#define PNG_SEQUENTIAL_READ_SUPPORTED

+#define PNG_SETJMP_SUPPORTED

+#define PNG_SET_CHUNK_CACHE_LIMIT_SUPPORTED

+#define PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED

+#define PNG_SET_OPTION_SUPPORTED

+#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED

+#define PNG_SET_USER_LIMITS_SUPPORTED

+#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED

+#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED

+#define PNG_SIMPLIFIED_READ_SUPPORTED

+#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED

+#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED

+#define PNG_SIMPLIFIED_WRITE_SUPPORTED

+#define PNG_STDIO_SUPPORTED

+#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED

+#define PNG_TEXT_SUPPORTED

+#define PNG_TIME_RFC1123_SUPPORTED

+#define PNG_UNKNOWN_CHUNKS_SUPPORTED

+#define PNG_USER_CHUNKS_SUPPORTED

+#define PNG_USER_LIMITS_SUPPORTED

+#define PNG_USER_MEM_SUPPORTED

+#define PNG_USER_TRANSFORM_INFO_SUPPORTED

+#define PNG_USER_TRANSFORM_PTR_SUPPORTED

+#define PNG_WARNINGS_SUPPORTED

+#define PNG_WRITE_16BIT_SUPPORTED

+#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED

+#define PNG_WRITE_BGR_SUPPORTED

+#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED

+#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED

+#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED

+#define PNG_WRITE_FILLER_SUPPORTED

+#define PNG_WRITE_FILTER_SUPPORTED

+#define PNG_WRITE_FLUSH_SUPPORTED

+#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED

+#define PNG_WRITE_INTERLACING_SUPPORTED

+#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED

+#define PNG_WRITE_INVERT_ALPHA_SUPPORTED

+#define PNG_WRITE_INVERT_SUPPORTED

+#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED

+#define PNG_WRITE_PACKSWAP_SUPPORTED

+#define PNG_WRITE_PACK_SUPPORTED

+#define PNG_WRITE_SHIFT_SUPPORTED

+#define PNG_WRITE_SUPPORTED

+#define PNG_WRITE_SWAP_ALPHA_SUPPORTED

+#define PNG_WRITE_SWAP_SUPPORTED

+#define PNG_WRITE_TEXT_SUPPORTED

+#define PNG_WRITE_TRANSFORMS_SUPPORTED

+#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED

+#define PNG_WRITE_USER_TRANSFORM_SUPPORTED

+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED

+#define PNG_WRITE_bKGD_SUPPORTED

+#define PNG_WRITE_cHRM_SUPPORTED

+#define PNG_WRITE_gAMA_SUPPORTED

+#define PNG_WRITE_hIST_SUPPORTED

+#define PNG_WRITE_iCCP_SUPPORTED

+#define PNG_WRITE_iTXt_SUPPORTED

+#define PNG_WRITE_oFFs_SUPPORTED

+#define PNG_WRITE_pCAL_SUPPORTED

+#define PNG_WRITE_pHYs_SUPPORTED

+#define PNG_WRITE_sBIT_SUPPORTED

+#define PNG_WRITE_sCAL_SUPPORTED

+#define PNG_WRITE_sPLT_SUPPORTED

+#define PNG_WRITE_sRGB_SUPPORTED

+#define PNG_WRITE_tEXt_SUPPORTED

+#define PNG_WRITE_tIME_SUPPORTED

+#define PNG_WRITE_tRNS_SUPPORTED

+#define PNG_WRITE_zTXt_SUPPORTED

+#define PNG_bKGD_SUPPORTED

+#define PNG_cHRM_SUPPORTED

+#define PNG_gAMA_SUPPORTED

+#define PNG_hIST_SUPPORTED

+#define PNG_iCCP_SUPPORTED

+#define PNG_iTXt_SUPPORTED

+#define PNG_oFFs_SUPPORTED

+#define PNG_pCAL_SUPPORTED

+#define PNG_pHYs_SUPPORTED

+#define PNG_sBIT_SUPPORTED

+#define PNG_sCAL_SUPPORTED

+#define PNG_sPLT_SUPPORTED

+#define PNG_sRGB_SUPPORTED

+#define PNG_tEXt_SUPPORTED

+#define PNG_tIME_SUPPORTED

+#define PNG_tRNS_SUPPORTED

+#define PNG_zTXt_SUPPORTED

+/* end of options */

+/* settings */

+#define PNG_API_RULE 0

+#define PNG_COST_SHIFT 3

+#define PNG_DEFAULT_READ_MACROS 1

+#define PNG_GAMMA_THRESHOLD_FIXED 5000

+#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE

+#define PNG_INFLATE_BUF_SIZE 1024

+#define PNG_MAX_GAMMA_8 11

+#define PNG_QUANTIZE_BLUE_BITS 5

+#define PNG_QUANTIZE_GREEN_BITS 5

+#define PNG_QUANTIZE_RED_BITS 5

+#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)

+#define PNG_TEXT_Z_DEFAULT_STRATEGY 0

+#define PNG_WEIGHT_SHIFT 8

+#define PNG_ZBUF_SIZE 8192

+#define PNG_ZLIB_VERNUM 0 /* unknown */

+#define PNG_Z_DEFAULT_COMPRESSION (-1)

+#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0

+#define PNG_Z_DEFAULT_STRATEGY 1

+#define PNG_sCAL_PRECISION 5

+#define PNG_sRGB_PROFILE_CHECKS 2

+/* end of settings */

+#endif /* PNGLCONF_H */

diff --git a/plugins/AdvaImg/src/LibPNG/pngrutil.c b/plugins/AdvaImg/src/LibPNG/pngrutil.c
index 4e9fbe7ce2..6b12e72617 100644
--- a/plugins/AdvaImg/src/LibPNG/pngrutil.c
+++ b/plugins/AdvaImg/src/LibPNG/pngrutil.c
@@ -788,6 +788,7 @@ png_inflate_read(png_structrp png_ptr, png_bytep read_buffer, uInt read_size,
 #endif

 

 /* Read and check the IDHR chunk */

+

 void /* PRIVATE */

 png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)

 {

@@ -852,8 +853,7 @@ png_handle_IHDR(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length)
    }

 

    /* Set up other useful info */

-   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth *

-   png_ptr->channels);

+   png_ptr->pixel_depth = (png_byte)(png_ptr->bit_depth * png_ptr->channels);

    png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, png_ptr->width);

    png_debug1(3, "bit_depth = %d", png_ptr->bit_depth);

    png_debug1(3, "channels = %d", png_ptr->channels);

@@ -3003,7 +3003,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
 {

    unsigned int pixel_depth = png_ptr->transformed_pixel_depth;

    png_const_bytep sp = png_ptr->row_buf + 1;

-   png_uint_32 row_width = png_ptr->width;

+   png_alloc_size_t row_width = png_ptr->width;

    unsigned int pass = png_ptr->pass;

    png_bytep end_ptr = 0;

    png_byte end_byte = 0;

@@ -3278,7 +3278,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
 

             /* But don't allow this number to exceed the actual row width. */

             if (bytes_to_copy > row_width)

-               bytes_to_copy = row_width;

+               bytes_to_copy = (unsigned int)/*SAFE*/row_width;

          }

 

          else /* normal row; Adam7 only ever gives us one pixel to copy. */

@@ -3458,7 +3458,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display)
                   dp += bytes_to_jump;

                   row_width -= bytes_to_jump;

                   if (bytes_to_copy > row_width)

-                     bytes_to_copy = row_width;

+                     bytes_to_copy = (unsigned int)/*SAFE*/row_width;

                }

          }

 

@@ -4228,7 +4228,7 @@ png_read_start_row(png_structrp png_ptr)
 

    max_pixel_depth = png_ptr->pixel_depth;

 

-   /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpliar set of

+   /* WARNING: * png_read_transform_info (pngrtran.c) performs a simpler set of

     * calculations to calculate the final pixel depth, then

     * png_do_read_transforms actually does the transforms.  This means that the

     * code which effectively calculates this value is actually repeated in three

diff --git a/plugins/AdvaImg/src/LibPNG/pngtest.c b/plugins/AdvaImg/src/LibPNG/pngtest.c
index 0064064eb2..dbf51a816d 100644
--- a/plugins/AdvaImg/src/LibPNG/pngtest.c
+++ b/plugins/AdvaImg/src/LibPNG/pngtest.c
@@ -2008,4 +2008,4 @@ main(void)
 #endif

 

 /* Generate a compiler error if there is an old png.h in the search path. */

-typedef png_libpng_version_1_6_15 Your_png_h_is_not_version_1_6_15;

+typedef png_libpng_version_1_6_16 Your_png_h_is_not_version_1_6_16;