packages: libpng/libpng-apng.patch, libpng/libpng-pngminus.patch, libpng/li...
arekm
arekm at pld-linux.org
Thu Jan 28 10:48:21 CET 2010
Author: arekm Date: Thu Jan 28 09:48:21 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- move 1.4 from DEVEL; 1.2 at libpng12.spec
---- Files affected:
packages/libpng:
libpng-apng.patch (1.10 -> 1.11) , libpng-pngminus.patch (1.6 -> 1.7) , libpng.spec (1.176 -> 1.177) , libpng-export_old.patch (1.4 -> NONE) (REMOVED), libpng-norpath.patch (1.4 -> NONE) (REMOVED), libpng-opt.patch (1.11 -> NONE) (REMOVED), libpng-revert.patch (1.5 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/libpng/libpng-apng.patch
diff -u packages/libpng/libpng-apng.patch:1.10 packages/libpng/libpng-apng.patch:1.11
--- packages/libpng/libpng-apng.patch:1.10 Fri Dec 4 15:02:36 2009
+++ packages/libpng/libpng-apng.patch Thu Jan 28 10:48:16 2010
@@ -2,19 +2,19 @@
===================================================================
--- pngread.c
+++ pngread.c
-@@ -423,6 +423,11 @@
+@@ -292,6 +292,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
- PNG_CONST PNG_zTXt;
+ PNG_zTXt;
#endif
+#ifdef PNG_READ_APNG_SUPPORTED
-+ PNG_CONST PNG_acTL;
-+ PNG_CONST PNG_fcTL;
-+ PNG_CONST PNG_fdAT;
++ PNG_acTL;
++ PNG_fcTL;
++ PNG_fdAT;
+#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;
-@@ -467,6 +472,9 @@
+
+@@ -335,6 +340,9 @@
!(png_ptr->mode & PNG_HAVE_PLTE))
png_error(png_ptr, "Missing PLTE before IDAT");
@@ -24,7 +24,7 @@
png_ptr->idat_size = length;
png_ptr->mode |= PNG_HAVE_IDAT;
break;
-@@ -539,12 +547,97 @@
+@@ -407,12 +415,95 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
@@ -66,11 +66,9 @@
+ have_chunk_after_DAT = 0;
+ for (;;)
+ {
-+#ifdef PNG_USE_LOCAL_ARRAYS
+ PNG_IDAT;
+ PNG_fdAT;
+ PNG_fcTL;
-+#endif
+ png_byte chunk_length[4];
+ png_uint_32 length;
+
@@ -122,18 +120,18 @@
/* Optional call to update the users info_ptr structure */
void PNGAPI
png_read_update_info(png_structp png_ptr, png_infop info_ptr)
-@@ -584,6 +677,10 @@
+@@ -453,6 +544,10 @@
png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
{
- PNG_CONST PNG_IDAT;
+ PNG_IDAT;
+#ifdef PNG_READ_APNG_SUPPORTED
-+ PNG_CONST PNG_fdAT;
-+ PNG_CONST PNG_IEND;
++ 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};
-@@ -716,13 +813,39 @@
+@@ -585,13 +680,39 @@
{
if (!(png_ptr->zstream.avail_in))
{
@@ -175,8 +173,8 @@
}
png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
png_ptr->zstream.next_in = png_ptr->zbuf;
-@@ -740,6 +863,9 @@
- png_error(png_ptr, "Extra compressed data");
+@@ -609,6 +730,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
@@ -185,19 +183,19 @@
break;
}
if (ret != Z_OK)
-@@ -997,6 +1123,11 @@
+@@ -864,6 +988,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
- PNG_CONST PNG_zTXt;
+ PNG_zTXt;
#endif
+#ifdef PNG_READ_APNG_SUPPORTED
-+ PNG_CONST PNG_acTL;
-+ PNG_CONST PNG_fcTL;
-+ PNG_CONST PNG_fdAT;
++ PNG_acTL;
++ PNG_fcTL;
++ PNG_fdAT;
+#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;
-@@ -1097,6 +1228,14 @@
+
+@@ -963,6 +1092,14 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
@@ -273,7 +271,7 @@
+ width != NULL && height != NULL &&
+ x_offset != NULL && x_offset != NULL &&
+ delay_num != NULL && delay_den != NULL &&
-+ dispose_op != NULL && blend_op != NULL)
++ dispose_op != NULL && blend_op != NULL)
+ {
+ *width = info_ptr->next_frame_width;
+ *height = info_ptr->next_frame_height;
@@ -384,27 +382,11 @@
#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
png_uint_32 PNGAPI
png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
-Index: png.c
-===================================================================
---- png.c
-+++ png.c
-@@ -56,6 +56,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 */
Index: png.h
===================================================================
--- png.h
+++ png.h
-@@ -1029,6 +1029,19 @@
+@@ -861,6 +861,19 @@
png_fixed_point int_y_blue PNG_DEPSTRUCT;
#endif
@@ -424,7 +406,7 @@
} png_info;
typedef png_info FAR * png_infop;
-@@ -1130,6 +1143,10 @@
+@@ -958,6 +971,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 */
@@ -435,7 +417,7 @@
/* This is used for the transformation routines, as some of them
* change these values for the row. It also should enable using
-@@ -1170,6 +1187,10 @@
+@@ -998,6 +1015,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));
@@ -446,8 +428,8 @@
#endif
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-@@ -1506,6 +1527,39 @@
- png_uint_32 user_height_max PNG_DEPSTRUCT;
+@@ -1320,6 +1341,39 @@
+ png_uint_32 user_chunk_cache_max PNG_DEPSTRUCT;
#endif
+#ifdef PNG_APNG_SUPPORTED
@@ -486,7 +468,7 @@
/* 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. */
-@@ -1840,6 +1894,18 @@
+@@ -1648,6 +1702,18 @@
extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
png_bytepp image));
@@ -494,18 +476,18 @@
+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_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
-+
- /* Writes the end of the PNG file. */
++
+ /* Write the end of the PNG file. */
extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
png_infop info_ptr));
-@@ -2093,6 +2159,11 @@
+@@ -1891,6 +1957,11 @@
png_voidp progressive_ptr,
png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
png_progressive_end_ptr end_fn));
@@ -517,7 +499,7 @@
/* Returns the user pointer associated with the push read functions */
extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
-@@ -2533,6 +2604,59 @@
+@@ -2317,6 +2388,59 @@
#endif
#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
@@ -577,7 +559,11 @@
#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
-@@ -2897,6 +3021,10 @@
+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 */
@@ -587,32 +573,20 @@
+#endif
/* Flags for the transformations the PNG library does on the image data */
- #define PNG_BGR 0x0001
-@@ -3039,6 +3167,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'}
+ #define PNG_BGR 0x0001
+@@ -231,6 +235,11 @@
+ #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_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'}
++#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'}
+#endif
- #ifdef PNG_USE_GLOBAL_ARRAYS
- PNG_EXPORT_VAR (png_byte FARDATA) png_IHDR[5];
-@@ -3062,6 +3195,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)
-@@ -3344,6 +3482,17 @@
+ /* Inhibit C++ name-mangling for libpng functions but not for system calls. */
+@@ -468,6 +477,17 @@
#endif
#endif
@@ -628,11 +602,11 @@
+#endif
+
/* Called when finished processing a row of data */
- PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr)) PNG_PRIVATE;
+ PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
-@@ -3396,6 +3545,20 @@
+@@ -520,6 +540,20 @@
PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
- png_infop info_ptr)) PNG_PRIVATE;
+ png_infop info_ptr));
+#ifdef PNG_READ_APNG_SUPPORTED
+/* Private, reset some things to become ready for reading next frame */
@@ -651,8 +625,8 @@
/* 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,
-@@ -3619,6 +3782,18 @@
- png_uint_32 length)) PNG_PRIVATE;
+@@ -735,6 +769,18 @@
+ png_uint_32 length));
#endif
+#ifdef PNG_READ_APNG_SUPPORTED
@@ -668,7 +642,7 @@
+#endif
+
PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
- png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE;
+ png_infop info_ptr, png_uint_32 length));
Index: pngwrite.c
===================================================================
@@ -696,7 +670,7 @@
/* See if user wants us to write information chunks */
if (info_ptr != NULL)
-@@ -1582,4 +1590,39 @@
+@@ -1451,4 +1459,39 @@
params = params;
}
#endif
@@ -740,18 +714,18 @@
===================================================================
--- pngconf.h
+++ pngconf.h
-@@ -944,6 +944,10 @@
- # define PNG_NO_READ_tEXt
- # define PNG_NO_READ_zTXt
+@@ -845,6 +845,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_bKGD
- # define PNG_READ_bKGD_SUPPORTED
- # define PNG_bKGD_SUPPORTED
-@@ -1170,6 +1174,14 @@
+ #ifndef PNG_NO_READ_zTXt
+ # define PNG_READ_zTXt_SUPPORTED
+ # define PNG_zTXt_SUPPORTED
+@@ -1002,6 +1006,14 @@
# define PNG_TEXT_SUPPORTED
# endif
#endif
@@ -770,19 +744,19 @@
===================================================================
--- pngpread.c
+++ pngpread.c
-@@ -206,6 +206,11 @@
+@@ -205,6 +205,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
- PNG_CONST PNG_zTXt;
+ PNG_zTXt;
#endif
+#ifdef PNG_READ_APNG_SUPPORTED
-+ PNG_CONST PNG_acTL;
-+ PNG_CONST PNG_fcTL;
-+ PNG_CONST PNG_fdAT;
++ PNG_acTL;
++ PNG_fcTL;
++ PNG_fdAT;
+#endif
- #endif /* PNG_USE_LOCAL_ARRAYS */
/* First we make sure we have enough data for the 4 byte chunk name
-@@ -232,6 +237,103 @@
+ * and the 4 byte chunk length before proceeding with decoding the
+@@ -230,6 +235,103 @@
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
}
@@ -886,8 +860,8 @@
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;
-@@ -327,6 +429,9 @@
- png_error(png_ptr, "Too many IDAT's found");
+@@ -325,6 +427,9 @@
+ png_benign_error(png_ptr, "Too many IDATs found");
}
+#ifdef PNG_READ_APNG_SUPPORTED
@@ -896,7 +870,7 @@
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 @@
+@@ -555,6 +660,38 @@
}
#endif
@@ -935,17 +909,14 @@
else
{
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
-@@ -731,13 +868,17 @@
+@@ -729,11 +866,15 @@
png_push_read_IDAT(png_structp png_ptr)
{
- #ifdef PNG_USE_LOCAL_ARRAYS
-- PNG_CONST PNG_IDAT;
-+ PNG_IDAT;
+ PNG_IDAT;
+#ifdef PNG_READ_APNG_SUPPORTED
+ PNG_fdAT;
+ PNG_IEND;
+#endif
- #endif
if (!(png_ptr->mode & PNG_HAVE_CHUNK_HEADER))
{
png_byte chunk_length[4];
@@ -955,13 +926,13 @@
{
png_push_save_buffer(png_ptr);
return;
-@@ -749,15 +890,62 @@
+@@ -745,15 +886,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_bytep)png_fdAT, 4)
++ if (png_memcmp(png_ptr->chunk_name, png_fdAT, 4)
+ && png_ptr->num_frames_read > 0)
+ {
+ if (png_ptr->flags & PNG_FLAG_ZLIB_FINISHED)
@@ -1019,7 +990,7 @@
}
if (png_ptr->idat_size && png_ptr->save_buffer_size)
{
-@@ -1719,6 +1907,17 @@
+@@ -1710,6 +1898,17 @@
png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
}
@@ -1041,8 +1012,8 @@
===================================================================
--- pngset.c
+++ pngset.c
-@@ -266,6 +266,11 @@
- info_ptr->rowbytes = (png_size_t)0;
+@@ -260,6 +260,11 @@
+ info_ptr->rowbytes = 0;
else
info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
+
@@ -1053,7 +1024,7 @@
}
#ifdef PNG_oFFs_SUPPORTED
-@@ -960,6 +965,142 @@
+@@ -932,6 +937,142 @@
}
#endif /* PNG_sPLT_SUPPORTED */
@@ -1166,12 +1137,12 @@
+ 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)
++ 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)
++ blend_op != PNG_BLEND_OP_OVER)
+ png_error(png_ptr, "invalid blend_op in fcTL");
+}
+
@@ -1193,14 +1164,14 @@
+}
+#endif /* PNG_APNG_SUPPORTED */
+
- #ifdef PNG_HANDLE_AS_UNKNOWN_SUPPORTED
+ #ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
void PNGAPI
png_set_unknown_chunks(png_structp png_ptr,
Index: pngrutil.c
===================================================================
--- pngrutil.c
+++ pngrutil.c
-@@ -425,6 +425,11 @@
+@@ -423,6 +423,11 @@
filter_type = buf[11];
interlace_type = buf[12];
@@ -1212,7 +1183,7 @@
/* Set internal variables */
png_ptr->width = width;
png_ptr->height = height;
-@@ -2227,6 +2232,168 @@
+@@ -2294,6 +2299,168 @@
}
#endif
@@ -1381,7 +1352,7 @@
/* 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
-@@ -3240,4 +3407,84 @@
+@@ -3333,4 +3500,82 @@
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
@@ -1407,14 +1378,13 @@
+ 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_check(png_ptr, png_ptr->prev_row, 0, png_ptr->rowbytes + 1);
++ 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)
+{
-+#ifdef PNG_USE_LOCAL_ARRAYS
+ /* start of interlace block */
+ const int FARDATA png_pass_start[] = {0, 4, 0, 2, 0, 1, 0};
+
@@ -1426,7 +1396,6 @@
+
+ /* offset to next interlace block in the y direction */
+ const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
-+#endif
+ png_uint_32 row_bytes;
+
+ if (png_ptr->interlaced)
@@ -1470,7 +1439,7 @@
===================================================================
--- pngwutil.c
+++ pngwutil.c
-@@ -515,6 +515,11 @@
+@@ -538,6 +538,11 @@
/* Write the chunk */
png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
@@ -1482,17 +1451,17 @@
/* Initialize zlib with PNG info */
png_ptr->zstream.zalloc = png_zalloc;
png_ptr->zstream.zfree = png_zfree;
-@@ -638,6 +643,9 @@
+@@ -658,6 +663,9 @@
+ png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
{
- #ifdef PNG_USE_LOCAL_ARRAYS
PNG_IDAT;
+#ifdef PNG_WRITE_APNG_SUPPORTED
+ PNG_fdAT;
+#endif
- #endif
png_debug(1, "in png_write_IDAT");
-@@ -683,7 +691,28 @@
+
+@@ -702,7 +710,28 @@
"Invalid zlib compression method or flags in IDAT");
}
@@ -1521,7 +1490,7 @@
png_ptr->mode |= PNG_HAVE_IDAT;
}
-@@ -1750,6 +1779,70 @@
+@@ -1709,6 +1738,66 @@
}
#endif
@@ -1530,9 +1499,7 @@
+png_write_acTL(png_structp png_ptr,
+ png_uint_32 num_frames, png_uint_32 num_plays)
+{
-+#ifdef PNG_USE_LOCAL_ARRAYS
+ PNG_acTL;
-+#endif
+ png_byte data[16];
+
+ png_debug(1, "in png_write_acTL");
@@ -1554,9 +1521,7 @@
+ png_uint_16 delay_num, png_uint_16 delay_den, png_byte dispose_op,
+ png_byte blend_op)
+{
-+#ifdef PNG_USE_LOCAL_ARRAYS
+ PNG_fcTL;
-+#endif
+ png_byte data[26];
+
+ png_debug(1, "in png_write_fcTL");
@@ -1592,7 +1557,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpng/libpng-apng.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpng/libpng-pngminus.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpng/libpng.spec?r1=1.176&r2=1.177&f=u
More information about the pld-cvs-commit
mailing list