Updated libpng to v1.4.3

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@2079 10f7b99b-c216-0410-bff0-8a66a9350fd8

11 files changed, 183 insertions, 92 deletions

diff --git a/src/thirdparty/libpng/CHANGES b/src/thirdparty/libpng/CHANGES
index 0feb78c6d..be63e4084 100644
--- a/src/thirdparty/libpng/CHANGES
+++ b/src/thirdparty/libpng/CHANGES
@@ -1672,7 +1672,7 @@ version 1.2.15rc2 [December 21, 2006]
   Added scripts/makefile.nommx

 

 version 1.2.15rc3 [December 25, 2006]

-  Fixed shared library numbering error that was intruduced in 1.2.15beta6.

+  Fixed shared library numbering error that was introduced in 1.2.15beta6.

 

 version 1.2.15rc4 [December 27, 2006]

   Fixed handling of rgb_to_gray when png_ptr->color.gray isn't set.

@@ -2125,7 +2125,7 @@ version 1.4.0beta57 [May 2, 2009]
   Removed pngprefs.h and MMX from makefiles

 

 version 1.4.0beta58 [May 14, 2009]

-  Changed pngw32.def to pngwin.def in makefile.mingw (typo was intruduced

+  Changed pngw32.def to pngwin.def in makefile.mingw (typo was introduced

     in beta57).

   Clarified usage of sig_bit versus sig_bit_p in example.c (Vincent Torri)

 

@@ -2576,6 +2576,40 @@ version 1.4.2rc06 [May 3, 2010]
 

 version 1.4.2 [May 6, 2010]

 

+version 1.4.3beta01 [June 18, 2010]

+  Added missing quotation marks in the aix block of configure.ac

+  The new "vstudio" project was missing from the zip and 7z distributions.

+  In pngpread.c: png_push_have_row() add check for new_row > height

+

+version 1.4.3beta02 [June 18, 2010]

+  Removed the now-redundant check for out-of-bounds new_row from example.c

+

+version 1.4.3beta03 [June 18, 2010]

+  In pngpread.c: png_push_finish_row() add check for too many rows.

+

+version 1.4.3beta04 [June 19, 2010]

+  In pngpread.c: png_push_process_row() add check for too many rows.

+  Removed the checks added in beta01 and beta03, as they are now redundant.

+

+version 1.4.3beta05 [June 20, 2010]

+  Rewrote png_process_IDAT_data to consistently treat extra data as warnings

+    and handle end conditions more cleanly.

+  Removed the new (beta04) check in png_push_process_row().

+

+version 1.4.3rc01 [June 21, 2010]

+  Revised some comments in png_process_IDAT_data().

+

+version 1.4.3rc02 [June 22, 2010]

+  Changed char *msg to PNG_CONST char *msg in pngrutil.c

+  Stop memory leak when reading a malformed sCAL chunk.

+  Removed some trailing blanks.

+

+version 1.4.3rc03 [June 23, 2010]

+  Revised pngpread.c patch of beta05 to avoid an endless loop.

+

+version 1.4.3 [June 26, 2010]

+  Updated some of the "last changed" dates.

+

 Send comments/corrections/commendations to glennrp at users.sourceforge.net

 or to png-mng-implement at lists.sf.net (subscription required; visit

 https://lists.sourceforge.net/lists/listinfo/png-mng-implement).

diff --git a/src/thirdparty/libpng/LICENSE b/src/thirdparty/libpng/LICENSE
index e5eadd78f..06ce0301a 100644
--- a/src/thirdparty/libpng/LICENSE
+++ b/src/thirdparty/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.4.2, May 6, 2010, are

+libpng versions 1.2.6, August 15, 2004, through 1.4.3, June 26, 2010, are

 Copyright (c) 2004, 2006-2007 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

-May 6, 2010

+June 26, 2010

diff --git a/src/thirdparty/libpng/README b/src/thirdparty/libpng/README
index 730597d3c..4cf825fd0 100644
--- a/src/thirdparty/libpng/README
+++ b/src/thirdparty/libpng/README
@@ -1,4 +1,4 @@
-README for libpng version 1.4.2 - May 6, 2010 (shared library 14.0)

+README for libpng version 1.4.3 - June 26, 2010 (shared library 14.0)

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

 

 See INSTALL for instructions on how to install libpng.

@@ -185,9 +185,9 @@ Files in this distribution:
        makefile.std     =>  Generic UNIX makefile (cc, creates static

                             libpng.a)

        makefile.elf     =>  Linux/ELF makefile symbol versioning,

-                            gcc, creates libpng14.so.14.1.4.2)

+                            gcc, creates libpng14.so.14.1.4.3)

        makefile.linux   =>  Linux/ELF makefile

