automatic version update by autodist [release 1.6.25-1mamba;Tue Oct 04 2016]
This commit is contained in:
parent
dcfc443627
commit
94aa4b4017
@ -1,7 +1,7 @@
|
||||
diff -Naru libpng-1.6.24.org/png.h libpng-1.6.24/png.h
|
||||
--- libpng-1.6.24.org/png.h 2016-08-17 20:57:23.407418588 +0900
|
||||
+++ libpng-1.6.24/png.h 2016-08-17 20:56:54.962479318 +0900
|
||||
@@ -365,6 +365,10 @@
|
||||
diff -Naru libpng-1.6.25.org/png.h libpng-1.6.25/png.h
|
||||
--- libpng-1.6.25.org/png.h 2016-09-16 21:30:52.615790113 +0900
|
||||
+++ libpng-1.6.25/png.h 2016-09-16 21:30:52.664790257 +0900
|
||||
@@ -366,6 +366,10 @@
|
||||
# include "pnglibconf.h"
|
||||
#endif
|
||||
|
||||
@ -12,7 +12,7 @@ diff -Naru libpng-1.6.24.org/png.h libpng-1.6.24/png.h
|
||||
#ifndef PNG_VERSION_INFO_ONLY
|
||||
/* Machine specific configuration. */
|
||||
# include "pngconf.h"
|
||||
@@ -460,6 +464,17 @@
|
||||
@@ -461,6 +465,17 @@
|
||||
* See pngconf.h for base types that vary by machine/system
|
||||
*/
|
||||
|
||||
@ -30,7 +30,7 @@ diff -Naru libpng-1.6.24.org/png.h libpng-1.6.24/png.h
|
||||
/* This triggers a compiler error in png.c, if png.c and png.h
|
||||
* do not agree upon the version number.
|
||||
*/
|
||||
@@ -780,6 +795,10 @@
|
||||
@@ -781,6 +796,10 @@
|
||||
#define PNG_INFO_sPLT 0x2000U /* ESR, 1.0.6 */
|
||||
#define PNG_INFO_sCAL 0x4000U /* ESR, 1.0.6 */
|
||||
#define PNG_INFO_IDAT 0x8000U /* ESR, 1.0.6 */
|
||||
@ -41,7 +41,7 @@ diff -Naru libpng-1.6.24.org/png.h libpng-1.6.24/png.h
|
||||
|
||||
/* This is used for the transformation routines, as some of them
|
||||
* change these values for the row. It also should enable using
|
||||
@@ -817,6 +836,10 @@
|
||||
@@ -818,6 +837,10 @@
|
||||
#ifdef PNG_PROGRESSIVE_READ_SUPPORTED
|
||||
typedef PNG_CALLBACK(void, *png_progressive_info_ptr, (png_structp, png_infop));
|
||||
typedef PNG_CALLBACK(void, *png_progressive_end_ptr, (png_structp, png_infop));
|
||||
@ -52,7 +52,7 @@ diff -Naru libpng-1.6.24.org/png.h libpng-1.6.24/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
|
||||
@@ -3241,6 +3264,74 @@
|
||||
@@ -3245,6 +3268,74 @@
|
||||
/*******************************************************************************
|
||||
* END OF HARDWARE AND SOFTWARE OPTIONS
|
||||
******************************************************************************/
|
||||
@ -127,7 +127,7 @@ diff -Naru libpng-1.6.24.org/png.h libpng-1.6.24/png.h
|
||||
|
||||
/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
|
||||
* defs, and in scripts/symbols.def.
|
||||
@@ -3250,7 +3341,11 @@
|
||||
@@ -3254,7 +3345,11 @@
|
||||
* one to use is one more than this.)
|
||||
*/
|
||||
#ifdef PNG_EXPORT_LAST_ORDINAL
|
||||
@ -139,9 +139,9 @@ diff -Naru libpng-1.6.24.org/png.h libpng-1.6.24/png.h
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
diff -Naru libpng-1.6.24.org/pngget.c libpng-1.6.24/pngget.c
|
||||
--- libpng-1.6.24.org/pngget.c 2016-08-17 20:53:14.856972732 +0900
|
||||
+++ libpng-1.6.24/pngget.c 2016-08-17 20:56:54.932479384 +0900
|
||||
diff -Naru libpng-1.6.25.org/pngget.c libpng-1.6.25/pngget.c
|
||||
--- libpng-1.6.25.org/pngget.c 2016-09-16 21:30:52.616790117 +0900
|
||||
+++ libpng-1.6.25/pngget.c 2016-09-16 21:30:52.665790260 +0900
|
||||
@@ -1216,4 +1216,166 @@
|
||||
# endif
|
||||
#endif
|
||||
@ -309,9 +309,9 @@ diff -Naru libpng-1.6.24.org/pngget.c libpng-1.6.24/pngget.c
|
||||
+}
|
||||
+#endif /* PNG_APNG_SUPPORTED */
|
||||
#endif /* READ || WRITE */
|
||||
diff -Naru libpng-1.6.24.org/pnginfo.h libpng-1.6.24/pnginfo.h
|
||||
--- libpng-1.6.24.org/pnginfo.h 2016-06-09 22:21:54.200319885 +0900
|
||||
+++ libpng-1.6.24/pnginfo.h 2016-08-17 20:56:54.906479442 +0900
|
||||
diff -Naru libpng-1.6.25.org/pnginfo.h libpng-1.6.25/pnginfo.h
|
||||
--- libpng-1.6.25.org/pnginfo.h 2016-09-16 21:30:52.616790117 +0900
|
||||
+++ libpng-1.6.25/pnginfo.h 2016-09-16 21:30:52.665790260 +0900
|
||||
@@ -255,5 +255,18 @@
|
||||
png_bytepp row_pointers; /* the image bits */
|
||||
#endif
|
||||
@ -331,9 +331,9 @@ diff -Naru libpng-1.6.24.org/pnginfo.h libpng-1.6.24/pnginfo.h
|
||||
+
|
||||
};
|
||||
#endif /* PNGINFO_H */
|
||||
diff -Naru libpng-1.6.24.org/pngpread.c libpng-1.6.24/pngpread.c
|
||||
--- libpng-1.6.24.org/pngpread.c 2016-08-17 20:53:14.856972732 +0900
|
||||
+++ libpng-1.6.24/pngpread.c 2016-08-17 20:56:54.931479387 +0900
|
||||
diff -Naru libpng-1.6.25.org/pngpread.c libpng-1.6.25/pngpread.c
|
||||
--- libpng-1.6.25.org/pngpread.c 2016-09-16 21:30:52.616790117 +0900
|
||||
+++ libpng-1.6.25/pngpread.c 2016-09-16 21:30:52.665790260 +0900
|
||||
@@ -194,6 +194,106 @@
|
||||
|
||||
chunk_name = png_ptr->chunk_name;
|
||||
@ -594,10 +594,10 @@ diff -Naru libpng-1.6.24.org/pngpread.c libpng-1.6.24/pngpread.c
|
||||
png_voidp PNGAPI
|
||||
png_get_progressive_ptr(png_const_structrp png_ptr)
|
||||
{
|
||||
diff -Naru libpng-1.6.24.org/pngpriv.h libpng-1.6.24/pngpriv.h
|
||||
--- libpng-1.6.24.org/pngpriv.h 2016-08-17 20:57:23.408418585 +0900
|
||||
+++ libpng-1.6.24/pngpriv.h 2016-08-17 20:56:54.929479391 +0900
|
||||
@@ -537,6 +537,10 @@
|
||||
diff -Naru libpng-1.6.25.org/pngpriv.h libpng-1.6.25/pngpriv.h
|
||||
--- libpng-1.6.25.org/pngpriv.h 2016-09-16 21:30:52.616790117 +0900
|
||||
+++ libpng-1.6.25/pngpriv.h 2016-09-16 21:30:52.666790263 +0900
|
||||
@@ -566,6 +566,10 @@
|
||||
#define PNG_HAVE_CHUNK_AFTER_IDAT 0x2000 /* Have another chunk after IDAT */
|
||||
/* 0x4000 (unused) */
|
||||
#define PNG_IS_READ_STRUCT 0x8000 /* Else is a write struct */
|
||||
@ -608,7 +608,7 @@ diff -Naru libpng-1.6.24.org/pngpriv.h libpng-1.6.24/pngpriv.h
|
||||
|
||||
/* Flags for the transformations the PNG library does on the image data */
|
||||
#define PNG_BGR 0x0001
|
||||
@@ -754,6 +758,16 @@
|
||||
@@ -783,6 +787,16 @@
|
||||
#define png_tRNS PNG_U32(116, 82, 78, 83)
|
||||
#define png_zTXt PNG_U32(122, 84, 88, 116)
|
||||
|
||||
@ -625,7 +625,7 @@ diff -Naru libpng-1.6.24.org/pngpriv.h libpng-1.6.24/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.
|
||||
*/
|
||||
@@ -1463,6 +1477,47 @@
|
||||
@@ -1509,6 +1523,47 @@
|
||||
*/
|
||||
#endif
|
||||
|
||||
@ -673,9 +673,9 @@ diff -Naru libpng-1.6.24.org/pngpriv.h libpng-1.6.24/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.24.org/pngread.c libpng-1.6.24/pngread.c
|
||||
--- libpng-1.6.24.org/pngread.c 2016-08-17 20:53:14.857972730 +0900
|
||||
+++ libpng-1.6.24/pngread.c 2016-08-17 20:56:54.927479396 +0900
|
||||
diff -Naru libpng-1.6.25.org/pngread.c libpng-1.6.25/pngread.c
|
||||
--- libpng-1.6.25.org/pngread.c 2016-09-16 21:30:52.617790119 +0900
|
||||
+++ libpng-1.6.25/pngread.c 2016-09-16 21:30:52.666790263 +0900
|
||||
@@ -161,6 +161,9 @@
|
||||
|
||||
else if (chunk_name == png_IDAT)
|
||||
@ -777,9 +777,9 @@ diff -Naru libpng-1.6.24.org/pngread.c libpng-1.6.24/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.24.org/pngrutil.c libpng-1.6.24/pngrutil.c
|
||||
--- libpng-1.6.24.org/pngrutil.c 2016-08-17 20:57:23.409418583 +0900
|
||||
+++ libpng-1.6.24/pngrutil.c 2016-08-17 20:56:54.922479407 +0900
|
||||
diff -Naru libpng-1.6.25.org/pngrutil.c libpng-1.6.25/pngrutil.c
|
||||
--- libpng-1.6.25.org/pngrutil.c 2016-09-16 21:30:52.618790122 +0900
|
||||
+++ libpng-1.6.25/pngrutil.c 2016-09-16 21:30:52.668790268 +0900
|
||||
@@ -857,6 +857,11 @@
|
||||
filter_type = buf[11];
|
||||
interlace_type = buf[12];
|
||||
@ -1111,9 +1111,9 @@ diff -Naru libpng-1.6.24.org/pngrutil.c libpng-1.6.24/pngrutil.c
|
||||
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
|
||||
+#endif /* PNG_READ_APNG_SUPPORTED */
|
||||
#endif /* READ */
|
||||
diff -Naru libpng-1.6.24.org/pngset.c libpng-1.6.24/pngset.c
|
||||
--- libpng-1.6.24.org/pngset.c 2016-08-17 20:53:14.858972728 +0900
|
||||
+++ libpng-1.6.24/pngset.c 2016-08-17 20:56:54.917479418 +0900
|
||||
diff -Naru libpng-1.6.25.org/pngset.c libpng-1.6.25/pngset.c
|
||||
--- libpng-1.6.25.org/pngset.c 2016-09-16 21:30:52.618790122 +0900
|
||||
+++ libpng-1.6.25/pngset.c 2016-09-16 21:30:52.668790268 +0900
|
||||
@@ -241,6 +241,11 @@
|
||||
info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
|
||||
|
||||
@ -1225,9 +1225,9 @@ diff -Naru libpng-1.6.24.org/pngset.c libpng-1.6.24/pngset.c
|
||||
+ png_uint_16 delay_num, png_uint_16 delay_den,
|
||||
+ png_byte dispose_op, png_byte blend_op)
|
||||
+{
|
||||
+ if (width > PNG_UINT_31_MAX)
|
||||
+ if (width == 0 || width > PNG_UINT_31_MAX)
|
||||
+ png_error(png_ptr, "invalid width in fcTL (> 2^31-1)");
|
||||
+ if (height > PNG_UINT_31_MAX)
|
||||
+ if (height == 0 || height > PNG_UINT_31_MAX)
|
||||
+ png_error(png_ptr, "invalid height in fcTL (> 2^31-1)");
|
||||
+ if (x_offset > PNG_UINT_31_MAX)
|
||||
+ png_error(png_ptr, "invalid x_offset in fcTL (> 2^31-1)");
|
||||
@ -1274,9 +1274,9 @@ diff -Naru libpng-1.6.24.org/pngset.c libpng-1.6.24/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.24.org/pngstruct.h libpng-1.6.24/pngstruct.h
|
||||
--- libpng-1.6.24.org/pngstruct.h 2016-08-17 20:53:14.858972728 +0900
|
||||
+++ libpng-1.6.24/pngstruct.h 2016-08-17 20:56:54.915479422 +0900
|
||||
diff -Naru libpng-1.6.25.org/pngstruct.h libpng-1.6.25/pngstruct.h
|
||||
--- libpng-1.6.25.org/pngstruct.h 2016-09-16 21:30:52.618790122 +0900
|
||||
+++ libpng-1.6.25/pngstruct.h 2016-09-16 21:30:52.668790268 +0900
|
||||
@@ -403,6 +403,27 @@
|
||||
png_byte filter_type;
|
||||
#endif
|
||||
@ -1305,10 +1305,10 @@ diff -Naru libpng-1.6.24.org/pngstruct.h libpng-1.6.24/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.24.org/pngtest.c libpng-1.6.24/pngtest.c
|
||||
--- libpng-1.6.24.org/pngtest.c 2016-08-17 20:57:23.409418583 +0900
|
||||
+++ libpng-1.6.24/pngtest.c 2016-08-17 20:56:54.914479424 +0900
|
||||
@@ -883,6 +883,10 @@
|
||||
diff -Naru libpng-1.6.25.org/pngtest.c libpng-1.6.25/pngtest.c
|
||||
--- libpng-1.6.25.org/pngtest.c 2016-09-16 21:30:52.618790122 +0900
|
||||
+++ libpng-1.6.25/pngtest.c 2016-09-16 21:30:52.668790268 +0900
|
||||
@@ -884,6 +884,10 @@
|
||||
volatile int num_passes;
|
||||
int pass;
|
||||
int bit_depth, color_type;
|
||||
@ -1319,7 +1319,7 @@ diff -Naru libpng-1.6.24.org/pngtest.c libpng-1.6.24/pngtest.c
|
||||
|
||||
row_buf = NULL;
|
||||
error_parameters.file_name = inname;
|
||||
@@ -1356,6 +1360,22 @@
|
||||
@@ -1363,6 +1367,22 @@
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@ -1342,7 +1342,7 @@ diff -Naru libpng-1.6.24.org/pngtest.c libpng-1.6.24/pngtest.c
|
||||
#ifdef PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
|
||||
{
|
||||
png_unknown_chunkp unknowns;
|
||||
@@ -1427,6 +1447,110 @@
|
||||
@@ -1434,6 +1454,110 @@
|
||||
t_misc += (t_stop - t_start);
|
||||
t_start = t_stop;
|
||||
#endif
|
||||
@ -1453,9 +1453,9 @@ diff -Naru libpng-1.6.24.org/pngtest.c libpng-1.6.24/pngtest.c
|
||||
for (pass = 0; pass < num_passes; pass++)
|
||||
{
|
||||
# ifdef calc_pass_height
|
||||
diff -Naru libpng-1.6.24.org/pngwrite.c libpng-1.6.24/pngwrite.c
|
||||
--- libpng-1.6.24.org/pngwrite.c 2016-08-17 20:53:14.859972727 +0900
|
||||
+++ libpng-1.6.24/pngwrite.c 2016-08-17 20:56:54.912479429 +0900
|
||||
diff -Naru libpng-1.6.25.org/pngwrite.c libpng-1.6.25/pngwrite.c
|
||||
--- libpng-1.6.25.org/pngwrite.c 2016-09-16 21:30:52.619790125 +0900
|
||||
+++ libpng-1.6.25/pngwrite.c 2016-09-16 21:30:52.669790271 +0900
|
||||
@@ -128,6 +128,10 @@
|
||||
* the application continues writing the PNG. So check the 'invalid'
|
||||
* flag here too.
|
||||
@ -1523,9 +1523,9 @@ diff -Naru libpng-1.6.24.org/pngwrite.c libpng-1.6.24/pngwrite.c
|
||||
|
||||
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
|
||||
/* Initialize the write structure - general purpose utility. */
|
||||
diff -Naru libpng-1.6.24.org/pngwutil.c libpng-1.6.24/pngwutil.c
|
||||
--- libpng-1.6.24.org/pngwutil.c 2016-08-17 20:53:14.860972725 +0900
|
||||
+++ libpng-1.6.24/pngwutil.c 2016-08-17 20:56:54.909479435 +0900
|
||||
diff -Naru libpng-1.6.25.org/pngwutil.c libpng-1.6.25/pngwutil.c
|
||||
--- libpng-1.6.25.org/pngwutil.c 2016-09-16 21:30:52.619790125 +0900
|
||||
+++ libpng-1.6.25/pngwutil.c 2016-09-16 21:30:52.669790271 +0900
|
||||
@@ -817,6 +817,11 @@
|
||||
/* Write the chunk */
|
||||
png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
|
||||
@ -1692,9 +1692,9 @@ diff -Naru libpng-1.6.24.org/pngwutil.c libpng-1.6.24/pngwutil.c
|
||||
+}
|
||||
+#endif /* PNG_WRITE_APNG_SUPPORTED */
|
||||
#endif /* WRITE */
|
||||
diff -Naru libpng-1.6.24.org/scripts/symbols.def libpng-1.6.24/scripts/symbols.def
|
||||
--- libpng-1.6.24.org/scripts/symbols.def 2016-08-17 20:57:23.410418581 +0900
|
||||
+++ libpng-1.6.24/scripts/symbols.def 2016-08-17 20:56:54.907479440 +0900
|
||||
diff -Naru libpng-1.6.25.org/scripts/symbols.def libpng-1.6.25/scripts/symbols.def
|
||||
--- libpng-1.6.25.org/scripts/symbols.def 2016-09-16 21:30:52.624790140 +0900
|
||||
+++ libpng-1.6.25/scripts/symbols.def 2016-09-16 21:30:52.674790286 +0900
|
||||
@@ -250,3 +250,23 @@
|
||||
png_get_palette_max @243
|
||||
png_set_option @244
|
||||
@ -1,6 +1,6 @@
|
||||
%define apiver %(echo %version | cut -d. -f1-2 | tr -d .)
|
||||
Name: libpng
|
||||
Version: 1.6.24
|
||||
Version: 1.6.25
|
||||
Release: 1mamba
|
||||
Summary: A library of functions for manipulating PNG image format files
|
||||
Group: System/Libraries
|
||||
@ -91,7 +91,7 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/png-fix-itxt
|
||||
%{_bindir}/pngcp
|
||||
#%{_bindir}/pngcp
|
||||
%{_bindir}/pngfix
|
||||
%{_bindir}/libpng-config
|
||||
%{_bindir}/libpng%{apiver}-config
|
||||
@ -126,6 +126,9 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Oct 04 2016 Automatic Build System <autodist@mambasoft.it> 1.6.25-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Sat Aug 20 2016 Automatic Build System <autodist@mambasoft.it> 1.6.24-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user