summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-07-14 17:22:15 +0000
committerMike Frysinger <vapier@gentoo.org>2007-07-14 17:22:15 +0000
commit3e1b50d0eea73b6c476e9731ee155159960e4fcc (patch)
tree4f8642e6cbc787c169e6a3d699a901ddd393182c /media-libs/libpng/files
parentppc stable (bug #184746) (diff)
downloadgentoo-2-3e1b50d0eea73b6c476e9731ee155159960e4fcc.tar.gz
gentoo-2-3e1b50d0eea73b6c476e9731ee155159960e4fcc.tar.bz2
gentoo-2-3e1b50d0eea73b6c476e9731ee155159960e4fcc.zip
Add fix from upstream for gray handling #181318 by David Barnett and Steffen Wolf.
(Portage version: 2.1.3_rc8)
Diffstat (limited to 'media-libs/libpng/files')
-rw-r--r--media-libs/libpng/files/digest-libpng-1.2.18-r16
-rw-r--r--media-libs/libpng/files/libpng-1.2.18-gray.patch20
2 files changed, 26 insertions, 0 deletions
diff --git a/media-libs/libpng/files/digest-libpng-1.2.18-r1 b/media-libs/libpng/files/digest-libpng-1.2.18-r1
new file mode 100644
index 000000000000..037ad9edfa25
--- /dev/null
+++ b/media-libs/libpng/files/digest-libpng-1.2.18-r1
@@ -0,0 +1,6 @@
+MD5 25a7f2f101eaaf2eb18c4987e0fbe39d libpng-1.2.18.tar.bz2 623690
+RMD160 ea81056a896eb038fa5d7fde2b7fa626c1a2e31e libpng-1.2.18.tar.bz2 623690
+SHA256 6fce62f9e67e951c38672bf520c062a2be742e893d240d150748a00c32f20c62 libpng-1.2.18.tar.bz2 623690
+MD5 1518ec4b873f2c61a7d32ad867b67b17 libpng-manual.txt 128284
+RMD160 f019974f931327e6d9d332d306e07dce71ff031b libpng-manual.txt 128284
+SHA256 0cc3a25643024807672e5df255332cb63c902cea333246f4a5ab48c682c3297a libpng-manual.txt 128284
diff --git a/media-libs/libpng/files/libpng-1.2.18-gray.patch b/media-libs/libpng/files/libpng-1.2.18-gray.patch
new file mode 100644
index 000000000000..bf6564e8850c
--- /dev/null
+++ b/media-libs/libpng/files/libpng-1.2.18-gray.patch
@@ -0,0 +1,20 @@
+fix from upstream for a regression in grey handling
+
+http://bugs.gentoo.org/181318
+
+--- pngrtran.c
++++ pngrtran.c
+@@ -1293,9 +1293,11 @@
+ if(rgb_error)
+ {
+ png_ptr->rgb_to_gray_status=1;
+- if(png_ptr->transformations & PNG_RGB_TO_GRAY_WARN)
++ if((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
++ PNG_RGB_TO_GRAY_WARN)
+ png_warning(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+- if(png_ptr->transformations & PNG_RGB_TO_GRAY_ERR)
++ if((png_ptr->transformations & PNG_RGB_TO_GRAY) ==
++ PNG_RGB_TO_GRAY_ERR)
+ png_error(png_ptr, "png_do_rgb_to_gray found nongray pixel");
+ }
+ }