Request for backport.
Dr Andrew John Hughes
ahughes at redhat.com
Mon Dec 20 09:31:09 PST 2010
On 10:12 Mon 20 Dec , Denis Lila wrote:
> Hi.
>
> I would like to backport 6800846:
> http://hg.openjdk.java.net/jdk7/2d/jdk/rev/b02162077f24
>
> It would fix RH662230.
>
> ChangeLog:
> +2010-12-20 Denis Lila <dlila at redhat.com>
> +
> + Backport S6800846.
> + * NEWS: Updated with fixes.
> + * Makefile.am: Apply patch.
> + * patches/openjdk/6800846-printing-quality.patch: New file. Backport
> + of S6795356, and fix for RH662230.
> +
>
> Can I push?
>
> Thank you,
> Denis.
The NEWS contains two entries for one fix. Please merge them together under
'Backports'. With regard to the patch itself, the copyright header should be
updated to the Oracle version (see OpenJDK7).
Please repost with these changes.
> diff -r 12df222ab029 ChangeLog
> --- a/ChangeLog Fri Dec 17 09:30:47 2010 -0500
> +++ b/ChangeLog Mon Dec 20 10:10:54 2010 -0500
> @@ -1,3 +1,11 @@
> +2010-12-20 Denis Lila <dlila at redhat.com>
> +
> + Backport S6800846.
> + * NEWS: Updated with fixes.
> + * Makefile.am: Apply patch.
> + * patches/openjdk/6800846-printing-quality.patch: New file. Backport
> + of S6795356, and fix for RH662230.
> +
> 2010-12-17 Denis Lila <dlila at redhat.com>
> Pavel Tisnovsky <ptisnovs at redhat.com>
>
> diff -r 12df222ab029 Makefile.am
> --- a/Makefile.am Fri Dec 17 09:30:47 2010 -0500
> +++ b/Makefile.am Mon Dec 20 10:10:54 2010 -0500
> @@ -313,6 +313,7 @@
> patches/openjdk/6795356-proxylazyvalue-leak.patch \
> patches/rendering-engine-tests.patch \
> patches/jtreg-TestXEmbedServer-fix.patch
> + patches/openjdk/6800846-printing-quality.patch
>
> if WITH_ALT_HSBUILD
> ICEDTEA_PATCHES += \
> diff -r 12df222ab029 NEWS
> --- a/NEWS Fri Dec 17 09:30:47 2010 -0500
> +++ b/NEWS Mon Dec 20 10:10:54 2010 -0500
> @@ -50,10 +50,12 @@
> - S7002666: Eclipse CDT projects crash with compressed oops
> - S6979979, RH508185: Rounding error in font sizes selected by the GTK Look and Feel
> - S6795356: Leak caused by javax.swing.UIDefaults.ProxyLazyValue.acc
> + - S6800846: REGRESSION: Printing quality degraded with Java 6 compared to 5.0
>
> * Bug fixes
> - S7003777, RH647674: JTextPane produces incorrect content after parsing the html text
> - S7004655, PR590: Unable to activate (click) checkboxes in jtable
> + - RH662230: ArrayIndexOutOfBoundsException
>
> New in release 1.9.2 (2010-11-24):
>
> diff -r 12df222ab029 patches/openjdk/6800846-printing-quality.patch
> --- /dev/null Thu Jan 01 00:00:00 1970 +0000
> +++ b/patches/openjdk/6800846-printing-quality.patch Mon Dec 20 10:10:54 2010 -0500
> @@ -0,0 +1,138 @@
> +# HG changeset patch
> +# User bae
> +# Date 1233942593 -10800
> +# Node ID b02162077f2447872337c8db5a0fcb70e6c37680
> +# Parent e0a9038939ee2b90e1d63b43abdb5174e8ad53cb
> +6800846: REGRESSION: Printing quality degraded with Java 6 compared to 5.0
> +Reviewed-by: igor, prr
> +
> +diff -r e0a9038939ee -r b02162077f24 src/share/native/sun/awt/image/dither.c
> +--- openjdk.orig/jdk/src/share/native/sun/awt/image/dither.c Wed Feb 04 14:06:18 2009 +0300
> ++++ openjdk/jdk/src/share/native/sun/awt/image/dither.c Fri Feb 06 20:49:53 2009 +0300
> +@@ -169,6 +169,7 @@
> + int cubesize = cube_dim * cube_dim * cube_dim;
> + unsigned char *useFlags;
> + unsigned char *newILut = (unsigned char*)malloc(cubesize);
> ++ int cmap_mid = (cmap_len >> 1) + (cmap_len & 0x1);
> + if (newILut) {
> +
> + useFlags = (unsigned char *)calloc(cubesize, 1);
> +@@ -188,7 +189,7 @@
> + currentState.iLUT = newILut;
> +
> + currentState.rgb = (unsigned short *)
> +- malloc(256 * sizeof(unsigned short));
> ++ malloc(cmap_len * sizeof(unsigned short));
> + if (currentState.rgb == NULL) {
> + free(newILut);
> + free(useFlags);
> +@@ -199,7 +200,7 @@
> + }
> +
> + currentState.indices = (unsigned char *)
> +- malloc(256 * sizeof(unsigned char));
> ++ malloc(cmap_len * sizeof(unsigned char));
> + if (currentState.indices == NULL) {
> + free(currentState.rgb);
> + free(newILut);
> +@@ -210,18 +211,18 @@
> + return NULL;
> + }
> +
> +- for (i = 0; i < 128; i++) {
> ++ for (i = 0; i < cmap_mid; i++) {
> + unsigned short rgb;
> + int pixel = cmap[i];
> + rgb = (pixel & 0x00f80000) >> 9;
> + rgb |= (pixel & 0x0000f800) >> 6;
> + rgb |= (pixel & 0xf8) >> 3;
> + INSERTNEW(currentState, rgb, i);
> +- pixel = cmap[255-i];
> ++ pixel = cmap[cmap_len - i - 1];
> + rgb = (pixel & 0x00f80000) >> 9;
> + rgb |= (pixel & 0x0000f800) >> 6;
> + rgb |= (pixel & 0xf8) >> 3;
> +- INSERTNEW(currentState, rgb, 255-i);
> ++ INSERTNEW(currentState, rgb, cmap_len - i - 1);
> + }
> +
> + if (!recurseLevel(¤tState)) {
> +diff -r e0a9038939ee -r b02162077f24 test/sun/awt/image/DrawByteBinary.java
> +--- /dev/null Thu Jan 01 00:00:00 1970 +0000
> ++++ openjdk/jdk/test/sun/awt/image/DrawByteBinary.java Fri Feb 06 20:49:53 2009 +0300
> +@@ -0,0 +1,75 @@
> ++/*
> ++ * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
> ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
> ++ *
> ++ * This code is free software; you can redistribute it and/or modify it
> ++ * under the terms of the GNU General Public License version 2 only, as
> ++ * published by the Free Software Foundation.
> ++ *
> ++ * This code is distributed in the hope that it will be useful, but WITHOUT
> ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> ++ * version 2 for more details (a copy is included in the LICENSE file that
> ++ * accompanied this code).
> ++ *
> ++ * You should have received a copy of the GNU General Public License version
> ++ * 2 along with this work; if not, write to the Free Software Foundation,
> ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
> ++ *
> ++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
> ++ * CA 95054 USA or visit www.sun.com if you need additional information or
> ++ * have any questions.
> ++ */
> ++
> ++/**
> ++ * @test
> ++ * @bug 6800846
> ++ *
> ++ * @summary Test verifes that images with short palette are rendered
> ++ * withourt artifacts.
> ++ *
> ++ * @run main DrawByteBinary
> ++ */
> ++
> ++
> ++import java.awt.*;
> ++import java.awt.color.*;
> ++import java.awt.image.*;
> ++import static java.awt.image.BufferedImage.*;
> ++
> ++
> ++public class DrawByteBinary {
> ++
> ++ public static void main(String args[]) {
> ++ int w = 100, h = 30;
> ++ int x = 10;
> ++ byte[] arr = {(byte)0xff, (byte)0x0, (byte)0x00};
> ++
> ++ IndexColorModel newCM = new IndexColorModel(1, 2, arr, arr, arr);
> ++ BufferedImage orig = new BufferedImage(w, h, TYPE_BYTE_BINARY, newCM);
> ++ Graphics2D g2d = orig.createGraphics();
> ++ g2d.setColor(Color.white);
> ++ g2d.fillRect(0, 0, w, h);
> ++ g2d.setColor(Color.black);
> ++ g2d.drawLine(x, 0, x, h);
> ++ g2d.dispose();
> ++
> ++ IndexColorModel origCM = (IndexColorModel)orig.getColorModel();
> ++ BufferedImage test = new BufferedImage(w, h, TYPE_BYTE_BINARY,origCM);
> ++ g2d = test.createGraphics();
> ++ g2d.drawImage(orig, 0, 0, null);
> ++ g2d.dispose();
> ++
> ++ int y = h / 2;
> ++
> ++ // we expect white color outside the line
> ++ if (test.getRGB(x - 1, y) != 0xffffffff) {
> ++ throw new RuntimeException("Invalid color outside the line.");
> ++ }
> ++
> ++ // we expect black color on the line
> ++ if (test.getRGB(x, y) != 0xff000000) {
> ++ throw new RuntimeException("Invalid color on the line.");
> ++ }
> ++ }
> ++}
--
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
More information about the distro-pkg-dev
mailing list