===================================================================
--- pngread.c
+++ pngread.c
-@@ -410,6 +410,11 @@
+@@ -413,6 +413,11 @@
#if defined(PNG_READ_zTXt_SUPPORTED)
PNG_CONST PNG_zTXt;
#endif
#endif /* PNG_USE_LOCAL_ARRAYS */
png_uint_32 length = png_read_chunk_header(png_ptr);
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-@@ -454,6 +459,9 @@
+@@ -457,6 +462,9 @@
!(png_ptr->mode & PNG_HAVE_PLTE))
png_error(png_ptr, "Missing PLTE before IDAT");
png_ptr->idat_size = length;
png_ptr->mode |= PNG_HAVE_IDAT;
break;
-@@ -526,12 +534,97 @@
+@@ -529,12 +537,97 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
/* Optional call to update the users info_ptr structure */
void PNGAPI
png_read_update_info(png_structp png_ptr, png_infop info_ptr)
-@@ -570,6 +663,10 @@
+@@ -573,6 +666,10 @@
{
#ifdef PNG_USE_LOCAL_ARRAYS
PNG_CONST PNG_IDAT;
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};
-@@ -700,13 +797,39 @@
+@@ -703,13 +800,39 @@
{
if (!(png_ptr->zstream.avail_in))
{
}
png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
png_ptr->zstream.next_in = png_ptr->zbuf;
-@@ -724,6 +847,9 @@
+@@ -727,6 +850,9 @@
png_error(png_ptr, "Extra compressed data");
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
break;
}
if (ret != Z_OK)
-@@ -978,6 +1104,11 @@
+@@ -981,6 +1107,11 @@
#if defined(PNG_READ_zTXt_SUPPORTED)
PNG_CONST PNG_zTXt;
#endif
#endif /* PNG_USE_LOCAL_ARRAYS */
png_uint_32 length = png_read_chunk_header(png_ptr);
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
-@@ -1078,6 +1209,14 @@
+@@ -1081,6 +1212,14 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
===================================================================
--- pngget.c
+++ pngget.c
-@@ -835,6 +835,167 @@
+@@ -839,6 +839,167 @@
}
#endif
-+#if defined(PNG_APNG_SUPPORTED)
++#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.c
+++ png.c
-@@ -51,6 +51,9 @@
+@@ -54,6 +54,11 @@
PNG_tIME;
PNG_tRNS;
PNG_zTXt;
++#ifdef PNG_APNG_SUPPORTED
+PNG_acTL;
+PNG_fcTL;
+PNG_fdAT;
++#endif
#ifdef PNG_READ_SUPPORTED
/* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */
===================================================================
--- png.h
+++ png.h
-@@ -1001,6 +1001,19 @@
+@@ -1024,6 +1024,19 @@
png_fixed_point int_y_blue;
#endif
-+#if defined(PNG_APNG_SUPPORTED)
++#ifdef PNG_APNG_SUPPORTED
+ png_uint_32 num_frames; /* including default image */
+ png_uint_32 num_plays;
+ png_uint_32 next_frame_width;
} png_info;
typedef png_info FAR * png_infop;
-@@ -1102,6 +1115,8 @@
+@@ -1125,6 +1138,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
-@@ -1142,6 +1157,10 @@
+@@ -1165,6 +1182,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));
-+#if defined(PNG_APNG_SUPPORTED)
++#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) || \
-@@ -1476,6 +1495,39 @@
+@@ -1499,6 +1520,39 @@
png_uint_32 user_height_max;
#endif
-+#if defined(PNG_APNG_SUPPORTED)
++#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;
+
-+#if defined(PNG_READ_APNG_SUPPORTED)
++#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
+#endif
+#endif
+
-+#if defined(PNG_WRITE_APNG_SUPPORTED)
++#ifdef PNG_WRITE_APNG_SUPPORTED
+ png_uint_32 num_frames_to_write;
+ png_uint_32 num_frames_written;
+#endif
-+#endif
+
+/* For png_struct.apng_flags: */
+#define PNG_FIRST_FRAME_HIDDEN 0x0001
+/* 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 */
#if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
- /* storage for unknown chunk that the library doesn't recognize. */
-@@ -1809,6 +1861,18 @@
+ /* Storage for unknown chunk that the library doesn't recognize. */
+@@ -1832,6 +1886,18 @@
extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
png_bytepp image));
-+#if defined(PNG_WRITE_APNG_SUPPORTED)
++#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_infop png_info));
+#endif
+
- /* writes the end of the PNG file. */
+ /* Writes the end of the PNG file. */
extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
png_infop info_ptr));
-@@ -2062,6 +2126,11 @@
+@@ -2085,6 +2151,11 @@
png_voidp progressive_ptr,
png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
png_progressive_end_ptr end_fn));
-+#if defined(PNG_READ_APNG_SUPPORTED)
++#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 */
+ /* Returns the user pointer associated with the push read functions */
extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
-@@ -2499,6 +2568,59 @@
+@@ -2525,6 +2596,59 @@
#endif
#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
-+#if defined(PNG_APNG_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,
+ PNGARG((png_structp png_ptr, png_infop info_ptr, png_byte is_hidden));
+#endif /* PNG_APNG_SUPPORTED */
+
-+#if defined(PNG_READ_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
+
- #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
- /* provide a list of chunks and how they are to be handled, if the built-in
+ #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
-@@ -2860,6 +2982,8 @@
+@@ -2891,6 +3015,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 */
+ /* Flags for the transformations the PNG library does on the image data */
#define PNG_BGR 0x0001
-@@ -3000,6 +3124,9 @@
+@@ -3032,6 +3160,11 @@
#define PNG_tIME png_byte png_tIME[5] = {116, 73, 77, 69, '\0'}
#define PNG_tRNS png_byte png_tRNS[5] = {116, 82, 78, 83, '\0'}
#define PNG_zTXt png_byte png_zTXt[5] = {122, 84, 88, 116, '\0'}
++#ifdef PNG_APNG_SUPPORTED
+#define PNG_acTL png_byte png_acTL[5] = { 97, 99, 84, 76, '\0'}
+#define PNG_fcTL png_byte png_fcTL[5] = {102, 99, 84, 76, '\0'}
+#define PNG_fdAT png_byte png_fdAT[5] = {102, 100, 65, 84, '\0'}
++#endif
#ifdef PNG_USE_GLOBAL_ARRAYS
PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5];
-@@ -3023,6 +3150,9 @@
+@@ -3055,6 +3188,11 @@
PNG_EXPORT_VAR (png_byte FARDATA) png_tIME[5];
PNG_EXPORT_VAR (png_byte FARDATA) png_tRNS[5];
PNG_EXPORT_VAR (png_byte FARDATA) png_zTXt[5];
++#ifdef PNG_APNG_SUPPORTED
+PNG_EXPORT_VAR (png_byte FARDATA) png_acTL[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_fcTL[5];
+PNG_EXPORT_VAR (png_byte FARDATA) png_fdAT[5];
++#endif
#endif /* PNG_USE_GLOBAL_ARRAYS */
#if defined(PNG_1_0_X) || defined (PNG_1_2_X)
-@@ -3297,6 +3427,17 @@
+@@ -3330,6 +3468,17 @@
#endif
#endif
-+#if defined(PNG_WRITE_APNG_SUPPORTED)
++#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));
+
/* Called when finished processing a row of data */
PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
-@@ -3348,6 +3489,20 @@
+@@ -3381,6 +3530,20 @@
PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
png_infop info_ptr));
-+#if defined(PNG_READ_APNG_SUPPORTED)
-+/* private, reset some things to become ready for reading next frame */
++#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
-+#if defined(PNG_WRITE_APNG_SUPPORTED)
-+/* private, reset some things to become ready for writing next frame */
++#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 */
+ /* These are the functions that do the transformations */
#if defined(PNG_READ_FILLER_SUPPORTED)
PNG_EXTERN void png_do_read_filler PNGARG((png_row_infop row_info,
-@@ -3563,6 +3718,18 @@
+@@ -3596,6 +3759,18 @@
png_uint_32 length));
#endif
-+#if defined(PNG_READ_APNG_SUPPORTED)
++#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,
===================================================================
--- pngwrite.c
+++ pngwrite.c
-@@ -50,6 +50,10 @@
+@@ -53,6 +53,10 @@
/* The rest of these check to see if the valid field has the appropriate
* flag set, and if it does, writes the chunk.
*/
#if defined(PNG_WRITE_gAMA_SUPPORTED)
if (info_ptr->valid & PNG_INFO_gAMA)
{
-@@ -311,6 +315,10 @@
+@@ -314,6 +318,10 @@
return;
if (!(png_ptr->mode & PNG_HAVE_IDAT))
png_error(png_ptr, "No IDATs written into file");
/* See if user wants us to write information chunks */
if (info_ptr != NULL)
-@@ -1555,4 +1563,39 @@
+@@ -1558,4 +1566,39 @@
params = params;
}
#endif
===================================================================
--- pngconf.h
+++ pngconf.h
-@@ -940,6 +940,10 @@
- # define PNG_READ_zTXt_SUPPORTED
- # define PNG_zTXt_SUPPORTED
+@@ -872,6 +872,10 @@
+ # define PNG_NO_READ_tEXt
+ # define PNG_NO_READ_zTXt
#endif
+#ifndef PNG_NO_READ_APNG
+# define PNG_READ_APNG_SUPPORTED
+# define PNG_APNG_SUPPORTED
+#endif
- #ifndef PNG_NO_READ_UNKNOWN_CHUNKS
- # define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
- # ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
-@@ -1082,6 +1086,12 @@
- # define PNG_zTXt_SUPPORTED
+ #ifndef PNG_NO_READ_bKGD
+ # define PNG_READ_bKGD_SUPPORTED
+ # define PNG_bKGD_SUPPORTED
+@@ -1098,6 +1102,14 @@
+ # define PNG_TEXT_SUPPORTED
# endif
#endif
+#ifndef PNG_NO_WRITE_APNG
-+# define PNG_WRITE_APNG_SUPPORTED
++# ifndef PNG_WRITE_APNG_SUPPORTED
++# define PNG_WRITE_APNG_SUPPORTED
++# endif
+# ifndef PNG_APNG_SUPPORTED
+# define PNG_APNG_SUPPORTED
+# endif
+#endif
- #ifndef PNG_NO_WRITE_UNKNOWN_CHUNKS
- # define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
- # ifndef PNG_UNKNOWN_CHUNKS_SUPPORTED
+
+ #endif /* PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED */
+
Index: pngpread.c
===================================================================
--- pngpread.c
+++ pngpread.c
-@@ -202,6 +202,11 @@
+@@ -205,6 +205,11 @@
#if defined(PNG_READ_zTXt_SUPPORTED)
PNG_CONST PNG_zTXt;
#endif
#endif /* PNG_USE_LOCAL_ARRAYS */
/* 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
-@@ -227,6 +232,103 @@
+@@ -230,6 +235,103 @@
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
}
+ {
+ if (!png_memcmp(png_ptr->chunk_name, png_IDAT, 4))
+ {
-+ /* discard trailing IDATs for the first frame */
++ /* 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->mode & PNG_HAVE_fcTL))
+ {
-+ /* discard trailing fdATs for frames other than the first */
++ /* 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_memcmp(png_ptr->chunk_name, png_IDAT, 4))
if (png_ptr->mode & PNG_AFTER_IDAT)
png_ptr->mode |= PNG_HAVE_CHUNK_AFTER_IDAT;
-@@ -322,6 +424,9 @@
+@@ -325,6 +427,9 @@
png_error(png_ptr, "Too many IDAT's found");
}
png_ptr->idat_size = png_ptr->push_length;
png_ptr->mode |= PNG_HAVE_IDAT;
png_ptr->process_mode = PNG_READ_IDAT_MODE;
-@@ -552,6 +657,38 @@
+@@ -555,6 +660,38 @@
}
#endif
+ 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))
+ 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))
+ 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)
-@@ -726,13 +863,17 @@
+@@ -729,13 +866,17 @@
png_push_read_IDAT(png_structp png_ptr)
{
#ifdef PNG_USE_LOCAL_ARRAYS
{
png_push_save_buffer(png_ptr);
return;
-@@ -744,15 +885,62 @@
+@@ -747,15 +888,62 @@
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
+#endif
+ if (png_memcmp(png_ptr->chunk_name, png_IDAT, 4)
+#if defined(PNG_READ_APNG_SUPPORTED)
-+ && (png_ptr->num_frames_read == 0)
++ && (png_ptr->num_frames_read == 0)
+#endif
-+ )
++ )
{
png_ptr->process_mode = PNG_READ_CHUNK_MODE;
if (!(png_ptr->flags & PNG_FLAG_ZLIB_FINISHED))
png_ptr->idat_size = png_ptr->push_length;
+
+#if defined(PNG_READ_APNG_SUPPORTED)
-+ if(png_ptr->num_frames_read > 0)
++ if (png_ptr->num_frames_read > 0)
+ {
+ png_ensure_sequence_number(png_ptr, 4);
+ png_ptr->idat_size -= 4;
}
if (png_ptr->idat_size && png_ptr->save_buffer_size)
{
-@@ -1713,6 +1901,17 @@
+@@ -1716,6 +1904,17 @@
png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
}
===================================================================
--- pngset.c
+++ pngset.c
-@@ -317,6 +317,11 @@
+@@ -329,6 +329,11 @@
info_ptr->rowbytes = (png_size_t)0;
else
info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
-+
-+#if defined(PNG_APNG_SUPPORTED)
++
++#ifdef PNG_APNG_SUPPORTED
+ /* for non-animated png. this may be overritten from an acTL chunk later */
+ info_ptr->num_frames = 1;
+#endif
}
#if defined(PNG_oFFs_SUPPORTED)
-@@ -1004,6 +1009,142 @@
+@@ -1029,6 +1034,142 @@
}
#endif /* PNG_sPLT_SUPPORTED */
-+#if defined(PNG_APNG_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)
+
+ if (png_ptr == NULL || info_ptr == NULL)
+ {
-+ png_warning(png_ptr,
++ 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,
++ 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,
++ 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,
++ png_warning(png_ptr,
+ "Ignoring attempt to set acTL with num_plays "
+ "> 2^31-1");
+ return (0);
+
+ if (png_ptr == NULL || info_ptr == NULL)
+ {
-+ png_warning(png_ptr,
++ 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 (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_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");
+}
+#endif /* PNG_APNG_SUPPORTED */
+
- #if defined(PNG_UNKNOWN_CHUNKS_SUPPORTED)
+ #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
void PNGAPI
png_set_unknown_chunks(png_structp png_ptr,
Index: pngrutil.c
===================================================================
--- pngrutil.c
+++ pngrutil.c
-@@ -421,6 +421,11 @@
+@@ -424,6 +424,11 @@
filter_type = buf[11];
interlace_type = buf[12];
/* Set internal variables */
png_ptr->width = width;
png_ptr->height = height;
-@@ -2227,6 +2232,168 @@
+@@ -2230,6 +2235,168 @@
}
#endif
/* 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
-@@ -3241,4 +3408,84 @@
+@@ -3249,4 +3416,84 @@
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
+ png_ptr->iwidth = png_ptr->width;
+ png_ptr->irowbytes = png_ptr->rowbytes + 1;
+ }
-+
++
+ png_ptr->flags &= ~PNG_FLAG_ZLIB_FINISHED;
+ if (inflateReset(&(png_ptr->zstream)) != Z_OK)
+ png_error(png_ptr, "inflateReset failed");
===================================================================
--- pngwutil.c
+++ pngwutil.c
-@@ -508,6 +508,11 @@
+@@ -513,6 +513,11 @@
/* Write the chunk */
png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
/* Initialize zlib with PNG info */
png_ptr->zstream.zalloc = png_zalloc;
png_ptr->zstream.zfree = png_zfree;
-@@ -630,6 +635,9 @@
+@@ -636,6 +641,9 @@
{
#ifdef PNG_USE_LOCAL_ARRAYS
PNG_IDAT;
+ PNG_fdAT;
+#endif
#endif
- png_debug(1, "in png_write_IDAT");
-@@ -674,7 +682,28 @@
+ png_debug(1, "in png_write_IDAT");
+@@ -681,7 +689,28 @@
"Invalid zlib compression method or flags in IDAT");
}
png_ptr->mode |= PNG_HAVE_IDAT;
}
-@@ -1716,6 +1745,70 @@
+@@ -1748,6 +1777,70 @@
}
#endif
/* Initializes the row writing capability of libpng */
void /* PRIVATE */
png_write_start_row(png_structp png_ptr)
-@@ -2119,6 +2212,8 @@
- #if defined(PNG_WRITE_WEIGHTED_FILTER_SUPPORTED)
- int num_p_filters = (int)png_ptr->num_prev_filters;
- #endif
-+ if (png_ptr->row_number == 0)
-+ filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_AVG | PNG_FILTER_PAETH); /* they use previous row */
+@@ -2157,6 +2250,14 @@
png_debug(1, "in png_write_find_filter");
+
++#ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
++ if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
++ {
++ /* These use previous row */
++ filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_AVG | PNG_FILTER_PAETH);
++ }
++#endif
++
/* Find out how many bytes offset each pixel is */
-@@ -2785,4 +2880,39 @@
+ bpp = (row_info->pixel_depth + 7) >> 3;
+
+@@ -2822,4 +2923,39 @@
}
#endif
}
===================================================================
--- pngrtran.c
+++ pngrtran.c
-@@ -1322,7 +1322,7 @@
+@@ -1321,7 +1321,7 @@
* pixels. This check added to libpng-1.2.19
*/
#if (PNG_WARN_UNINITIALIZED_ROW==1)
projects / packages / libpng.git / blobdiff