jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-31 14:37:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

libpng: change install script to an more generic way, update apng patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-02-08 13:28:24 +01:00
parent 1dd216b9bd
commit 6abe1ae9fe
2 changed files with 92 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/graphics/libpng/install
View File

@ -23,4 +23,4 @@
. config/options $1
mkdir -p $INSTALL/usr/lib
cp -P $PKG_BUILD/.libs/libpng14.so* $INSTALL/usr/lib
cp -P $PKG_BUILD/.libs/libpng*.so* $INSTALL/usr/lib

182
packages/graphics/libpng/patches/libpng-1.4.5-apng.patch
View File

@ -1,7 +1,7 @@
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 @@
diff -Naur libpng-1.4.5/pngconf.h libpng-1.4.5.patch/pngconf.h
--- libpng-1.4.5/pngconf.h 2010-12-09 14:48:10.000000000 +0100
+++ libpng-1.4.5.patch/pngconf.h 2011-02-08 11:49:58.016628521 +0100
@@ -894,6 +894,10 @@
# define PNG_READ_tRNS_SUPPORTED
# define PNG_tRNS_SUPPORTED
#endif
@ -12,7 +12,7 @@ diff -Naur libpng-1.4.1/pngconf.h libpng-1.4.1.patch/pngconf.h
#ifndef PNG_NO_READ_zTXt
# define PNG_READ_zTXt_SUPPORTED
# define PNG_zTXt_SUPPORTED
@@ -1028,6 +1032,14 @@
@@ -1053,6 +1057,14 @@
# define PNG_TEXT_SUPPORTED
# endif
#endif
@ -27,9 +27,9 @@ diff -Naur libpng-1.4.1/pngconf.h libpng-1.4.1.patch/pngconf.h
#ifdef PNG_WRITE_tIME_SUPPORTED
# ifndef PNG_NO_CONVERT_tIME
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
diff -Naur libpng-1.4.5/pngget.c libpng-1.4.5.patch/pngget.c
--- libpng-1.4.5/pngget.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngget.c 2011-02-08 11:49:58.009628646 +0100
@@ -842,6 +842,167 @@
}
#endif
@ -198,10 +198,10 @@ diff -Naur libpng-1.4.1/pngget.c libpng-1.4.1.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.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 @@
diff -Naur libpng-1.4.5/png.h libpng-1.4.5.patch/png.h
--- libpng-1.4.5/png.h 2010-12-09 14:48:10.000000000 +0100
+++ libpng-1.4.5.patch/png.h 2011-02-08 11:49:58.011628611 +0100
@@ -902,6 +902,19 @@
png_fixed_point int_y_blue PNG_DEPSTRUCT;
#endif
@ -221,7 +221,7 @@ diff -Naur libpng-1.4.1/png.h libpng-1.4.1.patch/png.h
} png_info;
typedef png_info FAR * png_infop;
@@ -985,6 +998,10 @@
@@ -999,6 +1012,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.1/png.h libpng-1.4.1.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
@@ -1026,6 +1043,10 @@
@@ -1040,6 +1057,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.1/png.h libpng-1.4.1.patch/png.h
#endif
#if defined(PNG_READ_USER_TRANSFORM_SUPPORTED) || \
@@ -1445,6 +1466,36 @@
@@ -1459,6 +1480,36 @@
png_uint_32 user_chunk_cache_max PNG_DEPSTRUCT;
#endif
@ -280,94 +280,94 @@ diff -Naur libpng-1.4.1/png.h libpng-1.4.1.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. */
@@ -1773,6 +1824,18 @@
extern PNG_EXPORT(void,png_write_image) PNGARG((png_structp png_ptr,
@@ -1796,6 +1847,18 @@
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_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_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_EXPORT(void,png_write_end) PNGARG((png_structp png_ptr,
png_infop info_ptr));
@@ -2017,6 +2080,11 @@
@@ -2040,6 +2103,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_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 @@
PNG_EXPORT(png_voidp,png_get_progressive_ptr)
@@ -2466,6 +2534,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_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_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_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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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)
+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_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
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
diff -Naur libpng-1.4.5/pngpread.c libpng-1.4.5.patch/pngpread.c
--- libpng-1.4.5/pngpread.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngpread.c 2011-02-08 11:49:58.023628393 +0100
@@ -205,6 +205,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
PNG_zTXt;
@ -614,7 +614,7 @@ diff -Naur libpng-1.4.1/pngpread.c libpng-1.4.1.patch/pngpread.c
}
if (png_ptr->idat_size && png_ptr->save_buffer_size)
{
@@ -1716,6 +1904,17 @@
@@ -1756,6 +1944,17 @@
png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
}
@ -632,10 +632,10 @@ diff -Naur libpng-1.4.1/pngpread.c libpng-1.4.1.patch/pngpread.c
png_voidp PNGAPI
png_get_progressive_ptr(png_structp png_ptr)
{
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 @@
diff -Naur libpng-1.4.5/pngpriv.h libpng-1.4.5.patch/pngpriv.h
--- libpng-1.4.5/pngpriv.h 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngpriv.h 2011-02-08 11:49:58.013628575 +0100
@@ -96,6 +96,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 */
@ -646,7 +646,7 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
/* Flags for the transformations the PNG library does on the image data */
#define PNG_BGR 0x0001
@@ -231,6 +235,14 @@
@@ -229,6 +233,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'}
@ -661,7 +661,7 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
/* Inhibit C++ name-mangling for libpng functions but not for system calls. */
@@ -468,6 +480,17 @@
@@ -469,6 +481,17 @@
#endif
#endif
@ -679,7 +679,7 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.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 +543,20 @@
@@ -521,6 +544,20 @@
PNG_EXTERN void png_read_transform_info PNGARG((png_structp png_ptr,
png_infop info_ptr));
@ -700,7 +700,7 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.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,
@@ -736,6 +773,25 @@
@@ -737,6 +774,25 @@
png_uint_32 length));
#endif
@ -726,10 +726,10 @@ diff -Naur libpng-1.4.1/pngpriv.h libpng-1.4.1.patch/pngpriv.h
PNG_EXTERN void png_handle_unknown PNGARG((png_structp png_ptr,
png_infop info_ptr, png_uint_32 length));
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 @@
diff -Naur libpng-1.4.5/pngread.c libpng-1.4.5.patch/pngread.c
--- libpng-1.4.5/pngread.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngread.c 2011-02-08 11:49:58.008628665 +0100
@@ -278,6 +278,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
PNG_zTXt;
#endif
@ -741,7 +741,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
png_uint_32 length = png_read_chunk_header(png_ptr);
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
@@ -343,6 +348,9 @@
@@ -321,6 +326,9 @@
!(png_ptr->mode & PNG_HAVE_PLTE))
png_error(png_ptr, "Missing PLTE before IDAT");
@ -751,7 +751,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
png_ptr->idat_size = length;
png_ptr->mode |= PNG_HAVE_IDAT;
break;
@@ -415,12 +423,95 @@
@@ -393,12 +401,95 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
@ -847,7 +847,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.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)
@@ -461,6 +552,10 @@
@@ -439,6 +530,10 @@
png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
{
PNG_IDAT;
@ -858,7 +858,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.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};
@@ -596,13 +691,39 @@
@@ -581,13 +676,39 @@
{
if (!(png_ptr->zstream.avail_in))
{
@ -900,7 +900,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
}
png_ptr->zstream.avail_in = (uInt)png_ptr->zbuf_size;
png_ptr->zstream.next_in = png_ptr->zbuf;
@@ -620,6 +741,9 @@
@@ -605,6 +726,9 @@
png_benign_error(png_ptr, "Extra compressed data");
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZLIB_FINISHED;
@ -910,7 +910,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
break;
}
if (ret != Z_OK)
@@ -875,6 +999,11 @@
@@ -860,6 +984,11 @@
#ifdef PNG_READ_zTXt_SUPPORTED
PNG_zTXt;
#endif
@ -922,7 +922,7 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
png_uint_32 length = png_read_chunk_header(png_ptr);
PNG_CONST png_bytep chunk_name = png_ptr->chunk_name;
@@ -974,6 +1103,14 @@
@@ -959,6 +1088,14 @@
else if (!png_memcmp(chunk_name, png_iTXt, 4))
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
@ -937,10 +937,10 @@ diff -Naur libpng-1.4.1/pngread.c libpng-1.4.1.patch/pngread.c
else
png_handle_unknown(png_ptr, info_ptr, length);
} while (!(png_ptr->mode & PNG_HAVE_IEND));
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 @@
diff -Naur libpng-1.4.5/pngrtran.c libpng-1.4.5.patch/pngrtran.c
--- libpng-1.4.5/pngrtran.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngrtran.c 2011-02-08 11:49:58.034628193 +0100
@@ -1335,7 +1335,7 @@
* pixels. This check added to libpng-1.2.19
*/
#if (PNG_WARN_UNINITIALIZED_ROW==1)
@ -949,10 +949,10 @@ diff -Naur libpng-1.4.1/pngrtran.c libpng-1.4.1.patch/pngrtran.c
#else
png_warning(png_ptr, "Uninitialized row");
#endif
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 @@
diff -Naur libpng-1.4.5/pngrutil.c libpng-1.4.5.patch/pngrutil.c
--- libpng-1.4.5/pngrutil.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngrutil.c 2011-02-08 11:49:58.026628338 +0100
@@ -499,6 +499,11 @@
filter_type = buf[11];
interlace_type = buf[12];
@ -964,7 +964,7 @@ diff -Naur libpng-1.4.1/pngrutil.c libpng-1.4.1.patch/pngrutil.c
/* Set internal variables */
png_ptr->width = width;
png_ptr->height = height;
@@ -2318,6 +2323,172 @@
@@ -2394,6 +2399,172 @@
}
#endif
@ -1137,7 +1137,7 @@ diff -Naur libpng-1.4.1/pngrutil.c libpng-1.4.1.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
@@ -3353,4 +3524,73 @@
@@ -3422,4 +3593,73 @@
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
@ -1211,9 +1211,9 @@ diff -Naur libpng-1.4.1/pngrutil.c libpng-1.4.1.patch/pngrutil.c
+}
+#endif /* PNG_READ_APNG_SUPPORTED */
#endif /* PNG_READ_SUPPORTED */
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
diff -Naur libpng-1.4.5/pngset.c libpng-1.4.5.patch/pngset.c
--- libpng-1.4.5/pngset.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngset.c 2011-02-08 11:49:58.024628375 +0100
@@ -260,6 +260,11 @@
info_ptr->rowbytes = 0;
else
@ -1226,7 +1226,7 @@ diff -Naur libpng-1.4.1/pngset.c libpng-1.4.1.patch/pngset.c
}
#ifdef PNG_oFFs_SUPPORTED
@@ -932,6 +937,142 @@
@@ -939,6 +944,142 @@
}
#endif /* PNG_sPLT_SUPPORTED */
@ -1369,9 +1369,9 @@ diff -Naur libpng-1.4.1/pngset.c libpng-1.4.1.patch/pngset.c
#ifdef PNG_UNKNOWN_CHUNKS_SUPPORTED
void PNGAPI
png_set_unknown_chunks(png_structp png_ptr,
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
diff -Naur libpng-1.4.5/pngwrite.c libpng-1.4.5.patch/pngwrite.c
--- libpng-1.4.5/pngwrite.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngwrite.c 2011-02-08 11:49:58.014628557 +0100
@@ -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.
@ -1434,10 +1434,10 @@ diff -Naur libpng-1.4.1/pngwrite.c libpng-1.4.1.patch/pngwrite.c
+#endif /* PNG_WRITE_APNG_SUPPORTED */
+
#endif /* PNG_WRITE_SUPPORTED */
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 @@
diff -Naur libpng-1.4.5/pngwutil.c libpng-1.4.5.patch/pngwutil.c
--- libpng-1.4.5/pngwutil.c 2010-12-09 14:48:11.000000000 +0100
+++ libpng-1.4.5.patch/pngwutil.c 2011-02-08 11:49:58.031628246 +0100
@@ -541,6 +541,11 @@
/* Write the chunk */
png_write_chunk(png_ptr, (png_bytep)png_IHDR, buf, (png_size_t)13);
@ -1449,7 +1449,7 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
/* Initialize zlib with PNG info */
png_ptr->zstream.zalloc = png_zalloc;
png_ptr->zstream.zfree = png_zfree;
@@ -661,6 +666,9 @@
@@ -663,6 +668,9 @@
png_write_IDAT(png_structp png_ptr, png_bytep data, png_size_t length)
{
PNG_IDAT;
@ -1459,7 +1459,7 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
png_debug(1, "in png_write_IDAT");
@@ -705,7 +713,28 @@
@@ -707,7 +715,28 @@
"Invalid zlib compression method or flags in IDAT");
}
@ -1488,7 +1488,7 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
png_ptr->mode |= PNG_HAVE_IDAT;
}
@@ -1712,6 +1741,66 @@
@@ -1714,6 +1743,66 @@
}
#endif
@ -1555,7 +1555,7 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
/* Initializes the row writing capability of libpng */
void /* PRIVATE */
png_write_start_row(png_structp png_ptr)
@@ -2113,8 +2202,8 @@
@@ -2115,8 +2204,8 @@
#ifndef PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
if (png_ptr->row_number == 0 && filter_to_do == PNG_ALL_FILTERS)
{
@ -1564,9 +1564,9 @@ diff -Naur libpng-1.4.1/pngwutil.c libpng-1.4.1.patch/pngwutil.c
+ /* These use previous row */
+ filter_to_do &= ~(PNG_FILTER_UP | PNG_FILTER_AVG | PNG_FILTER_PAETH);
}
#endif
#endif
@@ -2783,4 +2872,39 @@
@@ -2785,4 +2874,39 @@
}
#endif
}