Browse Source

update to latest upstream

Waldemar Brodkorb 11 years ago
parent
commit
d64fa37d0a
2 changed files with 72 additions and 72 deletions
  1. 2 2
      package/libpng/Makefile
  2. 70 70
      package/libpng/patches/libpng-1.6.12-apng.patch

+ 2 - 2
package/libpng/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 include ${TOPDIR}/rules.mk
 
 
 PKG_NAME:=		libpng
 PKG_NAME:=		libpng
-PKG_VERSION:=		1.6.10
+PKG_VERSION:=		1.6.12
 PKG_RELEASE:=		1
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		5f414b20f683b1d96b163c89e3eff768
+PKG_MD5SUM:=		ee752da8aa75076500e4cf31318e636e
 PKG_DESCR:=		library for reading/writing png images
 PKG_DESCR:=		library for reading/writing png images
 PKG_SECTION:=		libs/image
 PKG_SECTION:=		libs/image
 PKG_DEPENDS:=		zlib
 PKG_DEPENDS:=		zlib

+ 70 - 70
package/libpng/patches/libpng-1.6.8-apng.patch → package/libpng/patches/libpng-1.6.12-apng.patch

@@ -1,7 +1,7 @@
-diff -Naru libpng-1.6.8.org/png.h libpng-1.6.8/png.h
---- libpng-1.6.8.org/png.h	2013-12-22 17:03:17.220988502 +0900
-+++ libpng-1.6.8/png.h	2013-12-22 17:03:17.287990651 +0900
-@@ -451,6 +451,10 @@
+diff -Naru libpng-1.6.12.org/png.h libpng-1.6.12/png.h
+--- libpng-1.6.12.org/png.h	2014-06-12 20:50:55.236436493 +0900
++++ libpng-1.6.12/png.h	2014-06-12 20:50:55.301438712 +0900
+@@ -464,6 +464,10 @@
  #   include "pnglibconf.h"
  #   include "pnglibconf.h"
  #endif
  #endif
  
  
@@ -12,7 +12,7 @@ diff -Naru libpng-1.6.8.org/png.h libpng-1.6.8/png.h
  #ifndef PNG_VERSION_INFO_ONLY
  #ifndef PNG_VERSION_INFO_ONLY
     /* Machine specific configuration. */
     /* Machine specific configuration. */
  #  include "pngconf.h"
  #  include "pngconf.h"
-@@ -541,6 +545,17 @@
+@@ -554,6 +558,17 @@
   * See pngconf.h for base types that vary by machine/system
   * See pngconf.h for base types that vary by machine/system
   */
   */
  
  
@@ -30,7 +30,7 @@ diff -Naru libpng-1.6.8.org/png.h libpng-1.6.8/png.h
  /* This triggers a compiler error in png.c, if png.c and png.h
  /* This triggers a compiler error in png.c, if png.c and png.h
   * do not agree upon the version number.
   * do not agree upon the version number.
   */
   */
-@@ -861,6 +876,10 @@
+@@ -874,6 +889,10 @@
  #define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
  #define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
  #define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
  #define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
  #define PNG_INFO_IDAT 0x8000   /* ESR, 1.0.6 */
  #define PNG_INFO_IDAT 0x8000   /* ESR, 1.0.6 */
