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}
+}