diff --git a/libpng-1.6.31-apng.patch b/libpng-1.6.32-apng.patch similarity index 90% rename from libpng-1.6.31-apng.patch rename to libpng-1.6.32-apng.patch index 2bd2b5d..4ac322a 100644 --- a/libpng-1.6.31-apng.patch +++ b/libpng-1.6.32-apng.patch @@ -1,6 +1,6 @@ -diff -Naru libpng-1.6.31.org/png.h libpng-1.6.31/png.h ---- libpng-1.6.31.org/png.h 2017-07-29 10:08:06.209574100 +0900 -+++ libpng-1.6.31/png.h 2017-07-29 10:50:19.591317483 +0900 +diff -Naru libpng-1.6.32.org/png.h libpng-1.6.32/png.h +--- libpng-1.6.32.org/png.h 2017-08-26 22:11:25.278792058 +0900 ++++ libpng-1.6.32/png.h 2017-08-26 22:09:53.992082612 +0900 @@ -361,6 +361,10 @@ # include "pnglibconf.h" #endif @@ -52,97 +52,97 @@ diff -Naru libpng-1.6.31.org/png.h libpng-1.6.31/png.h /* The following callback receives png_uint_32 row_number, int pass for the * png_bytep data of the row. When transforming an interlaced image the -@@ -3250,6 +3273,74 @@ +@@ -3255,6 +3278,74 @@ /******************************************************************************* * END OF HARDWARE AND SOFTWARE OPTIONS ******************************************************************************/ +#ifdef PNG_APNG_SUPPORTED -+PNG_EXPORT(248, png_uint_32, png_get_acTL, (png_structp png_ptr, ++PNG_EXPORT(250, png_uint_32, png_get_acTL, (png_structp png_ptr, + png_infop info_ptr, png_uint_32 *num_frames, png_uint_32 *num_plays)); + -+PNG_EXPORT(249, png_uint_32, png_set_acTL, (png_structp png_ptr, ++PNG_EXPORT(251, png_uint_32, png_set_acTL, (png_structp png_ptr, + png_infop info_ptr, png_uint_32 num_frames, png_uint_32 num_plays)); + -+PNG_EXPORT(250, png_uint_32, png_get_num_frames, (png_structp png_ptr, ++PNG_EXPORT(252, png_uint_32, png_get_num_frames, (png_structp png_ptr, + png_infop info_ptr)); + -+PNG_EXPORT(251, png_uint_32, png_get_num_plays, (png_structp png_ptr, ++PNG_EXPORT(253, png_uint_32, png_get_num_plays, (png_structp png_ptr, + png_infop info_ptr)); + -+PNG_EXPORT(252, png_uint_32, png_get_next_frame_fcTL, ++PNG_EXPORT(254, png_uint_32, png_get_next_frame_fcTL, + (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)); + -+PNG_EXPORT(253, png_uint_32, png_set_next_frame_fcTL, ++PNG_EXPORT(255, png_uint_32, png_set_next_frame_fcTL, + (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)); + -+PNG_EXPORT(254, png_uint_32, png_get_next_frame_width, ++PNG_EXPORT(256, png_uint_32, png_get_next_frame_width, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(255, png_uint_32, png_get_next_frame_height, ++PNG_EXPORT(257, png_uint_32, png_get_next_frame_height, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(256, png_uint_32, png_get_next_frame_x_offset, ++PNG_EXPORT(258, png_uint_32, png_get_next_frame_x_offset, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(257, png_uint_32, png_get_next_frame_y_offset, ++PNG_EXPORT(259, png_uint_32, png_get_next_frame_y_offset, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(258, png_uint_16, png_get_next_frame_delay_num, ++PNG_EXPORT(260, png_uint_16, png_get_next_frame_delay_num, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(259, png_uint_16, png_get_next_frame_delay_den, ++PNG_EXPORT(261, png_uint_16, png_get_next_frame_delay_den, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(260, png_byte, png_get_next_frame_dispose_op, ++PNG_EXPORT(262, png_byte, png_get_next_frame_dispose_op, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(261, png_byte, png_get_next_frame_blend_op, ++PNG_EXPORT(263, png_byte, png_get_next_frame_blend_op, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(262, png_byte, png_get_first_frame_is_hidden, ++PNG_EXPORT(264, png_byte, png_get_first_frame_is_hidden, + (png_structp png_ptr, png_infop info_ptr)); -+PNG_EXPORT(263, png_uint_32, png_set_first_frame_is_hidden, ++PNG_EXPORT(265, png_uint_32, png_set_first_frame_is_hidden, + (png_structp png_ptr, png_infop info_ptr, png_byte is_hidden)); + +#ifdef PNG_READ_APNG_SUPPORTED -+PNG_EXPORT(264, void, png_read_frame_head, (png_structp png_ptr, ++PNG_EXPORT(266, void, png_read_frame_head, (png_structp png_ptr, + png_infop info_ptr)); +#ifdef PNG_PROGRESSIVE_READ_SUPPORTED -+PNG_EXPORT(265, void, png_set_progressive_frame_fn, (png_structp png_ptr, ++PNG_EXPORT(267, void, png_set_progressive_frame_fn, (png_structp png_ptr, + png_progressive_frame_ptr frame_info_fn, + png_progressive_frame_ptr frame_end_fn)); +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ + +#ifdef PNG_WRITE_APNG_SUPPORTED -+PNG_EXPORT(266, void, png_write_frame_head, (png_structp png_ptr, ++PNG_EXPORT(268, void, png_write_frame_head, (png_structp png_ptr, + png_infop info_ptr, 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)); + -+PNG_EXPORT(267, void, png_write_frame_tail, (png_structp png_ptr, ++PNG_EXPORT(269, void, png_write_frame_tail, (png_structp png_ptr, + png_infop info_ptr)); +#endif /* PNG_WRITE_APNG_SUPPORTED */ +#endif /* PNG_APNG_SUPPORTED */ /* Maintainer: Put new public prototypes here ^, in libpng.3, in project * defs, and in scripts/symbols.def. -@@ -3259,7 +3350,11 @@ +@@ -3264,7 +3355,11 @@ * one to use is one more than this.) */ #ifdef PNG_EXPORT_LAST_ORDINAL +#ifdef PNG_APNG_SUPPORTED -+ PNG_EXPORT_LAST_ORDINAL(267); ++ PNG_EXPORT_LAST_ORDINAL(269); +#else - PNG_EXPORT_LAST_ORDINAL(247); + PNG_EXPORT_LAST_ORDINAL(249); +#endif /* PNG_APNG_SUPPORTED */ #endif #ifdef __cplusplus -diff -Naru libpng-1.6.31.org/pngget.c libpng-1.6.31/pngget.c ---- libpng-1.6.31.org/pngget.c 2017-07-29 10:08:06.209574100 +0900 -+++ libpng-1.6.31/pngget.c 2017-07-29 10:50:19.582316721 +0900 -@@ -1234,4 +1234,166 @@ +diff -Naru libpng-1.6.32.org/pngget.c libpng-1.6.32/pngget.c +--- libpng-1.6.32.org/pngget.c 2017-08-26 22:11:25.279792143 +0900 ++++ libpng-1.6.32/pngget.c 2017-08-26 22:06:27.947679261 +0900 +@@ -1245,4 +1245,166 @@ # endif #endif @@ -309,10 +309,10 @@ diff -Naru libpng-1.6.31.org/pngget.c libpng-1.6.31/pngget.c +} +#endif /* PNG_APNG_SUPPORTED */ #endif /* READ || WRITE */ -diff -Naru libpng-1.6.31.org/pnginfo.h libpng-1.6.31/pnginfo.h ---- libpng-1.6.31.org/pnginfo.h 2017-07-29 10:08:06.210574185 +0900 -+++ libpng-1.6.31/pnginfo.h 2017-07-29 10:50:19.582316721 +0900 -@@ -260,5 +260,18 @@ +diff -Naru libpng-1.6.32.org/pnginfo.h libpng-1.6.32/pnginfo.h +--- libpng-1.6.32.org/pnginfo.h 2017-08-26 22:11:25.279792143 +0900 ++++ libpng-1.6.32/pnginfo.h 2017-08-26 22:06:27.947679261 +0900 +@@ -263,5 +263,18 @@ png_bytepp row_pointers; /* the image bits */ #endif @@ -331,10 +331,10 @@ diff -Naru libpng-1.6.31.org/pnginfo.h libpng-1.6.31/pnginfo.h + }; #endif /* PNGINFO_H */ -diff -Naru libpng-1.6.31.org/pngpread.c libpng-1.6.31/pngpread.c ---- libpng-1.6.31.org/pngpread.c 2017-06-30 16:42:16.781952082 +0900 -+++ libpng-1.6.31/pngpread.c 2017-07-29 10:50:19.582316721 +0900 -@@ -194,6 +194,106 @@ +diff -Naru libpng-1.6.32.org/pngpread.c libpng-1.6.32/pngpread.c +--- libpng-1.6.32.org/pngpread.c 2017-08-26 22:11:25.279792143 +0900 ++++ libpng-1.6.32/pngpread.c 2017-08-26 22:06:27.947679261 +0900 +@@ -195,6 +195,106 @@ chunk_name = png_ptr->chunk_name; @@ -441,7 +441,7 @@ diff -Naru libpng-1.6.31.org/pngpread.c libpng-1.6.31/pngpread.c if (chunk_name == png_IDAT) { if ((png_ptr->mode & PNG_AFTER_IDAT) != 0) -@@ -260,6 +360,9 @@ +@@ -261,6 +361,9 @@ else if (chunk_name == png_IDAT) { @@ -451,7 +451,7 @@ diff -Naru libpng-1.6.31.org/pngpread.c libpng-1.6.31/pngpread.c png_ptr->idat_size = png_ptr->push_length; png_ptr->process_mode = PNG_READ_IDAT_MODE; png_push_have_info(png_ptr, info_ptr); -@@ -405,6 +508,30 @@ +@@ -406,6 +509,30 @@ png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length); } #endif @@ -482,7 +482,7 @@ diff -Naru libpng-1.6.31.org/pngpread.c libpng-1.6.31/pngpread.c else { -@@ -538,7 +665,11 @@ +@@ -539,7 +666,11 @@ png_byte chunk_tag[4]; /* TODO: this code can be commoned up with the same code in push_read */ @@ -494,7 +494,7 @@ diff -Naru libpng-1.6.31.org/pngpread.c libpng-1.6.31/pngpread.c png_push_fill_buffer(png_ptr, chunk_length, 4); png_ptr->push_length = png_get_uint_31(png_ptr, chunk_length); png_reset_crc(png_ptr); -@@ -546,17 +677,64 @@ +@@ -547,17 +678,64 @@ png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag); png_ptr->mode |= PNG_HAVE_CHUNK_HEADER; @@ -559,7 +559,7 @@ diff -Naru libpng-1.6.31.org/pngpread.c libpng-1.6.31/pngpread.c } if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0) -@@ -630,6 +808,15 @@ +@@ -631,6 +809,15 @@ if (!(buffer_length > 0) || buffer == NULL) png_error(png_ptr, "No IDAT data (internal error)"); @@ -575,7 +575,7 @@ diff -Naru libpng-1.6.31.org/pngpread.c libpng-1.6.31/pngpread.c /* This routine must process all the data it has been given * before returning, calling the row callback as required to * handle the uncompressed results. -@@ -1084,6 +1271,18 @@ +@@ -1085,6 +1272,18 @@ png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer); } @@ -594,9 +594,9 @@ diff -Naru libpng-1.6.31.org/pngpread.c libpng-1.6.31/pngpread.c png_voidp PNGAPI png_get_progressive_ptr(png_const_structrp png_ptr) { -diff -Naru libpng-1.6.31.org/pngpriv.h libpng-1.6.31/pngpriv.h ---- libpng-1.6.31.org/pngpriv.h 2017-07-29 10:08:06.210574185 +0900 -+++ libpng-1.6.31/pngpriv.h 2017-07-29 10:50:19.582316721 +0900 +diff -Naru libpng-1.6.32.org/pngpriv.h libpng-1.6.32/pngpriv.h +--- libpng-1.6.32.org/pngpriv.h 2017-08-26 22:11:25.280792227 +0900 ++++ libpng-1.6.32/pngpriv.h 2017-08-26 22:06:27.948679346 +0900 @@ -628,6 +628,10 @@ #define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */ /* 0x4000U (unused) */ @@ -625,7 +625,7 @@ diff -Naru libpng-1.6.31.org/pngpriv.h libpng-1.6.31/pngpriv.h /* The following will work on (signed char*) strings, whereas the get_uint_32 * macro will fail on top-bit-set values because of the sign extension. */ -@@ -1627,6 +1641,47 @@ +@@ -1635,6 +1649,47 @@ */ #endif @@ -673,9 +673,9 @@ diff -Naru libpng-1.6.31.org/pngpriv.h libpng-1.6.31/pngpriv.h /* Added at libpng version 1.4.0 */ #ifdef PNG_COLORSPACE_SUPPORTED /* These internal functions are for maintaining the colorspace structure within -diff -Naru libpng-1.6.31.org/pngread.c libpng-1.6.31/pngread.c ---- libpng-1.6.31.org/pngread.c 2017-07-29 10:08:06.211574269 +0900 -+++ libpng-1.6.31/pngread.c 2017-07-29 10:50:19.582316721 +0900 +diff -Naru libpng-1.6.32.org/pngread.c libpng-1.6.32/pngread.c +--- libpng-1.6.32.org/pngread.c 2017-08-26 22:11:25.280792227 +0900 ++++ libpng-1.6.32/pngread.c 2017-08-26 22:06:27.948679346 +0900 @@ -161,6 +161,9 @@ else if (chunk_name == png_IDAT) @@ -686,7 +686,7 @@ diff -Naru libpng-1.6.31.org/pngread.c libpng-1.6.31/pngread.c png_ptr->idat_size = length; break; } -@@ -250,6 +253,17 @@ +@@ -255,6 +258,17 @@ png_handle_iTXt(png_ptr, info_ptr, length); #endif @@ -704,7 +704,7 @@ diff -Naru libpng-1.6.31.org/pngread.c libpng-1.6.31/pngread.c else png_handle_unknown(png_ptr, info_ptr, length, PNG_HANDLE_CHUNK_AS_DEFAULT); -@@ -257,6 +271,72 @@ +@@ -262,6 +276,72 @@ } #endif /* SEQUENTIAL_READ */ @@ -777,10 +777,10 @@ diff -Naru libpng-1.6.31.org/pngread.c libpng-1.6.31/pngread.c /* Optional call to update the users info_ptr structure */ void PNGAPI png_read_update_info(png_structrp png_ptr, png_inforp info_ptr) -diff -Naru libpng-1.6.31.org/pngrutil.c libpng-1.6.31/pngrutil.c ---- libpng-1.6.31.org/pngrutil.c 2017-07-29 10:08:06.212574354 +0900 -+++ libpng-1.6.31/pngrutil.c 2017-07-29 10:50:19.583316806 +0900 -@@ -861,6 +861,11 @@ +diff -Naru libpng-1.6.32.org/pngrutil.c libpng-1.6.32/pngrutil.c +--- libpng-1.6.32.org/pngrutil.c 2017-08-26 22:11:25.281792312 +0900 ++++ libpng-1.6.32/pngrutil.c 2017-08-26 22:06:27.950679514 +0900 +@@ -864,6 +864,11 @@ filter_type = buf[11]; interlace_type = buf[12]; @@ -792,7 +792,7 @@ diff -Naru libpng-1.6.31.org/pngrutil.c libpng-1.6.31/pngrutil.c /* Set internal variables */ png_ptr->width = width; png_ptr->height = height; -@@ -2802,6 +2807,179 @@ +@@ -2847,6 +2852,179 @@ } #endif @@ -972,7 +972,7 @@ diff -Naru libpng-1.6.31.org/pngrutil.c libpng-1.6.31/pngrutil.c #ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED /* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */ static int -@@ -4069,7 +4247,38 @@ +@@ -4152,7 +4330,38 @@ { uInt avail_in; png_bytep buffer; @@ -1011,7 +1011,7 @@ diff -Naru libpng-1.6.31.org/pngrutil.c libpng-1.6.31/pngrutil.c while (png_ptr->idat_size == 0) { png_crc_finish(png_ptr, 0); -@@ -4081,7 +4290,7 @@ +@@ -4164,7 +4373,7 @@ if (png_ptr->chunk_name != png_IDAT) png_error(png_ptr, "Not enough image data"); } @@ -1020,7 +1020,7 @@ diff -Naru libpng-1.6.31.org/pngrutil.c libpng-1.6.31/pngrutil.c avail_in = png_ptr->IDAT_read_size; if (avail_in > png_ptr->idat_size) -@@ -4144,6 +4353,9 @@ +@@ -4227,6 +4436,9 @@ png_ptr->mode |= PNG_AFTER_IDAT; png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED; @@ -1030,7 +1030,7 @@ diff -Naru libpng-1.6.31.org/pngrutil.c libpng-1.6.31/pngrutil.c if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0) png_chunk_benign_error(png_ptr, "Extra compressed data"); -@@ -4582,4 +4794,80 @@ +@@ -4665,4 +4877,80 @@ png_ptr->flags |= PNG_FLAG_ROW_INIT; } @@ -1111,10 +1111,10 @@ diff -Naru libpng-1.6.31.org/pngrutil.c libpng-1.6.31/pngrutil.c +#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */ +#endif /* PNG_READ_APNG_SUPPORTED */ #endif /* READ */ -diff -Naru libpng-1.6.31.org/pngset.c libpng-1.6.31/pngset.c ---- libpng-1.6.31.org/pngset.c 2017-07-29 10:08:06.212574354 +0900 -+++ libpng-1.6.31/pngset.c 2017-07-29 10:50:19.587317145 +0900 -@@ -274,6 +274,11 @@ +diff -Naru libpng-1.6.32.org/pngset.c libpng-1.6.32/pngset.c +--- libpng-1.6.32.org/pngset.c 2017-08-26 22:11:25.282792396 +0900 ++++ libpng-1.6.32/pngset.c 2017-08-26 22:06:27.950679514 +0900 +@@ -288,6 +288,11 @@ info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth); info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width); @@ -1126,7 +1126,7 @@ diff -Naru libpng-1.6.31.org/pngset.c libpng-1.6.31/pngset.c } #ifdef PNG_oFFs_SUPPORTED -@@ -1144,6 +1149,147 @@ +@@ -1158,6 +1163,147 @@ } #endif /* sPLT */ @@ -1274,9 +1274,9 @@ diff -Naru libpng-1.6.31.org/pngset.c libpng-1.6.31/pngset.c #ifdef PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED static png_byte check_location(png_const_structrp png_ptr, int location) -diff -Naru libpng-1.6.31.org/pngstruct.h libpng-1.6.31/pngstruct.h ---- libpng-1.6.31.org/pngstruct.h 2017-07-29 10:08:06.212574354 +0900 -+++ libpng-1.6.31/pngstruct.h 2017-07-29 10:50:19.583316806 +0900 +diff -Naru libpng-1.6.32.org/pngstruct.h libpng-1.6.32/pngstruct.h +--- libpng-1.6.32.org/pngstruct.h 2017-08-26 22:11:25.282792396 +0900 ++++ libpng-1.6.32/pngstruct.h 2017-08-26 22:06:27.950679514 +0900 @@ -403,6 +403,27 @@ png_byte filter_type; #endif @@ -1305,10 +1305,10 @@ diff -Naru libpng-1.6.31.org/pngstruct.h libpng-1.6.31/pngstruct.h /* New members added in libpng-1.2.0 */ /* New members added in libpng-1.0.2 but first enabled by default in 1.2.0 */ -diff -Naru libpng-1.6.31.org/pngtest.c libpng-1.6.31/pngtest.c ---- libpng-1.6.31.org/pngtest.c 2017-07-29 10:08:06.212574354 +0900 -+++ libpng-1.6.31/pngtest.c 2017-07-29 10:50:19.583316806 +0900 -@@ -874,6 +874,10 @@ +diff -Naru libpng-1.6.32.org/pngtest.c libpng-1.6.32/pngtest.c +--- libpng-1.6.32.org/pngtest.c 2017-08-26 22:11:25.282792396 +0900 ++++ libpng-1.6.32/pngtest.c 2017-08-26 22:06:27.950679514 +0900 +@@ -875,6 +875,10 @@ volatile int num_passes; int pass; int bit_depth, color_type; @@ -1319,7 +1319,7 @@ diff -Naru libpng-1.6.31.org/pngtest.c libpng-1.6.31/pngtest.c row_buf = NULL; error_parameters.file_name = inname; -@@ -1366,6 +1370,22 @@ +@@ -1381,6 +1385,22 @@ } } #endif @@ -1342,7 +1342,7 @@ diff -Naru libpng-1.6.31.org/pngtest.c libpng-1.6.31/pngtest.c #ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED { png_unknown_chunkp unknowns; -@@ -1442,6 +1462,110 @@ +@@ -1461,6 +1481,110 @@ t_misc += (t_stop - t_start); t_start = t_stop; #endif @@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.31.org/pngtest.c libpng-1.6.31/pngtest.c for (pass = 0; pass < num_passes; pass++) { # ifdef calc_pass_height -diff -Naru libpng-1.6.31.org/pngwrite.c libpng-1.6.31/pngwrite.c ---- libpng-1.6.31.org/pngwrite.c 2017-07-29 10:08:06.213574438 +0900 -+++ libpng-1.6.31/pngwrite.c 2017-07-29 10:50:19.584316891 +0900 +diff -Naru libpng-1.6.32.org/pngwrite.c libpng-1.6.32/pngwrite.c +--- libpng-1.6.32.org/pngwrite.c 2017-08-26 22:11:25.283792481 +0900 ++++ libpng-1.6.32/pngwrite.c 2017-08-26 22:06:27.951679599 +0900 @@ -128,6 +128,10 @@ * the application continues writing the PNG. So check the 'invalid' * flag here too. @@ -1467,7 +1467,7 @@ diff -Naru libpng-1.6.31.org/pngwrite.c libpng-1.6.31/pngwrite.c #ifdef PNG_GAMMA_SUPPORTED # ifdef PNG_WRITE_gAMA_SUPPORTED if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 && -@@ -365,6 +369,11 @@ +@@ -370,6 +374,11 @@ png_benign_error(png_ptr, "Wrote palette index exceeding num_palette"); #endif @@ -1479,7 +1479,7 @@ diff -Naru libpng-1.6.31.org/pngwrite.c libpng-1.6.31/pngwrite.c /* See if user wants us to write information chunks */ if (info_ptr != NULL) { -@@ -1450,6 +1459,43 @@ +@@ -1461,6 +1470,43 @@ } #endif @@ -1523,9 +1523,9 @@ diff -Naru libpng-1.6.31.org/pngwrite.c libpng-1.6.31/pngwrite.c #ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED /* Initialize the write structure - general purpose utility. */ -diff -Naru libpng-1.6.31.org/pngwutil.c libpng-1.6.31/pngwutil.c ---- libpng-1.6.31.org/pngwutil.c 2017-07-29 10:08:06.213574438 +0900 -+++ libpng-1.6.31/pngwutil.c 2017-07-29 10:50:19.597317991 +0900 +diff -Naru libpng-1.6.32.org/pngwutil.c libpng-1.6.32/pngwutil.c +--- libpng-1.6.32.org/pngwutil.c 2017-08-26 22:11:25.283792481 +0900 ++++ libpng-1.6.32/pngwutil.c 2017-08-26 22:06:27.952679683 +0900 @@ -822,6 +822,11 @@ /* Write the chunk */ png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13); @@ -1576,7 +1576,7 @@ diff -Naru libpng-1.6.31.org/pngwutil.c libpng-1.6.31/pngwutil.c png_ptr->zstream.avail_out = 0; png_ptr->zstream.next_out = NULL; png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT; -@@ -1896,6 +1920,82 @@ +@@ -1887,6 +1911,82 @@ } #endif @@ -1659,7 +1659,7 @@ diff -Naru libpng-1.6.31.org/pngwutil.c libpng-1.6.31/pngwutil.c /* Initializes the row writing capability of libpng */ void /* PRIVATE */ png_write_start_row(png_structrp png_ptr) -@@ -2790,4 +2890,39 @@ +@@ -2781,4 +2881,39 @@ } #endif /* WRITE_FLUSH */ } @@ -1699,30 +1699,30 @@ diff -Naru libpng-1.6.31.org/pngwutil.c libpng-1.6.31/pngwutil.c +} +#endif /* PNG_WRITE_APNG_SUPPORTED */ #endif /* WRITE */ -diff -Naru libpng-1.6.31.org/scripts/symbols.def libpng-1.6.31/scripts/symbols.def ---- libpng-1.6.31.org/scripts/symbols.def 2017-07-29 10:08:06.215574607 +0900 -+++ libpng-1.6.31/scripts/symbols.def 2017-07-29 10:50:19.584316891 +0900 -@@ -252,3 +252,23 @@ - png_image_write_to_memory @245 - png_get_eXIf @246 +diff -Naru libpng-1.6.32.org/scripts/symbols.def libpng-1.6.32/scripts/symbols.def +--- libpng-1.6.32.org/scripts/symbols.def 2017-08-26 22:11:25.289792987 +0900 ++++ libpng-1.6.32/scripts/symbols.def 2017-08-26 22:06:27.962680528 +0900 +@@ -254,3 +254,23 @@ png_set_eXIf @247 -+ png_get_acTL @248 -+ png_set_acTL @249 -+ png_get_num_frames @250 -+ png_get_num_plays @251 -+ png_get_next_frame_fcTL @252 -+ png_set_next_frame_fcTL @253 -+ png_get_next_frame_width @254 -+ png_get_next_frame_height @255 -+ png_get_next_frame_x_offset @256 -+ png_get_next_frame_y_offset @257 -+ png_get_next_frame_delay_num @258 -+ png_get_next_frame_delay_den @259 -+ png_get_next_frame_dispose_op @260 -+ png_get_next_frame_blend_op @261 -+ png_get_first_frame_is_hidden @262 -+ png_set_first_frame_is_hidden @263 -+ png_read_frame_head @264 -+ png_set_progressive_frame_fn @265 -+ png_write_frame_head @266 -+ png_write_frame_tail @267 + png_get_eXIf_1 @248 + png_set_eXIf_1 @249 ++ png_get_acTL @250 ++ png_set_acTL @251 ++ png_get_num_frames @252 ++ png_get_num_plays @253 ++ png_get_next_frame_fcTL @254 ++ png_set_next_frame_fcTL @255 ++ png_get_next_frame_width @256 ++ png_get_next_frame_height @257 ++ png_get_next_frame_x_offset @258 ++ png_get_next_frame_y_offset @259 ++ png_get_next_frame_delay_num @260 ++ png_get_next_frame_delay_den @261 ++ png_get_next_frame_dispose_op @262 ++ png_get_next_frame_blend_op @263 ++ png_get_first_frame_is_hidden @264 ++ png_set_first_frame_is_hidden @265 ++ png_read_frame_head @266 ++ png_set_progressive_frame_fn @267 ++ png_write_frame_head @268 ++ png_write_frame_tail @269 diff --git a/libpng.spec b/libpng.spec index e9c290f..fd0d124 100644 --- a/libpng.spec +++ b/libpng.spec @@ -1,6 +1,6 @@ %define apiver %(echo %version | cut -d. -f1-2 | tr -d .) Name: libpng -Version: 1.6.31 +Version: 1.6.32 Release: 1mamba Summary: A library of functions for manipulating PNG image format files Group: System/Libraries @@ -126,6 +126,9 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so %endif %changelog +* Thu Aug 31 2017 Automatic Build System 1.6.32-1mamba +- automatic version update by autodist + * Mon Aug 07 2017 Automatic Build System 1.6.31-1mamba - automatic version update by autodist