rpms/libpng
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

automatic version update by autodist [release 1.6.45-1mamba;Fri Jan 10 2025]

Browse Source
This commit is contained in:
Automatic Build System 2025-01-11 01:03:14 +01:00
parent e838a3d072
commit 0b262753c4
2 changed files with 139 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

268
libpng-1.6.44-apng.patch → libpng-1.6.45-apng.patch
View File

@ -1,7 +1,7 @@
diff -Naru libpng-1.6.44.org/png.h libpng-1.6.44/png.h
--- libpng-1.6.44.org/png.h 2024-09-14 09:46:13.877277813 +0900
+++ libpng-1.6.44/png.h 2024-09-14 09:46:58.042395715 +0900
@@ -329,6 +329,10 @@
diff -Naru libpng-1.6.45.org/png.h libpng-1.6.45/png.h
--- libpng-1.6.45.org/png.h 2025-01-10 15:56:19.711319390 +0900
+++ libpng-1.6.45/png.h 2025-01-10 19:02:26.130020487 +0900
@@ -328,6 +328,10 @@
# include "pnglibconf.h"
#endif
@ -12,7 +12,7 @@ diff -Naru libpng-1.6.44.org/png.h libpng-1.6.44/png.h
#ifndef PNG_VERSION_INFO_ONLY
/* Machine specific configuration. */
# include "pngconf.h"
@@ -424,6 +428,17 @@
@@ -423,6 +427,17 @@
* See pngconf.h for base types that vary by machine/system
*/
@ -31,12 +31,12 @@ diff -Naru libpng-1.6.44.org/png.h libpng-1.6.44/png.h
* do not agree upon the version number.
*/
@@ -745,6 +760,10 @@
#define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */
#define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */
#define PNG_INFO_eXIf 0x10000U /* GR-P, 1.6.31 */
#define PNG_INFO_cICP 0x20000U
+#ifdef PNG_APNG_SUPPORTED
+#define PNG_INFO_acTL 0x20000U
+#define PNG_INFO_fcTL 0x40000U
+#define PNG_INFO_acTL 0x40000U
+#define PNG_INFO_fcTL 0x80000U
+#endif
/* This is used for the transformation routines, as some of them
@ -52,97 +52,98 @@ diff -Naru libpng-1.6.44.org/png.h libpng-1.6.44/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
@@ -3229,6 +3252,74 @@
/*******************************************************************************
@@ -3241,6 +3264,75 @@
* END OF HARDWARE AND SOFTWARE OPTIONS
******************************************************************************/
+#ifdef PNG_APNG_SUPPORTED
+PNG_EXPORT(250, png_uint_32, png_get_acTL, (png_structp png_ptr,
+PNG_EXPORT(252, 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(251, png_uint_32, png_set_acTL, (png_structp png_ptr,
+PNG_EXPORT(253, 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(252, png_uint_32, png_get_num_frames, (png_structp png_ptr,
+PNG_EXPORT(254, png_uint_32, png_get_num_frames, (png_structp png_ptr,
+ png_infop info_ptr));
+
+PNG_EXPORT(253, png_uint_32, png_get_num_plays, (png_structp png_ptr,
+PNG_EXPORT(255, png_uint_32, png_get_num_plays, (png_structp png_ptr,
+ png_infop info_ptr));
+
+PNG_EXPORT(254, png_uint_32, png_get_next_frame_fcTL,
+PNG_EXPORT(256, 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(255, png_uint_32, png_set_next_frame_fcTL,
+PNG_EXPORT(257, 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(256, png_uint_32, png_get_next_frame_width,
+PNG_EXPORT(258, png_uint_32, png_get_next_frame_width,
+ (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(257, png_uint_32, png_get_next_frame_height,
+PNG_EXPORT(259, png_uint_32, png_get_next_frame_height,
+ (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(258, png_uint_32, png_get_next_frame_x_offset,
+PNG_EXPORT(260, png_uint_32, png_get_next_frame_x_offset,
+ (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(259, png_uint_32, png_get_next_frame_y_offset,
+PNG_EXPORT(261, png_uint_32, png_get_next_frame_y_offset,
+ (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(260, png_uint_16, png_get_next_frame_delay_num,
+PNG_EXPORT(262, png_uint_16, png_get_next_frame_delay_num,
+ (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(261, png_uint_16, png_get_next_frame_delay_den,
+PNG_EXPORT(263, png_uint_16, png_get_next_frame_delay_den,
+ (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(262, png_byte, png_get_next_frame_dispose_op,
+PNG_EXPORT(264, png_byte, png_get_next_frame_dispose_op,
+ (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(263, png_byte, png_get_next_frame_blend_op,
+PNG_EXPORT(265, png_byte, png_get_next_frame_blend_op,
+ (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(264, png_byte, png_get_first_frame_is_hidden,
+PNG_EXPORT(266, png_byte, png_get_first_frame_is_hidden,
+ (png_structp png_ptr, png_infop info_ptr));
+PNG_EXPORT(265, png_uint_32, png_set_first_frame_is_hidden,
+PNG_EXPORT(267, 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(266, void, png_read_frame_head, (png_structp png_ptr,
+PNG_EXPORT(268, void, png_read_frame_head, (png_structp png_ptr,
+ png_infop info_ptr));
+#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
+PNG_EXPORT(267, void, png_set_progressive_frame_fn, (png_structp png_ptr,
+PNG_EXPORT(269, 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(268, void, png_write_frame_head, (png_structp png_ptr,
+PNG_EXPORT(270, 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(269, void, png_write_frame_tail, (png_structp png_ptr,
+PNG_EXPORT(271, 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.
@@ -3238,7 +3329,11 @@
*/
@@ -3249,7 +3341,11 @@
* one to use is one more than this.)
*/
#ifdef PNG_EXPORT_LAST_ORDINAL
+#ifdef PNG_APNG_SUPPORTED
+ PNG_EXPORT_LAST_ORDINAL(269);
+ PNG_EXPORT_LAST_ORDINAL(271);
+#else
PNG_EXPORT_LAST_ORDINAL(249);
PNG_EXPORT_LAST_ORDINAL(251);
+#endif /* PNG_APNG_SUPPORTED */
#endif
#ifdef __cplusplus
diff -Naru libpng-1.6.44.org/pngget.c libpng-1.6.44/pngget.c
--- libpng-1.6.44.org/pngget.c 2024-02-24 21:30:16.161079410 +0900
+++ libpng-1.6.44/pngget.c 2024-09-14 09:46:58.009395627 +0900
@@ -1264,4 +1264,166 @@
diff -Naru libpng-1.6.45.org/pngget.c libpng-1.6.45/pngget.c
--- libpng-1.6.45.org/pngget.c 2025-01-10 15:56:19.711319390 +0900
+++ libpng-1.6.45/pngget.c 2025-01-10 19:02:26.130020487 +0900
@@ -1288,4 +1288,166 @@
# endif
#endif
@ -309,10 +310,10 @@ diff -Naru libpng-1.6.44.org/pngget.c libpng-1.6.44/pngget.c
+}
+#endif /* PNG_APNG_SUPPORTED */
#endif /* READ || WRITE */
diff -Naru libpng-1.6.44.org/pnginfo.h libpng-1.6.44/pnginfo.h
--- libpng-1.6.44.org/pnginfo.h 2022-11-24 08:37:51.507052183 +0900
+++ libpng-1.6.44/pnginfo.h 2024-09-14 09:46:58.009395627 +0900
@@ -263,5 +263,18 @@
diff -Naru libpng-1.6.45.org/pnginfo.h libpng-1.6.45/pnginfo.h
--- libpng-1.6.45.org/pnginfo.h 2025-01-10 15:56:19.711319390 +0900
+++ libpng-1.6.45/pnginfo.h 2025-01-10 19:02:26.130020487 +0900
@@ -270,5 +270,18 @@
png_bytepp row_pointers; /* the image bits */
#endif
@ -331,10 +332,10 @@ diff -Naru libpng-1.6.44.org/pnginfo.h libpng-1.6.44/pnginfo.h
+
};
#endif /* PNGINFO_H */
diff -Naru libpng-1.6.44.org/pngpread.c libpng-1.6.44/pngpread.c
--- libpng-1.6.44.org/pngpread.c 2024-02-25 09:17:31.833108085 +0900
+++ libpng-1.6.44/pngpread.c 2024-09-14 09:46:58.010395629 +0900
@@ -195,6 +195,106 @@
diff -Naru libpng-1.6.45.org/pngpread.c libpng-1.6.45/pngpread.c
--- libpng-1.6.45.org/pngpread.c 2025-01-10 15:56:19.712319390 +0900
+++ libpng-1.6.45/pngpread.c 2025-01-10 19:02:26.130020487 +0900
@@ -209,6 +209,106 @@
chunk_name = png_ptr->chunk_name;
@ -441,7 +442,7 @@ diff -Naru libpng-1.6.44.org/pngpread.c libpng-1.6.44/pngpread.c
if (chunk_name == png_IDAT)
{
if ((png_ptr->mode & PNG_AFTER_IDAT) != 0)
@@ -261,6 +361,9 @@
@@ -275,6 +375,9 @@
else if (chunk_name == png_IDAT)
{
@ -451,7 +452,7 @@ diff -Naru libpng-1.6.44.org/pngpread.c libpng-1.6.44/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);
@@ -414,6 +517,30 @@
@@ -436,6 +539,30 @@
png_handle_iTXt(png_ptr, info_ptr, png_ptr->push_length);
}
#endif
@ -482,7 +483,7 @@ diff -Naru libpng-1.6.44.org/pngpread.c libpng-1.6.44/pngpread.c
else
{
@@ -547,7 +674,11 @@
@@ -569,7 +696,11 @@
png_byte chunk_tag[4];
/* TODO: this code can be commoned up with the same code in push_read */
@ -494,7 +495,7 @@ diff -Naru libpng-1.6.44.org/pngpread.c libpng-1.6.44/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);
@@ -555,17 +686,64 @@
@@ -577,17 +708,64 @@
png_ptr->chunk_name = PNG_CHUNK_FROM_STRING(chunk_tag);
png_ptr->mode |= PNG_HAVE_CHUNK_HEADER;
@ -559,7 +560,7 @@ diff -Naru libpng-1.6.44.org/pngpread.c libpng-1.6.44/pngpread.c
}
if (png_ptr->idat_size != 0 && png_ptr->save_buffer_size != 0)
@@ -639,6 +817,15 @@
@@ -661,6 +839,15 @@
if (!(buffer_length > 0) || buffer == NULL)
png_error(png_ptr, "No IDAT data (internal error)");
@ -575,7 +576,7 @@ diff -Naru libpng-1.6.44.org/pngpread.c libpng-1.6.44/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.
@@ -1093,6 +1280,18 @@
@@ -1094,6 +1281,18 @@
png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
}
@ -594,10 +595,10 @@ diff -Naru libpng-1.6.44.org/pngpread.c libpng-1.6.44/pngpread.c
png_voidp PNGAPI
png_get_progressive_ptr(png_const_structrp png_ptr)
{
diff -Naru libpng-1.6.44.org/pngpriv.h libpng-1.6.44/pngpriv.h
--- libpng-1.6.44.org/pngpriv.h 2024-09-14 09:46:13.878277815 +0900
+++ libpng-1.6.44/pngpriv.h 2024-09-14 09:46:58.010395629 +0900
@@ -621,6 +621,10 @@
diff -Naru libpng-1.6.45.org/pngpriv.h libpng-1.6.45/pngpriv.h
--- libpng-1.6.45.org/pngpriv.h 2025-01-10 15:56:19.712319390 +0900
+++ libpng-1.6.45/pngpriv.h 2025-01-10 19:02:26.131020486 +0900
@@ -620,6 +620,10 @@
#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000U /* Have another chunk after IDAT */
#define PNG_WROTE_eXIf 0x4000U
#define PNG_IS_READ_STRUCT 0x8000U /* Else is a write struct */
@ -625,7 +626,7 @@ diff -Naru libpng-1.6.44.org/pngpriv.h libpng-1.6.44/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.
*/
@@ -1662,6 +1676,47 @@
@@ -1673,6 +1687,47 @@
*/
#endif
@ -673,10 +674,10 @@ diff -Naru libpng-1.6.44.org/pngpriv.h libpng-1.6.44/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.44.org/pngread.c libpng-1.6.44/pngread.c
--- libpng-1.6.44.org/pngread.c 2024-02-25 09:17:31.833108085 +0900
+++ libpng-1.6.44/pngread.c 2024-09-14 09:46:58.010395629 +0900
@@ -161,6 +161,9 @@
diff -Naru libpng-1.6.45.org/pngread.c libpng-1.6.45/pngread.c
--- libpng-1.6.45.org/pngread.c 2025-01-10 15:56:19.712319390 +0900
+++ libpng-1.6.45/pngread.c 2025-01-10 19:02:26.131020486 +0900
@@ -160,6 +160,9 @@
else if (chunk_name == png_IDAT)
{
@ -686,7 +687,7 @@ diff -Naru libpng-1.6.44.org/pngread.c libpng-1.6.44/pngread.c
png_ptr->idat_size = length;
break;
}
@@ -255,6 +258,17 @@
@@ -259,6 +262,17 @@
png_handle_iTXt(png_ptr, info_ptr, length);
#endif
@ -704,7 +705,7 @@ diff -Naru libpng-1.6.44.org/pngread.c libpng-1.6.44/pngread.c
else
png_handle_unknown(png_ptr, info_ptr, length,
PNG_HANDLE_CHUNK_AS_DEFAULT);
@@ -262,6 +276,72 @@
@@ -266,6 +280,72 @@
}
#endif /* SEQUENTIAL_READ */
@ -777,10 +778,10 @@ diff -Naru libpng-1.6.44.org/pngread.c libpng-1.6.44/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.44.org/pngrutil.c libpng-1.6.44/pngrutil.c
--- libpng-1.6.44.org/pngrutil.c 2024-02-24 21:30:16.164079400 +0900
+++ libpng-1.6.44/pngrutil.c 2024-09-14 09:46:58.011395632 +0900
@@ -863,6 +863,11 @@
diff -Naru libpng-1.6.45.org/pngrutil.c libpng-1.6.45/pngrutil.c
--- libpng-1.6.45.org/pngrutil.c 2025-01-10 15:56:19.713319389 +0900
+++ libpng-1.6.45/pngrutil.c 2025-01-10 19:02:26.132020484 +0900
@@ -877,6 +877,11 @@
filter_type = buf[11];
interlace_type = buf[12];
@ -792,7 +793,7 @@ diff -Naru libpng-1.6.44.org/pngrutil.c libpng-1.6.44/pngrutil.c
/* Set internal variables */
png_ptr->width = width;
png_ptr->height = height;
@@ -2857,6 +2862,179 @@
@@ -2912,6 +2917,179 @@
}
#endif
@ -972,18 +973,18 @@ diff -Naru libpng-1.6.44.org/pngrutil.c libpng-1.6.44/pngrutil.c
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
static int
@@ -4165,7 +4343,38 @@
@@ -4216,7 +4394,38 @@
{
uInt avail_in;
png_bytep buffer;
+#ifdef PNG_READ_APNG_SUPPORTED
+ png_uint_32 bytes_to_skip = 0;
+
+ while (png_ptr->idat_size == 0 || bytes_to_skip != 0)
+ {
+ png_crc_finish(png_ptr, bytes_to_skip);
+ bytes_to_skip = 0;
+
+ png_ptr->idat_size = png_read_chunk_header(png_ptr);
+ if (png_ptr->num_frames_read == 0)
+ {
@ -1011,7 +1012,7 @@ diff -Naru libpng-1.6.44.org/pngrutil.c libpng-1.6.44/pngrutil.c
while (png_ptr->idat_size == 0)
{
png_crc_finish(png_ptr, 0);
@@ -4177,7 +4386,7 @@
@@ -4228,7 +4437,7 @@
if (png_ptr->chunk_name != png_IDAT)
png_error(png_ptr, "Not enough image data");
}
@ -1020,7 +1021,7 @@ diff -Naru libpng-1.6.44.org/pngrutil.c libpng-1.6.44/pngrutil.c
avail_in = png_ptr->IDAT_read_size;
if (avail_in > png_ptr->idat_size)
@@ -4240,6 +4449,9 @@
@@ -4291,6 +4500,9 @@
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
@ -1030,7 +1031,7 @@ diff -Naru libpng-1.6.44.org/pngrutil.c libpng-1.6.44/pngrutil.c
if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
png_chunk_benign_error(png_ptr, "Extra compressed data");
@@ -4677,4 +4889,80 @@
@@ -4700,4 +4912,80 @@
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
@ -1111,10 +1112,10 @@ diff -Naru libpng-1.6.44.org/pngrutil.c libpng-1.6.44/pngrutil.c
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PNG_READ_APNG_SUPPORTED */
#endif /* READ */
diff -Naru libpng-1.6.44.org/pngset.c libpng-1.6.44/pngset.c
--- libpng-1.6.44.org/pngset.c 2024-02-24 21:30:16.164079400 +0900
+++ libpng-1.6.44/pngset.c 2024-09-14 09:46:58.015395643 +0900
@@ -280,6 +280,11 @@
diff -Naru libpng-1.6.45.org/pngset.c libpng-1.6.45/pngset.c
--- libpng-1.6.45.org/pngset.c 2025-01-10 15:56:19.713319389 +0900
+++ libpng-1.6.45/pngset.c 2025-01-10 19:02:26.133020483 +0900
@@ -305,6 +305,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 +1127,7 @@ diff -Naru libpng-1.6.44.org/pngset.c libpng-1.6.44/pngset.c
}
#ifdef PNG_oFFs_SUPPORTED
@@ -1151,6 +1156,147 @@
@@ -1176,6 +1181,147 @@
}
#endif /* sPLT */
@ -1274,10 +1275,10 @@ diff -Naru libpng-1.6.44.org/pngset.c libpng-1.6.44/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.44.org/pngstruct.h libpng-1.6.44/pngstruct.h
--- libpng-1.6.44.org/pngstruct.h 2022-11-24 08:37:51.510052177 +0900
+++ libpng-1.6.44/pngstruct.h 2024-09-14 09:46:58.011395632 +0900
@@ -399,6 +399,27 @@
diff -Naru libpng-1.6.45.org/pngstruct.h libpng-1.6.45/pngstruct.h
--- libpng-1.6.45.org/pngstruct.h 2025-01-10 14:00:52.843880956 +0900
+++ libpng-1.6.45/pngstruct.h 2025-01-10 19:02:26.133020483 +0900
@@ -398,6 +398,27 @@
png_byte filter_type;
#endif
@ -1305,10 +1306,10 @@ diff -Naru libpng-1.6.44.org/pngstruct.h libpng-1.6.44/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.44.org/pngtest.c libpng-1.6.44/pngtest.c
--- libpng-1.6.44.org/pngtest.c 2024-09-14 09:46:13.878277815 +0900
+++ libpng-1.6.44/pngtest.c 2024-09-14 09:46:58.012395635 +0900
@@ -882,6 +882,10 @@
diff -Naru libpng-1.6.45.org/pngtest.c libpng-1.6.45/pngtest.c
--- libpng-1.6.45.org/pngtest.c 2025-01-10 15:56:19.714319388 +0900
+++ libpng-1.6.45/pngtest.c 2025-01-10 19:02:26.133020483 +0900
@@ -881,6 +881,10 @@
int bit_depth, color_type;
user_chunk_info my_user_chunk_data;
int pass, num_passes;
@ -1319,7 +1320,7 @@ diff -Naru libpng-1.6.44.org/pngtest.c libpng-1.6.44/pngtest.c
row_buf = NULL;
error_parameters.file_name = inname;
@@ -1380,6 +1384,22 @@
@@ -1394,6 +1398,22 @@
}
}
#endif
@ -1342,7 +1343,7 @@ diff -Naru libpng-1.6.44.org/pngtest.c libpng-1.6.44/pngtest.c
#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
{
png_unknown_chunkp unknowns;
@@ -1439,6 +1459,110 @@
@@ -1453,6 +1473,110 @@
t_misc += (t_stop - t_start);
t_start = t_stop;
#endif
@ -1453,21 +1454,22 @@ diff -Naru libpng-1.6.44.org/pngtest.c libpng-1.6.44/pngtest.c
for (pass = 0; pass < num_passes; pass++)
{
# ifdef calc_pass_height
diff -Naru libpng-1.6.44.org/pngwrite.c libpng-1.6.44/pngwrite.c
--- libpng-1.6.44.org/pngwrite.c 2024-02-24 21:30:16.165079396 +0900
+++ libpng-1.6.44/pngwrite.c 2024-09-14 09:46:58.012395635 +0900
@@ -128,6 +128,10 @@
diff -Naru libpng-1.6.45.org/pngwrite.c libpng-1.6.45/pngwrite.c
--- libpng-1.6.45.org/pngwrite.c 2025-01-10 15:56:19.714319388 +0900
+++ libpng-1.6.45/pngwrite.c 2025-01-10 19:02:26.134020481 +0900
@@ -127,6 +127,11 @@
* the application continues writing the PNG. So check the 'invalid'
* flag here too.
*/
+#ifdef PNG_WRITE_APNG_SUPPORTED
+ if (info_ptr->valid & PNG_INFO_acTL)
+ png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays);
+ if ((info_ptr->valid & PNG_INFO_acTL) != 0)
+ png_write_acTL(png_ptr, info_ptr->num_frames, info_ptr->num_plays);
+#endif
#ifdef PNG_GAMMA_SUPPORTED
# ifdef PNG_WRITE_gAMA_SUPPORTED
if ((info_ptr->colorspace.flags & PNG_COLORSPACE_INVALID) == 0 &&
@@ -374,6 +378,11 @@
+
#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
/* Write unknown chunks first; PNG v3 establishes a precedence order
* for colourspace chunks. It is certain therefore that new
@@ -405,6 +410,11 @@
png_benign_error(png_ptr, "Wrote palette index exceeding num_palette");
#endif
@ -1479,7 +1481,7 @@ diff -Naru libpng-1.6.44.org/pngwrite.c libpng-1.6.44/pngwrite.c
/* See if user wants us to write information chunks */
if (info_ptr != NULL)
{
@@ -1484,6 +1493,43 @@
@@ -1515,6 +1525,43 @@
}
#endif
@ -1523,10 +1525,10 @@ diff -Naru libpng-1.6.44.org/pngwrite.c libpng-1.6.44/pngwrite.c
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
/* Initialize the write structure - general purpose utility. */
diff -Naru libpng-1.6.44.org/pngwutil.c libpng-1.6.44/pngwutil.c
--- libpng-1.6.44.org/pngwutil.c 2024-02-24 21:30:16.166079393 +0900
+++ libpng-1.6.44/pngwutil.c 2024-09-14 09:46:58.032395689 +0900
@@ -821,6 +821,11 @@
diff -Naru libpng-1.6.45.org/pngwutil.c libpng-1.6.45/pngwutil.c
--- libpng-1.6.45.org/pngwutil.c 2025-01-10 15:56:19.714319388 +0900
+++ libpng-1.6.45/pngwutil.c 2025-01-10 19:02:26.134020481 +0900
@@ -838,6 +838,11 @@
/* Write the chunk */
png_write_complete_chunk(png_ptr, png_IHDR, buf, 13);
@ -1538,7 +1540,7 @@ diff -Naru libpng-1.6.44.org/pngwutil.c libpng-1.6.44/pngwutil.c
if ((png_ptr->do_filter) == PNG_NO_FILTERS)
{
if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE ||
@@ -1002,8 +1007,17 @@
@@ -1019,8 +1024,17 @@
optimize_cmf(data, png_image_size(png_ptr));
#endif
@ -1558,7 +1560,7 @@ diff -Naru libpng-1.6.44.org/pngwutil.c libpng-1.6.44/pngwutil.c
png_ptr->mode |= PNG_HAVE_IDAT;
png_ptr->zstream.next_out = data;
@@ -1050,7 +1064,17 @@
@@ -1067,7 +1081,17 @@
#endif
if (size > 0)
@ -1576,7 +1578,7 @@ diff -Naru libpng-1.6.44.org/pngwutil.c libpng-1.6.44/pngwutil.c
png_ptr->zstream.avail_out = 0;
png_ptr->zstream.next_out = NULL;
png_ptr->mode |= PNG_HAVE_IDAT | PNG_AFTER_IDAT;
@@ -1885,6 +1909,82 @@
@@ -1925,6 +1949,82 @@
}
#endif
@ -1699,30 +1701,30 @@ diff -Naru libpng-1.6.44.org/pngwutil.c libpng-1.6.44/pngwutil.c
+}
+#endif /* PNG_WRITE_APNG_SUPPORTED */
#endif /* WRITE */
diff -Naru libpng-1.6.44.org/scripts/symbols.def libpng-1.6.44/scripts/symbols.def
--- libpng-1.6.44.org/scripts/symbols.def 2022-11-24 08:37:51.515052168 +0900
+++ libpng-1.6.44/scripts/symbols.def 2024-09-14 09:46:58.013395638 +0900
@@ -253,3 +253,23 @@
png_set_eXIf @247
png_get_eXIf_1 @248
diff -Naru libpng-1.6.45.org/scripts/symbols.def libpng-1.6.45/scripts/symbols.def
--- libpng-1.6.45.org/scripts/symbols.def 2025-01-10 15:56:19.715319387 +0900
+++ libpng-1.6.45/scripts/symbols.def 2025-01-10 19:02:26.140020471 +0900
@@ -255,3 +255,23 @@
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
png_get_cICP @250
png_set_cICP @251
+ png_get_acTL @252
+ png_set_acTL @253
+ png_get_num_frames @254
+ png_get_num_plays @255
+ png_get_next_frame_fcTL @256
+ png_set_next_frame_fcTL @257
+ png_get_next_frame_width @258
+ png_get_next_frame_height @259
+ png_get_next_frame_x_offset @260
+ png_get_next_frame_y_offset @261
+ png_get_next_frame_delay_num @262
+ png_get_next_frame_delay_den @263
+ png_get_next_frame_dispose_op @264
+ png_get_next_frame_blend_op @265
+ png_get_first_frame_is_hidden @266
+ png_set_first_frame_is_hidden @267
+ png_read_frame_head @268
+ png_set_progressive_frame_fn @269
+ png_write_frame_head @270
+ png_write_frame_tail @271

6
libpng.spec
View File

@ -1,7 +1,7 @@
%define apiver %(echo %version | cut -d. -f1-2 | tr -d .)
%define apngver %{version}
Name: libpng
Version: 1.6.44
Version: 1.6.45
Release: 1mamba
Summary: A library of functions for manipulating PNG image format files
Group: System/Libraries
@ -35,7 +35,6 @@ The libpng-devel package contains the header files and libraries necessary for d
If you want to develop programs which will manipulate PNG image format files, you should install libpng-devel.
You'll also need to install the libpng package.
%debug_package
%prep
%setup -q
@ -95,6 +94,9 @@ rm -f %{buildroot}%{_libdir}/libpng.la
%endif
%changelog
* Fri Jan 10 2025 Automatic Build System <autodist@openmamba.org> 1.6.45-1mamba
- automatic version update by autodist
* Sat Sep 14 2024 Automatic Build System <autodist@openmamba.org> 1.6.44-1mamba
- automatic version update by autodist