-                            (gcc, creates libpng14.so.14.1.4.2)

+                            (gcc, creates libpng14.so.14.1.4.3)

        makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)

        makefile.knr     =>  Archaic UNIX Makefile that converts files with

                             ansi2knr (Requires ansi2knr.c from

@@ -209,12 +209,12 @@ Files in this distribution:
        makefile.openbsd =>  OpenBSD makefile

        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)

        makefile.sggcc   =>  Silicon Graphics

-                            (gcc, creates libpng14.so.14.1.4.2)

+                            (gcc, creates libpng14.so.14.1.4.3)

        makefile.sunos   =>  Sun makefile

        makefile.solaris =>  Solaris 2.X makefile

-                            (gcc, creates libpng14.so.14.1.4.2)

+                            (gcc, creates libpng14.so.14.1.4.3)

        makefile.so9     =>  Solaris 9 makefile

-                            (gcc, creates libpng14.so.14.1.4.2)

+                            (gcc, creates libpng14.so.14.1.4.3)

        makefile.32sunu  =>  Sun Ultra 32-bit makefile

        makefile.64sunu  =>  Sun Ultra 64-bit makefile

        makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc

diff --git a/src/thirdparty/libpng/png.c b/src/thirdparty/libpng/png.c
index 39fa6b802..239615dab 100644
--- a/src/thirdparty/libpng/png.c
+++ b/src/thirdparty/libpng/png.c
@@ -17,7 +17,7 @@
 #include "pngpriv.h"

 

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

-typedef version_1_4_2 Your_png_h_is_not_version_1_4_2;

+typedef version_1_4_3 Your_png_h_is_not_version_1_4_3;

 

 /* Version information for C files.  This had better match the version

  * string defined in png.h.

@@ -551,13 +551,13 @@ png_get_copyright(png_structp png_ptr)
 #else

 #ifdef __STDC__

    return ((png_charp) PNG_STRING_NEWLINE \

-     "libpng version 1.4.2 - May 6, 2010" PNG_STRING_NEWLINE \

+     "libpng version 1.4.3 - June 26, 2010" PNG_STRING_NEWLINE \

      "Copyright (c) 1998-2010 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 ((png_charp) "libpng version 1.4.2 - May 6, 2010\

+      return ((png_charp) "libpng version 1.4.3 - June 26, 2010\

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

       Copyright (c) 1996-1997 Andreas Dilger\

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

diff --git a/src/thirdparty/libpng/png.h b/src/thirdparty/libpng/png.h
index d556dc654..ef6dc8e45 100644
--- a/src/thirdparty/libpng/png.h
+++ b/src/thirdparty/libpng/png.h
@@ -1,7 +1,7 @@
 

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

  *

- * libpng version 1.4.2 - May 6, 2010

+ * libpng version 1.4.3 - June 26, 2010

  * 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.)

@@ -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.4.2 - May 6, 2010: Glenn

+ *  libpng versions 0.97, January 1998, through 1.4.3 - June 26, 2010: Glenn

  *  See also "Contributing Authors", below.

  *

  * Note about libpng version numbers:

@@ -142,6 +142,9 @@
  *    1.4.2beta01             14    10402  14.so.14.2[.0]

  *    1.4.2rc02-06            14    10402  14.so.14.2[.0]

  *    1.4.2                   14    10402  14.so.14.2[.0]

+ *    1.4.3beta01-05          14    10403  14.so.14.3[.0]

+ *    1.4.3rc01-03            14    10403  14.so.14.3[.0]

+ *    1.4.3                   14    10403  14.so.14.3[.0]

  *

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

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

@@ -173,7 +176,7 @@
  *

  * This code is released under the libpng license.

  *

- * libpng versions 1.2.6, August 15, 2004, through 1.4.2, May 6, 2010, are

+ * libpng versions 1.2.6, August 15, 2004, through 1.4.3, June 26, 2010, are

  * Copyright (c) 2004, 2006-2010 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:

@@ -285,13 +288,13 @@
  * Y2K compliance in libpng:

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

  *

- *    May 6, 2010

+ *    June 26, 2010

  *

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

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

  *    versions were also Y2K compliant.

  *

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

@@ -347,9 +350,9 @@
  */

 

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

