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

automatic update by autodist [release 1.6.17-1mamba;Wed Apr 15 2015]

Browse Source
This commit is contained in:
Automatic Build System 2024-01-06 05:24:41 +01:00
parent 9124aef5c6
commit 55063d4a1b
2 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

122
libpng-1.6.16-apng.patch → libpng-1.6.17-apng.patch
View File

@ -1,7 +1,7 @@
diff -Naru libpng-1.6.16.org/png.h libpng-1.6.16/png.h
--- libpng-1.6.16.org/png.h 2014-12-23 13:43:20.602727303 +0900
+++ libpng-1.6.16/png.h 2014-12-23 13:43:20.681729791 +0900
@@ -476,6 +476,10 @@
diff -Naru libpng-1.6.17.org/png.h libpng-1.6.17/png.h
--- libpng-1.6.17.org/png.h 2015-03-27 07:56:22.460189754 +0900
+++ libpng-1.6.17/png.h 2015-03-27 07:56:22.536191843 +0900
@@ -480,6 +480,10 @@
# include "pnglibconf.h"
#endif
@ -12,7 +12,7 @@ diff -Naru libpng-1.6.16.org/png.h libpng-1.6.16/png.h
#ifndef PNG_VERSION_INFO_ONLY
/* Machine specific configuration. */
# include "pngconf.h"
@@ -566,6 +570,17 @@
@@ -570,6 +574,17 @@
* See pngconf.h for base types that vary by machine/system
*/
@ -30,7 +30,7 @@ diff -Naru libpng-1.6.16.org/png.h libpng-1.6.16/png.h
/* This triggers a compiler error in png.c, if png.c and png.h
* do not agree upon the version number.
*/
@@ -886,6 +901,10 @@
@@ -890,6 +905,10 @@
#define PNG_INFO_sPLT 0x2000 /* ESR, 1.0.6 */
#define PNG_INFO_sCAL 0x4000 /* ESR, 1.0.6 */
#define PNG_INFO_IDAT 0x8000 /* ESR, 1.0.6 */
@ -41,7 +41,7 @@ diff -Naru libpng-1.6.16.org/png.h libpng-1.6.16/png.h
/* This is used for the transformation routines, as some of them
* change these values for the row. It also should enable using
@@ -923,6 +942,10 @@
@@ -927,6 +946,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.16.org/png.h libpng-1.6.16/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
@@ -3261,6 +3284,74 @@
@@ -3271,6 +3294,74 @@
/*******************************************************************************
* END OF HARDWARE AND SOFTWARE OPTIONS
******************************************************************************/
@ -127,7 +127,7 @@ diff -Naru libpng-1.6.16.org/png.h libpng-1.6.16/png.h
/* Maintainer: Put new public prototypes here ^, in libpng.3, in project
* defs, and in scripts/symbols.def.
@@ -3270,7 +3361,11 @@
@@ -3280,7 +3371,11 @@
* one to use is one more than this.)
*/
#ifdef PNG_EXPORT_LAST_ORDINAL
@ -139,10 +139,10 @@ diff -Naru libpng-1.6.16.org/png.h libpng-1.6.16/png.h
#endif
#ifdef __cplusplus
diff -Naru libpng-1.6.16.org/pngget.c libpng-1.6.16/pngget.c
--- libpng-1.6.16.org/pngget.c 2014-12-23 13:43:20.603727334 +0900
+++ libpng-1.6.16/pngget.c 2014-12-23 13:43:20.682729822 +0900
@@ -1210,4 +1210,166 @@
diff -Naru libpng-1.6.17.org/pngget.c libpng-1.6.17/pngget.c
--- libpng-1.6.17.org/pngget.c 2015-03-27 07:56:22.461189782 +0900
+++ libpng-1.6.17/pngget.c 2015-03-27 07:56:22.537191870 +0900
@@ -1216,4 +1216,166 @@
# endif
#endif
@ -309,10 +309,10 @@ diff -Naru libpng-1.6.16.org/pngget.c libpng-1.6.16/pngget.c
+}
+#endif /* PNG_APNG_SUPPORTED */
#endif /* READ || WRITE */
diff -Naru libpng-1.6.16.org/pnginfo.h libpng-1.6.16/pnginfo.h
--- libpng-1.6.16.org/pnginfo.h 2014-12-23 13:43:20.603727334 +0900
+++ libpng-1.6.16/pnginfo.h 2014-12-23 13:43:20.682729822 +0900
@@ -256,5 +256,18 @@
diff -Naru libpng-1.6.17.org/pnginfo.h libpng-1.6.17/pnginfo.h
--- libpng-1.6.17.org/pnginfo.h 2015-03-27 07:56:22.461189782 +0900
+++ libpng-1.6.17/pnginfo.h 2015-03-27 07:56:22.537191870 +0900
@@ -255,5 +255,18 @@
png_bytepp row_pointers; /* the image bits */
#endif
@ -331,9 +331,9 @@ diff -Naru libpng-1.6.16.org/pnginfo.h libpng-1.6.16/pnginfo.h
+
};
#endif /* PNGINFO_H */
diff -Naru libpng-1.6.16.org/pngpread.c libpng-1.6.16/pngpread.c
--- libpng-1.6.16.org/pngpread.c 2014-12-23 13:43:20.603727334 +0900
+++ libpng-1.6.16/pngpread.c 2014-12-23 13:43:20.683729854 +0900
diff -Naru libpng-1.6.17.org/pngpread.c libpng-1.6.17/pngpread.c
--- libpng-1.6.17.org/pngpread.c 2015-03-27 07:56:22.461189782 +0900
+++ libpng-1.6.17/pngpread.c 2015-03-27 07:56:22.537191870 +0900
@@ -219,6 +219,109 @@
chunk_name = png_ptr->chunk_name;
@ -578,7 +578,7 @@ diff -Naru libpng-1.6.16.org/pngpread.c libpng-1.6.16/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.
@@ -1157,6 +1347,18 @@
@@ -1163,6 +1353,18 @@
png_set_read_fn(png_ptr, progressive_ptr, png_push_fill_buffer);
}
@ -597,10 +597,10 @@ diff -Naru libpng-1.6.16.org/pngpread.c libpng-1.6.16/pngpread.c
png_voidp PNGAPI
png_get_progressive_ptr(png_const_structrp png_ptr)
{
diff -Naru libpng-1.6.16.org/pngpriv.h libpng-1.6.16/pngpriv.h
--- libpng-1.6.16.org/pngpriv.h 2014-12-23 13:43:20.604727366 +0900
+++ libpng-1.6.16/pngpriv.h 2014-12-23 13:43:20.683729854 +0900
@@ -555,6 +555,10 @@
diff -Naru libpng-1.6.17.org/pngpriv.h libpng-1.6.17/pngpriv.h
--- libpng-1.6.17.org/pngpriv.h 2015-03-27 07:56:22.462189809 +0900
+++ libpng-1.6.17/pngpriv.h 2015-03-27 07:56:22.538191898 +0900
@@ -516,6 +516,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 */
@ -611,7 +611,7 @@ diff -Naru libpng-1.6.16.org/pngpriv.h libpng-1.6.16/pngpriv.h
/* Flags for the transformations the PNG library does on the image data */
#define PNG_BGR 0x0001
@@ -776,6 +780,16 @@
@@ -737,6 +741,16 @@
#define png_tRNS PNG_U32(116, 82, 78, 83)
#define png_zTXt PNG_U32(122, 84, 88, 116)
@ -628,7 +628,7 @@ diff -Naru libpng-1.6.16.org/pngpriv.h libpng-1.6.16/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.
*/
@@ -1476,6 +1490,47 @@
@@ -1440,6 +1454,47 @@
*/
#endif
@ -676,9 +676,9 @@ diff -Naru libpng-1.6.16.org/pngpriv.h libpng-1.6.16/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.16.org/pngread.c libpng-1.6.16/pngread.c
--- libpng-1.6.16.org/pngread.c 2014-12-23 13:43:20.605727397 +0900
+++ libpng-1.6.16/pngread.c 2014-12-23 13:43:20.684729885 +0900
diff -Naru libpng-1.6.17.org/pngread.c libpng-1.6.17/pngread.c
--- libpng-1.6.17.org/pngread.c 2015-03-27 07:56:22.463189837 +0900
+++ libpng-1.6.17/pngread.c 2015-03-27 07:56:22.539191925 +0900
@@ -158,6 +158,9 @@
else if (chunk_name == png_IDAT)
@ -780,9 +780,9 @@ diff -Naru libpng-1.6.16.org/pngread.c libpng-1.6.16/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.16.org/pngrutil.c libpng-1.6.16/pngrutil.c
--- libpng-1.6.16.org/pngrutil.c 2014-12-23 13:43:20.607727460 +0900
+++ libpng-1.6.16/pngrutil.c 2014-12-23 13:43:20.686729948 +0900
diff -Naru libpng-1.6.17.org/pngrutil.c libpng-1.6.17/pngrutil.c
--- libpng-1.6.17.org/pngrutil.c 2015-03-27 07:56:22.469190002 +0900
+++ libpng-1.6.17/pngrutil.c 2015-03-27 07:56:22.541191980 +0900
@@ -819,6 +819,11 @@
filter_type = buf[11];
interlace_type = buf[12];
@ -795,7 +795,7 @@ diff -Naru libpng-1.6.16.org/pngrutil.c libpng-1.6.16/pngrutil.c
/* Set internal variables */
png_ptr->width = width;
png_ptr->height = height;
@@ -2700,6 +2705,179 @@
@@ -2702,6 +2707,179 @@
}
#endif
@ -975,7 +975,7 @@ diff -Naru libpng-1.6.16.org/pngrutil.c libpng-1.6.16/pngrutil.c
#ifdef PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
/* Utility function for png_handle_unknown; set up png_ptr::unknown_chunk */
static int
@@ -3958,7 +4136,38 @@
@@ -3960,7 +4138,38 @@
{
uInt avail_in;
png_bytep buffer;
@ -1014,7 +1014,7 @@ diff -Naru libpng-1.6.16.org/pngrutil.c libpng-1.6.16/pngrutil.c
while (png_ptr->idat_size == 0)
{
png_crc_finish(png_ptr, 0);
@@ -3970,7 +4179,7 @@
@@ -3972,7 +4181,7 @@
if (png_ptr->chunk_name != png_IDAT)
png_error(png_ptr, "Not enough image data");
}
@ -1023,7 +1023,7 @@ diff -Naru libpng-1.6.16.org/pngrutil.c libpng-1.6.16/pngrutil.c
avail_in = png_ptr->IDAT_read_size;
if (avail_in > png_ptr->idat_size)
@@ -4033,6 +4242,9 @@
@@ -4035,6 +4244,9 @@
png_ptr->mode |= PNG_AFTER_IDAT;
png_ptr->flags |= PNG_FLAG_ZSTREAM_ENDED;
@ -1033,7 +1033,7 @@ diff -Naru libpng-1.6.16.org/pngrutil.c libpng-1.6.16/pngrutil.c
if (png_ptr->zstream.avail_in > 0 || png_ptr->idat_size > 0)
png_chunk_benign_error(png_ptr, "Extra compressed data");
@@ -4471,4 +4683,80 @@
@@ -4473,4 +4685,80 @@
png_ptr->flags |= PNG_FLAG_ROW_INIT;
}
@ -1114,10 +1114,10 @@ diff -Naru libpng-1.6.16.org/pngrutil.c libpng-1.6.16/pngrutil.c
+#endif /* PNG_PROGRESSIVE_READ_SUPPORTED */
+#endif /* PNG_READ_APNG_SUPPORTED */
#endif /* READ */
diff -Naru libpng-1.6.16.org/pngset.c libpng-1.6.16/pngset.c
--- libpng-1.6.16.org/pngset.c 2014-12-23 13:43:20.607727460 +0900
+++ libpng-1.6.16/pngset.c 2014-12-23 13:43:20.686729948 +0900
@@ -240,6 +240,11 @@
diff -Naru libpng-1.6.17.org/pngset.c libpng-1.6.17/pngset.c
--- libpng-1.6.17.org/pngset.c 2015-03-27 07:56:22.469190002 +0900
+++ libpng-1.6.17/pngset.c 2015-03-27 07:56:22.541191980 +0900
@@ -241,6 +241,11 @@
info_ptr->pixel_depth = (png_byte)(info_ptr->channels * info_ptr->bit_depth);
info_ptr->rowbytes = PNG_ROWBYTES(info_ptr->pixel_depth, width);
@ -1129,7 +1129,7 @@ diff -Naru libpng-1.6.16.org/pngset.c libpng-1.6.16/pngset.c
}
#ifdef PNG_oFFs_SUPPORTED
@@ -1071,6 +1076,147 @@
@@ -1090,6 +1095,147 @@
}
#endif /* sPLT */
@ -1277,10 +1277,10 @@ diff -Naru libpng-1.6.16.org/pngset.c libpng-1.6.16/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.16.org/pngstruct.h libpng-1.6.16/pngstruct.h
--- libpng-1.6.16.org/pngstruct.h 2014-12-23 13:43:20.608727492 +0900
+++ libpng-1.6.16/pngstruct.h 2014-12-23 13:43:20.686729948 +0900
@@ -409,6 +409,27 @@
diff -Naru libpng-1.6.17.org/pngstruct.h libpng-1.6.17/pngstruct.h
--- libpng-1.6.17.org/pngstruct.h 2015-03-27 07:56:22.470190029 +0900
+++ libpng-1.6.17/pngstruct.h 2015-03-27 07:56:22.541191980 +0900
@@ -408,6 +408,27 @@
png_byte filter_type;
#endif
@ -1308,9 +1308,9 @@ diff -Naru libpng-1.6.16.org/pngstruct.h libpng-1.6.16/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.16.org/pngtest.c libpng-1.6.16/pngtest.c
--- libpng-1.6.16.org/pngtest.c 2014-12-23 13:43:20.608727492 +0900
+++ libpng-1.6.16/pngtest.c 2014-12-23 13:43:20.687729980 +0900
diff -Naru libpng-1.6.17.org/pngtest.c libpng-1.6.17/pngtest.c
--- libpng-1.6.17.org/pngtest.c 2015-03-27 07:56:22.470190029 +0900
+++ libpng-1.6.17/pngtest.c 2015-03-27 07:56:22.541191980 +0900
@@ -849,6 +849,10 @@
png_uint_32 width, height;
int num_pass = 1, pass;
@ -1433,9 +1433,9 @@ diff -Naru libpng-1.6.16.org/pngtest.c libpng-1.6.16/pngtest.c
for (pass = 0; pass < num_pass; pass++)
{
pngtest_debug1("Writing row data for pass %d", pass);
diff -Naru libpng-1.6.16.org/pngwrite.c libpng-1.6.16/pngwrite.c
--- libpng-1.6.16.org/pngwrite.c 2014-12-23 13:43:20.609727523 +0900
+++ libpng-1.6.16/pngwrite.c 2014-12-23 13:43:20.687729980 +0900
diff -Naru libpng-1.6.17.org/pngwrite.c libpng-1.6.17/pngwrite.c
--- libpng-1.6.17.org/pngwrite.c 2015-03-27 07:56:22.471190057 +0900
+++ libpng-1.6.17/pngwrite.c 2015-03-27 07:56:22.542192007 +0900
@@ -127,6 +127,10 @@
* application continues writing the PNG. So check the 'invalid' flag here
* too.
@ -1459,7 +1459,7 @@ diff -Naru libpng-1.6.16.org/pngwrite.c libpng-1.6.16/pngwrite.c
/* See if user wants us to write information chunks */
if (info_ptr != NULL)
{
@@ -1678,6 +1687,43 @@
@@ -1680,6 +1689,43 @@
}
#endif
@ -1503,9 +1503,9 @@ diff -Naru libpng-1.6.16.org/pngwrite.c libpng-1.6.16/pngwrite.c
#ifdef PNG_SIMPLIFIED_WRITE_SUPPORTED
#ifdef PNG_STDIO_SUPPORTED /* currently required for png_image_write_* */
diff -Naru libpng-1.6.16.org/pngwutil.c libpng-1.6.16/pngwutil.c
--- libpng-1.6.16.org/pngwutil.c 2014-12-23 13:43:20.610727555 +0900
+++ libpng-1.6.16/pngwutil.c 2014-12-23 13:43:20.688730012 +0900
diff -Naru libpng-1.6.17.org/pngwutil.c libpng-1.6.17/pngwutil.c
--- libpng-1.6.17.org/pngwutil.c 2015-03-27 07:56:22.477190222 +0900
+++ libpng-1.6.17/pngwutil.c 2015-03-27 07:56:22.543192035 +0900
@@ -901,6 +901,11 @@
/* Write the chunk */
png_write_complete_chunk(png_ptr, png_IHDR, buf, (png_size_t)13);
@ -1632,7 +1632,7 @@ diff -Naru libpng-1.6.16.org/pngwutil.c libpng-1.6.16/pngwutil.c
/* Initializes the row writing capability of libpng */
void /* PRIVATE */
png_write_start_row(png_structrp png_ptr)
@@ -3026,4 +3122,39 @@
@@ -3028,4 +3124,39 @@
}
#endif /* WRITE_FLUSH */
}
@ -1672,9 +1672,9 @@ diff -Naru libpng-1.6.16.org/pngwutil.c libpng-1.6.16/pngwutil.c
+}
+#endif /* PNG_WRITE_APNG_SUPPORTED */
#endif /* WRITE */
diff -Naru libpng-1.6.16.org/scripts/symbols.def libpng-1.6.16/scripts/symbols.def
--- libpng-1.6.16.org/scripts/symbols.def 2014-12-23 13:43:20.616727744 +0900
+++ libpng-1.6.16/scripts/symbols.def 2014-12-23 13:43:20.693730169 +0900
diff -Naru libpng-1.6.17.org/scripts/symbols.def libpng-1.6.17/scripts/symbols.def
--- libpng-1.6.17.org/scripts/symbols.def 2015-03-27 07:56:22.482190359 +0900
+++ libpng-1.6.17/scripts/symbols.def 2015-03-27 07:56:22.548192172 +0900
@@ -249,3 +249,23 @@
png_set_check_for_invalid_index @242
png_get_palette_max @243

5
libpng.spec
View File

@ -1,6 +1,6 @@
%define apiver %(echo %version | cut -d. -f1-2 | tr -d .)
Name: libpng
Version: 1.6.16
Version: 1.6.17
Release: 1mamba
Summary: A library of functions for manipulating PNG image format files
Group: System/Libraries
@ -125,6 +125,9 @@ ln -s libpng%{apiver}.so %{buildroot}%{_prefix}/lib/libpng.so
%endif
%changelog
* Wed Apr 15 2015 Automatic Build System <autodist@mambasoft.it> 1.6.17-1mamba
- automatic update by autodist
* Wed Dec 24 2014 Automatic Build System <autodist@mambasoft.it> 1.6.16-1mamba
- automatic version update by autodist