Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 3423:1513ccf103a9
6996867: Garbage rendering of LCD text with SRC composite mode
Reviewed-by: igor, jgodinez
author | prr |
---|---|
date | Wed, 22 Dec 2010 13:49:23 -0800 |
parents | b0f9760f3103 |
children | 78d0a8d449fd cb3c0ffb27bb |
files | src/share/classes/sun/java2d/SurfaceData.java test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java |
diffstat | 2 files changed, 94 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/java2d/SurfaceData.java Wed Dec 22 13:32:58 2010 -0800 +++ b/src/share/classes/sun/java2d/SurfaceData.java Wed Dec 22 13:49:23 2010 -0800 @@ -644,7 +644,7 @@ sg2d.drawpipe = converter; sg2d.fillpipe = converter; sg2d.shapepipe = converter; - if (sg2d.paintState > sg2d.PAINT_OPAQUECOLOR || + if (sg2d.paintState > sg2d.PAINT_ALPHACOLOR || sg2d.compositeState > sg2d.COMP_ISCOPY) { sg2d.textpipe = colorText;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/Graphics2D/DrawString/LCDTextSrcEa.java Wed Dec 22 13:49:23 2010 -0800 @@ -0,0 +1,93 @@ +/* + * Copyright (c) 2010, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 6996867 + * @summary Render as LCD Text in SrcEa composite mode. + */ + +import java.awt.*; +import java.awt.event.*; +import java.awt.image.*; + +public class LCDTextSrcEa extends Component { + + static int SZ=150; + BufferedImage target = + new BufferedImage(SZ, SZ, BufferedImage.TYPE_INT_RGB); + + public static void main(String args[]) { + Frame f = new Frame("LCD Text SrcEa Test"); + f.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + System.exit(0); + } + }); + LCDTextSrcEa td = new LCDTextSrcEa(); + f.add("Center", td); + f.pack(); + f.setVisible(true); + } + + public Dimension getPreferredSize() { + return new Dimension(SZ,SZ); + } + + public void paint(Graphics gx) { + + Graphics2D g2d = (Graphics2D) target.getGraphics(); + g2d.setColor(Color.white); + g2d.fillRect(0, 0, getWidth(), getHeight()); + + g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC, 0.01f)); + g2d.setRenderingHint( + RenderingHints.KEY_TEXT_ANTIALIASING, + RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_VBGR); + g2d.setRenderingHint( + RenderingHints.KEY_ANTIALIASING, + RenderingHints.VALUE_ANTIALIAS_ON); + + g2d.setColor(Color.black); + g2d.drawString("Some sample text.", 10, 20); + gx.drawImage(target, 0, 0, null); + boolean nongrey = false; + //Test BI: should be some non-greyscale color + for (int px=0;px<SZ;px++) { + for (int py=0;py<SZ;py++) { + int rgb = target.getRGB(px, py); + int r = (rgb & 0xff0000) >> 16; + int g = (rgb & 0x00ff00) >> 8; + int b = (rgb & 0x0000ff); + if (r != g || r !=b || g != b) { + nongrey=true; + break; + } + } + } + if (!nongrey) { + throw new RuntimeException("No LCD text found"); + } + } +}