libpng: update to 1.6.28

2 files changed, 514 insertions, 408 deletions

diff --git a/package/libpng/Makefile b/package/libpng/Makefile
index 8026f9ae5..f728e1676 100644
--- a/package/libpng/Makefile
+++ b/package/libpng/Makefile
@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		libpng
-PKG_VERSION:=		1.6.22
+PKG_VERSION:=		1.6.28
 PKG_RELEASE:=		1
-PKG_HASH:=		6b5a6ad5c5801ec4d24aacc87a0ed7b666cd586478174f69368a1d7747715226
+PKG_HASH:=		d8d3ec9de6b5db740fefac702c37ffcf96ae46cb17c18c1544635a3852f78f7a
 PKG_DESCR:=		library for reading/writing png images
 PKG_SECTION:=		libs/image
 PKG_DEPENDS:=		zlib
diff --git a/package/libpng/patches/libpng-1.6.22-apng.patch b/package/libpng/patches/libpng-1.6.28-apng.patch
index 24cc9aa9a..95929dde8 100644
--- a/package/libpng/patches/libpng-1.6.22-apng.patch
+++ b/package/libpng/patches/libpng-1.6.28-apng.patch
@@ -1,51 +1,147 @@
-diff -Nur libpng-1.6.22.orig/LICENSE libpng-1.6.22/LICENSE
---- libpng-1.6.22.orig/LICENSE	2016-05-26 05:41:45.000000000 +0200
-+++ libpng-1.6.22/LICENSE	2016-10-01 00:22:37.029393861 +0200
-@@ -8,6 +8,12 @@
- If you modify libpng you may insert additional notices immediately following
- this sentence.
+diff -Naru libpng-1.6.28.org/png.h libpng-1.6.28/png.h
+--- libpng-1.6.28.org/png.h	2017-01-06 07:54:14.001821909 +0900
++++ libpng-1.6.28/png.h	2017-01-06 07:52:51.552368347 +0900
+@@ -359,6 +359,10 @@
+ #   include "pnglibconf.h"
+ #endif
  
-+This modified version of libpng code adds animated PNG support and is
-+released under the libpng license described below. The modifications are
-+Copyright (c) 2006-2007 Andrew Smith, Copyright (c) 2008-2016 Max Stepin,
-+and are delimited by "#ifdef PNG_APNG_SUPPORTED / #endif" directives
-+surrounding them in the modified libpng source files.
++#define PNG_APNG_SUPPORTED
++#define PNG_READ_APNG_SUPPORTED
++#define PNG_WRITE_APNG_SUPPORTED
 +
- This code is released under the libpng license.
+ #ifndef PNG_VERSION_INFO_ONLY
+ /* Machine specific configuration. */
+ #  include "pngconf.h"
+@@ -454,6 +458,17 @@
+  * See pngconf.h for base types that vary by machine/system
+  */
  
- libpng versions 1.0.7, July 1, 2000 through 1.6.22, May 26, 2016 are
-diff -Nur libpng-1.6.22.orig/png.c libpng-1.6.22/png.c
---- libpng-1.6.22.orig/png.c	2016-05-26 05:41:45.000000000 +0200
-+++ libpng-1.6.22/png.c	2016-10-01 00:22:37.029393861 +0200
-@@ -775,17 +775,21 @@
- #else
- #  ifdef __STDC__
-    return PNG_STRING_NEWLINE \
--      "libpng version 1.6.22 - May 26, 2016" PNG_STRING_NEWLINE \
-+      "libpng version 1.6.22+apng - May 26, 2016" PNG_STRING_NEWLINE \
-       "Copyright (c) 1998-2002,2004,2006-2016 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;
-+      PNG_STRING_NEWLINE \
-+      "Portions Copyright (c) 2006-2007 Andrew Smith" PNG_STRING_NEWLINE \
-+      "Portions Copyright (c) 2008-2016 Max Stepin" PNG_STRING_NEWLINE ;
- #  else
--   return "libpng version 1.6.22 - May 26, 2016\
-+   return "libpng version 1.6.22+apng - May 26, 2016\
-       Copyright (c) 1998-2002,2004,2006-2016 Glenn Randers-Pehrson\
-       Copyright (c) 1996-1997 Andreas Dilger\
--      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.";
-+      Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.\
-+      Portions Copyright (c) 2006-2007 Andrew Smith\
-+      Portions Copyright (c) 2008-2016 Max Stepin";
- #  endif
++#ifdef PNG_APNG_SUPPORTED
++/* dispose_op flags from inside fcTL */
++#define PNG_DISPOSE_OP_NONE        0x00U
++#define PNG_DISPOSE_OP_BACKGROUND  0x01U
++#define PNG_DISPOSE_OP_PREVIOUS    0x02U
++
++/* blend_op flags from inside fcTL */
++#define PNG_BLEND_OP_SOURCE        0x00U
++#define PNG_BLEND_OP_OVER          0x01U
++#endif /* PNG_APNG_SUPPORTED */
++
+ /* This triggers a compiler error in png.c, if png.c and png.h
+  * do not agree upon the version number.
+  */
+@@ -774,6 +789,10 @@
+ #define PNG_INFO_sPLT 0x2000U  /* ESR, 1.0.6 */
+ #define PNG_INFO_sCAL 0x4000U  /* ESR, 1.0.6 */
+ #define PNG_INFO_IDAT 0x8000U  /* ESR, 1.0.6 */
++#ifdef PNG_APNG_SUPPORTED
++#define PNG_INFO_acTL 0x10000U
++#define PNG_INFO_fcTL 0x20000U
++#endif
+ 
+ /* This is used for the transformation routines, as some of them
+  * change these values for the row.  It also should enable using
+@@ -811,6 +830,10 @@
+ #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+ typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
+ typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
++#ifdef PNG_APNG_SUPPORTED
++typedef PNG_CALLBACK(void, *png_progressive_frame_ptr, (png_structp,
++    png_uint_32));
++#endif
+ 
+ /* 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
+@@ -3239,6 +3262,74 @@
+ /*******************************************************************************
+  *  END OF HARDWARE AND SOFTWARE OPTIONS
+  ******************************************************************************/
++#ifdef PNG_APNG_SUPPORTED
++PNG_EXPORT(246, png_uint_32, png_get_acTL, (png_structp png_ptr,
++   png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
++
++PNG_EXPORT(247, png_uint_32, png_set_acTL, (png_structp png_ptr,
++   png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays));
++
++PNG_EXPORT(248, png_uint_32, png_get_num_frames, (png_structp png_ptr,
++   png_infop info_ptr));
++
++PNG_EXPORT(249, png_uint_32, png_get_num_plays, (png_structp png_ptr,
++   png_infop info_ptr));
++
++PNG_EXPORT(250, png_uint_32, png_get_next_frame_fcTL,
++   (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width,
++   png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset,
++   png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op,
++   png_byte *blend_op));
++
++PNG_EXPORT(251, png_uint_32, png_set_next_frame_fcTL,
++   (png_structp png_ptr, png_infop info_ptr, png_uint_32 width,
++   png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset,
++   png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
++   png_byte blend_op));
++
++PNG_EXPORT(252, png_uint_32, png_get_next_frame_width,
++   (png_structp png_ptr, png_infop info_ptr));
++PNG_EXPORT(253, png_uint_32, png_get_next_frame_height,
++   (png_structp png_ptr, png_infop info_ptr));
++PNG_EXPORT(254, png_uint_32, png_get_next_frame_x_offset,
++   (png_structp png_ptr, png_infop info_ptr));
++PNG_EXPORT(255, png_uint_32, png_get_next_frame_y_offset,
++   (png_structp png_ptr, png_infop info_ptr));
++PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_num,
++   (png_structp png_ptr, png_infop info_ptr));
++PNG_EXPORT(257, png_uint_16, png_get_next_frame_delay_den,
++   (png_structp png_ptr, png_infop info_ptr));
++PNG_EXPORT(258, png_byte, png_get_next_frame_dispose_op,
++   (png_structp png_ptr, png_infop info_ptr));
++PNG_EXPORT(259, png_byte, png_get_next_frame_blend_op,
++   (png_structp png_ptr, png_infop info_ptr));
++PNG_EXPORT(260, png_byte, png_get_first_frame_is_hidden,
++   (png_structp png_ptr, png_infop info_ptr));
++PNG_EXPORT(261, png_uint_32, png_set_first_frame_is_hidden,
++   (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden));
++
++#ifdef PNG_READ_APNG_SUPPORTED
++PNG_EXPORT(262, void, png_read_frame_head, (png_structp png_ptr,
++   png_infop info_ptr));
++#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
++PNG_EXPORT(263, void, png_set_progressive_frame_fn, (png_structp png_ptr,
++   png_progressive_frame_ptr frame_info_fn,
++   png_progressive_frame_ptr frame_end_fn));
++#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
++#endif /* PNG_READ_APNG_SUPPORTED */
++
++#ifdef PNG_WRITE_APNG_SUPPORTED
++PNG_EXPORT(264, void, png_write_frame_head, (png_structp png_ptr,
++   png_infop info_ptr, png_bytepp row_pointers,
++   png_uint_32 width, png_uint_32 height,
++   png_uint_32 x_offset, png_uint_32 y_offset,
++   png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
++   png_byte blend_op));
++
++PNG_EXPORT(265, void, png_write_frame_tail, (png_structp png_ptr,
++   png_infop info_ptr));
++#endif /* PNG_WRITE_APNG_SUPPORTED */
++#endif /* PNG_APNG_SUPPORTED */
+ 
+ /* Maintainer: Put new public prototypes here ^, in libpng.3, in project
+  * defs, and in scripts/symbols.def.
+@@ -3248,7 +3339,11 @@
+  * one to use is one more than this.)
+  */
+ #ifdef PNG_EXPORT_LAST_ORDINAL
++#ifdef PNG_APNG_SUPPORTED
++  PNG_EXPORT_LAST_ORDINAL(265);
++#else
+   PNG_EXPORT_LAST_ORDINAL(245);
++#endif /* PNG_APNG_SUPPORTED */
  #endif
- }
-diff -Nur libpng-1.6.22.orig/pngget.c libpng-1.6.22/pngget.c
---- libpng-1.6.22.orig/pngget.c	2016-05-26 05:41:45.000000000 +0200
-+++ libpng-1.6.22/pngget.c	2016-10-01 00:22:37.029393861 +0200
+ 
+ #ifdef __cplusplus
+diff -Naru libpng-1.6.28.org/pngget.c libpng-1.6.28/pngget.c
+--- libpng-1.6.28.org/pngget.c	2017-01-06 07:13:10.613993529 +0900
++++ libpng-1.6.28/pngget.c	2017-01-06 07:52:51.542368413 +0900
 @@ -1216,4 +1216,166 @@
  #  endif
  #endif
