Request for review: RH661505 fix

[Dr Andrew John Hughes]

On 14:19 Fri 24 Dec     , Denis Lila wrote:
> Hello.
> 
> I think this fixes https://bugzilla.redhat.com/show_bug.cgi?id=661505
> (it definitely makes bad.jpg display properly). Could someone please
> review it?
> 
> ChangeLog:
> 
> +2010-12-24  Denis Lila <dlila at redhat.com>
> +
> +   Fixed RH661505.
> +   * NEWS: Updated with fix.
> +   * Makefile.am: Apply patch.
> +   * patches/openjdk/661506-jpeg.patch: New file. Bug fix.
> +
> 

The patch looks ok and, from looking at the issue, I also thought jpegsavemarkers
was the correct fix.

What puzzles me is why you are putting this under openjdk?  It's not a backport
and 661506 is an RH bug ID AIUI and not an Oracle one.

> Thank you,
> Denis.

> --- 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  */
> -
>  /*

> diff -r 7219bd74962a ChangeLog
> --- a/ChangeLog	Thu Dec 23 14:56:09 2010 +0100
> +++ b/ChangeLog	Fri Dec 24 14:08:22 2010 -0500
> @@ -1,3 +1,10 @@
> +2010-12-24  Denis Lila <dlila at redhat.com>
> +
> +	Fixed RH661505.
> +	* NEWS: Updated with fix.
> +	* Makefile.am: Apply patch.
> +	* patches/openjdk/661506-jpeg.patch: New file. Bug fix.
> +
>  2010-12-22  Jiri Vanek <jvanek at redhat.com>
>  	* NEWS: Updated with rh.bugzilas.
>  	* patches/fonts-rhel.patch:repaired rhel 6 fonts configuration.
> diff -r 7219bd74962a Makefile.am
> --- a/Makefile.am	Thu Dec 23 14:56:09 2010 +0100
> +++ b/Makefile.am	Fri Dec 24 14:08:22 2010 -0500
> @@ -312,8 +312,9 @@
>  	patches/openjdk/6979979-gtk_font_size_rounding.patch \
>  	patches/openjdk/6795356-proxylazyvalue-leak.patch \
>  	patches/rendering-engine-tests.patch \
> -	patches/jtreg-TestXEmbedServer-fix.patch
> -	patches/openjdk/6800846-printing-quality.patch
> +	patches/jtreg-TestXEmbedServer-fix.patch \
> +	patches/openjdk/6800846-printing-quality.patch \
> +	patches/openjdk/661505-jpeg.patch
>  
>  if WITH_ALT_HSBUILD
>  ICEDTEA_PATCHES += \
> diff -r 7219bd74962a NEWS
> --- a/NEWS	Thu Dec 23 14:56:09 2010 +0100
> +++ b/NEWS	Fri Dec 24 14:08:22 2010 -0500
> @@ -56,6 +56,7 @@
>    - S7003777, RH647674: JTextPane produces incorrect content after parsing the html text
>    - S7004655, PR590: Unable to activate (click) checkboxes in jtable
>    - RH647157,RH582455: Update fontconfig files for rhel 6
> +  - RH661505: JPEGs with sRGB IEC61966-2.1 color profiles have wrong colors
>  
>  New in release 1.9.2 (2010-11-24):
>  
> diff -r 7219bd74962a patches/openjdk/661505-jpeg.patch
> --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/openjdk/661505-jpeg.patch	Fri Dec 24 14:08:22 2010 -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  */
> +-
> + /*


-- 
Andrew :)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and IcedTea
http://www.gnu.org/software/classpath
http://icedtea.classpath.org
PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint = F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8