packages (LIBPNG_1_2): libpng/libpng-apng.patch, libpng/libpng-export_old.p...
glen
glen at pld-linux.org
Thu Jul 8 12:39:24 CEST 2010
Author: glen Date: Thu Jul 8 10:39:24 2010 GMT
Module: packages Tag: LIBPNG_1_2
---- Log message:
- update to 1.2.44 (from libpng12); fixes CVE-2010-1205, CVE-2010-2249
---- Files affected:
packages/libpng:
libpng-apng.patch (1.10 -> 1.10.4.1) , libpng-export_old.patch (1.4 -> 1.4.2.1) , libpng.spec (1.175 -> 1.175.4.1)
---- Diffs:
================================================================
Index: packages/libpng/libpng-apng.patch
diff -u packages/libpng/libpng-apng.patch:1.10 packages/libpng/libpng-apng.patch:1.10.4.1
--- packages/libpng/libpng-apng.patch:1.10 Fri Dec 4 15:02:36 2009
+++ packages/libpng/libpng-apng.patch Thu Jul 8 12:39:18 2010
@@ -2,7 +2,7 @@
===================================================================
--- pngread.c
+++ pngread.c
-@@ -423,6 +423,11 @@
+@@ -437,6 +437,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
PNG_CONST PNG_zTXt;
#endif
@@ -14,17 +14,17 @@
#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 @@
+@@ -481,6 +486,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;
-@@ -539,12 +547,97 @@
+@@ -553,12 +561,97 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
@@ -41,28 +41,28 @@
}
}
#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 (;;)
+ {
@@ -73,13 +73,13 @@
+#endif
+ 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 */
@@ -95,7 +95,7 @@
+ 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);
@@ -103,7 +103,7 @@
+ {
+ png_ptr->idat_size = length - 4;
+ png_ptr->mode |= PNG_HAVE_IDAT;
-+
++
+ break;
+ }
+ else
@@ -122,7 +122,7 @@
/* 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 @@
+@@ -599,6 +692,10 @@
png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
{
PNG_CONST PNG_IDAT;
@@ -133,19 +133,19 @@
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 @@
+@@ -734,13 +831,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)
@@ -166,16 +166,16 @@
+ 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;
-@@ -740,6 +863,9 @@
+@@ -758,6 +881,9 @@
png_error(png_ptr, "Extra compressed data");
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
@@ -185,7 +185,7 @@
break;
}
if (ret != Z_OK)
-@@ -997,6 +1123,11 @@
+@@ -1015,6 +1141,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
PNG_CONST PNG_zTXt;
#endif
@@ -197,7 +197,7 @@
#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 @@
+@@ -1115,6 +1246,14 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
@@ -219,14 +219,14 @@
@@ -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)
@@ -235,7 +235,7 @@
+ *num_plays = info_ptr->num_plays;
+ return (1);
+ }
-+
++
+ return (0);
+}
+
@@ -243,7 +243,7 @@
+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);
@@ -253,7 +253,7 @@
+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);
@@ -267,13 +267,13 @@
+ 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 &&
++ 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;
@@ -285,7 +285,7 @@
+ *blend_op = info_ptr->next_frame_blend_op;
+ return (1);
+ }
-+
++
+ return (0);
+}
+
@@ -293,7 +293,7 @@
+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);
@@ -303,7 +303,7 @@
+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);
@@ -313,7 +313,7 @@
+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);
@@ -323,7 +323,7 @@
+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);
@@ -333,7 +333,7 @@
+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);
@@ -343,7 +343,7 @@
+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);
@@ -353,7 +353,7 @@
+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);
@@ -363,7 +363,7 @@
+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);
@@ -373,10 +373,10 @@
+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 */
@@ -397,17 +397,17 @@
+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 @@
+@@ -1038,6 +1038,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;
@@ -422,9 +422,9 @@
+#endif
+
} png_info;
-
+
typedef png_info FAR * png_infop;
-@@ -1130,6 +1143,10 @@
+@@ -1139,6 +1152,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 */
@@ -432,24 +432,24 @@
+#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
-@@ -1170,6 +1187,10 @@
+@@ -1179,6 +1196,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,
++typedef void (PNGAPI *png_progressive_frame_ptr) PNGARG((png_structp,
+ png_uint_32));
+#endif
#endif
-
+
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
-@@ -1506,6 +1527,39 @@
+@@ -1524,6 +1545,39 @@
png_uint_32 user_height_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 */
@@ -486,26 +486,26 @@
/* 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 @@
+@@ -1858,6 +1912,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_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. */
extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
png_infop info_ptr));
-@@ -2093,6 +2159,11 @@
+@@ -2111,6 +2177,11 @@
png_voidp progressive_ptr,
png_progressive_info_ptr info_fn, png_progressive_row_ptr row_fn,
png_progressive_end_ptr end_fn));
@@ -514,31 +514,31 @@
+ 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)
-@@ -2533,6 +2604,59 @@
+@@ -2551,6 +2622,59 @@
#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,
++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)
++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,
++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,
++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(void,png_ensure_fcTL_is_valid)
@@ -577,7 +577,7 @@
#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 @@
+@@ -2915,6 +3039,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 */
@@ -585,10 +585,10 @@
+#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
-@@ -3039,6 +3167,11 @@
+@@ -3057,6 +3185,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'}
@@ -597,10 +597,10 @@
+#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];
-@@ -3062,6 +3195,11 @@
+@@ -3080,6 +3213,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];
@@ -610,30 +610,30 @@
+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 @@
+@@ -3362,6 +3500,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_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)) PNG_PRIVATE;
-
-@@ -3396,6 +3545,20 @@
+
+@@ -3414,6 +3563,20 @@
PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
png_infop info_ptr)) PNG_PRIVATE;
-
+
+#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));
@@ -644,17 +644,17 @@
+#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_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,
-@@ -3619,6 +3782,18 @@
+@@ -3637,6 +3800,18 @@
png_uint_32 length)) PNG_PRIVATE;
#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));
@@ -663,18 +663,18 @@
+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_EXTERN void png_ensure_sequence_number PNGARG((png_structp png_ptr,
+ png_uint_32 length));
+#endif
+
PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
png_infop info_ptr, png_uint_32 length)) PNG_PRIVATE;
-
+
Index: pngwrite.c
===================================================================
--- pngwrite.c
+++ pngwrite.c
-@@ -56,6 +56,10 @@
+@@ -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.
*/
@@ -685,7 +685,7 @@
#ifdef PNG_WRITE_gAMA_SUPPORTED
if (info_ptr->valid & PNG_INFO_gAMA)
{
-@@ -318,6 +322,10 @@
+@@ -319,6 +323,10 @@
return;
if (!(png_ptr->mode & PNG_HAVE_IDAT))
<<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.10.4.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpng/libpng-export_old.patch?r1=1.4&r2=1.4.2.1&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpng/libpng.spec?r1=1.175&r2=1.175.4.1&f=u
More information about the pld-cvs-commit
mailing list