-#define PNG_LIBPNG_VER_STRING "1.4.2"

+#define PNG_LIBPNG_VER_STRING "1.4.3"

 #define PNG_HEADER_VERSION_STRING \

-   " libpng version 1.4.2 - May 6, 2010\n"

+   " libpng version 1.4.3 - June 26, 2010\n"

 

 #define PNG_LIBPNG_VER_SONUM   14

 #define PNG_LIBPNG_VER_DLLNUM  14

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

 #define PNG_LIBPNG_VER_MAJOR   1

 #define PNG_LIBPNG_VER_MINOR   4

-#define PNG_LIBPNG_VER_RELEASE 2

+#define PNG_LIBPNG_VER_RELEASE 3

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

  * PNG_LIBPNG_VER_STRING, omitting any leading zero:

  */

@@ -387,7 +390,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 10402 /* 1.4.2 */

+#define PNG_LIBPNG_VER 10403 /* 1.4.3 */

 

 #ifndef PNG_VERSION_INFO_ONLY

 /* Include the compression library's header */

@@ -1471,7 +1474,7 @@ struct png_struct_def
 /* This triggers a compiler error in png.c, if png.c and png.h

  * do not agree upon the version number.

  */

-typedef png_structp version_1_4_2;

+typedef png_structp version_1_4_3;

 

 typedef png_struct FAR * FAR * png_structpp;

 