@@ -41,7 +41,7 @@ diff -Naru libpng-1.6.8.org/png.h libpng-1.6.8/png.h
  
  
  /* This is used for the transformation routines, as some of them
  /* This is used for the transformation routines, as some of them
   * change these values for the row.  It also should enable using
   * change these values for the row.  It also should enable using
-@@ -898,6 +917,10 @@
+@@ -911,6 +930,10 @@
  #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
  #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
  typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
  typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
  typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
  typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
@@ -52,9 +52,9 @@ diff -Naru libpng-1.6.8.org/png.h libpng-1.6.8/png.h
  
  
  /* The following callback receives png_uint_32 row_number, int pass for the
  /* The following callback receives png_uint_32 row_number, int pass for the
   * png_bytep data of the row.  When transforming an interlaced image the
   * png_bytep data of the row.  When transforming an interlaced image the
-@@ -3300,6 +3323,74 @@
+@@ -3246,6 +3269,74 @@
  /*******************************************************************************
  /*******************************************************************************
-  *  END OF HARDWARE OPTIONS
+  *  END OF HARDWARE AND SOFTWARE OPTIONS
   ******************************************************************************/
   ******************************************************************************/
 +#ifdef PNG_APNG_SUPPORTED
 +#ifdef PNG_APNG_SUPPORTED
 +PNG_EXPORT(245, png_uint_32, png_get_acTL, (png_structp png_ptr,
 +PNG_EXPORT(245, png_uint_32, png_get_acTL, (png_structp png_ptr,
@@ -127,7 +127,7 @@ diff -Naru libpng-1.6.8.org/png.h libpng-1.6.8/png.h
  
  
  /* Maintainer: Put new public prototypes here ^, in libpng.3, and project
  /* Maintainer: Put new public prototypes here ^, in libpng.3, and project
   * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt
   * defs, scripts/pnglibconf.h, and scripts/pnglibconf.h.prebuilt
-@@ -3310,7 +3401,11 @@
+@@ -3256,7 +3347,11 @@
   * scripts/symbols.def as well.
   * scripts/symbols.def as well.
   */
   */
  #ifdef PNG_EXPORT_LAST_ORDINAL
  #ifdef PNG_EXPORT_LAST_ORDINAL
@@ -139,10 +139,10 @@ diff -Naru libpng-1.6.8.org/png.h libpng-1.6.8/png.h
  #endif
  #endif
  
  
  #ifdef __cplusplus
  #ifdef __cplusplus
-diff -Naru libpng-1.6.8.org/pngget.c libpng-1.6.8/pngget.c
---- libpng-1.6.8.org/pngget.c	2013-12-22 17:03:17.220988502 +0900
-+++ libpng-1.6.8/pngget.c	2013-12-22 17:03:17.288990684 +0900
-@@ -1174,4 +1174,166 @@
+diff -Naru libpng-1.6.12.org/pngget.c libpng-1.6.12/pngget.c
+--- libpng-1.6.12.org/pngget.c	2014-06-12 20:50:55.237436527 +0900
++++ libpng-1.6.12/pngget.c	2014-06-12 20:50:55.302438746 +0900
+@@ -1195,4 +1195,166 @@
  #  endif
  #  endif
  #endif
  #endif
  
  
@@ -309,9 +309,9 @@ diff -Naru libpng-1.6.8.org/pngget.c libpng-1.6.8/pngget.c
 +}
 +}
 +#endif /* PNG_APNG_SUPPORTED */
 +#endif /* PNG_APNG_SUPPORTED */
  #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
  #endif /* PNG_READ_SUPPORTED || PNG_WRITE_SUPPORTED */
-diff -Naru libpng-1.6.8.org/pnginfo.h libpng-1.6.8/pnginfo.h
---- libpng-1.6.8.org/pnginfo.h	2013-12-22 17:03:17.220988502 +0900
-+++ libpng-1.6.8/pnginfo.h	2013-12-22 17:03:17.288990684 +0900
+diff -Naru libpng-1.6.12.org/pnginfo.h libpng-1.6.12/pnginfo.h
+--- libpng-1.6.12.org/pnginfo.h	2014-06-12 20:50:55.237436527 +0900
++++ libpng-1.6.12/pnginfo.h	2014-06-12 20:50:55.302438746 +0900
 @@ -256,5 +256,18 @@
 @@ -256,5 +256,18 @@
     png_bytepp row_pointers;        /* the image bits */
     png_bytepp row_pointers;        /* the image bits */
  #endif
  #endif
@@ -331,9 +331,9 @@ diff -Naru libpng-1.6.8.org/pnginfo.h libpng-1.6.8/pnginfo.h
 +
 +
  };
  };
  #endif /* PNGINFO_H */
  #endif /* PNGINFO_H */
-diff -Naru libpng-1.6.8.org/pngpread.c libpng-1.6.8/pngpread.c
---- libpng-1.6.8.org/pngpread.c	2013-12-22 17:03:17.221988534 +0900
-+++ libpng-1.6.8/pngpread.c	2013-12-22 17:03:17.288990684 +0900
+diff -Naru libpng-1.6.12.org/pngpread.c libpng-1.6.12/pngpread.c
+--- libpng-1.6.12.org/pngpread.c	2014-06-12 20:50:55.237436527 +0900
++++ libpng-1.6.12/pngpread.c	2014-06-12 20:50:55.302438746 +0900
 @@ -217,6 +217,109 @@
 @@ -217,6 +217,109 @@
  
  
     chunk_name = png_ptr->chunk_name;
     chunk_name = png_ptr->chunk_name;