@@ -58,7 +154,7 @@ diff -Nur libpng-1.6.22.orig/pngget.c libpng-1.6.22/pngget.c
 +    png_debug1(1, "in %s retrieval function", "acTL");
 +
 +    if (png_ptr != NULL && info_ptr != NULL &&
-+        (info_ptr->valid & PNG_INFO_acTL) != 0 &&
++        (info_ptr->valid & PNG_INFO_acTL) &&
 +        num_frames != NULL && num_plays != NULL)
 +    {
 +        *num_frames = info_ptr->num_frames;
@@ -99,7 +195,7 @@ diff -Nur libpng-1.6.22.orig/pngget.c libpng-1.6.22/pngget.c
 +    png_debug1(1, "in %s retrieval function", "fcTL");
 +
 +    if (png_ptr != NULL && info_ptr != NULL &&
-+        (info_ptr->valid & PNG_INFO_fcTL) != 0 &&
++        (info_ptr->valid & PNG_INFO_fcTL) &&
 +        width != NULL && height != NULL &&
 +        x_offset != NULL && y_offset != NULL &&
 +        delay_num != NULL && delay_den != NULL &&
@@ -211,178 +307,11 @@ diff -Nur libpng-1.6.22.orig/pngget.c libpng-1.6.22/pngget.c
 +
 +    return 0;
 +}
-+#endif /* APNG */
++#endif /* PNG_APNG_SUPPORTED */
  #endif /* READ || WRITE */
-diff -Nur libpng-1.6.22.orig/png.h libpng-1.6.22/png.h
---- libpng-1.6.22.orig/png.h	2016-05-26 05:41:45.000000000 +0200
-+++ libpng-1.6.22/png.h	2016-10-01 00:22:37.029393861 +0200
-@@ -23,6 +23,12 @@
-  * If you modify libpng you may insert additional notices immediately following
-  * this sentence.
-  *
-+ * This modified version of libpng code adds animated PNG support and is
-+ * released under the libpng license described below. The modifications are
-+ * Copyright (c) 2006-2007 Andrew Smith, Copyright (c) 2008-2016 Max Stepin,
-+ * and are delimited by "#ifdef PNG_APNG_SUPPORTED / #endif" directives
-+ * surrounding them in the modified libpng source files.
-+ *
-  * This code is released under the libpng license.
-  *
-  * Some files in the "contrib" directory and some configure-generated
-@@ -313,9 +319,9 @@
-  */
- 
- /* Version information for png.h - this should match the version in png.c */
--#define PNG_LIBPNG_VER_STRING "1.6.22"
-+#define PNG_LIBPNG_VER_STRING "1.6.22+apng"
- #define PNG_HEADER_VERSION_STRING \
--     " libpng version 1.6.22 - May 26, 2016\n"
-+     " libpng version 1.6.22+apng - May 26, 2016\n"
- 
- #define PNG_LIBPNG_VER_SONUM   16
- #define PNG_LIBPNG_VER_DLLNUM  16
-@@ -366,6 +372,10 @@
- #   include "pnglibconf.h"
- #endif
- 
-+#define PNG_APNG_SUPPORTED
-+#define PNG_READ_APNG_SUPPORTED
-+#define PNG_WRITE_APNG_SUPPORTED
-+
- #ifndef PNG_VERSION_INFO_ONLY
-    /* Machine specific configuration. */
- #  include "pngconf.h"
-@@ -461,6 +471,17 @@
-  * See pngconf.h for base types that vary by machine/system
-  */
- 
-+#ifdef PNG_APNG_SUPPORTED
-+/* dispose_op flags from inside fcTL */
-+#define PNG_DISPOSE_OP_NONE        0x00
-+#define PNG_DISPOSE_OP_BACKGROUND  0x01
-+#define PNG_DISPOSE_OP_PREVIOUS    0x02
-+
-+/* blend_op flags from inside fcTL */
-+#define PNG_BLEND_OP_SOURCE        0x00
-+#define PNG_BLEND_OP_OVER          0x01
-+#endif /* APNG */
-+
- /* This triggers a compiler error in png.c, if png.c and png.h
-  * do not agree upon the version number.
-  */
-@@ -781,6 +802,10 @@
- #define PNG_INFO_sPLT 0x2000U  /* ESR, 1.0.6 */
- #define PNG_INFO_sCAL 0x4000U  /* ESR, 1.0.6 */
- #define PNG_INFO_IDAT 0x8000U  /* ESR, 1.0.6 */
-+#ifdef PNG_APNG_SUPPORTED
-+#define PNG_INFO_acTL 0x10000
-+#define PNG_INFO_fcTL 0x20000
-+#endif
- 
- /* This is used for the transformation routines, as some of them
-  * change these values for the row.  It also should enable using
-@@ -818,6 +843,10 @@
- #ifdef PNG_PROGRESSIVE_READ_SUPPORTED
- typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
- typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
-+#ifdef PNG_APNG_SUPPORTED
-+typedef PNG_CALLBACK(void, *png_progressive_frame_ptr, (png_structp,
-+    png_uint_32));
-+#endif
- 
- /* 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
-@@ -3237,6 +3266,75 @@
-  *  END OF HARDWARE AND SOFTWARE OPTIONS
-  ******************************************************************************/
- 
-+#ifdef PNG_APNG_SUPPORTED
-+PNG_EXPORT(245, png_uint_32, png_get_acTL, (png_structp png_ptr,
-+   png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
-+
-+PNG_EXPORT(246, png_uint_32, png_set_acTL, (png_structp png_ptr,
-+   png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays));
-+
-+PNG_EXPORT(247, png_uint_32, png_get_num_frames, (png_structp png_ptr,
-+   png_infop info_ptr));
-+
-+PNG_EXPORT(248, png_uint_32, png_get_num_plays, (png_structp png_ptr,
-+   png_infop info_ptr));
-+
-+PNG_EXPORT(249, png_uint_32, png_get_next_frame_fcTL,
-+   (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width,
-+   png_uint_32 *height, png_uint_32 *x_offset, png_uint_32 *y_offset,
-+   png_uint_16 *delay_num, png_uint_16 *delay_den, png_byte *dispose_op,
-+   png_byte *blend_op));
-+
-+PNG_EXPORT(250, png_uint_32, png_set_next_frame_fcTL,
-+   (png_structp png_ptr, png_infop info_ptr, png_uint_32 width,
-+   png_uint_32 height, png_uint_32 x_offset, png_uint_32 y_offset,
-+   png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
-+   png_byte blend_op));
-+
-+PNG_EXPORT(251, png_uint_32, png_get_next_frame_width,
-+   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(252, png_uint_32, png_get_next_frame_height,
-+   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(253, png_uint_32, png_get_next_frame_x_offset,
-+   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(254, png_uint_32, png_get_next_frame_y_offset,
-+   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(255, png_uint_16, png_get_next_frame_delay_num,
-+   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(256, png_uint_16, png_get_next_frame_delay_den,
-+   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(257, png_byte, png_get_next_frame_dispose_op,
-+   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(258, png_byte, png_get_next_frame_blend_op,
-+   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(259, png_byte, png_get_first_frame_is_hidden,
-+   (png_structp png_ptr, png_infop info_ptr));
-+PNG_EXPORT(260, png_uint_32, png_set_first_frame_is_hidden,
-+   (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden));
-+
-+#ifdef PNG_READ_APNG_SUPPORTED
-+PNG_EXPORT(261, void, png_read_frame_head, (png_structp png_ptr,
-+   png_infop info_ptr));
-+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-+PNG_EXPORT(262, void, png_set_progressive_frame_fn, (png_structp png_ptr,
-+   png_progressive_frame_ptr frame_info_fn,
-+   png_progressive_frame_ptr frame_end_fn));
-+#endif /* PROGRESSIVE_READ */
-+#endif /* READ_APNG */
-+
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+PNG_EXPORT(263, void, png_write_frame_head, (png_structp png_ptr,
-+   png_infop info_ptr, png_bytepp row_pointers,
-+   png_uint_32 width, png_uint_32 height,
-+   png_uint_32 x_offset, png_uint_32 y_offset,
-+   png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
-+   png_byte blend_op));
-+
-+PNG_EXPORT(264, void, png_write_frame_tail, (png_structp png_ptr,
-+   png_infop info_ptr));
-+#endif /* WRITE_APNG */
-+#endif /* APNG */
-+
- /* Maintainer: Put new public prototypes here ^, in libpng.3, in project
-  * defs, and in scripts/symbols.def.
-  */
-@@ -3245,7 +3343,11 @@
-  * one to use is one more than this.)
-  */
- #ifdef PNG_EXPORT_LAST_ORDINAL
-+#ifdef PNG_APNG_SUPPORTED
-+  PNG_EXPORT_LAST_ORDINAL(265);
-+#else
-   PNG_EXPORT_LAST_ORDINAL(245);
-+#endif /* APNG */
- #endif
- 
- #ifdef __cplusplus
-diff -Nur libpng-1.6.22.orig/pnginfo.h libpng-1.6.22/pnginfo.h
---- libpng-1.6.22.orig/pnginfo.h	2016-05-26 05:41:45.000000000 +0200
-+++ libpng-1.6.22/pnginfo.h	2016-10-01 00:22:37.033394016 +0200
+diff -Naru libpng-1.6.28.org/pnginfo.h libpng-1.6.28/pnginfo.h
+--- libpng-1.6.28.org/pnginfo.h	2017-01-06 07:13:10.613993529 +0900
++++ libpng-1.6.28/pnginfo.h	2017-01-06 07:52:51.542368413 +0900
 @@ -255,5 +255,18 @@
     png_bytepp row_pointers;        /* the image bits */
  #endif
@@ -402,10 +331,10 @@ diff -Nur libpng-1.6.22.orig/pnginfo.h libpng-1.6.22/pnginfo.h
 +
  };
  #endif /* PNGINFO_H */
-diff -Nur libpng-1.6.22.orig/pngpread.c libpng-1.6.22/pngpread.c
---- libpng-1.6.22.orig/pngpread.c	2016-05-26 05:41:45.000000000 +0200
-+++ libpng-1.6.22/pngpread.c	2016-10-01 00:22:37.033394016 +0200
-@@ -194,6 +194,89 @@
+diff -Naru libpng-1.6.28.org/pngpread.c libpng-1.6.28/pngpread.c
+--- libpng-1.6.28.org/pngpread.c	2017-01-06 07:13:10.614993523 +0900
++++ libpng-1.6.28/pngpread.c	2017-01-06 07:52:51.542368413 +0900
+@@ -194,6 +194,106 @@
  
     chunk_name = png_ptr->chunk_name;
  
@@ -416,29 +345,42 @@ diff -Nur libpng-1.6.22.orig/pngpread.c libpng-1.6.22/pngpread.c
 +      if (chunk_name == png_IDAT)
 +      {
 +         /* Discard trailing IDATs for the first frame */
-+         if ((png_ptr->mode & PNG_HAVE_fcTL) != 0 ||
-+             png_ptr->num_frames_read > 1)
++         if (png_ptr->mode & PNG_HAVE_fcTL || png_ptr->num_frames_read > 1)
 +            png_error(png_ptr, "out of place IDAT");
 +
-+         PNG_PUSH_SAVE_BUFFER_IF_FULL
-+         png_crc_finish(png_ptr, png_ptr->push_length);
++         if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++         {
++            png_push_save_buffer(png_ptr);
++            return;
++         }
++
 +         png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
++         return;
 +      }
-+
 +      else if (chunk_name == png_fdAT)
 +      {
-+         PNG_PUSH_SAVE_BUFFER_IF_LT(4)
++         if (png_ptr->buffer_size < 4)
++         {
++            png_push_save_buffer(png_ptr);
++            return;
++         }
++
 +         png_ensure_sequence_number(png_ptr, 4);
 +
-+         if ((png_ptr->mode & PNG_HAVE_fcTL) == 0)
++         if (!(png_ptr->mode & PNG_HAVE_fcTL))
 +         {
 +            /* Discard trailing fdATs for frames other than the first */
 +            if (png_ptr->num_frames_read < 2)
 +               png_error(png_ptr, "out of place fdAT");
 +
-+            PNG_PUSH_SAVE_BUFFER_IF_FULL
-+            png_crc_finish(png_ptr, png_ptr->push_length);
++            if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++            {
++               png_push_save_buffer(png_ptr);
++               return;
++            }
++
 +            png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
++            return;
 +         }
 +
 +         else
@@ -447,18 +389,25 @@ diff -Nur libpng-1.6.22.orig/pngpread.c libpng-1.6.22/pngpread.c
 +            png_ptr->idat_size = png_ptr->push_length - 4;
 +            png_ptr->mode |= PNG_HAVE_IDAT;
 +            png_ptr->process_mode = PNG_READ_IDAT_MODE;
++
++            return;
 +         }
 +      }
 +
 +      else if (chunk_name == png_fcTL)
 +      {
-+         PNG_PUSH_SAVE_BUFFER_IF_FULL
++         if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++         {
++            png_push_save_buffer(png_ptr);
++            return;
++         }
++
 +         png_read_reset(png_ptr);
 +         png_ptr->mode &= ~PNG_HAVE_fcTL;
 +
 +         png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length);
 +
-+         if ((png_ptr->mode & PNG_HAVE_fcTL) == 0)
++         if (!(png_ptr->mode & PNG_HAVE_fcTL))
 +            png_error(png_ptr, "missing required fcTL chunk");
 +
 +         png_read_reinit(png_ptr, info_ptr);
@@ -468,34 +417,31 @@ diff -Nur libpng-1.6.22.orig/pngpread.c libpng-1.6.22/pngpread.c
 +            (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read);
 +
 +         png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-+      }
 +
-+      else if (chunk_name == png_IEND)
-+      {
-+         PNG_PUSH_SAVE_BUFFER_IF_FULL
-+         png_warning(png_ptr, "Number of actual frames fewer than expected");
-+         png_crc_finish(png_ptr, png_ptr->push_length);
-+         png_ptr->process_mode = PNG_READ_DONE_MODE;
-+         png_push_have_end(png_ptr, info_ptr);
++         return;
 +      }
 +
 +      else
 +      {
-+         PNG_PUSH_SAVE_BUFFER_IF_FULL
++         if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++         {
++            png_push_save_buffer(png_ptr);
++            return;
++         }
 +         png_warning(png_ptr, "Skipped (ignored) a chunk "
 +                              "between APNG chunks");
-+         png_crc_finish(png_ptr, png_ptr->push_length);
 +         png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
++         return;
 +      }
 +
 +      return;
 +   }
-+#endif /* READ_APNG */
++#endif /* PNG_READ_APNG_SUPPORTED */
 +
     if (chunk_name == png_IDAT)
     {
        if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
-@@ -258,6 +341,9 @@
+@@ -260,6 +360,9 @@
  
     else if (chunk_name == png_IDAT)
     {
@@ -505,28 +451,38 @@ diff -Nur libpng-1.6.22.orig/pngpread.c libpng-1.6.22/pngpread.c
        png_ptr->idat_size = png_ptr->push_length;
        png_ptr->process_mode = PNG_READ_IDAT_MODE;
        png_push_have_info(png_ptr, info_ptr);
-@@ -404,6 +490,20 @@
+@@ -405,6 +508,30 @@
+       png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
     }
  #endif
- 
 +#ifdef PNG_READ_APNG_SUPPORTED
 +   else if (chunk_name == png_acTL)
 +   {
-+      PNG_PUSH_SAVE_BUFFER_IF_FULL
++      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++      {
++         png_push_save_buffer(png_ptr);
++         return;
++      }
++
 +      png_handle_acTL(png_ptr, info_ptr, png_ptr->push_length);
 +   }
 +
 +   else if (chunk_name == png_fcTL)
 +   {
-+      PNG_PUSH_SAVE_BUFFER_IF_FULL
++      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++      {
++         png_push_save_buffer(png_ptr);
++         return;
++      }
++
 +      png_handle_fcTL(png_ptr, info_ptr, png_ptr->push_length);
 +   }
 +
-+#endif /* READ_APNG */
++#endif /* PNG_READ_APNG_SUPPORTED */
+ 
     else
     {
-       PNG_PUSH_SAVE_BUFFER_IF_FULL
-@@ -533,7 +633,11 @@
+@@ -538,7 +665,11 @@
        png_byte chunk_tag[4];
  
        /* TODO: this code can be commoned up with the same code in push_read */
@@ -538,14 +494,14 @@ diff -Nur libpng-1.6.22.orig/pngpread.c libpng-1.6.22/pngpread.c
        png_push_fill_buffer(png_ptr, chunk_length, 4);
        png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length);
        png_reset_crc(png_ptr);
-@@ -541,17 +645,60 @@
+@@ -546,17 +677,64 @@
        png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
        png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
  
 +#ifdef PNG_READ_APNG_SUPPORTED
 +      if (png_ptr->chunk_name != png_fdAT && png_ptr->num_frames_read > 0)
 +      {
-+          if ((png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED) != 0)
++          if (png_ptr->flags & PNG_FLAG_ZSTREAM_ENDED)
 +          {
 +              png_ptr->process_mode = PNG_READ_CHUNK_MODE;
 +              if (png_ptr->frame_end_fn != NULL)
@@ -557,7 +513,11 @@ diff -Nur libpng-1.6.22.orig/pngpread.c libpng-1.6.22/pngpread.c
 +          {
 +              if (png_ptr->chunk_name == png_IEND)
 +                  png_error(png_ptr, "Not enough image data");
-+              PNG_PUSH_SAVE_BUFFER_IF_FULL
++              if (png_ptr->push_length + 4 > png_ptr->buffer_size)
++              {
++                 png_push_save_buffer(png_ptr);
++                 return;
++              }
 +              png_warning(png_ptr, "Skipping (ignoring) a chunk between "
 +                                   "APNG chunks");
 +              png_crc_finish(png_ptr, png_ptr->push_length);
@@ -599,24 +559,23 @@ diff -Nur libpng-1.6.22.orig/pngpread.c libpng-1.6.22/pngpread.c
     }
  
     if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
-@@ -625,6 +772,16 @@
+@@ -630,6 +808,15 @@
     if (!(buffer_length > 0) || buffer == NULL)
        png_error(png_ptr, "No IDAT data (internal error)");
  
 +#ifdef PNG_READ_APNG_SUPPORTED
 +   /* If the app is not APNG-aware, decode only the first frame */
-+   if ((png_ptr->apng_flags & PNG_APNG_APP) == 0 &&
-+      png_ptr->num_frames_read > 0)
++   if (!(png_ptr->apng_flags & PNG_APNG_APP) && png_ptr->num_frames_read > 0)
 +   {
-+      png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
-+      return;
++     png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
++     return;
 +   }
 +#endif
 +
     /* This routine must process all the data it has been given
      * before returning, calling the row callback as required to
      * handle the uncompressed results.
-@@ -1074,6 +1231,18 @@
+@@ -1084,6 +1271,18 @@
     png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
  }
  
@@ -635,21 +594,21 @@ diff -Nur libpng-1.6.22.orig/pngpread.c libpng-1.6.22/pngpread.c
  png_voidp PNGAPI
  png_get_progressive_ptr(png_const_structrp png_ptr)
  {
-diff -Nur libpng-1.6.22.orig/pngpriv.h libpng-1.6.22/pngpriv.h
---- libpng-1.6.22.orig/pngpriv.h	2016-05-26 05:41:45.000000000 +0200
-+++ libpng-1.6.22/pngpriv.h	2016-10-01 00:22:37.033394016 +0200
-@@ -537,6 +537,10 @@
- #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
-                    /*             0x4000 (unused) */
- #define PNG_IS_READ_STRUCT        0x8000 /* Else is a write struct */
+diff -Naru libpng-1.6.28.org/pngpriv.h libpng-1.6.28/pngpriv.h
+--- libpng-1.6.28.org/pngpriv.h	2017-01-06 07:13:10.614993523 +0900
++++ libpng-1.6.28/pngpriv.h	2017-01-06 07:52:51.542368413 +0900
+@@ -567,6 +567,10 @@
+ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
+                    /*             0x4000U (unused) */
+ #define PNG_IS_READ_STRUCT        0x8000U /* Else is a write struct */
 +#ifdef PNG_APNG_SUPPORTED
-+#define PNG_HAVE_acTL            0x10000
-+#define PNG_HAVE_fcTL            0x20000
++#define PNG_HAVE_acTL            0x10000U
++#define PNG_HAVE_fcTL            0x20000U
 +#endif
  
  /* Flags for the transformations the PNG library does on the image data */
- #define PNG_BGR                 0x0001
-@@ -754,6 +758,16 @@
+ #define PNG_BGR                 0x0001U
+@@ -802,6 +806,16 @@
  #define png_tRNS PNG_U32(116,  82,  78,  83)
  #define png_zTXt PNG_U32(122,  84,  88, 116)
  
@@ -659,43 +618,41 @@ diff -Nur libpng-1.6.22.orig/pngpriv.h libpng-1.6.22/pngpriv.h
 +#define png_fdAT PNG_U32(102, 100,  65,  84)
 +
 +/* For png_struct.apng_flags: */
-+#define PNG_FIRST_FRAME_HIDDEN       0x0001
-+#define PNG_APNG_APP                 0x0002
++#define PNG_FIRST_FRAME_HIDDEN       0x0001U
++#define PNG_APNG_APP                 0x0002U
 +#endif
 +
  /* 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.
   */
-@@ -1441,6 +1455,49 @@
- 
- #endif /* PROGRESSIVE_READ */
+@@ -1528,6 +1542,47 @@
+     */
+ #endif
  
 +#ifdef PNG_APNG_SUPPORTED
 +PNG_INTERNAL_FUNCTION(void,png_ensure_fcTL_is_valid,(png_structp png_ptr,
 +   png_uint_32 width, png_uint_32 height,
 +   png_uint_32 x_offset, png_uint_32 y_offset,
 +   png_uint_16 delay_num, png_uint_16 delay_den,
-+   png_byte dispose_op, png_byte blend_op),PNG_EMPTY);
++   png_byte dispose_op, png_byte blend_op), PNG_EMPTY);
 +
 +#ifdef PNG_READ_APNG_SUPPORTED
-+PNG_INTERNAL_FUNCTION(void,png_handle_acTL,(png_structp png_ptr,
-+   png_infop info_ptr, png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_handle_fcTL,(png_structp png_ptr,
-+   png_infop info_ptr, png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_handle_fdAT,(png_structp png_ptr,
-+   png_infop info_ptr, png_uint_32 length),PNG_EMPTY);
-+PNG_INTERNAL_FUNCTION(void,png_have_info,(png_structp png_ptr,
-+   png_infop info_ptr),PNG_EMPTY);
++PNG_INTERNAL_FUNCTION(void,png_handle_acTL,(png_structp png_ptr, png_infop info_ptr,
++   png_uint_32 length),PNG_EMPTY);
++PNG_INTERNAL_FUNCTION(void,png_handle_fcTL,(png_structp png_ptr, png_infop info_ptr,
++   png_uint_32 length),PNG_EMPTY);
++PNG_INTERNAL_FUNCTION(void,png_handle_fdAT,(png_structp png_ptr, png_infop info_ptr,
++   png_uint_32 length),PNG_EMPTY);
++PNG_INTERNAL_FUNCTION(void,png_have_info,(png_structp png_ptr, png_infop info_ptr),PNG_EMPTY);
 +PNG_INTERNAL_FUNCTION(void,png_ensure_sequence_number,(png_structp png_ptr,
 +   png_uint_32 length),PNG_EMPTY);
 +PNG_INTERNAL_FUNCTION(void,png_read_reset,(png_structp png_ptr),PNG_EMPTY);
 +PNG_INTERNAL_FUNCTION(void,png_read_reinit,(png_structp png_ptr,
 +   png_infop info_ptr),PNG_EMPTY);
 +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-+PNG_INTERNAL_FUNCTION(void,png_progressive_read_reset,(png_structp png_ptr),
-+   PNG_EMPTY);
-+#endif /* PROGRESSIVE_READ */
-+#endif /* READ_APNG */
++PNG_INTERNAL_FUNCTION(void,png_progressive_read_reset,(png_structp png_ptr),PNG_EMPTY);
++#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
++#endif /* PNG_READ_APNG_SUPPORTED */
 +
 +#ifdef PNG_WRITE_APNG_SUPPORTED
 +PNG_INTERNAL_FUNCTION(void,png_write_acTL,(png_structp png_ptr,
@@ -710,16 +667,16 @@ diff -Nur libpng-1.6.22.orig/pngpriv.h libpng-1.6.22/pngpriv.h
 +PNG_INTERNAL_FUNCTION(void,png_write_reset,(png_structp png_ptr),PNG_EMPTY);
 +PNG_INTERNAL_FUNCTION(void,png_write_reinit,(png_structp png_ptr,
 +   png_infop info_ptr, png_uint_32 width, png_uint_32 height),PNG_EMPTY);
-+#endif /* WRITE_APNG */
-+#endif /* APNG */
-+
- /* Added at libpng version 1.6.0 */
- #ifdef PNG_GAMMA_SUPPORTED
- PNG_INTERNAL_FUNCTION(void,png_colorspace_set_gamma,(png_const_structrp png_ptr,
-diff -Nur libpng-1.6.22.orig/pngread.c libpng-1.6.22/pngread.c
---- libpng-1.6.22.orig/pngread.c	2016-05-26 05:41:46.000000000 +0200
-+++ libpng-1.6.22/pngread.c	2016-10-01 00:22:37.029393861 +0200
-@@ -158,6 +158,9 @@
++#endif /* PNG_WRITE_APNG_SUPPORTED */
++#endif /* PNG_APNG_SUPPORTED */
++
+ /* Added at libpng version 1.4.0 */
+ #ifdef PNG_COLORSPACE_SUPPORTED
+ /* These internal functions are for maintaining the colorspace structure within
+diff -Naru libpng-1.6.28.org/pngread.c libpng-1.6.28/pngread.c
+--- libpng-1.6.28.org/pngread.c	2017-01-06 07:13:10.615993516 +0900
++++ libpng-1.6.28/pngread.c	2017-01-06 07:52:51.543368407 +0900
+@@ -161,6 +161,9 @@
  
        else if (chunk_name == png_IDAT)
        {
@@ -729,7 +686,7 @@ diff -Nur libpng-1.6.22.orig/pngread.c libpng-1.6.22/pngread.c
           png_ptr->idat_size = length;
           break;
        }
-@@ -247,6 +250,17 @@
+@@ -250,6 +253,17 @@
           png_handle_iTXt(png_ptr, info_ptr, length);
  #endif
  
@@ -746,8 +703,8 @@ diff -Nur libpng-1.6.22.orig/pngread.c libpng-1.6.22/pngread.c
 +
        else
           png_handle_unknown(png_ptr, info_ptr, length,
-             PNG_HANDLE_CHUNK_AS_DEFAULT);
-@@ -254,6 +268,72 @@
+              PNG_HANDLE_CHUNK_AS_DEFAULT);
+@@ -257,6 +271,72 @@
  }
  #endif /* SEQUENTIAL_READ */
  
@@ -759,7 +716,7 @@ diff -Nur libpng-1.6.22.orig/pngread.c libpng-1.6.22/pngread.c
 +
 +    png_debug(0, "Reading frame head");
 +
-+    if ((png_ptr->mode & PNG_HAVE_acTL) == 0)
++    if (!(png_ptr->mode & PNG_HAVE_acTL))
 +        png_error(png_ptr, "attempt to png_read_frame_head() but "
 +                           "no acTL present");
 +
@@ -779,7 +736,7 @@ diff -Nur libpng-1.6.22.orig/pngread.c libpng-1.6.22/pngread.c
 +        if (png_ptr->chunk_name == png_IDAT)
 +        {
 +            /* discard trailing IDATs for the first frame */
-+            if (have_chunk_after_DAT != 0 || png_ptr->num_frames_read > 1)
++            if (have_chunk_after_DAT || png_ptr->num_frames_read > 1)
 +                png_error(png_ptr, "png_read_frame_head(): out of place IDAT");
 +            png_crc_finish(png_ptr, length);
 +        }
@@ -795,7 +752,7 @@ diff -Nur libpng-1.6.22.orig/pngread.c libpng-1.6.22/pngread.c
 +            png_ensure_sequence_number(png_ptr, length);
 +
 +            /* discard trailing fdATs for frames other than the first */
-+            if (have_chunk_after_DAT == 0 && png_ptr->num_frames_read > 1)
++            if (!have_chunk_after_DAT && png_ptr->num_frames_read > 1)
 +                png_crc_finish(png_ptr, length - 4);
 +            else if(png_ptr->mode & PNG_HAVE_fcTL)
 +            {
@@ -815,15 +772,15 @@ diff -Nur libpng-1.6.22.orig/pngread.c libpng-1.6.22/pngread.c
 +        }
 +    }
 +}
-+#endif /* READ_APNG */
++#endif /* PNG_READ_APNG_SUPPORTED */
 +
  /* Optional call to update the users info_ptr structure */
  void PNGAPI
  png_read_update_info(png_structrp png_ptr, png_inforp info_ptr)
-diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
---- libpng-1.6.22.orig/pngrutil.c	2016-05-26 05:41:46.000000000 +0200
-+++ libpng-1.6.22/pngrutil.c	2016-10-01 00:22:37.033394016 +0200
-@@ -855,6 +855,11 @@
+diff -Naru libpng-1.6.28.org/pngrutil.c libpng-1.6.28/pngrutil.c
+--- libpng-1.6.28.org/pngrutil.c	2017-01-06 07:54:14.001821909 +0900
++++ libpng-1.6.28/pngrutil.c	2017-01-06 07:52:51.543368407 +0900
+@@ -861,6 +861,11 @@
     filter_type = buf[11];
     interlace_type = buf[12];
  
@@ -835,7 +792,7 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
     /* Set internal variables */
     png_ptr->width = width;
     png_ptr->height = height;
-@@ -2755,6 +2760,180 @@
+@@ -2761,6 +2766,179 @@
  }
  #endif
  
@@ -850,17 +807,17 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +
 +    png_debug(1, "in png_handle_acTL");
 +
-+    if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
++    if (!(png_ptr->mode & PNG_HAVE_IHDR))
 +    {
 +        png_error(png_ptr, "Missing IHDR before acTL");
 +    }
-+    else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
++    else if (png_ptr->mode & PNG_HAVE_IDAT)
 +    {
 +        png_warning(png_ptr, "Invalid acTL after IDAT skipped");
 +        png_crc_finish(png_ptr, length);
 +        return;
 +    }
-+    else if ((png_ptr->mode & PNG_HAVE_acTL) != 0)
++    else if (png_ptr->mode & PNG_HAVE_acTL)
 +    {
 +        png_warning(png_ptr, "Duplicate acTL skipped");
 +        png_crc_finish(png_ptr, length);
@@ -881,7 +838,7 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +
 +    /* the set function will do error checking on num_frames */
 +    didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays);
-+    if (didSet != 0)
++    if(didSet)
 +        png_ptr->mode |= PNG_HAVE_acTL;
 +}
 +
@@ -902,11 +859,11 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +
 +    png_ensure_sequence_number(png_ptr, length);
 +
-+    if ((png_ptr->mode & PNG_HAVE_IHDR) == 0)
++    if (!(png_ptr->mode & PNG_HAVE_IHDR))
 +    {
 +        png_error(png_ptr, "Missing IHDR before fcTL");
 +    }
-+    else if ((png_ptr->mode & PNG_HAVE_IDAT) != 0)
++    else if (png_ptr->mode & PNG_HAVE_IDAT)
 +    {
 +        /* for any frames other then the first this message may be misleading,
 +        * but correct. PNG_HAVE_IDAT is unset before the frame head is read
@@ -915,7 +872,7 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +        png_crc_finish(png_ptr, length-4);
 +        return;
 +    }
-+    else if ((png_ptr->mode & PNG_HAVE_fcTL) != 0)
++    else if (png_ptr->mode & PNG_HAVE_fcTL)
 +    {
 +        png_warning(png_ptr, "Duplicate fcTL within one frame skipped");
 +        png_crc_finish(png_ptr, length-4);
@@ -970,8 +927,7 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +void /* PRIVATE */
 +png_have_info(png_structp png_ptr, png_infop info_ptr)
 +{
-+    if ((info_ptr->valid & PNG_INFO_acTL) != 0 &&
-+        (info_ptr->valid & PNG_INFO_fcTL) == 0)
++    if((info_ptr->valid & PNG_INFO_acTL) && !(info_ptr->valid & PNG_INFO_fcTL))
 +    {
 +        png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN;
 +        info_ptr->num_frames++;
@@ -1011,15 +967,15 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +
 +    png_ptr->next_seq_num++;
 +}
-+#endif /* READ_APNG */
++#endif /* PNG_READ_APNG_SUPPORTED */
 +
  #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
  /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
  static int
-@@ -4014,6 +4193,38 @@
+@@ -4022,7 +4200,38 @@
+       {
           uInt avail_in;
           png_bytep buffer;
- 
 +#ifdef PNG_READ_APNG_SUPPORTED
 +         png_uint_32 bytes_to_skip = 0;
 +
@@ -1045,7 +1001,7 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +                  bytes_to_skip = png_ptr->idat_size;
 +                  continue;
 +               }
-+
+ 
 +               png_ensure_sequence_number(png_ptr, png_ptr->idat_size);
 +
 +               png_ptr->idat_size -= 4;
@@ -1055,15 +1011,16 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
           while (png_ptr->idat_size == 0)
           {
              png_crc_finish(png_ptr, 0);
-@@ -4025,6 +4236,7 @@
+@@ -4034,7 +4243,7 @@
              if (png_ptr->chunk_name != png_IDAT)
                 png_error(png_ptr, "Not enough image data");
           }
-+#endif /* READ_APNG */
- 
+-
++#endif /* PNG_READ_APNG_SUPPORTED */
           avail_in = png_ptr->IDAT_read_size;
  
-@@ -4088,6 +4300,9 @@
+          if (avail_in > png_ptr->idat_size)
+@@ -4097,6 +4306,9 @@
  
           png_ptr->mode |= PNG_AFTER_IDAT;
           png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
@@ -1073,7 +1030,7 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
  
           if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
              png_chunk_benign_error(png_ptr, "Extra compressed data");
-@@ -4526,4 +4741,80 @@
+@@ -4535,4 +4747,80 @@
  
     png_ptr->flags |= PNG_FLAG_ROW_INIT;
  }
@@ -1099,7 +1056,7 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +    png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width);
 +    png_ptr->info_rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth,
 +        png_ptr->width);
-+    if (png_ptr->prev_row != NULL)
++    if (png_ptr->prev_row)
 +        memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
 +}
 +
@@ -1109,23 +1066,23 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +png_progressive_read_reset(png_structp png_ptr)
 +{
 +#ifdef PNG_READ_INTERLACING_SUPPORTED
-+    /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
++   /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
 +
-+    /* Start of interlace block */
-+    static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
++   /* Start of interlace block */
++    const int png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
 +
 +    /* Offset to next interlace block */
-+    static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
++    const int png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
 +
 +    /* Start of interlace block in the y direction */
-+    static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
++    const int png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
 +
 +    /* Offset to next interlace block in the y direction */
-+    static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
++    const int png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
 +
-+    if (png_ptr->interlaced != 0)
++    if (png_ptr->interlaced)
 +    {
-+        if ((png_ptr->transformations & PNG_INTERLACE) == 0)
++        if (!(png_ptr->transformations & PNG_INTERLACE))
 +            png_ptr->num_rows = (png_ptr->height + png_pass_yinc[0] - 1 -
 +                                png_pass_ystart[0]) / png_pass_yinc[0];
 +        else
@@ -1137,7 +1094,7 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +                           png_pass_inc[png_ptr->pass];
 +    }
 +    else
-+#endif /* READ_INTERLACING */
++#endif /* PNG_READ_INTERLACING_SUPPORTED */
 +    {
 +        png_ptr->num_rows = png_ptr->height;
 +        png_ptr->iwidth = png_ptr->width;
@@ -1151,12 +1108,12 @@ diff -Nur libpng-1.6.22.orig/pngrutil.c libpng-1.6.22/pngrutil.c
 +    png_ptr->zstream.avail_out = (uInt)PNG_ROWBYTES(png_ptr->pixel_depth,
 +        png_ptr->iwidth) + 1;
 +}
-+#endif /* PROGRESSIVE_READ */
-+#endif /* READ_APNG */
++#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
++#endif /* PNG_READ_APNG_SUPPORTED */
  #endif /* READ */
-diff -Nur libpng-1.6.22.orig/pngset.c libpng-1.6.22/pngset.c
---- libpng-1.6.22.orig/pngset.c	2016-05-26 05:41:46.000000000 +0200
-+++ libpng-1.6.22/pngset.c	2016-10-01 00:22:37.033394016 +0200
+diff -Naru libpng-1.6.28.org/pngset.c libpng-1.6.28/pngset.c
+--- libpng-1.6.28.org/pngset.c	2017-01-06 07:13:10.617993502 +0900
++++ libpng-1.6.28/pngset.c	2017-01-06 07:52:51.548368374 +0900
 @@ -241,6 +241,11 @@
     info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
  
@@ -1169,7 +1126,7 @@ diff -Nur libpng-1.6.22.orig/pngset.c libpng-1.6.22/pngset.c
  }
  
  #ifdef PNG_oFFs_SUPPORTED
-@@ -1094,6 +1099,146 @@
+@@ -1110,6 +1115,147 @@
  }
  #endif /* sPLT */
  
@@ -1202,7 +1159,8 @@ diff -Nur libpng-1.6.22.orig/pngset.c libpng-1.6.22/pngset.c
 +    if (num_plays > PNG_UINT_31_MAX)
 +    {
 +        png_warning(png_ptr,
-+                    "Ignoring attempt to set acTL with num_plays > 2^31-1");
++                    "Ignoring attempt to set acTL with num_plays "
++                    "> 2^31-1");
 +        return (0);
 +    }
 +
@@ -1237,8 +1195,8 @@ diff -Nur libpng-1.6.22.orig/pngset.c libpng-1.6.22/pngset.c
 +
 +    if (blend_op == PNG_BLEND_OP_OVER)
 +    {
-+        if ((png_ptr->color_type & PNG_COLOR_MASK_ALPHA) == 0 &&
-+            png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) == 0)
++        if (!(png_ptr->color_type & PNG_COLOR_MASK_ALPHA) &&
++            !(png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)))
 +        {
 +          png_warning(png_ptr, "PNG_BLEND_OP_OVER is meaningless "
 +                               "and wasteful for opaque images, ignored");
@@ -1267,9 +1225,9 @@ diff -Nur libpng-1.6.22.orig/pngset.c libpng-1.6.22/pngset.c
 +    png_uint_16 delay_num, png_uint_16 delay_den,
 +    png_byte dispose_op, png_byte blend_op)
 +{
-+    if (width > PNG_UINT_31_MAX)
++    if (width == 0 || width > PNG_UINT_31_MAX)
 +        png_error(png_ptr, "invalid width in fcTL (> 2^31-1)");
-+    if (height > PNG_UINT_31_MAX)
++    if (height == 0 || height > PNG_UINT_31_MAX)
 +        png_error(png_ptr, "invalid height in fcTL (> 2^31-1)");
 +    if (x_offset > PNG_UINT_31_MAX)
 +        png_error(png_ptr, "invalid x_offset in fcTL (> 2^31-1)");
@@ -1277,7 +1235,7 @@ diff -Nur libpng-1.6.22.orig/pngset.c libpng-1.6.22/pngset.c
 +        png_error(png_ptr, "invalid y_offset in fcTL (> 2^31-1)");
 +    if (width + x_offset > png_ptr->first_frame_width ||
 +        height + y_offset > png_ptr->first_frame_height)
-+        png_error(png_ptr, "dimensions of a frame are greater than "
++        png_error(png_ptr, "dimensions of a frame are greater than"
 +                           "the ones in IHDR");
 +
 +    if (dispose_op != PNG_DISPOSE_OP_NONE &&
@@ -1302,7 +1260,7 @@ diff -Nur libpng-1.6.22.orig/pngset.c libpng-1.6.22/pngset.c
 +    if (png_ptr == NULL)
 +        return 0;
 +
-+    if (is_hidden != 0)
++    if (is_hidden)
 +        png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN;
 +    else
 +        png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN;
@@ -1311,14 +1269,14 @@ diff -Nur libpng-1.6.22.orig/pngset.c libpng-1.6.22/pngset.c
 +
 +    return 1;
 +}
-+#endif /* APNG */
++#endif /* PNG_APNG_SUPPORTED */
 +
  #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
  static png_byte
  check_location(png_const_structrp png_ptr, int location)
-diff -Nur libpng-1.6.22.orig/pngstruct.h libpng-1.6.22/pngstruct.h
---- libpng-1.6.22.orig/pngstruct.h	2016-05-26 05:41:45.000000000 +0200
-+++ libpng-1.6.22/pngstruct.h	2016-10-01 00:22:37.033394016 +0200
+diff -Naru libpng-1.6.28.org/pngstruct.h libpng-1.6.28/pngstruct.h
+--- libpng-1.6.28.org/pngstruct.h	2017-01-06 07:54:14.002821902 +0900
++++ libpng-1.6.28/pngstruct.h	2017-01-06 07:52:51.544368400 +0900
 @@ -403,6 +403,27 @@
     png_byte filter_type;
  #endif
@@ -1342,42 +1300,189 @@ diff -Nur libpng-1.6.22.orig/pngstruct.h libpng-1.6.22/pngstruct.h
 +   png_uint_32 num_frames_to_write;
 +   png_uint_32 num_frames_written;
 +#endif
-+#endif /* APNG */
++#endif /* PNG_APNG_SUPPORTED */
 +
  /* 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 */
-diff -Nur libpng-1.6.22.orig/pngwrite.c libpng-1.6.22/pngwrite.c
---- libpng-1.6.22.orig/pngwrite.c	2016-05-26 05:41:46.000000000 +0200
-+++ libpng-1.6.22/pngwrite.c	2016-10-01 00:22:37.033394016 +0200
+diff -Naru libpng-1.6.28.org/pngtest.c libpng-1.6.28/pngtest.c
+--- libpng-1.6.28.org/pngtest.c	2017-01-06 07:54:14.002821902 +0900
++++ libpng-1.6.28/pngtest.c	2017-01-06 07:52:51.545368393 +0900
+@@ -874,6 +874,10 @@
+    volatile int num_passes;
+    int pass;
+    int bit_depth, color_type;
++#ifdef PNG_APNG_SUPPORTED
++   png_uint_32 num_frames;
++   png_uint_32 num_plays;
++#endif
+ 
+    row_buf = NULL;
+    error_parameters.file_name = inname;
+@@ -1358,6 +1362,22 @@
+       }
+    }
+ #endif
++
++#ifdef PNG_APNG_SUPPORTED
++   if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL))
++   {
++      if (png_get_acTL(read_ptr, read_info_ptr, &num_frames, &num_plays))
++      {
++         png_byte is_hidden;
++         pngtest_debug2("Handling acTL chunks (frames %ld, plays %ld)",
++                    num_frames, num_plays);
++         png_set_acTL(write_ptr, write_info_ptr, num_frames, num_plays);
++         is_hidden = png_get_first_frame_is_hidden(read_ptr, read_info_ptr);
++         png_set_first_frame_is_hidden(write_ptr, write_info_ptr, is_hidden);
++      }
++   }
++#endif
++
+ #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
+    {
+       png_unknown_chunkp unknowns;
+@@ -1434,6 +1454,110 @@
+    t_misc += (t_stop - t_start);
+    t_start = t_stop;
+ #endif
++#ifdef PNG_APNG_SUPPORTED
++   if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_acTL))
++   {
++      png_uint_32 frame;
++      for (frame = 0; frame < num_frames; frame++)
++      {
++         png_uint_32 frame_width;
++         png_uint_32 frame_height;
++         png_uint_32 x_offset;
++         png_uint_32 y_offset;
++         png_uint_16 delay_num;
++         png_uint_16 delay_den;
++         png_byte dispose_op;
++         png_byte blend_op;
++         png_read_frame_head(read_ptr, read_info_ptr);
++         if (png_get_valid(read_ptr, read_info_ptr, PNG_INFO_fcTL))
++         {
++            png_get_next_frame_fcTL(read_ptr, read_info_ptr,
++                                    &frame_width, &frame_height,
++                                    &x_offset, &y_offset,
++                                    &delay_num, &delay_den,
++                                    &dispose_op, &blend_op);
++         }
++         else
++         {
++            frame_width = width;
++            frame_height = height;
++            x_offset = 0;
++            y_offset = 0;
++            delay_num = 1;
++            delay_den = 1;
++            dispose_op = PNG_DISPOSE_OP_NONE;
++            blend_op = PNG_BLEND_OP_SOURCE;
++         }
++#ifdef PNG_WRITE_APNG_SUPPORTED
++         png_write_frame_head(write_ptr, write_info_ptr, (png_bytepp)&row_buf,
++                              frame_width, frame_height,
++                              x_offset, y_offset,
++                              delay_num, delay_den,
++                              dispose_op, blend_op);
++#endif
++         for (pass = 0; pass < num_passes; pass++)
++         {
++#           ifdef calc_pass_height
++               png_uint_32 pass_height;
++
++               if (num_passes == 7) /* interlaced */
++               {
++                  if (PNG_PASS_COLS(frame_width, pass) > 0)
++                     pass_height = PNG_PASS_ROWS(frame_height, pass);
++
++                  else
++                     pass_height = 0;
++               }
++
++               else /* not interlaced */
++                  pass_height = frame_height;
++#           else
++#              define pass_height frame_height
++#           endif
++
++            pngtest_debug1("Writing row data for pass %d", pass);
++            for (y = 0; y < pass_height; y++)
++            {
++#ifndef SINGLE_ROWBUF_ALLOC
++               pngtest_debug2("Allocating row buffer (pass %d, y = %u)...", pass, y);
++
++               row_buf = (png_bytep)png_malloc(read_ptr,
++                  png_get_rowbytes(read_ptr, read_info_ptr));
++
++               pngtest_debug2("\t0x%08lx (%lu bytes)", (unsigned long)row_buf,
++                  (unsigned long)png_get_rowbytes(read_ptr, read_info_ptr));
++
++#endif /* !SINGLE_ROWBUF_ALLOC */
++               png_read_rows(read_ptr, (png_bytepp)&row_buf, NULL, 1);
++
++#ifdef PNG_WRITE_SUPPORTED
++#ifdef PNGTEST_TIMING
++               t_stop = (float)clock();
++               t_decode += (t_stop - t_start);
++               t_start = t_stop;
++#endif
++               png_write_rows(write_ptr, (png_bytepp)&row_buf, 1);
++#ifdef PNGTEST_TIMING
++               t_stop = (float)clock();
++               t_encode += (t_stop - t_start);
++               t_start = t_stop;
++#endif
++#endif /* PNG_WRITE_SUPPORTED */
++
++#ifndef SINGLE_ROWBUF_ALLOC
++               pngtest_debug2("Freeing row buffer (pass %d, y = %u)", pass, y);
++               png_free(read_ptr, row_buf);
++               row_buf = NULL;
++#endif /* !SINGLE_ROWBUF_ALLOC */
++            }
++         }
++#ifdef PNG_WRITE_APNG_SUPPORTED
++         png_write_frame_tail(write_ptr, write_info_ptr);
++#endif
++      }
++   }
++   else
++#endif
+    for (pass = 0; pass < num_passes; pass++)
+    {
+ #     ifdef calc_pass_height
+diff -Naru libpng-1.6.28.org/pngwrite.c libpng-1.6.28/pngwrite.c
+--- libpng-1.6.28.org/pngwrite.c	2017-01-06 07:13:10.618993495 +0900
++++ libpng-1.6.28/pngwrite.c	2017-01-06 07:52:51.546368387 +0900
 @@ -128,6 +128,10 @@
         * the application continues writing the PNG.  So check the 'invalid'
         * flag here too.
         */
 +#ifdef PNG_WRITE_APNG_SUPPORTED
-+   if ((info_ptr->valid & PNG_INFO_acTL) != 0)
-+      png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays);
++      if (info_ptr->valid & PNG_INFO_acTL)
++         png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays);
 +#endif
  #ifdef PNG_GAMMA_SUPPORTED
  #  ifdef PNG_WRITE_gAMA_SUPPORTED
        if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