diff --git a/src/thirdparty/libpng/pngconf.h b/src/thirdparty/libpng/pngconf.h
index dbef5d265..2ebe72d0e 100644
--- a/src/thirdparty/libpng/pngconf.h
+++ b/src/thirdparty/libpng/pngconf.h
@@ -1,7 +1,7 @@
 

 /* pngconf.h - machine configurable file for libpng

  *

- * libpng version 1.4.2 - May 6, 2010

+ * libpng version 1.4.3 - June 26, 2010

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

diff --git a/src/thirdparty/libpng/pngpread.c b/src/thirdparty/libpng/pngpread.c
index 6a8ad93d9..ed5d82c63 100644
--- a/src/thirdparty/libpng/pngpread.c
+++ b/src/thirdparty/libpng/pngpread.c
@@ -1,7 +1,7 @@
 

 /* pngpread.c - read a png file in push mode

  *

- * Last changed in libpng 1.4.1 [February 25, 2010]

+ * Last changed in libpng 1.4.3 [June 26, 2010]

  * 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.)

@@ -779,8 +779,7 @@ png_push_read_IDAT(png_structp png_ptr)
 

       png_calculate_crc(png_ptr, png_ptr->save_buffer_ptr, save_size);

 

-      if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))

-         png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);

+      png_process_IDAT_data(png_ptr, png_ptr->save_buffer_ptr, save_size);

 

       png_ptr->idat_size -= save_size;

       png_ptr->buffer_size -= save_size;

@@ -803,8 +802,8 @@ png_push_read_IDAT(png_structp png_ptr)
          save_size = png_ptr->current_buffer_size;

 

       png_calculate_crc(png_ptr, png_ptr->current_buffer_ptr, save_size);

-      if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))

-         png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);

+

+      png_process_IDAT_data(png_ptr, png_ptr->current_buffer_ptr, save_size);

 

       png_ptr->idat_size -= save_size;

       png_ptr->buffer_size -= save_size;

@@ -829,62 +828,101 @@ void /* PRIVATE */
 png_process_IDAT_data(png_structp png_ptr, png_bytep buffer,

    png_size_t buffer_length)

 {

-   int ret;

-

-   if ((png_ptr->flags & PNG_FLAG_ZLIB_FINISHED) && buffer_length)

-      png_benign_error(png_ptr, "Extra compression data");

+   /* The caller checks for a non-zero buffer length. */

+   if (!(buffer_length > 0) || buffer == NULL)

+      png_error(png_ptr, "No IDAT data (internal error)");

 

+   /* This routine must process all the data it has been given

+    * before returning, calling the row callback as required to

+    * handle the uncompressed results.

+    */

    png_ptr->zstream.next_in = buffer;

    png_ptr->zstream.avail_in = (uInt)buffer_length;

-   for (;;)

-   {

-      ret = inflate(&png_ptr->zstream, Z_PARTIAL_FLUSH);

-      if (ret != Z_OK)

-      {

-         if (ret == Z_STREAM_END)

-         {

-            if (png_ptr->zstream.avail_in)

-               png_benign_error(png_ptr, "Extra compressed data");

-

-            if (!(png_ptr->zstream.avail_out))

-            {

-               png_push_process_row(png_ptr);

-            }

 

-            png_ptr->mode |= PNG_AFTER_IDAT;

-            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;

-            break;

-         }

-         else if (ret == Z_BUF_ERROR)

-            break;

+   /* Keep going until the decompressed data is all processed

+    * or the stream marked as finished.

+    */

+   while (png_ptr->zstream.avail_in > 0 &&

+	  !(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))

+   {

+      int ret;

 

-         else

-            png_error(png_ptr, "Decompression Error");

-      }

-      if (!(png_ptr->zstream.avail_out))

+      /* We have data for zlib, but we must check that zlib

+       * has somewhere to put the results.  It doesn't matter

+       * if we don't expect any results -- it may be the input

+       * data is just the LZ end code.

+       */

+      if (!(png_ptr->zstream.avail_out > 0))

       {

-         if ((

-#ifdef PNG_READ_INTERLACING_SUPPORTED

-             png_ptr->interlaced && png_ptr->pass > 6) ||

-             (!png_ptr->interlaced &&

-#endif

-             png_ptr->row_number == png_ptr->num_rows))

-         {

-           if (png_ptr->zstream.avail_in)

-             png_warning(png_ptr, "Too much data in IDAT chunks");

-           png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;

-           break;

-         }

-         png_push_process_row(png_ptr);

          png_ptr->zstream.avail_out =

              (uInt) PNG_ROWBYTES(png_ptr->pixel_depth,

              png_ptr->iwidth) + 1;

          png_ptr->zstream.next_out = png_ptr->row_buf;

       }

 

-      else

-         break;

+      /* Using Z_SYNC_FLUSH here means that an unterminated

+       * LZ stream can still be handled (a stream with a missing

+       * end code), otherwise (Z_NO_FLUSH) a future zlib

+       * implementation might defer output and, therefore,

+       * change the current behavior.  (See comments in inflate.c

+       * for why this doesn't happen at present with zlib 1.2.5.)

+       */

+      ret = inflate(&png_ptr->zstream, Z_SYNC_FLUSH);

+

+      /* Check for any failure before proceeding. */

+      if (ret != Z_OK && ret != Z_STREAM_END)

+      {

+	 /* Terminate the decompression. */

+	 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;

+

+         /* This may be a truncated stream (missing or

+	  * damaged end code).  Treat that as a warning.

+	  */

+         if (png_ptr->row_number >= png_ptr->num_rows ||

+	     png_ptr->pass > 6)

+	    png_warning(png_ptr, "Truncated compressed data in IDAT");

+	 else

+	    png_error(png_ptr, "Decompression error in IDAT");

+

+	 /* Skip the check on unprocessed input */

+         return;

+      }

+

+      /* Did inflate output any data? */

+      if (png_ptr->zstream.next_out != png_ptr->row_buf)

+      {

+	 /* Is this unexpected data after the last row?

+	  * If it is, artificially terminate the LZ output

+	  * here.

+	  */

+         if (png_ptr->row_number >= png_ptr->num_rows ||

+	     png_ptr->pass > 6)

+         {

+	    /* Extra data. */

+	    png_warning(png_ptr, "Extra compressed data in IDAT");

+            png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;

+	    /* Do no more processing; skip the unprocessed

+	     * input check below.

+	     */

+            return;

+	 }

+

+	 /* Do we have a complete row? */

+	 if (png_ptr->zstream.avail_out == 0)

+	    png_push_process_row(png_ptr);

+      }

+

+      /* And check for the end of the stream. */

+      if (ret == Z_STREAM_END)

+	 png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;

    }

+

+   /* All the data should have been processed, if anything

+    * is left at this point we have bytes of IDAT data

+    * after the zlib end code.

+    */

+   if (png_ptr->zstream.avail_in > 0)

+      png_warning(png_ptr, "Extra compression data");

 }

 

 void /* PRIVATE */

@@ -900,8 +938,8 @@ png_push_process_row(png_structp png_ptr)
        png_ptr->row_info.width);

 

    png_read_filter_row(png_ptr, &(png_ptr->row_info),

-      png_ptr->row_buf + 1, png_ptr->prev_row + 1,

-      (int)(png_ptr->row_buf[0]));

