Mercurial > hg > release > icedtea7-forest-2.3 > jdk

changeset 6321:5bbb4c34cc3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
author andrew
date Fri, 06 Sep 2013 12:44:40 +0100
parents 3297163636bf
children 5dc47fef62d0
files src/share/native/sun/awt/image/jpeg/imageioJPEG.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Wed Sep 04 18:20:38 2013 +0100
+++ b/src/share/native/sun/awt/image/jpeg/imageioJPEG.c	Fri Sep 06 12:44:40 2013 +0100
@@ -1435,6 +1435,8 @@
                                                     "[S");
 }
 
+#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
+
 JNIEXPORT jlong JNICALL
 Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_initJPEGImageReader
     (JNIEnv *env,
@@ -1488,6 +1490,7 @@
 
     // Set up to keep any APP2 markers, as these might contain ICC profile
     // data
+    jpegsavemarkers(cinfo, JPEG_APP1, 0xFFFF);
     jpeg_save_markers(cinfo, ICC_MARKER, 0xFFFF);
 
     /*
@@ -1550,8 +1553,6 @@
     imageio_init_source((j_decompress_ptr) cinfo);
 }
 
-#define JPEG_APP1  (JPEG_APP0 + 1)  /* EXIF APP1 marker code  */
-
 /*
  * For EXIF images, the APP1 will appear immediately after the SOI,
  * so it's safe to only look at the first marker in the list.