-@@ -360,6 +364,11 @@
-    if ((png_ptr->mode & PNG_HAVE_IDAT) == 0)
-       png_error(png_ptr, "No IDATs written into file");
+@@ -365,6 +369,11 @@
+       png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
+ #endif
  
 +#ifdef PNG_WRITE_APNG_SUPPORTED
 +   if (png_ptr->num_frames_written != png_ptr->num_frames_to_write)
 +      png_error(png_ptr, "Not enough frames written");
 +#endif
 +
- #ifdef PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
-    if (png_ptr->num_palette_max > png_ptr->num_palette)
-       png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
-@@ -2380,4 +2389,42 @@
+    /* See if user wants us to write information chunks */
+    if (info_ptr != NULL)
+    {
+@@ -1450,6 +1459,43 @@
  }
- #endif /* SIMPLIFIED_WRITE_STDIO */
- #endif /* SIMPLIFIED_WRITE */
-+
+ #endif
+ 
 +#ifdef PNG_WRITE_APNG_SUPPORTED
 +void PNGAPI
 +png_write_frame_head(png_structp png_ptr, png_infop info_ptr,
@@ -1390,15 +1495,15 @@ diff -Nur libpng-1.6.22.orig/pngwrite.c libpng-1.6.22/pngwrite.c
 +
 +    /* there is a chance this has been set after png_write_info was called,
 +    * so it would be set but not written. is there a way to be sure? */
-+    if ((info_ptr->valid & PNG_INFO_acTL) == 0)
++    if (!(info_ptr->valid & PNG_INFO_acTL))
 +        png_error(png_ptr, "png_write_frame_head(): acTL not set");
 +
 +    png_write_reset(png_ptr);
 +
 +    png_write_reinit(png_ptr, info_ptr, width, height);
 +
-+    if ((png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) == 0 ||
-+        png_ptr->num_frames_written != 0)
++    if ( !(png_ptr->num_frames_written == 0 &&
++           (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) ) )
 +        png_write_fcTL(png_ptr, width, height, x_offset, y_offset,
 +                       delay_num, delay_den, dispose_op, blend_op);
 +
@@ -1414,11 +1519,13 @@ diff -Nur libpng-1.6.22.orig/pngwrite.c libpng-1.6.22/pngwrite.c
 +
 +    PNG_UNUSED(info_ptr)
 +}