+       png_ptr->row_buf + 1, png_ptr->prev_row + 1,

+       (int)(png_ptr->row_buf[0]));

 

    png_memcpy(png_ptr->prev_row, png_ptr->row_buf, png_ptr->rowbytes + 1);

 

@@ -915,7 +953,7 @@ png_push_process_row(png_structp png_ptr)
       if (png_ptr->pass < 6)

 /*       old interface (pre-1.0.9):

          png_do_read_interlace(&(png_ptr->row_info),

-            png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);

+             png_ptr->row_buf + 1, png_ptr->pass, png_ptr->transformations);

  */

          png_do_read_interlace(png_ptr);

 

@@ -950,7 +988,7 @@ png_push_process_row(png_structp png_ptr)
 

             if (png_ptr->pass == 6 && png_ptr->height <= 4)

             {

-                png_push_have_row(png_ptr, NULL);

+                  png_push_have_row(png_ptr, NULL);

                 png_read_push_finish_row(png_ptr);

             }

 

@@ -990,7 +1028,7 @@ png_push_process_row(png_structp png_ptr)
 

             for (i = 0; i < 4 && png_ptr->pass == 2; i++)

             {

-               png_push_have_row(png_ptr, NULL);

+                  png_push_have_row(png_ptr, NULL);

                png_read_push_finish_row(png_ptr);

             }

 

@@ -1040,13 +1078,13 @@ png_push_process_row(png_structp png_ptr)
 

             for (i = 0; i < 2 && png_ptr->pass == 4; i++)

             {

-               png_push_have_row(png_ptr, NULL);

+                  png_push_have_row(png_ptr, NULL);

                png_read_push_finish_row(png_ptr);

             }

 

             if (png_ptr->pass == 6) /* Pass 5 might be empty */

             {

-               png_push_have_row(png_ptr, NULL);

+                  png_push_have_row(png_ptr, NULL);

                png_read_push_finish_row(png_ptr);

             }

 

