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</