-+#endif /* WRITE_APNG */
- #endif /* WRITE */
-diff -Nur libpng-1.6.22.orig/pngwutil.c libpng-1.6.22/pngwutil.c
---- libpng-1.6.22.orig/pngwutil.c	2016-05-26 05:41:46.000000000 +0200
-+++ libpng-1.6.22/pngwutil.c	2016-10-01 00:22:37.033394016 +0200
++#endif /* PNG_WRITE_APNG_SUPPORTED */
+ 
+ #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
+ /* Initialize the write structure - general purpose utility. */
+diff -Naru libpng-1.6.28.org/pngwutil.c libpng-1.6.28/pngwutil.c
+--- libpng-1.6.28.org/pngwutil.c	2017-01-06 07:13:10.619993488 +0900
++++ libpng-1.6.28/pngwutil.c	2017-01-06 07:52:51.546368387 +0900
 @@ -817,6 +817,11 @@
     /* Write the chunk */
     png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
@@ -1431,39 +1538,38 @@ diff -Nur libpng-1.6.22.orig/pngwutil.c libpng-1.6.22/pngwutil.c
     if ((png_ptr->do_filter) == PNG_NO_FILTERS)
     {
        if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
-@@ -998,7 +1003,15 @@
+@@ -998,7 +1003,14 @@
                 optimize_cmf(data, png_image_size(png_ptr));
  #endif
  
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+         if (png_ptr->num_frames_written == 0)
-+#endif
++#        ifdef PNG_WRITE_APNG_SUPPORTED
++            if (png_ptr->num_frames_written == 0)
++#        endif
           png_write_complete_chunk(png_ptr, png_IDAT, data, size);
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+         else
-+            png_write_fdAT(png_ptr, data, size);
-+#endif /* WRITE_APNG */
-+
++#        ifdef PNG_WRITE_APNG_SUPPORTED
++            else
++               png_write_fdAT(png_ptr, data, size);
++#        endif /* PNG_WRITE_APNG_SUPPORTED */
           png_ptr->mode |= PNG_HAVE_IDAT;
  
           png_ptr->zstream.next_out = data;
-@@ -1044,7 +1057,15 @@
+@@ -1044,7 +1056,15 @@
              optimize_cmf(data, png_image_size(png_ptr));
  #endif
  
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+         if (png_ptr->num_frames_written == 0)
-+#endif
++#        ifdef PNG_WRITE_APNG_SUPPORTED
++            if (png_ptr->num_frames_written == 0)
++#        endif
           png_write_complete_chunk(png_ptr, png_IDAT, data, size);
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+         else
-+            png_write_fdAT(png_ptr, data, size);
-+#endif /* WRITE_APNG */
++#        ifdef PNG_WRITE_APNG_SUPPORTED
++            else
++               png_write_fdAT(png_ptr, data, size);
++#        endif /* PNG_WRITE_APNG_SUPPORTED */
 +
           png_ptr->zstream.avail_out = 0;
           png_ptr->zstream.next_out = NULL;
           png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
-@@ -1857,6 +1878,82 @@
+@@ -1858,6 +1878,82 @@
  }
  #endif
  