@@ -1065,7 +1103,7 @@ png_push_process_row(png_structp png_ptr)
 

             if (png_ptr->pass == 6) /* Skip top generated row */

             {

-               png_push_have_row(png_ptr, NULL);

+                  png_push_have_row(png_ptr, NULL);

                png_read_push_finish_row(png_ptr);

             }

 

@@ -1079,7 +1117,7 @@ png_push_process_row(png_structp png_ptr)
             if (png_ptr->pass != 6)

                break;

 

-            png_push_have_row(png_ptr, NULL);

+                  png_push_have_row(png_ptr, NULL);

             png_read_push_finish_row(png_ptr);

          }

       }

@@ -1391,7 +1429,7 @@ png_push_read_zTXt(png_structp png_ptr, png_infop info_ptr)
 

                tmp = text;

                text = (png_charp)png_malloc(png_ptr, text_size +

-                  (png_ptr->zbuf_size 

+                  (png_ptr->zbuf_size

                   - png_ptr->zstream.avail_out + 1));

 

                png_memcpy(text, tmp, text_size);

@@ -1613,7 +1651,7 @@ png_push_handle_unknown(png_structp png_ptr, png_infop info_ptr, png_uint_32
       }

 #endif

       png_memcpy((png_charp)png_ptr->unknown_chunk.name,

-                 (png_charp)png_ptr->chunk_name, 

+                 (png_charp)png_ptr->chunk_name,

                  png_sizeof(png_ptr->unknown_chunk.name));

       png_ptr->unknown_chunk.name[png_sizeof(png_ptr->unknown_chunk.name) - 1]

         = '\0';

diff --git a/src/thirdparty/libpng/pngpriv.h b/src/thirdparty/libpng/pngpriv.h
index a15fdd815..b1b6a99b1 100644
--- a/src/thirdparty/libpng/pngpriv.h
+++ b/src/thirdparty/libpng/pngpriv.h
@@ -1,7 +1,7 @@
 

 /* pngpriv.h - private declarations for use inside libpng

  *

- * libpng version 1.4.2 - May 6, 2010

+ * libpng version 1.4.3 - June 26, 2010

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

diff --git a/src/thirdparty/libpng/pngrutil.c b/src/thirdparty/libpng/pngrutil.c
index aa70927a9..db5ec0c3f 100644
--- a/src/thirdparty/libpng/pngrutil.c
+++ b/src/thirdparty/libpng/pngrutil.c
@@ -1,7 +1,7 @@
 

 /* pngrutil.c - utilities to read a PNG file

  *

- * Last changed in libpng 1.4.1 [February 25, 2010]

+ * Last changed in libpng 1.4.3 [June 26, 2010]

  * 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.)

@@ -254,7 +254,7 @@ png_inflate(png_structp png_ptr, const png_byte *data, png_size_t size,
        * buffer if available.

        */

       {

-         char *msg;

+         PNG_CONST char *msg;

          if (png_ptr->zstream.msg != 0)

             msg = png_ptr->zstream.msg;

          else

@@ -326,8 +326,10 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
       if (png_ptr->user_chunk_malloc_max &&

           (prefix_size + expanded_size >= png_ptr->user_chunk_malloc_max - 1))

 #else

+#  ifdef PNG_USER_CHUNK_MALLOC_MAX

       if ((PNG_USER_CHUNK_MALLOC_MAX > 0) &&

           prefix_size + expanded_size >= PNG_USER_CHUNK_MALLOC_MAX - 1)

+#  endif

 #endif

          png_warning(png_ptr, "Exceeded size limit while expanding chunk");

 

@@ -363,7 +365,7 @@ png_decompress_chunk(png_structp png_ptr, int comp_type,
                *newlength = prefix_size + expanded_size;

                return; /* The success return! */

             }

-      

+

             png_warning(png_ptr, "png_inflate logic error");

             png_free(png_ptr, text);

          }

@@ -1811,6 +1813,7 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    if (png_ptr->chunkdata == NULL)

    {

       png_warning(png_ptr, "Out of memory while processing sCAL chunk");

+      png_crc_finish(png_ptr, length);

       return;

    }

    slength = (png_size_t)length;

@@ -1832,6 +1835,8 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    if (*vp)

    {

       png_warning(png_ptr, "malformed width string in sCAL chunk");

+      png_free(png_ptr, png_ptr->chunkdata);

+      png_ptr->chunkdata = NULL;

       return;

    }

 #else

@@ -1840,6 +1845,8 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    if (swidth == NULL)

    {

       png_warning(png_ptr, "Out of memory while processing sCAL chunk width");

+      png_free(png_ptr, png_ptr->chunkdata);

+      png_ptr->chunkdata = NULL;

       return;

    }

    png_memcpy(swidth, ep, png_strlen(ep));

@@ -1853,8 +1860,7 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    if (png_ptr->chunkdata + slength < ep)

    {

       png_warning(png_ptr, "Truncated sCAL chunk");

-#if defined(PNG_FIXED_POINT_SUPPORTED) && \

-    !defined(PNG_FLOATING_POINT_SUPPORTED)

+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)

       png_free(png_ptr, swidth);

 #endif

       png_free(png_ptr, png_ptr->chunkdata);

@@ -1867,6 +1873,11 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    if (*vp)

    {

       png_warning(png_ptr, "malformed height string in sCAL chunk");

+      png_free(png_ptr, png_ptr->chunkdata);

+      png_ptr->chunkdata = NULL;

+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)

+      png_free(png_ptr, swidth);

+#endif

       return;

    }

 #else

