mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
libpng:
- update to libpng-1.4.1
This commit is contained in:
parent
1cad867119
commit
e5d6015e43
@ -1,7 +1,7 @@
|
||||
diff -Naur libpng-1.4.0/pngconf.h libpng-1.4.0.patch/pngconf.h
|
||||
--- libpng-1.4.0/pngconf.h 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngconf.h 2010-02-07 22:41:01.976857238 +0100
|
||||
@@ -845,6 +845,10 @@
|
||||
diff -Naur libpng-1.4.1/pngconf.h libpng-1.4.1.patch/pngconf.h
|
||||
--- libpng-1.4.1/pngconf.h 2010-02-25 12:38:29.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngconf.h 2010-04-16 21:09:43.641352386 +0200
|
||||
@@ -869,6 +869,10 @@
|
||||
# define PNG_READ_tRNS_SUPPORTED
|
||||
# define PNG_tRNS_SUPPORTED
|
||||
#endif
|
||||
@ -12,7 +12,7 @@ diff -Naur libpng-1.4.0/pngconf.h libpng-1.4.0.patch/pngconf.h
|
||||
#ifndef PNG_NO_READ_zTXt
|
||||
# define PNG_READ_zTXt_SUPPORTED
|
||||
# define PNG_zTXt_SUPPORTED
|
||||
@@ -1002,6 +1006,14 @@
|
||||
@@ -1028,6 +1032,14 @@
|
||||
# define PNG_TEXT_SUPPORTED
|
||||
# endif
|
||||
#endif
|
||||
@ -27,9 +27,9 @@ diff -Naur libpng-1.4.0/pngconf.h libpng-1.4.0.patch/pngconf.h
|
||||
|
||||
#ifdef PNG_WRITE_tIME_SUPPORTED
|
||||
# ifndef PNG_NO_CONVERT_tIME
|
||||
diff -Naur libpng-1.4.0/pngget.c libpng-1.4.0.patch/pngget.c
|
||||
--- libpng-1.4.0/pngget.c 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngget.c 2010-02-07 22:41:01.955858172 +0100
|
||||
diff -Naur libpng-1.4.1/pngget.c libpng-1.4.1.patch/pngget.c
|
||||
--- libpng-1.4.1/pngget.c 2010-02-25 12:38:29.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngget.c 2010-04-16 21:09:34.942347204 +0200
|
||||
@@ -842,6 +842,167 @@
|
||||
}
|
||||
#endif
|
||||
@ -198,10 +198,10 @@ diff -Naur libpng-1.4.0/pngget.c libpng-1.4.0.patch/pngget.c
|
||||
#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
|
||||
png_uint_32 PNGAPI
|
||||
png_get_unknown_chunks(png_structp png_ptr, png_infop info_ptr,
|
||||
diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
--- libpng-1.4.0/png.h 2010-01-03 06:05:35.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/png.h 2010-02-07 22:41:01.969858760 +0100
|
||||
@@ -861,6 +861,19 @@
|
||||
diff -Naur libpng-1.4.1/png.h libpng-1.4.1.patch/png.h
|
||||
--- libpng-1.4.1/png.h 2010-02-25 12:38:29.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/png.h 2010-04-16 21:09:36.985444853 +0200
|
||||
@@ -888,6 +888,19 @@
|
||||
png_fixed_point int_y_blue PNG_DEPSTRUCT;
|
||||
#endif
|
||||
|
||||
@ -221,7 +221,7 @@ diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
} png_info;
|
||||
|
||||
typedef png_info FAR * png_infop;
|
||||
@@ -958,6 +971,10 @@
|
||||
@@ -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 */
|
||||
@ -232,7 +232,7 @@ diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
|
||||
/* This is used for the transformation routines, as some of them
|
||||
* change these values for the row. It also should enable using
|
||||
@@ -998,6 +1015,10 @@
|
||||
@@ -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));
|
||||
@ -243,7 +243,7 @@ diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
#endif
|
||||
|
||||
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
|
||||
@@ -1320,6 +1341,39 @@
|
||||
@@ -1445,6 +1466,36 @@
|
||||
png_uint_32 user_chunk_cache_max PNG_DEPSTRUCT;
|
||||
#endif
|
||||
|
||||
@ -267,9 +267,6 @@ diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
+ png_uint_32 num_frames_written;
|
||||
+#endif
|
||||
+
|
||||
+/* For png_struct.apng_flags: */
|
||||
+#define PNG_FIRST_FRAME_HIDDEN 0x0001
|
||||
+
|
||||
+/* dispose_op flags from inside fcTL */
|
||||
+#define PNG_DISPOSE_OP_NONE 0x00
|
||||
+#define PNG_DISPOSE_OP_BACKGROUND 0x01
|
||||
@ -283,7 +280,7 @@ diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
/* 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. */
|
||||
@@ -1648,6 +1702,18 @@
|
||||
@@ -1773,6 +1824,18 @@
|
||||
extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
|
||||
png_bytepp image));
|
||||
|
||||
@ -302,7 +299,7 @@ diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
/* Write the end of the PNG file. */
|
||||
extern PNG_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
|
||||
png_infop info_ptr));
|
||||
@@ -1891,6 +1957,11 @@
|
||||
@@ -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));
|
||||
@ -314,7 +311,7 @@ diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
|
||||
/* Returns the user pointer associated with the push read functions */
|
||||
extern PNG_EXPORT(png_voidp,png_get_progressive_ptr)
|
||||
@@ -2317,6 +2388,59 @@
|
||||
@@ -2443,6 +2511,53 @@
|
||||
#endif
|
||||
#endif /* PNG_sCAL_SUPPORTED || PNG_WRITE_sCAL_SUPPORTED */
|
||||
|
||||
@ -338,12 +335,6 @@ diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
+ 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)
|
||||
+ 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));
|
||||
+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)
|
||||
@ -374,9 +365,9 @@ diff -Naur libpng-1.4.0/png.h libpng-1.4.0.patch/png.h
|
||||
#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
|
||||
diff -Naur libpng-1.4.0/pngpread.c libpng-1.4.0.patch/pngpread.c
|
||||
--- libpng-1.4.0/pngpread.c 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngpread.c 2010-02-07 22:41:01.978856784 +0100
|
||||
diff -Naur libpng-1.4.1/pngpread.c libpng-1.4.1.patch/pngpread.c
|
||||
--- libpng-1.4.1/pngpread.c 2010-02-25 12:38:29.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngpread.c 2010-04-16 21:09:45.794352317 +0200
|
||||
@@ -205,6 +205,11 @@
|
||||
#ifdef PNG_READ_zTXt_SUPPORTED
|
||||
PNG_zTXt;
|
||||
@ -503,7 +494,7 @@ diff -Naur libpng-1.4.0/pngpread.c libpng-1.4.0.patch/pngpread.c
|
||||
png_ptr->idat_size = png_ptr->push_length;
|
||||
png_ptr->mode |= PNG_HAVE_IDAT;
|
||||
png_ptr->process_mode = PNG_READ_IDAT_MODE;
|
||||
@@ -555,6 +660,38 @@
|
||||
@@ -557,6 +662,38 @@
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -542,7 +533,7 @@ diff -Naur libpng-1.4.0/pngpread.c libpng-1.4.0.patch/pngpread.c
|
||||
else
|
||||
{
|
||||
if (png_ptr->push_length + 4 > png_ptr->buffer_size)
|
||||
@@ -729,11 +866,15 @@
|
||||
@@ -736,11 +873,15 @@
|
||||
png_push_read_IDAT(png_structp png_ptr)
|
||||
{
|
||||
PNG_IDAT;
|
||||
@ -559,7 +550,7 @@ diff -Naur libpng-1.4.0/pngpread.c libpng-1.4.0.patch/pngpread.c
|
||||
{
|
||||
png_push_save_buffer(png_ptr);
|
||||
return;
|
||||
@@ -745,15 +886,62 @@
|
||||
@@ -752,15 +893,62 @@
|
||||
png_crc_read(png_ptr, png_ptr->chunk_name, 4);
|
||||
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
|
||||
|
||||
@ -623,7 +614,7 @@ diff -Naur libpng-1.4.0/pngpread.c libpng-1.4.0.patch/pngpread.c
|
||||
}
|
||||
if (png_ptr->idat_size && png_ptr->save_buffer_size)
|
||||
{
|
||||
@@ -1710,6 +1898,17 @@
|
||||
@@ -1716,6 +1904,17 @@
|
||||
png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
|
||||
}
|
||||
|
||||
@ -641,9 +632,9 @@ diff -Naur libpng-1.4.0/pngpread.c libpng-1.4.0.patch/pngpread.c
|
||||
png_voidp PNGAPI
|
||||
png_get_progressive_ptr(png_structp png_ptr)
|
||||
{
|
||||
diff -Naur libpng-1.4.0/pngpriv.h libpng-1.4.0.patch/pngpriv.h
|
||||
--- libpng-1.4.0/pngpriv.h 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngpriv.h 2010-02-07 22:41:01.971859004 +0100
|
||||
diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
|
||||
--- libpng-1.4.1/pngpriv.h 2010-02-25 12:38:29.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngpriv.h 2010-04-16 21:09:39.167350934 +0200
|
||||
@@ -98,6 +98,10 @@
|
||||
#define PNG_BACKGROUND_IS_GRAY 0x800
|
||||
#define PNG_HAVE_PNG_SIGNATURE 0x1000
|
||||
@ -655,7 +646,7 @@ diff -Naur libpng-1.4.0/pngpriv.h libpng-1.4.0.patch/pngpriv.h
|
||||
|
||||
/* Flags for the transformations the PNG library does on the image data */
|
||||
#define PNG_BGR 0x0001
|
||||
@@ -231,6 +235,11 @@
|
||||
@@ -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'}
|
||||
@ -663,11 +654,14 @@ diff -Naur libpng-1.4.0/pngpriv.h libpng-1.4.0.patch/pngpriv.h
|
||||
+#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 +477,17 @@
|
||||
@@ -468,6 +480,17 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -685,7 +679,7 @@ diff -Naur libpng-1.4.0/pngpriv.h libpng-1.4.0.patch/pngpriv.h
|
||||
/* Called when finished processing a row of data */
|
||||
PNG_EXTERN void png_write_finish_row PNGARG((png_structp png_ptr));
|
||||
|
||||
@@ -520,6 +540,20 @@
|
||||
@@ -520,6 +543,20 @@
|
||||
PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
|
||||
png_infop info_ptr));
|
||||
|
||||
@ -706,7 +700,7 @@ diff -Naur libpng-1.4.0/pngpriv.h libpng-1.4.0.patch/pngpriv.h
|
||||
/* 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,
|
||||
@@ -735,6 +769,18 @@
|
||||
@@ -736,6 +773,25 @@
|
||||
png_uint_32 length));
|
||||
#endif
|
||||
|
||||
@ -721,14 +715,21 @@ diff -Naur libpng-1.4.0/pngpriv.h libpng-1.4.0.patch/pngpriv.h
|
||||
+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));
|
||||
|
||||
diff -Naur libpng-1.4.0/pngread.c libpng-1.4.0.patch/pngread.c
|
||||
--- libpng-1.4.0/pngread.c 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngread.c 2010-02-07 22:41:01.522983852 +0100
|
||||
@@ -292,6 +292,11 @@
|
||||
diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
|
||||
--- libpng-1.4.1/pngread.c 2010-02-25 12:38:29.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngread.c 2010-04-16 21:09:26.430319940 +0200
|
||||
@@ -300,6 +300,11 @@
|
||||
#ifdef PNG_READ_zTXt_SUPPORTED
|
||||
PNG_zTXt;
|
||||
#endif
|
||||
@ -740,7 +741,7 @@ diff -Naur libpng-1.4.0/pngread.c libpng-1.4.0.patch/pngread.c
|
||||
png_uint_32 length = png_read_chunk_header(png_ptr);
|
||||
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
|
||||
|
||||
@@ -335,6 +340,9 @@
|
||||
@@ -343,6 +348,9 @@
|
||||
!(png_ptr->mode & PNG_HAVE_PLTE))
|
||||
png_error(png_ptr, "Missing PLTE before IDAT");
|
||||
|
||||
@ -750,7 +751,7 @@ diff -Naur libpng-1.4.0/pngread.c libpng-1.4.0.patch/pngread.c
|
||||
png_ptr->idat_size = length;
|
||||
png_ptr->mode |= PNG_HAVE_IDAT;
|
||||
break;
|
||||
@@ -407,12 +415,95 @@
|
||||
@@ -415,12 +423,95 @@
|
||||
else if (!png_memcmp(chunk_name, png_iTXt, 4))
|
||||
png_handle_iTXt(png_ptr, info_ptr, length);
|
||||
#endif
|
||||
@ -846,7 +847,7 @@ diff -Naur libpng-1.4.0/pngread.c libpng-1.4.0.patch/pngread.c
|
||||
/* Optional call to update the users info_ptr structure */
|
||||
void PNGAPI
|
||||
png_read_update_info(png_structp png_ptr, png_infop info_ptr)
|
||||
@@ -453,6 +544,10 @@
|
||||
@@ -461,6 +552,10 @@
|
||||
png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
|
||||
{
|
||||
PNG_IDAT;
|
||||
@ -857,7 +858,7 @@ diff -Naur libpng-1.4.0/pngread.c libpng-1.4.0.patch/pngread.c
|
||||
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};
|
||||
@@ -585,13 +680,39 @@
|
||||
@@ -596,13 +691,39 @@
|
||||
{
|
||||
if (!(png_ptr->zstream.avail_in))
|
||||
{
|
||||
@ -899,7 +900,7 @@ diff -Naur libpng-1.4.0/pngread.c libpng-1.4.0.patch/pngread.c
|
||||
}
|
||||
png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
|
||||
png_ptr->zstream.next_in = png_ptr->zbuf;
|
||||
@@ -609,6 +730,9 @@
|
||||
@@ -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;
|
||||
@ -909,7 +910,7 @@ diff -Naur libpng-1.4.0/pngread.c libpng-1.4.0.patch/pngread.c
|
||||
break;
|
||||
}
|
||||
if (ret != Z_OK)
|
||||
@@ -864,6 +988,11 @@
|
||||
@@ -875,6 +999,11 @@
|
||||
#ifdef PNG_READ_zTXt_SUPPORTED
|
||||
PNG_zTXt;
|
||||
#endif
|
||||
@ -921,7 +922,7 @@ diff -Naur libpng-1.4.0/pngread.c libpng-1.4.0.patch/pngread.c
|
||||
png_uint_32 length = png_read_chunk_header(png_ptr);
|
||||
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
|
||||
|
||||
@@ -963,6 +1092,14 @@
|
||||
@@ -974,6 +1103,14 @@
|
||||
else if (!png_memcmp(chunk_name, png_iTXt, 4))
|
||||
png_handle_iTXt(png_ptr, info_ptr, length);
|
||||
#endif
|
||||
@ -936,10 +937,10 @@ diff -Naur libpng-1.4.0/pngread.c libpng-1.4.0.patch/pngread.c
|
||||
else
|
||||
png_handle_unknown(png_ptr, info_ptr, length);
|
||||
} while (!(png_ptr->mode & PNG_HAVE_IEND));
|
||||
diff -Naur libpng-1.4.0/pngrtran.c libpng-1.4.0.patch/pngrtran.c
|
||||
--- libpng-1.4.0/pngrtran.c 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngrtran.c 2010-02-07 22:41:01.997856654 +0100
|
||||
@@ -1320,7 +1320,7 @@
|
||||
diff -Naur libpng-1.4.1/pngrtran.c libpng-1.4.1.patch/pngrtran.c
|
||||
--- libpng-1.4.1/pngrtran.c 2010-02-25 12:38:29.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngrtran.c 2010-04-16 21:09:53.311444698 +0200
|
||||
@@ -1325,7 +1325,7 @@
|
||||
* pixels. This check added to libpng-1.2.19
|
||||
*/
|
||||
#if (PNG_WARN_UNINITIALIZED_ROW==1)
|
||||
@ -948,10 +949,10 @@ diff -Naur libpng-1.4.0/pngrtran.c libpng-1.4.0.patch/pngrtran.c
|
||||
#else
|
||||
png_warning(png_ptr, "Uninitialized row");
|
||||
#endif
|
||||
diff -Naur libpng-1.4.0/pngrutil.c libpng-1.4.0.patch/pngrutil.c
|
||||
--- libpng-1.4.0/pngrutil.c 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngrutil.c 2010-02-07 22:41:01.986856711 +0100
|
||||
@@ -423,6 +423,11 @@
|
||||
diff -Naur libpng-1.4.1/pngrutil.c libpng-1.4.1.patch/pngrutil.c
|
||||
--- libpng-1.4.1/pngrutil.c 2010-02-25 12:38:29.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngrutil.c 2010-04-16 21:09:49.604444890 +0200
|
||||
@@ -434,6 +434,11 @@
|
||||
filter_type = buf[11];
|
||||
interlace_type = buf[12];
|
||||
|
||||
@ -963,7 +964,7 @@ diff -Naur libpng-1.4.0/pngrutil.c libpng-1.4.0.patch/pngrutil.c
|
||||
/* Set internal variables */
|
||||
png_ptr->width = width;
|
||||
png_ptr->height = height;
|
||||
@@ -2294,6 +2299,168 @@
|
||||
@@ -2318,6 +2323,172 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1025,9 +1026,11 @@ diff -Naur libpng-1.4.0/pngrutil.c libpng-1.4.0.patch/pngrutil.c
|
||||
+ 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");
|
||||
@ -1038,27 +1041,25 @@ diff -Naur libpng-1.4.0/pngrutil.c libpng-1.4.0.patch/pngrutil.c
|
||||
+ * 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);
|
||||
+ 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);
|
||||
+ 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);
|
||||
+ png_crc_finish(png_ptr, length-4);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ png_ensure_sequence_number(png_ptr, length);
|
||||
+
|
||||
+
|
||||
+ 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);
|
||||
@ -1067,21 +1068,25 @@ diff -Naur libpng-1.4.0/pngrutil.c libpng-1.4.0.patch/pngrutil.c
|
||||
+ 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 (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);
|
||||
+
|
||||
+
|
||||
+ 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;
|
||||
+}
|
||||
+
|
||||
@ -1132,7 +1137,7 @@ diff -Naur libpng-1.4.0/pngrutil.c libpng-1.4.0.patch/pngrutil.c
|
||||
/* 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
|
||||
@@ -3333,4 +3500,82 @@
|
||||
@@ -3353,4 +3524,73 @@
|
||||
|
||||
png_ptr->flags |= PNG_FLAG_ROW_INIT;
|
||||
}
|
||||
@ -1176,7 +1181,6 @@ diff -Naur libpng-1.4.0/pngrutil.c libpng-1.4.0.patch/pngrutil.c
|
||||
+
|
||||
+ /* offset to next interlace block in the y direction */
|
||||
+ const int FARDATA png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2};
|
||||
+ png_uint_32 row_bytes;
|
||||
+
|
||||
+ if (png_ptr->interlaced)
|
||||
+ {
|
||||
@ -1190,34 +1194,26 @@ diff -Naur libpng-1.4.0/pngrutil.c libpng-1.4.0.patch/pngrutil.c
|
||||
+ png_pass_inc[png_ptr->pass] - 1 -
|
||||
+ png_pass_start[png_ptr->pass]) /
|
||||
+ png_pass_inc[png_ptr->pass];
|
||||
+
|
||||
+ row_bytes = PNG_ROWBYTES(png_ptr->pixel_depth,png_ptr->iwidth) + 1;
|
||||
+
|
||||
+ png_ptr->irowbytes = (png_size_t)row_bytes;
|
||||
+ if((png_uint_32)png_ptr->irowbytes != row_bytes)
|
||||
+ png_error(png_ptr, "png_progressive_read_reset(): Rowbytes "
|
||||
+ "overflow");
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ png_ptr->num_rows = png_ptr->height;
|
||||
+ 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");
|
||||
+ 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_ptr->irowbytes;
|
||||
+ 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 */
|
||||
diff -Naur libpng-1.4.0/pngset.c libpng-1.4.0.patch/pngset.c
|
||||
--- libpng-1.4.0/pngset.c 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngset.c 2010-02-07 22:41:01.979856906 +0100
|
||||
diff -Naur libpng-1.4.1/pngset.c libpng-1.4.1.patch/pngset.c
|
||||
--- libpng-1.4.1/pngset.c 2010-02-25 12:38:29.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngset.c 2010-04-16 21:09:47.875332919 +0200
|
||||
@@ -260,6 +260,11 @@
|
||||
info_ptr->rowbytes = 0;
|
||||
else
|
||||
@ -1373,10 +1369,10 @@ diff -Naur libpng-1.4.0/pngset.c libpng-1.4.0.patch/pngset.c
|
||||
#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
|
||||
void PNGAPI
|
||||
png_set_unknown_chunks(png_structp png_ptr,
|
||||
diff -Naur libpng-1.4.0/pngwrite.c libpng-1.4.0.patch/pngwrite.c
|
||||
--- libpng-1.4.0/pngwrite.c 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngwrite.c 2010-02-07 22:41:01.974858880 +0100
|
||||
@@ -56,6 +56,10 @@
|
||||
diff -Naur libpng-1.4.1/pngwrite.c libpng-1.4.1.patch/pngwrite.c
|
||||
--- libpng-1.4.1/pngwrite.c 2010-02-25 12:38:30.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngwrite.c 2010-04-16 21:09:40.967447171 +0200
|
||||
@@ -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.
|
||||
*/
|
||||
@ -1387,7 +1383,7 @@ diff -Naur libpng-1.4.0/pngwrite.c libpng-1.4.0.patch/pngwrite.c
|
||||
#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))
|
||||
png_error(png_ptr, "No IDATs written into file");
|
||||
@ -1398,7 +1394,7 @@ diff -Naur libpng-1.4.0/pngwrite.c libpng-1.4.0.patch/pngwrite.c
|
||||
|
||||
/* See if user wants us to write information chunks */
|
||||
if (info_ptr != NULL)
|
||||
@@ -1451,4 +1459,39 @@
|
||||
@@ -1454,4 +1462,39 @@
|
||||
params = params;
|
||||
}
|
||||
#endif
|
||||
@ -1438,10 +1434,10 @@ diff -Naur libpng-1.4.0/pngwrite.c libpng-1.4.0.patch/pngwrite.c
|
||||
+#endif /* PNG_WRITE_APNG_SUPPORTED */
|
||||
+
|
||||
#endif /* PNG_WRITE_SUPPORTED */
|
||||
diff -Naur libpng-1.4.0/pngwutil.c libpng-1.4.0.patch/pngwutil.c
|
||||
--- libpng-1.4.0/pngwutil.c 2010-01-03 06:05:36.000000000 +0100
|
||||
+++ libpng-1.4.0.patch/pngwutil.c 2010-02-07 22:41:01.994856708 +0100
|
||||
@@ -538,6 +538,11 @@
|
||||
diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
|
||||
--- libpng-1.4.1/pngwutil.c 2010-02-25 12:38:30.000000000 +0100
|
||||
+++ libpng-1.4.1.patch/pngwutil.c 2010-04-16 21:09:51.260444582 +0200
|
||||
@@ -539,6 +539,11 @@
|
||||
/* Write the chunk */
|
||||
png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
|
||||
|
||||
@ -1453,7 +1449,7 @@ diff -Naur libpng-1.4.0/pngwutil.c libpng-1.4.0.patch/pngwutil.c
|
||||
/* Initialize zlib with PNG info */
|
||||
png_ptr->zstream.zalloc = png_zalloc;
|
||||
png_ptr->zstream.zfree = png_zfree;
|
||||
@@ -658,6 +663,9 @@
|
||||
@@ -661,6 +666,9 @@
|
||||
png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
|
||||
{
|
||||
PNG_IDAT;
|
||||
@ -1463,7 +1459,7 @@ diff -Naur libpng-1.4.0/pngwutil.c libpng-1.4.0.patch/pngwutil.c
|
||||
|
||||
png_debug(1, "in png_write_IDAT");
|
||||
|
||||
@@ -702,7 +710,28 @@
|
||||
@@ -705,7 +713,28 @@
|
||||
"Invalid zlib compression method or flags in IDAT");
|
||||
}
|
||||
|
||||
@ -1492,7 +1488,7 @@ diff -Naur libpng-1.4.0/pngwutil.c libpng-1.4.0.patch/pngwutil.c
|
||||
png_ptr->mode |= PNG_HAVE_IDAT;
|
||||
}
|
||||
|
||||
@@ -1709,6 +1738,66 @@
|
||||
@@ -1712,6 +1741,66 @@
|
||||
}
|
||||
#endif
|
||||
|
||||
@ -1559,7 +1555,7 @@ diff -Naur libpng-1.4.0/pngwutil.c libpng-1.4.0.patch/pngwutil.c
|
||||
/* Initializes the row writing capability of libpng */
|
||||
void /* PRIVATE */
|
||||
png_write_start_row(png_structp png_ptr)
|
||||
@@ -2110,8 +2199,8 @@
|
||||
@@ -2113,8 +2202,8 @@
|
||||
#ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
|
||||
if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
|
||||
{
|
||||
@ -1570,7 +1566,7 @@ diff -Naur libpng-1.4.0/pngwutil.c libpng-1.4.0.patch/pngwutil.c
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -2780,4 +2869,39 @@
|
||||
@@ -2783,4 +2872,39 @@
|
||||
}
|
||||
#endif
|
||||
}
|
@ -1 +1 @@
|
||||
http://downloads.sourceforge.net/libpng/libpng-1.4.0.tar.bz2
|
||||
http://downloads.sourceforge.net/libpng/libpng-1.4.1.tar.bz2
|
||||
|
Loading…
x
Reference in New Issue
Block a user