@@ -1478,7 +1584,7 @@ diff -Nur libpng-1.6.22.orig/pngwutil.c libpng-1.6.22/pngwutil.c
 +
 +    png_ptr->num_frames_to_write = num_frames;
 +
-+    if ((png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN) != 0)
++    if (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN)
 +        num_frames--;
 +
 +    png_save_uint_32(buf, num_frames);
@@ -1541,12 +1647,12 @@ diff -Nur libpng-1.6.22.orig/pngwutil.c libpng-1.6.22/pngwutil.c
 +
 +    png_ptr->next_seq_num++;
 +}
-+#endif /* WRITE_APNG */
++#endif /* PNG_WRITE_APNG_SUPPORTED */
 +
  /* Initializes the row writing capability of libpng */
  void /* PRIVATE */
  png_write_start_row(png_structrp png_ptr)
-@@ -2622,4 +2719,39 @@
+@@ -2752,4 +2848,39 @@
     }
  #endif /* WRITE_FLUSH */
  }
@@ -1571,7 +1677,7 @@ diff -Nur libpng-1.6.22.orig/pngwutil.c libpng-1.6.22/pngwutil.c
 +                           "don't match the ones in IHDR");
 +    if (width > png_ptr->first_frame_width ||
 +        height > png_ptr->first_frame_height)