@@ -1875,6 +1886,11 @@ png_handle_sCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
    if (sheight == NULL)

    {

       png_warning(png_ptr, "Out of memory while processing sCAL chunk height");

+      png_free(png_ptr, png_ptr->chunkdata);

+      png_ptr->chunkdata = NULL;

+#if defined(PNG_FIXED_POINT_SUPPORTED) && !defined(PNG_FLOATING_POINT_SUPPORTED)

+      png_free(png_ptr, swidth);

+#endif

       return;

    }

    png_memcpy(sheight, ep, png_strlen(ep));

diff --git a/src/thirdparty/libpng/pngtest.c b/src/thirdparty/libpng/pngtest.c
index ca164198f..35a4c7dba 100644
--- a/src/thirdparty/libpng/pngtest.c
+++ b/src/thirdparty/libpng/pngtest.c
@@ -1627,4 +1627,4 @@ main(int argc, char *argv[])
 }

 

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

-typedef version_1_4_2 your_png_h_is_not_version_1_4_2;

+typedef version_1_4_3 your_png_h_is_not_version_1_4_3;

diff --git a/src/thirdparty/libpng/pngwutil.c b/src/thirdparty/libpng/pngwutil.c
index b75c34bfd..dc4aa142e 100644
--- a/src/thirdparty/libpng/pngwutil.c
+++ b/src/thirdparty/libpng/pngwutil.c
@@ -2106,7 +2106,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
    png_uint_32 row_bytes = row_info->rowbytes;

 #ifdef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED

    int num_p_filters = (int)png_ptr->num_prev_filters;

-#endif 

+#endif

 

    png_debug(1, "in png_write_find_filter");

 

@@ -2116,7 +2116,7 @@ png_write_find_filter(png_structp png_ptr, png_row_infop row_info)
       /* These will never be selected so we need not test them. */

       filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);

   }

-#endif 

+#endif

 

    /* Find out how many bytes offset each pixel is */

    bpp = (row_info->pixel_depth + 7) >> 3;