@@ -444,7 +444,7 @@ diff -Naru libpng-1.6.8.org/pngpread.c libpng-1.6.8/pngpread.c
     if (chunk_name == png_IDAT)
     if (chunk_name == png_IDAT)
     {
     {
        if (png_ptr->mode & PNG_AFTER_IDAT)
        if (png_ptr->mode & PNG_AFTER_IDAT)
-@@ -299,6 +402,9 @@
+@@ -300,6 +403,9 @@
  
  
     else if (chunk_name == png_IDAT)
     else if (chunk_name == png_IDAT)
     {
     {
@@ -454,7 +454,7 @@ diff -Naru libpng-1.6.8.org/pngpread.c libpng-1.6.8/pngpread.c
        png_ptr->idat_size = png_ptr->push_length;
        png_ptr->idat_size = png_ptr->push_length;
        png_ptr->process_mode = PNG_READ_IDAT_MODE;
        png_ptr->process_mode = PNG_READ_IDAT_MODE;
        png_push_have_info(png_ptr, info_ptr);
        png_push_have_info(png_ptr, info_ptr);
-@@ -529,6 +635,30 @@
+@@ -530,6 +636,30 @@
        png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
        png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
     }
     }
  #endif
  #endif
@@ -485,7 +485,7 @@ diff -Naru libpng-1.6.8.org/pngpread.c libpng-1.6.8/pngpread.c
  
  
     else
     else
     {
     {
-@@ -731,7 +861,11 @@
+@@ -732,7 +862,11 @@
        png_byte chunk_tag[4];
        png_byte chunk_tag[4];
  
  
        /* TODO: this code can be commoned up with the same code in push_read */
        /* TODO: this code can be commoned up with the same code in push_read */
@@ -497,7 +497,7 @@ diff -Naru libpng-1.6.8.org/pngpread.c libpng-1.6.8/pngpread.c
        {
        {
           png_push_save_buffer(png_ptr);
           png_push_save_buffer(png_ptr);
           return;
           return;
-@@ -744,17 +878,64 @@
+@@ -745,17 +879,64 @@
        png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
        png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
        png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
        png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
  
  
@@ -562,7 +562,7 @@ diff -Naru libpng-1.6.8.org/pngpread.c libpng-1.6.8/pngpread.c
     }
     }
  
  
     if (png_ptr->idat_size && png_ptr->save_buffer_size)
     if (png_ptr->idat_size && png_ptr->save_buffer_size)
-@@ -832,6 +1013,15 @@
+@@ -833,6 +1014,15 @@
     if (!(buffer_length > 0) || buffer == NULL)
     if (!(buffer_length > 0) || buffer == NULL)
        png_error(png_ptr, "No IDAT data (internal error)");
        png_error(png_ptr, "No IDAT data (internal error)");
  
  
@@ -578,7 +578,7 @@ diff -Naru libpng-1.6.8.org/pngpread.c libpng-1.6.8/pngpread.c
     /* This routine must process all the data it has been given
     /* This routine must process all the data it has been given
      * before returning, calling the row callback as required to
      * before returning, calling the row callback as required to
      * handle the uncompressed results.
      * handle the uncompressed results.
-@@ -1280,6 +1470,18 @@
+@@ -1275,6 +1465,18 @@
     png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
     png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
  }
  }
  
  
@@ -597,10 +597,10 @@ diff -Naru libpng-1.6.8.org/pngpread.c libpng-1.6.8/pngpread.c
  png_voidp PNGAPI
  png_voidp PNGAPI
  png_get_progressive_ptr(png_const_structrp png_ptr)
  png_get_progressive_ptr(png_const_structrp png_ptr)
  {
  {
-diff -Naru libpng-1.6.8.org/pngpriv.h libpng-1.6.8/pngpriv.h
---- libpng-1.6.8.org/pngpriv.h	2013-12-22 17:03:17.221988534 +0900
-+++ libpng-1.6.8/pngpriv.h	2013-12-22 17:03:17.289990716 +0900
-@@ -550,6 +550,10 @@
+diff -Naru libpng-1.6.12.org/pngpriv.h libpng-1.6.12/pngpriv.h
+--- libpng-1.6.12.org/pngpriv.h	2014-06-12 20:50:55.238436561 +0900
++++ libpng-1.6.12/pngpriv.h	2014-06-12 20:50:55.303438780 +0900
+@@ -551,6 +551,10 @@
  #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
  #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
                     /*             0x4000 (unused) */
                     /*             0x4000 (unused) */
  #define PNG_IS_READ_STRUCT        0x8000 /* Else is a write struct */
  #define PNG_IS_READ_STRUCT        0x8000 /* Else is a write struct */
@@ -611,7 +611,7 @@ diff -Naru libpng-1.6.8.org/pngpriv.h libpng-1.6.8/pngpriv.h
  
  
  /* Flags for the transformations the PNG library does on the image data */
  /* Flags for the transformations the PNG library does on the image data */
  #define PNG_BGR                 0x0001
  #define PNG_BGR                 0x0001
-@@ -771,6 +775,16 @@
+@@ -772,6 +776,16 @@
  #define png_tRNS PNG_U32(116,  82,  78,  83)
  #define png_tRNS PNG_U32(116,  82,  78,  83)
  #define png_zTXt PNG_U32(122,  84,  88, 116)
  #define png_zTXt PNG_U32(122,  84,  88, 116)
  
  
@@ -628,7 +628,7 @@ diff -Naru libpng-1.6.8.org/pngpriv.h libpng-1.6.8/pngpriv.h
  /* The following will work on (signed char*) strings, whereas the get_uint_32
  /* The following will work on (signed char*) strings, whereas the get_uint_32
   * macro will fail on top-bit-set values because of the sign extension.
   * macro will fail on top-bit-set values because of the sign extension.
   */
   */
-@@ -1583,6 +1597,47 @@
+@@ -1472,6 +1486,47 @@
       */
       */
  #endif
  #endif
  
  
@@ -676,9 +676,9 @@ diff -Naru libpng-1.6.8.org/pngpriv.h libpng-1.6.8/pngpriv.h
  /* Added at libpng version 1.4.0 */
  /* Added at libpng version 1.4.0 */
  #ifdef PNG_COLORSPACE_SUPPORTED
  #ifdef PNG_COLORSPACE_SUPPORTED
  /* These internal functions are for maintaining the colorspace structure within
  /* These internal functions are for maintaining the colorspace structure within
-diff -Naru libpng-1.6.8.org/pngread.c libpng-1.6.8/pngread.c
---- libpng-1.6.8.org/pngread.c	2013-12-22 17:03:17.222988566 +0900
-+++ libpng-1.6.8/pngread.c	2013-12-22 17:03:17.290990748 +0900
+diff -Naru libpng-1.6.12.org/pngread.c libpng-1.6.12/pngread.c
+--- libpng-1.6.12.org/pngread.c	2014-06-12 20:50:55.238436561 +0900
++++ libpng-1.6.12/pngread.c	2014-06-12 20:50:55.304438815 +0900
 @@ -158,6 +158,9 @@
 @@ -158,6 +158,9 @@
  
  
        else if (chunk_name == png_IDAT)
        else if (chunk_name == png_IDAT)
@@ -780,10 +780,10 @@ diff -Naru libpng-1.6.8.org/pngread.c libpng-1.6.8/pngread.c
  /* Optional call to update the users info_ptr structure */
  /* Optional call to update the users info_ptr structure */
  void PNGAPI
  void PNGAPI
  png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
  png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
-diff -Naru libpng-1.6.8.org/pngrutil.c libpng-1.6.8/pngrutil.c
---- libpng-1.6.8.org/pngrutil.c	2013-12-22 17:03:17.224988631 +0900
-+++ libpng-1.6.8/pngrutil.c	2013-12-22 17:03:17.291990780 +0900
-@@ -826,6 +826,11 @@
+diff -Naru libpng-1.6.12.org/pngrutil.c libpng-1.6.12/pngrutil.c
+--- libpng-1.6.12.org/pngrutil.c	2014-06-12 20:50:55.240436630 +0900
++++ libpng-1.6.12/pngrutil.c	2014-06-12 20:50:55.305438849 +0900
+@@ -818,6 +818,11 @@
     filter_type = buf[11];
     filter_type = buf[11];
     interlace_type = buf[12];
     interlace_type = buf[12];
  
  
@@ -795,7 +795,7 @@ diff -Naru libpng-1.6.8.org/pngrutil.c libpng-1.6.8/pngrutil.c
     /* Set internal variables */
     /* Set internal variables */
     png_ptr->width = width;
     png_ptr->width = width;
     png_ptr->height = height;
     png_ptr->height = height;
-@@ -2700,6 +2705,179 @@
+@@ -2698,6 +2703,179 @@
  }
  }
  #endif
  #endif
  
  
@@ -975,7 +975,7 @@ diff -Naru libpng-1.6.8.org/pngrutil.c libpng-1.6.8/pngrutil.c
  #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
  #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
  /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
  /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
  static int
  static int
-@@ -3956,7 +4134,38 @@
+@@ -3954,7 +4132,38 @@
        {
        {
           uInt avail_in;
           uInt avail_in;
           png_bytep buffer;
           png_bytep buffer;
@@ -1014,7 +1014,7 @@ diff -Naru libpng-1.6.8.org/pngrutil.c libpng-1.6.8/pngrutil.c
           while (png_ptr->idat_size == 0)
           while (png_ptr->idat_size == 0)
           {
           {
              png_crc_finish(png_ptr, 0);
              png_crc_finish(png_ptr, 0);
-@@ -3968,7 +4177,7 @@
+@@ -3966,7 +4175,7 @@
              if (png_ptr->chunk_name != png_IDAT)
              if (png_ptr->chunk_name != png_IDAT)
                 png_error(png_ptr, "Not enough image data");
                 png_error(png_ptr, "Not enough image data");
           }
           }
@@ -1023,7 +1023,7 @@ diff -Naru libpng-1.6.8.org/pngrutil.c libpng-1.6.8/pngrutil.c
           avail_in = png_ptr->IDAT_read_size;
           avail_in = png_ptr->IDAT_read_size;
  
  
           if (avail_in > png_ptr->idat_size)
           if (avail_in > png_ptr->idat_size)
-@@ -4031,6 +4240,9 @@
+@@ -4029,6 +4238,9 @@
  
  
           png_ptr->mode |= PNG_AFTER_IDAT;
           png_ptr->mode |= PNG_AFTER_IDAT;
           png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
           png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
@@ -1033,7 +1033,7 @@ diff -Naru libpng-1.6.8.org/pngrutil.c libpng-1.6.8/pngrutil.c
  
  
           if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
           if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
              png_chunk_benign_error(png_ptr, "Extra compressed data");
              png_chunk_benign_error(png_ptr, "Extra compressed data");
-@@ -4476,4 +4688,80 @@
+@@ -4466,4 +4678,80 @@
  
  
     png_ptr->flags |= PNG_FLAG_ROW_INIT;
     png_ptr->flags |= PNG_FLAG_ROW_INIT;
  }
  }
@@ -1114,9 +1114,9 @@ diff -Naru libpng-1.6.8.org/pngrutil.c libpng-1.6.8/pngrutil.c
 +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
 +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
 +#endif /* PNG_READ_APNG_SUPPORTED */
 +#endif /* PNG_READ_APNG_SUPPORTED */
  #endif /* PNG_READ_SUPPORTED */
  #endif /* PNG_READ_SUPPORTED */
-diff -Naru libpng-1.6.8.org/pngset.c libpng-1.6.8/pngset.c
---- libpng-1.6.8.org/pngset.c	2013-12-22 17:03:17.224988631 +0900
-+++ libpng-1.6.8/pngset.c	2013-12-22 17:03:17.292990812 +0900
+diff -Naru libpng-1.6.12.org/pngset.c libpng-1.6.12/pngset.c
+--- libpng-1.6.12.org/pngset.c	2014-06-12 20:50:55.240436630 +0900
++++ libpng-1.6.12/pngset.c	2014-06-12 20:50:55.306438883 +0900
 @@ -239,6 +239,11 @@
 @@ -239,6 +239,11 @@
     info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
     info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
  
  
@@ -1277,9 +1277,9 @@ diff -Naru libpng-1.6.8.org/pngset.c libpng-1.6.8/pngset.c
  #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
  #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
  static png_byte
  static png_byte
  check_location(png_const_structrp png_ptr, int location)
  check_location(png_const_structrp png_ptr, int location)
-diff -Naru libpng-1.6.8.org/pngstruct.h libpng-1.6.8/pngstruct.h
---- libpng-1.6.8.org/pngstruct.h	2013-12-22 17:03:17.224988631 +0900
-+++ libpng-1.6.8/pngstruct.h	2013-12-22 17:03:17.292990812 +0900
+diff -Naru libpng-1.6.12.org/pngstruct.h libpng-1.6.12/pngstruct.h
+--- libpng-1.6.12.org/pngstruct.h	2014-06-12 20:50:55.240436630 +0900
++++ libpng-1.6.12/pngstruct.h	2014-06-12 20:50:55.306438883 +0900
 @@ -409,6 +409,27 @@
 @@ -409,6 +409,27 @@
     png_byte filter_type;
     png_byte filter_type;
  #endif
  #endif
@@ -1308,12 +1308,12 @@ diff -Naru libpng-1.6.8.org/pngstruct.h libpng-1.6.8/pngstruct.h
  /* New members added in libpng-1.2.0 */
  /* New members added in libpng-1.2.0 */
  
  
  /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
  /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */
-diff -Naru libpng-1.6.8.org/pngtest.c libpng-1.6.8/pngtest.c
---- libpng-1.6.8.org/pngtest.c	2013-12-22 17:03:17.224988631 +0900
-+++ libpng-1.6.8/pngtest.c	2013-12-22 17:03:17.292990812 +0900
-@@ -840,6 +840,10 @@
+diff -Naru libpng-1.6.12.org/pngtest.c libpng-1.6.12/pngtest.c
+--- libpng-1.6.12.org/pngtest.c	2014-06-12 20:50:55.241436664 +0900
++++ libpng-1.6.12/pngtest.c	2014-06-12 20:50:55.306438883 +0900
+@@ -848,6 +848,10 @@
     png_uint_32 width, height;
     png_uint_32 width, height;
-    int num_pass, pass;
+    int num_pass = 1, pass;
     int bit_depth, color_type;
     int bit_depth, color_type;
 +#ifdef PNG_APNG_SUPPORTED
 +#ifdef PNG_APNG_SUPPORTED
 +   png_uint_32 num_frames;
 +   png_uint_32 num_frames;
@@ -1322,7 +1322,7 @@ diff -Naru libpng-1.6.8.org/pngtest.c libpng-1.6.8/pngtest.c
  
  
     row_buf = NULL;
     row_buf = NULL;
     error_parameters.file_name = inname;
     error_parameters.file_name = inname;
-@@ -1290,6 +1294,20 @@
+@@ -1314,6 +1318,20 @@
        }
        }
     }
     }
  #endif
  #endif