-+        png_error(png_ptr, "width and/or height for a frame greater than "
++        png_error(png_ptr, "width and/or height for a frame greater than"
 +                           "the ones in IHDR");
 +
 +    png_set_IHDR(png_ptr, info_ptr, width, height,
@@ -1584,11 +1690,11 @@ diff -Nur libpng-1.6.22.orig/pngwutil.c libpng-1.6.22/pngwutil.c
 +    png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
 +    png_ptr->usr_width = png_ptr->width;
 +}
-+#endif /* WRITE_APNG */
++#endif /* PNG_WRITE_APNG_SUPPORTED */
  #endif /* WRITE */
-diff -Nur libpng-1.6.22.orig/scripts/symbols.def libpng-1.6.22/scripts/symbols.def
---- libpng-1.6.22.orig/scripts/symbols.def	2016-05-26 05:41:46.000000000 +0200
-+++ libpng-1.6.22/scripts/symbols.def	2016-10-01 00:22:37.033394016 +0200
+diff -Naru libpng-1.6.28.org/scripts/symbols.def libpng-1.6.28/scripts/symbols.def
+--- libpng-1.6.28.org/scripts/symbols.def	2017-01-06 07:54:14.003821895 +0900
++++ libpng-1.6.28/scripts/symbols.def	2017-01-06 07:52:51.546368387 +0900
 @@ -250,3 +250,23 @@
   png_get_palette_max @243
   png_set_option @244