From 3dc46253579708dc89346cbec304c19e7d7be572 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Thu, 7 Jul 2011 19:07:30 +0200
Subject: [PATCH] libpng: update to 1.4.8.

---
 .../libpng/patches/libpng-1.4.1-apng.patch    | 1619 -----------------
 .../libpng/patches/libpng-1.4.7-apng.patch.gz |  Bin 0 -> 10437 bytes
 srcpkgs/libpng/template                       |   12 +-
 3 files changed, 10 insertions(+), 1621 deletions(-)
 delete mode 100644 srcpkgs/libpng/patches/libpng-1.4.1-apng.patch
 create mode 100644 srcpkgs/libpng/patches/libpng-1.4.7-apng.patch.gz

diff --git a/srcpkgs/libpng/patches/libpng-1.4.1-apng.patch b/srcpkgs/libpng/patches/libpng-1.4.1-apng.patch
deleted file mode 100644
index c287a281653..00000000000
--- a/srcpkgs/libpng/patches/libpng-1.4.1-apng.patch
+++ /dev/null
@@ -1,1619 +0,0 @@
-Index: pngread.c
-===================================================================
---- pngread.c
-+++ pngread.c
-@@ -300,6 +300,11 @@
- #ifdef PNG_READ_zTXt_SUPPORTED
-       PNG_zTXt;
- #endif
-+#ifdef PNG_READ_APNG_SUPPORTED
-+      PNG_acTL;
-+      PNG_fcTL;
-+      PNG_fdAT;
-+#endif
-       png_uint_32 length = png_read_chunk_header(png_ptr);
-       PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
- 
-@@ -343,6 +348,9 @@
-                   !(png_ptr->mode & PNG_HAVE_PLTE))
-             png_error(png_ptr, "Missing PLTE before IDAT");
- 
-+#ifdef PNG_READ_APNG_SUPPORTED
-+         png_have_info(png_ptr, info_ptr);
-+#endif
-          png_ptr->idat_size = length;
-          png_ptr->mode |= PNG_HAVE_IDAT;
-          break;
-@@ -415,12 +423,95 @@
-       else if (!png_memcmp(chunk_name, png_iTXt, 4))
-          png_handle_iTXt(png_ptr, info_ptr, length);
- #endif
-+#ifdef PNG_READ_APNG_SUPPORTED
-+      else if (!png_memcmp(chunk_name, png_acTL, 4))
-+         png_handle_acTL(png_ptr, info_ptr, length);
-+      else if (!png_memcmp(chunk_name, png_fcTL, 4))
-+         png_handle_fcTL(png_ptr, info_ptr, length);
-+      else if (!png_memcmp(chunk_name, png_fdAT, 4))
-+         png_handle_fdAT(png_ptr, info_ptr, length);
-+#endif
-       else
-          png_handle_unknown(png_ptr, info_ptr, length);
-    }
- }
- #endif /* PNG_SEQUENTIAL_READ_SUPPORTED */
- 
-+#ifdef PNG_READ_APNG_SUPPORTED
-+void PNGAPI
-+png_read_frame_head(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_byte have_chunk_after_DAT; /* after IDAT or after fdAT */
-+    
-+    png_debug(0, "Reading frame head");
-+    
-+    if (!(png_ptr->mode & PNG_HAVE_acTL))
-+        png_error(png_ptr, "attempt to png_read_frame_head() but "
-+                           "no acTL present");
-+    
-+    /* do nothing for the main IDAT */
-+    if (png_ptr->num_frames_read == 0)
-+        return;
-+    
-+    png_crc_finish(png_ptr, 0); /* CRC from last IDAT or fdAT chunk */
-+    
-+    png_read_reset(png_ptr);
-+    png_ptr->mode &= ~PNG_HAVE_fcTL;
-+    
-+    have_chunk_after_DAT = 0;
-+    for (;;)
-+    {
-+        PNG_IDAT;
-+        PNG_fdAT;
-+        PNG_fcTL;
-+        png_byte chunk_length[4];
-+        png_uint_32 length;
-+        
-+        png_read_data(png_ptr, chunk_length, 4);
-+        length = png_get_uint_31(png_ptr, chunk_length);
-+        
-+        png_reset_crc(png_ptr);
-+        png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-+        
-+        if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-+        {
-+            /* discard trailing IDATs for the first frame */
-+            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);
-+        }
-+        else if (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4))
-+        {
-+            png_handle_fcTL(png_ptr, info_ptr, length);
-+            have_chunk_after_DAT = 1;
-+        }
-+        else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
-+        {
-+            png_ensure_sequence_number(png_ptr, length);
-+            
-+            /* discard trailing fdATs for frames other than the first */
-+            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)
-+            {
-+                png_ptr->idat_size = length - 4;
-+                png_ptr->mode |= PNG_HAVE_IDAT;
-+                
-+                break;
-+            }
-+            else
-+                png_error(png_ptr, "png_read_frame_head(): out of place fdAT");
-+        }
-+        else
-+        {
-+            png_warning(png_ptr, "Skipped (ignored) a chunk "
-+                                 "between APNG chunks");
-+            png_crc_finish(png_ptr, length);
-+        }
-+    }
-+}
-+#endif /* PNG_READ_APNG_SUPPORTED */
-+
- /* Optional call to update the users info_ptr structure */
- void PNGAPI
- png_read_update_info(png_structp png_ptr, png_infop info_ptr)
-@@ -461,6 +552,10 @@
- png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
- {
-    PNG_IDAT;
-+#ifdef PNG_READ_APNG_SUPPORTED
-+   PNG_fdAT;
-+   PNG_IEND;
-+#endif
-    PNG_CONST int png_pass_dsp_mask[7] = {0xff, 0x0f, 0xff, 0x33, 0xff, 0x55,
-       0xff};
-    PNG_CONST int png_pass_mask[7] = {0x80, 0x08, 0x88, 0x22, 0xaa, 0x55, 0xff};
-@@ -596,13 +691,39 @@
-    {
-       if (!(png_ptr->zstream.avail_in))
-       {
--         while (!png_ptr->idat_size)
-+         png_uint_32 bytes_to_skip = 0;
-+         
-+         while (!png_ptr->idat_size || bytes_to_skip != 0)
-          {
--            png_crc_finish(png_ptr, 0);
-+            png_crc_finish(png_ptr, bytes_to_skip);
-+            bytes_to_skip = 0;
- 
-             png_ptr->idat_size = png_read_chunk_header(png_ptr);
-+#ifdef PNG_READ_APNG_SUPPORTED
-+            if (png_ptr->num_frames_read == 0)
-+            {
-+#endif
-             if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-                png_error(png_ptr, "Not enough image data");
-+#ifdef PNG_READ_APNG_SUPPORTED
-+            }
-+            else
-+            {
-+               if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
-+                  png_error(png_ptr, "Not enough image data");
-+               if (png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
-+               {
-+                  png_warning(png_ptr, "Skipped (ignored) a chunk "
-+                                       "between APNG chunks");
-+                  bytes_to_skip = png_ptr->idat_size;
-+                  continue;
-+               }
-+               
-+               png_ensure_sequence_number(png_ptr, png_ptr->idat_size);
-+               
-+               png_ptr->idat_size -= 4;
-+            }
-+#endif
-          }
-          png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
-          png_ptr->zstream.next_in = png_ptr->zbuf;
-@@ -620,6 +741,9 @@
-             png_benign_error(png_ptr, "Extra compressed data");
-          png_ptr->mode |= PNG_AFTER_IDAT;
-          png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
-+#ifdef PNG_READ_APNG_SUPPORTED
-+         png_ptr->num_frames_read++;
-+#endif
-          break;
-       }
-       if (ret != Z_OK)
-@@ -875,6 +999,11 @@
- #ifdef PNG_READ_zTXt_SUPPORTED
-       PNG_zTXt;
- #endif
-+#ifdef PNG_READ_APNG_SUPPORTED
-+      PNG_acTL;
-+      PNG_fcTL;
-+      PNG_fdAT;
-+#endif
-       png_uint_32 length = png_read_chunk_header(png_ptr);
-       PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
- 
-@@ -974,6 +1103,14 @@
-       else if (!png_memcmp(chunk_name, png_iTXt, 4))
-          png_handle_iTXt(png_ptr, info_ptr, length);
- #endif
-+#ifdef PNG_READ_APNG_SUPPORTED
-+      else if (!png_memcmp(chunk_name, png_acTL, 4))
-+         png_handle_acTL(png_ptr, info_ptr, length);
-+      else if (!png_memcmp(chunk_name, png_fcTL, 4))
-+         png_handle_fcTL(png_ptr, info_ptr, length);
-+      else if (!png_memcmp(chunk_name, png_fdAT, 4))
-+         png_handle_fdAT(png_ptr, info_ptr, length);
-+#endif
-       else
-          png_handle_unknown(png_ptr, info_ptr, length);
-    } while (!(png_ptr->mode & PNG_HAVE_IEND));
-Index: pngget.c
-===================================================================
---- pngget.c
-+++ pngget.c
-@@ -842,6 +842,167 @@
- }
- #endif
- 
-+#ifdef PNG_APNG_SUPPORTED
-+png_uint_32 PNGAPI
-+png_get_acTL(png_structp png_ptr, png_infop info_ptr,
-+             png_uint_32 *num_frames, png_uint_32 *num_plays)
-+{
-+    png_debug1(1, "in %s retrieval function", "acTL");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL &&
-+        (info_ptr->valid & PNG_INFO_acTL) &&
-+        num_frames != NULL && num_plays != NULL)
-+    {
-+        *num_frames = info_ptr->num_frames;
-+        *num_plays = info_ptr->num_plays;
-+        return (1);
-+    }
-+    
-+    return (0);
-+}
-+
-+png_uint_32 PNGAPI
-+png_get_num_frames(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_num_frames()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->num_frames);
-+    return (0);
-+}
-+
-+png_uint_32 PNGAPI
-+png_get_num_plays(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_num_plays()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->num_plays);
-+    return (0);
-+}
-+
-+png_uint_32 PNGAPI
-+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_debug1(1, "in %s retrieval function", "fcTL");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL &&
-+        (info_ptr->valid & PNG_INFO_fcTL) &&
-+        width != NULL && height != NULL && 
-+        x_offset != NULL && x_offset != NULL && 
-+        delay_num != NULL && delay_den != NULL &&
-+        dispose_op != NULL && blend_op != NULL)
-+    {
-+        *width = info_ptr->next_frame_width;
-+        *height = info_ptr->next_frame_height;
-+        *x_offset = info_ptr->next_frame_x_offset;
-+        *y_offset = info_ptr->next_frame_y_offset;
-+        *delay_num = info_ptr->next_frame_delay_num;
-+        *delay_den = info_ptr->next_frame_delay_den;
-+        *dispose_op = info_ptr->next_frame_dispose_op;
-+        *blend_op = info_ptr->next_frame_blend_op;
-+        return (1);
-+    }
-+    
-+    return (0);
-+}
-+
-+png_uint_32 PNGAPI
-+png_get_next_frame_width(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_next_frame_width()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->next_frame_width);
-+    return (0);
-+}
-+
-+png_uint_32 PNGAPI
-+png_get_next_frame_height(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_next_frame_height()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->next_frame_height);
-+    return (0);
-+}
-+
-+png_uint_32 PNGAPI
-+png_get_next_frame_x_offset(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_next_frame_x_offset()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->next_frame_x_offset);
-+    return (0);
-+}
-+
-+png_uint_32 PNGAPI
-+png_get_next_frame_y_offset(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_next_frame_y_offset()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->next_frame_y_offset);
-+    return (0);
-+}
-+
-+png_uint_16 PNGAPI
-+png_get_next_frame_delay_num(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_next_frame_delay_num()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->next_frame_delay_num);
-+    return (0);
-+}
-+
-+png_uint_16 PNGAPI
-+png_get_next_frame_delay_den(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_next_frame_delay_den()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->next_frame_delay_den);
-+    return (0);
-+}
-+
-+png_byte PNGAPI
-+png_get_next_frame_dispose_op(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_next_frame_dispose_op()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->next_frame_dispose_op);
-+    return (0);
-+}
-+
-+png_byte PNGAPI
-+png_get_next_frame_blend_op(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_get_next_frame_blend_op()");
-+    
-+    if (png_ptr != NULL && info_ptr != NULL)
-+        return (info_ptr->next_frame_blend_op);
-+    return (0);
-+}
-+
-+png_byte PNGAPI
-+png_get_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_debug(1, "in png_first_frame_is_hidden()");
-+    
-+    if (png_ptr != NULL)
-+       return (png_byte)(png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN);
-+    
-+    return 0;
-+}
-+#endif /* PNG_APNG_SUPPORTED */
-+
- #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
- png_uint_32 PNGAPI
- png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
-Index: png.h
-===================================================================
---- png.h
-+++ png.h
-@@ -888,6 +888,19 @@
-    png_fixed_point int_y_blue PNG_DEPSTRUCT;
- #endif
- 
-+#ifdef PNG_APNG_SUPPORTED
-+   png_uint_32 num_frames; /* including default image */
-+   png_uint_32 num_plays;
-+   png_uint_32 next_frame_width;
-+   png_uint_32 next_frame_height;
-+   png_uint_32 next_frame_x_offset;
-+   png_uint_32 next_frame_y_offset;
-+   png_uint_16 next_frame_delay_num;
-+   png_uint_16 next_frame_delay_den;
-+   png_byte next_frame_dispose_op;
-+   png_byte next_frame_blend_op;
-+#endif
-+
- } png_info;
- 
- typedef png_info FAR * png_infop;
-@@ -985,6 +998,10 @@
- #define PNG_INFO_sPLT 0x2000   /* ESR, 1.0.6 */
- #define PNG_INFO_sCAL 0x4000   /* ESR, 1.0.6 */
- #define PNG_INFO_IDAT 0x8000L  /* ESR, 1.0.6 */
-+#ifdef PNG_APNG_SUPPORTED
-+#define PNG_INFO_acTL 0x10000L
-+#define PNG_INFO_fcTL 0x20000L
-+#endif
- 
- /* This is used for the transformation routines, as some of them
-  * change these values for the row.  It also should enable using
-@@ -1026,6 +1043,10 @@
- typedef void (PNGAPI *png_progressive_end_ptr) PNGARG((png_structp, png_infop));
- typedef void (PNGAPI *png_progressive_row_ptr) PNGARG((png_structp, png_bytep,
-    png_uint_32, int));
-+#ifdef PNG_APNG_SUPPORTED
-+typedef void (PNGAPI *png_progressive_frame_ptr) PNGARG((png_structp, 
-+   png_uint_32));
-+#endif
- #endif
- 
- #if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-@@ -1445,6 +1466,36 @@
-    png_uint_32 user_chunk_cache_max PNG_DEPSTRUCT;
- #endif
- 
-+#ifdef PNG_APNG_SUPPORTED
-+   png_uint_32 apng_flags;
-+   png_uint_32 next_seq_num;         /* next fcTL/fdAT chunk sequence number */
-+   png_uint_32 first_frame_width;
-+   png_uint_32 first_frame_height;
-+
-+#ifdef PNG_READ_APNG_SUPPORTED
-+   png_uint_32 num_frames_read;      /* incremented after all image data of */
-+                                     /* a frame is read */
-+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
-+   png_progressive_frame_ptr frame_info_fn; /* frame info read callback */
-+   png_progressive_frame_ptr frame_end_fn;  /* frame data read callback */
-+#endif
-+#endif
-+
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+   png_uint_32 num_frames_to_write;
-+   png_uint_32 num_frames_written;
-+#endif
-+
-+/* 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 /* PNG_APNG_SUPPORTED */
-+
- /* New member added in libpng-1.0.25 and 1.2.17 */
- #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
-    /* Storage for unknown chunk that the library doesn't recognize. */
-@@ -1773,6 +1824,18 @@
- extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
-    png_bytepp image));
- 
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+extern PNG_EXPORT (void,png_write_frame_head) PNGARG((png_structp png_ptr,
-+   png_infop png_info, 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));
-+
-+extern PNG_EXPORT (void,png_write_frame_tail) PNGARG((png_structp png_ptr,
-+   png_infop png_info));
-+#endif
-+
- /* Write the end of the PNG file. */
- extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
-@@ -2017,6 +2080,11 @@
-    png_voidp progressive_ptr,
-    png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
-    png_progressive_end_ptr end_fn));
-+#ifdef PNG_READ_APNG_SUPPORTED
-+extern PNG_EXPORT(void,png_set_progressive_frame_fn) PNGARG((png_structp png_ptr,
-+   png_progressive_frame_ptr frame_info_fn,
-+   png_progressive_frame_ptr frame_end_fn));
-+#endif
- 
- /* Returns the user pointer associated with the push read functions */
- extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
-@@ -2443,6 +2511,53 @@
- #endif
- #endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
- 
-+#ifdef PNG_APNG_SUPPORTED
-+extern PNG_EXPORT(png_uint_32,png_get_acTL) PNGARG((png_structp png_ptr,
-+   png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays));
-+extern PNG_EXPORT(png_uint_32,png_set_acTL) PNGARG((png_structp png_ptr, 
-+   png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays));
-+extern PNG_EXPORT(png_uint_32,png_get_num_frames) PNGARG((png_structp png_ptr,
-+   png_infop info_ptr));
-+extern PNG_EXPORT(png_uint_32,png_get_num_plays) 
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+
-+extern PNG_EXPORT(png_uint_32,png_get_next_frame_fcTL) 
-+   PNGARG((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));
-+extern PNG_EXPORT(png_uint_32,png_set_next_frame_fcTL) 
-+   PNGARG((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));
-+extern PNG_EXPORT(png_uint_32,png_get_next_frame_width)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+extern PNG_EXPORT(png_uint_32,png_get_next_frame_height)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+extern PNG_EXPORT(png_uint_32,png_get_next_frame_x_offset)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+extern PNG_EXPORT(png_uint_32,png_get_next_frame_y_offset)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_num)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+extern PNG_EXPORT(png_uint_16,png_get_next_frame_delay_den)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+extern PNG_EXPORT(png_byte,png_get_next_frame_dispose_op)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+extern PNG_EXPORT(png_byte,png_get_next_frame_blend_op)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+extern PNG_EXPORT(png_byte,png_get_first_frame_is_hidden)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr));
-+extern PNG_EXPORT(png_uint_32,png_set_first_frame_is_hidden)
-+   PNGARG((png_structp png_ptr, png_infop info_ptr, png_byte is_hidden));
-+#endif /* PNG_APNG_SUPPORTED */
-+
-+#ifdef PNG_READ_APNG_SUPPORTED
-+extern PNG_EXPORT(void,png_read_frame_head) PNGARG((png_structp png_ptr,
-+   png_infop info_ptr));
-+#endif
-+
- #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
- /* Provide a list of chunks and how they are to be handled, if the built-in
-    handling or default unknown chunk handling is not desired.  Any chunks not
-Index: pngpriv.h
-===================================================================
---- pngpriv.h
-+++ pngpriv.h
-@@ -98,6 +98,10 @@
- #define PNG_BACKGROUND_IS_GRAY     0x800
- #define PNG_HAVE_PNG_SIGNATURE    0x1000
- #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
-+#ifdef PNG_APNG_SUPPORTED
-+#define PNG_HAVE_acTL             0x4000
-+#define PNG_HAVE_fcTL             0x8000L
-+#endif
- 
- /* Flags for the transformations the PNG library does on the image data */
- #define PNG_BGR                 0x0001
-@@ -231,6 +235,14 @@
- #define PNG_tIME PNG_CONST png_byte png_tIME[5] = {116,  73,  77,  69, '\0'}
- #define PNG_tRNS PNG_CONST png_byte png_tRNS[5] = {116,  82,  78,  83, '\0'}
- #define PNG_zTXt PNG_CONST png_byte png_zTXt[5] = {122,  84,  88, 116, '\0'}
-+#ifdef PNG_APNG_SUPPORTED
-+#define PNG_acTL PNG_CONST png_byte png_acTL[5] = { 97,  99,  84,  76, '\0'}
-+#define PNG_fcTL PNG_CONST png_byte png_fcTL[5] = {102,  99,  84,  76, '\0'}
-+#define PNG_fdAT PNG_CONST png_byte png_fdAT[5] = {102, 100,  65,  84, '\0'}
-+
-+/* For png_struct.apng_flags: */
-+#define PNG_FIRST_FRAME_HIDDEN       0x0001
-+#endif
- 
- 
- /* Inhibit C++ name-mangling for libpng functions but not for system calls. */
-@@ -468,6 +480,17 @@
- #endif
- #endif
- 
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+PNG_EXTERN void png_write_acTL PNGARG((png_structp png_ptr,
-+   png_uint_32 num_frames, png_uint_32 num_plays));
-+
-+PNG_EXTERN void png_write_fcTL PNGARG((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));
-+#endif
-+
- /* Called when finished processing a row of data */
- PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
- 
-@@ -520,6 +543,20 @@
- PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
-    png_infop info_ptr));
- 
-+#ifdef PNG_READ_APNG_SUPPORTED
-+/* Private, reset some things to become ready for reading next frame */
-+PNG_EXTERN void png_read_reset PNGARG((png_structp png_ptr));
-+PNG_EXTERN void png_read_reinit PNGARG((png_structp png_ptr,
-+   png_infop info_ptr));
-+PNG_EXTERN void png_progressive_read_reset PNGARG((png_structp png_ptr));
-+#endif
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+/* Private, reset some things to become ready for writing next frame */
-+PNG_EXTERN void png_write_reset PNGARG((png_structp png_ptr));
-+PNG_EXTERN void png_write_reinit PNGARG((png_structp png_ptr, 
-+   png_infop info_ptr, png_uint_32 width, png_uint_32 height));
-+#endif
-+
- /* These are the functions that do the transformations */
- #ifdef PNG_READ_FILLER_SUPPORTED
- PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
-@@ -736,6 +773,25 @@
-    png_uint_32 length));
- #endif
- 
-+#ifdef PNG_READ_APNG_SUPPORTED
-+PNG_EXTERN void png_handle_acTL PNGARG((png_structp png_ptr, png_infop info_ptr,
-+   png_uint_32 length));
-+PNG_EXTERN void png_handle_fcTL PNGARG((png_structp png_ptr, png_infop info_ptr,
-+   png_uint_32 length));
-+PNG_EXTERN void png_have_info PNGARG((png_structp png_ptr, png_infop info_ptr));
-+PNG_EXTERN void png_handle_fdAT PNGARG((png_structp png_ptr, png_infop info_ptr,
-+   png_uint_32 length));
-+PNG_EXTERN void png_ensure_sequence_number PNGARG((png_structp png_ptr, 
-+   png_uint_32 length));
-+#endif
-+#ifdef PNG_APNG_SUPPORTED
-+PNG_EXTERN void png_ensure_fcTL_is_valid PNGARG((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));
-+#endif
-+
- PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
-    png_infop info_ptr, png_uint_32 length));
- 
-Index: pngwrite.c
-===================================================================
---- pngwrite.c
-+++ pngwrite.c
-@@ -57,6 +57,10 @@
-    /* The rest of these check to see if the valid field has the appropriate
-     * flag set, and if it does, writes the chunk.
-     */
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+   if (info_ptr->valid & PNG_INFO_acTL)
-+      png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays);
-+#endif
- #ifdef PNG_WRITE_gAMA_SUPPORTED
-    if (info_ptr->valid & PNG_INFO_gAMA)
-    {
-@@ -319,6 +323,10 @@
-       return;
-    if (!(png_ptr->mode & PNG_HAVE_IDAT))
-       png_error(png_ptr, "No IDATs written into file");
-+#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
- 
-    /* See if user wants us to write information chunks */
-    if (info_ptr != NULL)
-@@ -1454,4 +1462,39 @@
-    params = params;
- }
- #endif
-+
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+void PNGAPI
-+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_debug(1, "in png_write_frame_head");
-+    
-+    /* 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))
-+        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->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);
-+}
-+
-+void PNGAPI
-+png_write_frame_tail(png_structp png_ptr, png_infop png_info)
-+{
-+    png_debug(1, "in png_write_frame_tail");
-+    
-+    png_ptr->num_frames_written++;
-+}
-+#endif /* PNG_WRITE_APNG_SUPPORTED */
-+
- #endif /* PNG_WRITE_SUPPORTED */
-Index: pngconf.h
-===================================================================
---- pngconf.h
-+++ pngconf.h
-@@ -869,6 +869,10 @@
- #  define PNG_READ_tRNS_SUPPORTED
- #  define PNG_tRNS_SUPPORTED
- #endif
-+#ifndef PNG_NO_READ_APNG
-+#  define PNG_READ_APNG_SUPPORTED
-+#  define PNG_APNG_SUPPORTED
-+#endif
- #ifndef PNG_NO_READ_zTXt
- #  define PNG_READ_zTXt_SUPPORTED
- #  define PNG_zTXt_SUPPORTED
-@@ -1028,6 +1032,14 @@
- #    define PNG_TEXT_SUPPORTED
- #  endif
- #endif
-+#ifndef PNG_NO_WRITE_APNG
-+#  ifndef PNG_WRITE_APNG_SUPPORTED
-+#    define PNG_WRITE_APNG_SUPPORTED
-+#  endif
-+#  ifndef PNG_APNG_SUPPORTED
-+#    define PNG_APNG_SUPPORTED
-+#  endif
-+#endif
- 
- #ifdef PNG_WRITE_tIME_SUPPORTED
- #  ifndef PNG_NO_CONVERT_tIME
-Index: pngpread.c
-===================================================================
---- pngpread.c
-+++ pngpread.c
-@@ -205,6 +205,11 @@
- #ifdef PNG_READ_zTXt_SUPPORTED
-       PNG_zTXt;
- #endif
-+#ifdef PNG_READ_APNG_SUPPORTED
-+      PNG_acTL;
-+      PNG_fcTL;
-+      PNG_fdAT;
-+#endif
- 
-    /* First we make sure we have enough data for the 4 byte chunk name
-     * and the 4 byte chunk length before proceeding with decoding the
-@@ -230,6 +235,103 @@
-       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
-    }
- 
-+#ifdef PNG_READ_APNG_SUPPORTED
-+   if (png_ptr->num_frames_read > 0 && 
-+       png_ptr->num_frames_read < info_ptr->num_frames)
-+   {
-+      if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-+      {
-+         /* Discard trailing IDATs for the first frame */
-+         if (png_ptr->mode & PNG_HAVE_fcTL || png_ptr->num_frames_read > 1)
-+            png_error(png_ptr, "out of place IDAT");
-+         
-+         if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-+         {
-+            png_push_save_buffer(png_ptr);
-+            return;
-+         }
-+         png_push_crc_skip(png_ptr, png_ptr->push_length);
-+         png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-+         return;
-+      }
-+      else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 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))
-+         {
-+            /* Discard trailing fdATs for frames other than the first */
-+            if (png_ptr->num_frames_read < 2)
-+               png_error(png_ptr, "out of place fdAT");
-+            
-+            if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-+            {
-+               png_push_save_buffer(png_ptr);
-+               return;
-+            }
-+            png_push_crc_skip(png_ptr, png_ptr->push_length);
-+            png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-+            return;
-+         }
-+         else
-+         {
-+            /* frame data follows */
-+            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(!png_memcmp(png_ptr->chunk_name, png_fcTL, 4))
-+      {
-+         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))
-+            png_error(png_ptr, "missing required fcTL chunk");
-+         
-+         png_read_reinit(png_ptr, info_ptr);
-+         png_progressive_read_reset(png_ptr);
-+         
-+         if (png_ptr->frame_info_fn != NULL)
-+            (*(png_ptr->frame_info_fn))(png_ptr, png_ptr->num_frames_read);
-+         
-+         png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-+         
-+         return;
-+      }
-+      else
-+      {
-+         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_push_crc_skip(png_ptr, png_ptr->push_length);
-+         png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-+         return;
-+      }
-+      
-+      return;
-+   }
-+#endif /* PNG_READ_APNG_SUPPORTED */
-+   
-    if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-      if (png_ptr->mode & PNG_AFTER_IDAT)
-         png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-@@ -325,6 +427,9 @@
-             png_benign_error(png_ptr, "Too many IDATs found");
-       }
- 
-+#ifdef PNG_READ_APNG_SUPPORTED
-+      png_have_info(png_ptr, info_ptr);
-+#endif
-       png_ptr->idat_size = png_ptr->push_length;
-       png_ptr->mode |= PNG_HAVE_IDAT;
-       png_ptr->process_mode = PNG_READ_IDAT_MODE;
-@@ -557,6 +662,38 @@
-    }
- 
- #endif
-+#ifdef PNG_READ_APNG_SUPPORTED
-+   else if (!png_memcmp(png_ptr->chunk_name, png_acTL, 4))
-+   {
-+      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 (!png_memcmp(png_ptr->chunk_name, png_fcTL, 4))
-+   {
-+      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);
-+   }
-+   else if (!png_memcmp(png_ptr->chunk_name, png_fdAT, 4))
-+   {
-+      if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-+      {
-+         png_push_save_buffer(png_ptr);
-+         return;
-+      }
-+
-+      png_handle_fdAT(png_ptr, info_ptr, png_ptr->push_length);
-+   }
-+#endif /* PNG_READ_APNG_SUPPORTED */
-    else
-    {
-       if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-@@ -736,11 +873,15 @@
- png_push_read_IDAT(png_structp png_ptr)
- {
-    PNG_IDAT;
-+#ifdef PNG_READ_APNG_SUPPORTED
-+   PNG_fdAT;
-+   PNG_IEND;
-+#endif
-    if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
-    {
-       png_byte chunk_length[4];
- 
--      if (png_ptr->buffer_size < 8)
-+      if (png_ptr->buffer_size < 12)
-       {
-          png_push_save_buffer(png_ptr);
-          return;
-@@ -752,15 +893,62 @@
-       png_crc_read(png_ptr, png_ptr->chunk_name, 4);
-       png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
- 
--      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
-+#ifdef PNG_READ_APNG_SUPPORTED
-+      if (png_memcmp(png_ptr->chunk_name, png_fdAT, 4)
-+          && png_ptr->num_frames_read > 0)
-+      {
-+          if (png_ptr->flags & PNG_FLAG_ZLIB_FINISHED)
-+          {
-+              png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-+              if (png_ptr->frame_end_fn != NULL)
-+                 (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read);
-+              png_ptr->num_frames_read++;
-+              return;
-+          }
-+          else
-+          {
-+              if (!png_memcmp(png_ptr->chunk_name, png_IEND, 4))
-+                  png_error(png_ptr, "Not enough image data");
-+              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);
-+              png_ptr->mode &= ~PNG_HAVE_CHUNK_HEADER;
-+              return;
-+          }
-+      }
-+      else 
-+#endif
-+      if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4)
-+#ifdef PNG_READ_APNG_SUPPORTED
-+                && (png_ptr->num_frames_read == 0)
-+#endif
-+         )
-       {
-          png_ptr->process_mode = PNG_READ_CHUNK_MODE;
-          if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
-             png_error(png_ptr, "Not enough compressed data");
-+#ifdef PNG_READ_APNG_SUPPORTED
-+         if (png_ptr->frame_end_fn != NULL)
-+            (*(png_ptr->frame_end_fn))(png_ptr, png_ptr->num_frames_read);
-+         png_ptr->num_frames_read++;
-+#endif
-          return;
-       }
- 
-       png_ptr->idat_size = png_ptr->push_length;
-+      
-+#ifdef PNG_READ_APNG_SUPPORTED
-+      if (png_ptr->num_frames_read > 0)
-+      {
-+         png_ensure_sequence_number(png_ptr, 4);
-+         png_ptr->idat_size -= 4;
-+      }
-+#endif
-    }
-    if (png_ptr->idat_size && png_ptr->save_buffer_size)
-    {
-@@ -1716,6 +1904,17 @@
-    png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
- }
- 
-+#ifdef PNG_READ_APNG_SUPPORTED
-+void PNGAPI
-+png_set_progressive_frame_fn(png_structp png_ptr,
-+   png_progressive_frame_ptr frame_info_fn,
-+   png_progressive_frame_ptr frame_end_fn)
-+{
-+   png_ptr->frame_info_fn = frame_info_fn;
-+   png_ptr->frame_end_fn = frame_end_fn;
-+}
-+#endif
-+
- png_voidp PNGAPI
- png_get_progressive_ptr(png_structp png_ptr)
- {
-Index: pngset.c
-===================================================================
---- pngset.c
-+++ pngset.c
-@@ -260,6 +260,11 @@
-       info_ptr->rowbytes = 0;
-    else
-       info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
-+
-+#ifdef PNG_APNG_SUPPORTED
-+   /* for non-animated png. this may be overritten from an acTL chunk later */
-+   info_ptr->num_frames = 1;
-+#endif
- }
- 
- #ifdef PNG_oFFs_SUPPORTED
-@@ -932,6 +937,142 @@
- }
- #endif /* PNG_sPLT_SUPPORTED */
- 
-+#ifdef PNG_APNG_SUPPORTED
-+png_uint_32 PNGAPI
-+png_set_acTL(png_structp png_ptr, png_infop info_ptr, 
-+    png_uint_32 num_frames, png_uint_32 num_plays)
-+{
-+    png_debug1(1, "in %s storage function", "acTL");
-+
-+    if (png_ptr == NULL || info_ptr == NULL)
-+    {
-+        png_warning(png_ptr,
-+                    "Call to png_set_acTL() with NULL png_ptr "
-+                    "or info_ptr ignored");
-+        return (0);
-+    }
-+    if (num_frames == 0)
-+    {
-+        png_warning(png_ptr,
-+                    "Ignoring attempt to set acTL with num_frames zero");
-+        return (0);
-+    }
-+    if (num_frames > PNG_UINT_31_MAX)
-+    {
-+        png_warning(png_ptr,
-+                    "Ignoring attempt to set acTL with num_frames > 2^31-1");
-+        return (0);
-+    }
-+    if (num_plays > PNG_UINT_31_MAX)
-+    {
-+        png_warning(png_ptr,
-+                    "Ignoring attempt to set acTL with num_plays "
-+                    "> 2^31-1");
-+        return (0);
-+    }
-+    
-+    info_ptr->num_frames = num_frames;
-+    info_ptr->num_plays = num_plays;
-+    
-+    info_ptr->valid |= PNG_INFO_acTL;
-+    
-+    return (1);
-+}
-+
-+/* delay_num and delay_den can hold any 16-bit values including zero */
-+png_uint_32 PNGAPI
-+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_debug1(1, "in %s storage function", "fcTL");
-+
-+    if (png_ptr == NULL || info_ptr == NULL)
-+    {
-+        png_warning(png_ptr,
-+                    "Call to png_set_fcTL() with NULL png_ptr or info_ptr "
-+                    "ignored");
-+        return (0);
-+    }
-+    
-+    png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, 
-+                             delay_num, delay_den, dispose_op, blend_op);
-+    
-+    if (blend_op == PNG_BLEND_OP_OVER)
-+    {
-+        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");
-+          blend_op = PNG_BLEND_OP_SOURCE;
-+        }
-+    }
-+
-+    info_ptr->next_frame_width = width;
-+    info_ptr->next_frame_height = height;
-+    info_ptr->next_frame_x_offset = x_offset;
-+    info_ptr->next_frame_y_offset = y_offset;
-+    info_ptr->next_frame_delay_num = delay_num;
-+    info_ptr->next_frame_delay_den = delay_den;
-+    info_ptr->next_frame_dispose_op = dispose_op;
-+    info_ptr->next_frame_blend_op = blend_op;
-+    
-+    info_ptr->valid |= PNG_INFO_fcTL;
-+    
-+    return (1);
-+}
-+
-+void /* PRIVATE */
-+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)
-+{
-+    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"
-+                           "the ones in IHDR");
-+    if (width > PNG_UINT_31_MAX)
-+        png_error(png_ptr, "invalid width in fcTL (> 2^31-1)");
-+    if (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)");
-+    if (y_offset > PNG_UINT_31_MAX)
-+        png_error(png_ptr, "invalid y_offset in fcTL (> 2^31-1)");
-+
-+    if (dispose_op != PNG_DISPOSE_OP_NONE &&
-+        dispose_op != PNG_DISPOSE_OP_BACKGROUND &&
-+        dispose_op != PNG_DISPOSE_OP_PREVIOUS)
-+        png_error(png_ptr, "invalid dispose_op in fcTL");
-+
-+    if (blend_op != PNG_BLEND_OP_SOURCE &&
-+        blend_op != PNG_BLEND_OP_OVER)
-+        png_error(png_ptr, "invalid blend_op in fcTL");
-+}
-+
-+png_uint_32 PNGAPI
-+png_set_first_frame_is_hidden(png_structp png_ptr, png_infop info_ptr,
-+                              png_byte is_hidden)
-+{
-+    png_debug(1, "in png_first_frame_is_hidden()");
-+    
-+    if (png_ptr == NULL)
-+        return 0;
-+    
-+    if(is_hidden)
-+        png_ptr->apng_flags |= PNG_FIRST_FRAME_HIDDEN;
-+    else
-+        png_ptr->apng_flags &= ~PNG_FIRST_FRAME_HIDDEN;
-+    
-+    return 1;
-+}
-+#endif /* PNG_APNG_SUPPORTED */
-+
- #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
- void PNGAPI
- png_set_unknown_chunks(png_structp png_ptr,
-Index: pngrutil.c
-===================================================================
---- pngrutil.c
-+++ pngrutil.c
-@@ -434,6 +434,11 @@
-    filter_type = buf[11];
-    interlace_type = buf[12];
- 
-+#ifdef PNG_READ_APNG_SUPPORTED
-+   png_ptr->first_frame_width = width;
-+   png_ptr->first_frame_height = height;
-+#endif
-+
-    /* Set internal variables */
-    png_ptr->width = width;
-    png_ptr->height = height;
-@@ -2318,6 +2323,172 @@
- }
- #endif
- 
-+#ifdef PNG_READ_APNG_SUPPORTED
-+void /* PRIVATE */
-+png_handle_acTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+{
-+    png_byte data[8];
-+    png_uint_32 num_frames;
-+    png_uint_32 num_plays;
-+    png_uint_32 didSet;
-+    
-+    png_debug(1, "in png_handle_acTL");
-+
-+    if (!(png_ptr->mode & PNG_HAVE_IHDR))
-+    {
-+        png_error(png_ptr, "Missing IHDR before acTL");
-+    }
-+    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)
-+    {
-+        png_warning(png_ptr, "Duplicate acTL skipped");
-+        png_crc_finish(png_ptr, length);
-+        return;
-+    }
-+    else if (length != 8)
-+    {
-+        png_warning(png_ptr, "acTL with invalid length skipped");
-+        png_crc_finish(png_ptr, length);
-+        return;
-+    }
-+    
-+    png_crc_read(png_ptr, data, 8);
-+    png_crc_finish(png_ptr, 0);
-+    
-+    num_frames = png_get_uint_31(png_ptr, data);
-+    num_plays = png_get_uint_31(png_ptr, data + 4);
-+    
-+    /* the set function will do error checking on num_frames */
-+    didSet = png_set_acTL(png_ptr, info_ptr, num_frames, num_plays);
-+    if(didSet)
-+        png_ptr->mode |= PNG_HAVE_acTL;
-+}
-+
-+void /* PRIVATE */
-+png_handle_fcTL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+{
-+    png_byte data[22];
-+    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_debug(1, "in png_handle_fcTL");
-+
-+    png_ensure_sequence_number(png_ptr, length);
-+
-+    if (!(png_ptr->mode & PNG_HAVE_IHDR))
-+    {
-+        png_error(png_ptr, "Missing IHDR before fcTL");
-+    }
-+    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
-+        * i can't think of a better message */
-+        png_warning(png_ptr, "Invalid fcTL after IDAT skipped");
-+        png_crc_finish(png_ptr, length-4);
-+        return;
-+    }
-+    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);
-+        return;
-+    }
-+    else if (length != 26)
-+    {
-+        png_warning(png_ptr, "fcTL with invalid length skipped");
-+        png_crc_finish(png_ptr, length-4);
-+        return;
-+    }
-+
-+    png_crc_read(png_ptr, data, 22);
-+    png_crc_finish(png_ptr, 0);
-+
-+    width = png_get_uint_31(png_ptr, data);
-+    height = png_get_uint_31(png_ptr, data + 4);
-+    x_offset = png_get_uint_31(png_ptr, data + 8);
-+    y_offset = png_get_uint_31(png_ptr, data + 12);
-+    delay_num = png_get_uint_16(data + 16);
-+    delay_den = png_get_uint_16(data + 18);
-+    dispose_op = data[20];
-+    blend_op = data[21];
-+
-+    if (png_ptr->num_frames_read == 0 && (x_offset != 0 || y_offset != 0))
-+        png_error(png_ptr, "fcTL for the first frame must have zero offset");
-+
-+    if (info_ptr != NULL)
-+    {
-+        if (png_ptr->num_frames_read == 0 &&
-+            (width != info_ptr->width || height != info_ptr->height))
-+            png_error(png_ptr, "size in first frame's fcTL must match "
-+                               "the size in IHDR");
-+
-+        /* the set function will do more error checking */
-+        png_set_next_frame_fcTL(png_ptr, info_ptr, width, height,
-+                                x_offset, y_offset, delay_num, delay_den,
-+                                dispose_op, blend_op);
-+
-+        png_read_reinit(png_ptr, info_ptr);
-+    }
-+
-+    png_ptr->mode |= PNG_HAVE_fcTL;
-+}
-+
-+void /* PRIVATE */
-+png_have_info(png_structp png_ptr, png_infop info_ptr)
-+{
-+    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++;
-+    }
-+}
-+
-+void /* PRIVATE */
-+png_handle_fdAT(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
-+{
-+    png_ensure_sequence_number(png_ptr, length);
-+    
-+    /* This function is only called from png_read_end(), png_read_info(), 
-+    * and png_push_read_chunk() which means that:
-+    * - the user doesn't want to read this frame
-+    * - or this is an out-of-place fdAT
-+    * in either case it is safe to ignore the chunk with a warning */
-+    png_warning(png_ptr, "ignoring fdAT chunk");
-+    png_crc_finish(png_ptr, length - 4);
-+}
-+
-+void /* PRIVATE */
-+png_ensure_sequence_number(png_structp png_ptr, png_uint_32 length)
-+{
-+    png_byte data[4];
-+    png_uint_32 sequence_number;
-+    
-+    if (length < 4)
-+        png_error(png_ptr, "invalid fcTL or fdAT chunk found");
-+    
-+    png_crc_read(png_ptr, data, 4);
-+    sequence_number = png_get_uint_31(png_ptr, data);
-+    
-+    if (sequence_number != png_ptr->next_seq_num)
-+        png_error(png_ptr, "fcTL or fdAT chunk with out-of-order sequence "
-+                           "number found");
-+    
-+    png_ptr->next_seq_num++;
-+}
-+#endif /* PNG_READ_APNG_SUPPORTED */
-+
- /* This function is called when we haven't found a handler for a
-    chunk.  If there isn't a problem with the chunk itself (ie bad
-    chunk name, CRC, or a critical chunk), the chunk is silently ignored
-@@ -3353,4 +3524,73 @@
- 
-    png_ptr->flags |= PNG_FLAG_ROW_INIT;
- }
-+
-+#ifdef PNG_READ_APNG_SUPPORTED
-+/* This function is to be called after the main IDAT set has been read and
-+ * before a new IDAT is read. It resets some parts of png_ptr
-+ * to make them usable by the read functions again */
-+void /* PRIVATE */
-+png_read_reset(png_structp png_ptr)
-+{
-+    png_ptr->mode &= ~PNG_HAVE_IDAT;
-+    png_ptr->mode &= ~PNG_AFTER_IDAT;
-+    png_ptr->row_number = 0;
-+    png_ptr->pass = 0;
-+    png_ptr->flags &= ~PNG_FLAG_ROW_INIT;
-+}
-+
-+void /* PRIVATE */
-+png_read_reinit(png_structp png_ptr, png_infop info_ptr)
-+{
-+    png_ptr->width = info_ptr->next_frame_width;
-+    png_ptr->height = info_ptr->next_frame_height;
-+    png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->width);
-+    if (png_ptr->prev_row)
-+       png_memset(png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
-+}
-+
-+/* same as png_read_reset() but for the progressive reader */
-+void /* PRIVATE */
-+png_progressive_read_reset(png_structp png_ptr)
-+{
-+    /* start of interlace block */
-+    const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
-+
-+    /* offset to next interlace block */
-+    const int FARDATA png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1};
-+
-+    /* start of interlace block in the y direction */
-+    const int FARDATA png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1};
-+
-+    /* offset to next interlace block in the y direction */
-+    const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-+    
-+    if (png_ptr->interlaced)
-+    {
-+        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
-+           png_ptr->num_rows = png_ptr->height;
-+
-+        png_ptr->iwidth = (png_ptr->width +
-+                           png_pass_inc[png_ptr->pass] - 1 -
-+                           png_pass_start[png_ptr->pass]) /
-+                           png_pass_inc[png_ptr->pass];
-+    }
-+    else
-+    {
-+        png_ptr->num_rows = png_ptr->height;
-+        png_ptr->iwidth = png_ptr->width;
-+    }
-+    png_ptr->flags &= ~PNG_FLAG_ZLIB_FINISHED;
-+    if (inflateReset(&(png_ptr->zstream)) != Z_OK)
-+        png_error(png_ptr, "inflateReset failed");
-+    png_ptr->zstream.avail_in = 0;
-+    png_ptr->zstream.next_in = 0;
-+    png_ptr->zstream.next_out = png_ptr->row_buf;
-+    png_ptr->zstream.avail_out = (uInt)PNG_ROWBYTES(png_ptr->pixel_depth,
-+        png_ptr->iwidth) + 1;
-+}
-+#endif /* PNG_READ_APNG_SUPPORTED */
- #endif /* PNG_READ_SUPPORTED */
-Index: pngwutil.c
-===================================================================
---- pngwutil.c
-+++ pngwutil.c
-@@ -539,6 +539,11 @@
-    /* Write the chunk */
-    png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
- 
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+   png_ptr->first_frame_width = width;
-+   png_ptr->first_frame_height = height;
-+#endif
-+
-    /* Initialize zlib with PNG info */
-    png_ptr->zstream.zalloc = png_zalloc;
-    png_ptr->zstream.zfree = png_zfree;
-@@ -661,6 +666,9 @@
- png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
- {
-    PNG_IDAT;
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+   PNG_fdAT;
-+#endif
- 
-    png_debug(1, "in png_write_IDAT");
- 
-@@ -705,7 +713,28 @@
-             "Invalid zlib compression method or flags in IDAT");
-    }
- 
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+   if(png_ptr->num_frames_written == 0)
-+#endif
-    png_write_chunk(png_ptr, (png_bytep)png_IDAT, data, length);
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+   else
-+   {
-+      png_byte buf[4];
-+      
-+      png_write_chunk_start(png_ptr, (png_bytep)png_fdAT, 4 + length);
-+      
-+      png_save_uint_32(buf, png_ptr->next_seq_num);
-+      png_write_chunk_data(png_ptr, buf, 4);
-+      
-+      png_write_chunk_data(png_ptr, data, length);
-+      
-+      png_write_chunk_end(png_ptr);
-+      
-+      png_ptr->next_seq_num++;
-+   }
-+#endif
-+
-    png_ptr->mode |= PNG_HAVE_IDAT;
- }
- 
-@@ -1712,6 +1741,66 @@
- }
- #endif
- 
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+void /* PRIVATE */
-+png_write_acTL(png_structp png_ptr,
-+   png_uint_32 num_frames, png_uint_32 num_plays)
-+{
-+    PNG_acTL;
-+    png_byte data[16];
-+    
-+    png_debug(1, "in png_write_acTL");
-+    
-+    png_ptr->num_frames_to_write = num_frames;
-+    
-+    if (png_ptr->apng_flags & PNG_FIRST_FRAME_HIDDEN)
-+        num_frames--;
-+    
-+    png_save_uint_32(data, num_frames);
-+    png_save_uint_32(data + 4, num_plays);
-+    
-+    png_write_chunk(png_ptr, (png_bytep)png_acTL, data, (png_size_t)8);
-+}
-+
-+void /* PRIVATE */
-+png_write_fcTL(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_fcTL;
-+    png_byte data[26];
-+    
-+    png_debug(1, "in png_write_fcTL");
-+    
-+    if (png_ptr->num_frames_written == 0 && (x_offset != 0 || y_offset != 0))
-+        png_error(png_ptr, "x and/or y offset for the first frame aren't 0");
-+    if (png_ptr->num_frames_written == 0 && 
-+        (width != png_ptr->first_frame_width || 
-+         height != png_ptr->first_frame_height))
-+        png_error(png_ptr, "width and/or height in the first frame's fcTL "
-+                           "don't match the ones in IHDR");
-+    
-+    /* more error checking */
-+    png_ensure_fcTL_is_valid(png_ptr, width, height, x_offset, y_offset, 
-+                             delay_num, delay_den, dispose_op, blend_op);
-+    
-+    png_save_uint_32(data, png_ptr->next_seq_num);
-+    png_save_uint_32(data + 4, width);
-+    png_save_uint_32(data + 8, height);
-+    png_save_uint_32(data + 12, x_offset);
-+    png_save_uint_32(data + 16, y_offset);
-+    png_save_uint_16(data + 20, delay_num);
-+    png_save_uint_16(data + 22, delay_den);
-+    data[24] = dispose_op;
-+    data[25] = blend_op;
-+    
-+    png_write_chunk(png_ptr, (png_bytep)png_fcTL, data, (png_size_t)26);
-+    
-+    png_ptr->next_seq_num++;
-+}
-+#endif /* PNG_WRITE_APNG_SUPPORTED */
-+
- /* Initializes the row writing capability of libpng */
- void /* PRIVATE */
- png_write_start_row(png_structp png_ptr)
-@@ -2113,8 +2202,8 @@
- #ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
-   if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
-   {
--      /* These will never be selected so we need not test them. */
--      filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_PAETH);
-+      /* These use previous row */
-+      filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_AVG | PNG_FILTER_PAETH);
-   }
- #endif 
- 
-@@ -2783,4 +2872,39 @@
-    }
- #endif
- }
-+
-+#ifdef PNG_WRITE_APNG_SUPPORTED
-+void /* PRIVATE */
-+png_write_reset(png_structp png_ptr)
-+{
-+    png_ptr->row_number = 0;
-+    png_ptr->pass = 0;
-+    png_ptr->mode &= ~PNG_HAVE_IDAT;
-+}
-+
-+void /* PRIVATE */
-+png_write_reinit(png_structp png_ptr, png_infop info_ptr, 
-+                 png_uint_32 width, png_uint_32 height)
-+{
-+    if (png_ptr->num_frames_written == 0 && 
-+        (width != png_ptr->first_frame_width || 
-+         height != png_ptr->first_frame_height))
-+        png_error(png_ptr, "width and/or height in the first frame's fcTL "
-+                           "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"
-+                           "the ones in IHDR");
-+    
-+    png_set_IHDR(png_ptr, info_ptr, width, height, 
-+                 info_ptr->bit_depth, info_ptr->color_type, 
-+                 info_ptr->interlace_type, info_ptr->compression_type,
-+                 info_ptr->filter_type);
-+   
-+    png_ptr->width = width;
-+    png_ptr->height = height;
-+    png_ptr->rowbytes = PNG_ROWBYTES(png_ptr->pixel_depth, width);
-+    png_ptr->usr_width = png_ptr->width;
-+}
-+#endif
- #endif /* PNG_WRITE_SUPPORTED */
-Index: pngrtran.c
-===================================================================
---- pngrtran.c
-+++ pngrtran.c
-@@ -1325,7 +1325,7 @@
-        * pixels.  This check added to libpng-1.2.19
-        */
- #if (PNG_WARN_UNINITIALIZED_ROW==1)
--      png_error(png_ptr, "Uninitialized row");
-+      png_warning(png_ptr, "Uninitialized row");
- #else
-       png_warning(png_ptr, "Uninitialized row");
- #endif
diff --git a/srcpkgs/libpng/patches/libpng-1.4.7-apng.patch.gz b/srcpkgs/libpng/patches/libpng-1.4.7-apng.patch.gz
new file mode 100644
index 0000000000000000000000000000000000000000..e6c89103cd0b8371c50cf2cf00e31770b066fadb
GIT binary patch
literal 10437
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

literal 0
HcmV?d00001

diff --git a/srcpkgs/libpng/template b/srcpkgs/libpng/template
index 797e1be1c80..17ea9b38fcf 100644
--- a/srcpkgs/libpng/template
+++ b/srcpkgs/libpng/template
@@ -1,11 +1,14 @@
 # Template build file for 'libpng'.
 pkgname=libpng
-version=1.4.5
+version=1.4.8
+patch_args="-Np1"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Library for manipulating PNG images"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=10ec58b9bb11dc829beb8f59fea52f3c10d7e89c81921ae9121f14d18ddce90a
+homepage="http://www.libpng.org/pub/png/libpng.html"
+license="zlib"
+checksum=a6df2b0da085706c8b3aa871224d83f97c2905ec2791838c5440239675deeda0
 long_desc="
  Libpng was written as a companion to the PNG specification, as a
  way to reduce the amount of time and effort it takes to support
@@ -20,3 +23,8 @@ subpackages="$pkgname-devel"
 Add_dependency run glibc
 Add_dependency run zlib
 Add_dependency build zlib-devel
+
+post_install()
+{
+	vinstall LICENSE 644 usr/share/licenses/${pkgname}
+}