diff --git a/libpng-1.6.0.tar.bz2 b/libpng-1.6.0.tar.bz2 deleted file mode 100644 index 9fb424d..0000000 --- a/libpng-1.6.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a573a100f5f404ac43d8d0f5df883fde1588fffd75736e03ee204964453e843d -size 1017964 diff --git a/libpng-1.6.1.tar.bz2 b/libpng-1.6.1.tar.bz2 new file mode 100644 index 0000000..c040d3a --- /dev/null +++ b/libpng-1.6.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3922538e2c866d1ec4adc69a76d5f2447c425d1bdedbbc896d8640574b6f6bb2 +size 1012517 diff --git a/libpng16-0387-Reenable-code-to-allow-zero-length-PLTE-chunks-for-M.patch b/libpng16-0387-Reenable-code-to-allow-zero-length-PLTE-chunks-for-M.patch deleted file mode 100644 index 318826c..0000000 --- a/libpng16-0387-Reenable-code-to-allow-zero-length-PLTE-chunks-for-M.patch +++ /dev/null @@ -1,57 +0,0 @@ -http://sourceforge.net/mailarchive/forum.php?thread_name=20130219075910.GK27522%40danbala.tuwien.ac.at&forum_name=png-mng-implement - -From 9ee585718b346d32767015152a728106922b49d1 Mon Sep 17 00:00:00 2001 -Message-Id: <9ee585718b346d32767015152a728106922b49d1.1361241956.git.jbowler@acm.org> -From: John Bowler -Date: Mon, 18 Feb 2013 18:44:14 -0800 -Subject: [libpng16] Reenable code to allow zero length PLTE chunks for MNG - support. - -Signed-off-by: John Bowler ---- - pngset.c | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) - -diff --git a/pngset.c b/pngset.c -index ac39a44..f89861e 100644 ---- a/pngset.c -+++ b/pngset.c -@@ -514,7 +514,7 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr, - - png_debug1(1, "in %s storage function", "PLTE"); - -- if (png_ptr == NULL || info_ptr == NULL || palette == NULL) -+ if (png_ptr == NULL || info_ptr == NULL) - return; - - if (num_palette < 0 || num_palette > PNG_MAX_PALETTE_LENGTH) -@@ -529,6 +529,17 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr, - } - } - -+ if ((num_palette > 0 && palette == NULL) || -+ (num_palette == 0 -+# ifdef PNG_MNG_FEATURES_SUPPORTED -+ && (png_ptr->mng_features_permitted & PNG_FLAG_MNG_EMPTY_PLTE) == 0 -+# endif -+ )) -+ { -+ png_chunk_report(png_ptr, "Invalid palette", PNG_CHUNK_ERROR); -+ return; -+ } -+ - /* It may not actually be necessary to set png_ptr->palette here; - * we do it for backward compatibility with the way the png_handle_tRNS - * function used to do the allocation. -@@ -545,7 +556,8 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr, - png_ptr->palette = png_voidcast(png_colorp, png_calloc(png_ptr, - PNG_MAX_PALETTE_LENGTH * (sizeof (png_color)))); - -- memcpy(png_ptr->palette, palette, num_palette * (sizeof (png_color))); -+ if (num_palette > 0) -+ memcpy(png_ptr->palette, palette, num_palette * (sizeof (png_color))); - info_ptr->palette = png_ptr->palette; - info_ptr->num_palette = png_ptr->num_palette = (png_uint_16)num_palette; - --- -1.8.1.2 diff --git a/libpng16.changes b/libpng16.changes index eefae11..587a354 100644 --- a/libpng16.changes +++ b/libpng16.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Thu Mar 28 08:12:03 UTC 2013 - pgajdos@suse.com + +- updated to 1.6.1: + Made sRGB check numbers consistent. + Use parentheses more consistently in "#if defined(MACRO)" tests. + Reenabled code to allow zero length PLTE chunks for MNG. + Fixed ALIGNED_MEMORY support. + Avoid a possible memory leak in contrib/gregbook/readpng.c + Better documentation of unknown handling API interactions. + Corrected simplified API default gamma for color-mapped output, added + a flag to change default. In 1.6.0 when the simplified API was used + to produce color-mapped output from an input image with no gamma + information the gamma assumed for the input could be different from + that assumed for non-color-mapped output. In particular 16-bit depth + input files were assumed to be sRGB encoded, whereas in the 'direct' + case they were assumed to have linear data. This was an error. The + fix makes the simplified API treat all input files the same way and + adds a new flag to the png_image::flags member to allow the + application/user to specify that 16-bit files contain sRGB data + rather than the default linear. + etc., see ANNOUNCE or CHANGES for details +- dropped upstreamed + 0387-Reenable-code-to-allow-zero-length-PLTE-chunks-for-M.patch + ------------------------------------------------------------------- Mon Mar 18 11:44:21 UTC 2013 - pgajdos@suse.com diff --git a/libpng16.spec b/libpng16.spec index 74a158a..3e95b71 100644 --- a/libpng16.spec +++ b/libpng16.spec @@ -19,7 +19,7 @@ # %define major 1 %define minor 6 -%define micro 0 +%define micro 1 %define branch %{major}%{minor} %define libname libpng%{branch}-%{branch} @@ -32,8 +32,6 @@ License: Zlib Group: System/Libraries Source: libpng-%{version}.tar.bz2 Source2: baselibs.conf -# will be upstreamed in 1.6.1 -Patch0: libpng16-0387-Reenable-code-to-allow-zero-length-PLTE-chunks-for-M.patch BuildRequires: libtool BuildRequires: pkg-config BuildRequires: zlib-devel @@ -98,7 +96,6 @@ about libpng version. %prep %setup -n libpng-%{version} -%patch0 -p1 %build # We'll never use the old pgcc-2.95.1 with the buggy -O3, so having