/hg/icedtea6: Fixed RH661505 - JPEGs decoder color space recogni...

[dlila at icedtea.classpath.org]

changeset d2d762ec4dda in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=d2d762ec4dda
author: Denis Lila <dlila at redhat.com>
date: Tue Jan 04 16:56:06 2011 -0500

	Fixed RH661505 - JPEGs decoder color space recognition problem.


diffstat:

4 files changed, 26 insertions(+), 1 deletion(-)
ChangeLog                 |    7 +++++++
Makefile.am               |    3 ++-
NEWS                      |    1 +
patches/661505-jpeg.patch |   16 ++++++++++++++++

diffs (58 lines):

diff -r 1121be5e4dbd -r d2d762ec4dda ChangeLog
--- a/ChangeLog	Tue Jan 04 08:50:11 2011 -0500
+++ b/ChangeLog	Tue Jan 04 16:56:06 2011 -0500
@@ -1,3 +1,10 @@ 2011-01-04  Deepak Bhole <dbhole at redhat.
+2011-01-04  Denis Lila <dlila at redhat.com>
+
+	Fixed RH661505.
+	* NEWS: Updated with fix.
+	* Makefile.am: Apply patch.
+	* patches/661506-jpeg.patch: New file. Bug fix.
+
 2011-01-04  Deepak Bhole <dbhole at redhat.com>
 
 	Backport S6687968, S6541476, S6782079
diff -r 1121be5e4dbd -r d2d762ec4dda Makefile.am
--- a/Makefile.am	Tue Jan 04 08:50:11 2011 -0500
+++ b/Makefile.am	Tue Jan 04 16:56:06 2011 -0500
@@ -316,7 +316,8 @@ ICEDTEA_PATCHES = \
 	patches/openjdk/6800846-printing-quality.patch \
 	patches/openjdk/6687968-pngimagereader_mem_leak.patch \
 	patches/openjdk/6541476-png-iTXt-chunk.patch \
-	patches/openjdk/6782079-png_metadata_oom.patch
+	patches/openjdk/6782079-png_metadata_oom.patch \
+	patches/661505-jpeg.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 1121be5e4dbd -r d2d762ec4dda NEWS
--- a/NEWS	Tue Jan 04 08:50:11 2011 -0500
+++ b/NEWS	Tue Jan 04 16:56:06 2011 -0500
@@ -54,6 +54,7 @@ New in release 1.10 (2010-XX-XX):
   - S6687968: PNGImageReader leaks native memory through an Inflater
   - S6541476, RH665355: PNG imageio plugin incorrectly handles iTXt chunk
   - S6782079: PNG: reading metadata may cause OOM on truncated images
+  - RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
 
 * Bug fixes
   - S7003777, RH647674: JTextPane produces incorrect content after parsing the html text
diff -r 1121be5e4dbd -r d2d762ec4dda patches/661505-jpeg.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/661505-jpeg.patch	Tue Jan 04 16:56:06 2011 -0500
@@ -0,0 +1,16 @@
+--- openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c.old	2010-12-24 13:20:49.444589072 -0500
++++ openjdk/jdk/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	2010-12-24 13:21:58.059463767 -0500
+@@ -1488,2 +1488,4 @@
+ 
++#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
++
+ JNIEXPORT jlong JNICALL
+@@ -1541,2 +1543,3 @@
+     jpegsavemarkers(cinfo, ICC_MARKER, 0xFFFF);
++    jpegsavemarkers(cinfo, JPEG_APP1, 0xFFFF);
+ 
+@@ -1601,4 +1604,2 @@
+ 
+-#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
+-
+ /*