@@ -1343,7 +1343,7 @@ diff -Naru libpng-1.6.8.org/pngtest.c libpng-1.6.8/pngtest.c
  #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
  #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
     {
     {
        png_unknown_chunkp unknowns;
        png_unknown_chunkp unknowns;
-@@ -1355,6 +1373,89 @@
+@@ -1375,6 +1393,89 @@
     t_misc += (t_stop - t_start);
     t_misc += (t_stop - t_start);
     t_start = t_stop;
     t_start = t_stop;
  #endif
  #endif
@@ -1433,9 +1433,9 @@ diff -Naru libpng-1.6.8.org/pngtest.c libpng-1.6.8/pngtest.c
     for (pass = 0; pass < num_pass; pass++)
     for (pass = 0; pass < num_pass; pass++)
     {
     {
        pngtest_debug1("Writing row data for pass %d", pass);
        pngtest_debug1("Writing row data for pass %d", pass);
-diff -Naru libpng-1.6.8.org/pngwrite.c libpng-1.6.8/pngwrite.c
---- libpng-1.6.8.org/pngwrite.c	2013-12-22 17:03:17.225988663 +0900
-+++ libpng-1.6.8/pngwrite.c	2013-12-22 17:03:17.310991389 +0900
+diff -Naru libpng-1.6.12.org/pngwrite.c libpng-1.6.12/pngwrite.c
+--- libpng-1.6.12.org/pngwrite.c	2014-06-12 20:50:55.241436664 +0900
++++ libpng-1.6.12/pngwrite.c	2014-06-12 20:50:55.307438917 +0900
 @@ -127,6 +127,10 @@
 @@ -127,6 +127,10 @@
      * application continues writing the PNG.  So check the 'invalid' flag here
      * application continues writing the PNG.  So check the 'invalid' flag here
      * too.
      * too.
@@ -1459,7 +1459,7 @@ diff -Naru libpng-1.6.8.org/pngwrite.c libpng-1.6.8/pngwrite.c
     /* See if user wants us to write information chunks */
     /* See if user wants us to write information chunks */
     if (info_ptr != NULL)
     if (info_ptr != NULL)
     {
     {
-@@ -1560,6 +1569,43 @@
+@@ -1662,6 +1671,43 @@
  }
  }
  #endif
  #endif
  
  
@@ -1503,9 +1503,9 @@ diff -Naru libpng-1.6.8.org/pngwrite.c libpng-1.6.8/pngwrite.c
  
  
  #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
  #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
  #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */
  #ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */
-diff -Naru libpng-1.6.8.org/pngwutil.c libpng-1.6.8/pngwutil.c
---- libpng-1.6.8.org/pngwutil.c	2013-12-22 17:03:17.226988695 +0900
-+++ libpng-1.6.8/pngwutil.c	2013-12-22 17:03:17.311991421 +0900
+diff -Naru libpng-1.6.12.org/pngwutil.c libpng-1.6.12/pngwutil.c
+--- libpng-1.6.12.org/pngwutil.c	2014-06-12 20:50:55.242436698 +0900
++++ libpng-1.6.12/pngwutil.c	2014-06-12 20:50:55.307438917 +0900
 @@ -898,6 +898,11 @@
 @@ -898,6 +898,11 @@
     /* Write the chunk */
     /* Write the chunk */
     png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
     png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
@@ -1515,7 +1515,7 @@ diff -Naru libpng-1.6.8.org/pngwutil.c libpng-1.6.8/pngwutil.c
 +   png_ptr->first_frame_height = height;
 +   png_ptr->first_frame_height = height;
 +#endif
 +#endif
 +
 +
-    if (!(png_ptr->do_filter))
+    if ((png_ptr->do_filter) == PNG_NO_FILTERS)
     {
     {
        if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
        if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
 @@ -1076,7 +1081,14 @@
 @@ -1076,7 +1081,14 @@
@@ -1549,7 +1549,7 @@ diff -Naru libpng-1.6.8.org/pngwutil.c libpng-1.6.8/pngwutil.c
           png_ptr->zstream.avail_out = 0;
           png_ptr->zstream.avail_out = 0;
           png_ptr->zstream.next_out = NULL;
           png_ptr->zstream.next_out = NULL;
           png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
           png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
-@@ -1934,6 +1954,82 @@
+@@ -1936,6 +1956,82 @@
  }
  }
  #endif
  #endif
  
  
@@ -1632,7 +1632,7 @@ diff -Naru libpng-1.6.8.org/pngwutil.c libpng-1.6.8/pngwutil.c
  /* Initializes the row writing capability of libpng */
  /* Initializes the row writing capability of libpng */
  void /* PRIVATE */
  void /* PRIVATE */
  png_write_start_row(png_structrp png_ptr)
  png_write_start_row(png_structrp png_ptr)
-@@ -3020,4 +3116,39 @@
+@@ -3023,4 +3119,39 @@
     }
     }
  #endif
  #endif
  }
  }
@@ -1672,9 +1672,9 @@ diff -Naru libpng-1.6.8.org/pngwutil.c libpng-1.6.8/pngwutil.c
 +}
 +}
 +#endif /* PNG_WRITE_APNG_SUPPORTED */
 +#endif /* PNG_WRITE_APNG_SUPPORTED */
  #endif /* PNG_WRITE_SUPPORTED */
  #endif /* PNG_WRITE_SUPPORTED */
-diff -Naru libpng-1.6.8.org/scripts/symbols.def libpng-1.6.8/scripts/symbols.def
---- libpng-1.6.8.org/scripts/symbols.def	2013-12-22 17:03:17.232988887 +0900
-+++ libpng-1.6.8/scripts/symbols.def	2013-12-22 17:03:17.317991614 +0900
+diff -Naru libpng-1.6.12.org/scripts/symbols.def libpng-1.6.12/scripts/symbols.def
+--- libpng-1.6.12.org/scripts/symbols.def	2014-06-12 20:50:55.248436903 +0900
++++ libpng-1.6.12/scripts/symbols.def	2014-06-12 20:50:55.314439156 +0900
 @@ -249,3 +249,23 @@
 @@ -249,3 +249,23 @@
   png_set_check_for_invalid_index @242
   png_set_check_for_invalid_index @242
   png_get_palette_max @243
   png_get_palette_max @243