stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6683472: Incorrect handling of translation component of font transform

Browse Source 
Reviewed-by: igor, campbell
This commit is contained in:
Phil Race 2008-04-09 13:11:46 -07:00
parent a15c780502
commit 3e1b0813ec
2 changed files with 90 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/share/classes/sun/font/AttributeValues.java
View File

@ -887,10 +887,10 @@ public final class AttributeValues implements Cloneable {
try {
AffineTransform rtxi = rtx.createInverse();
double dx = tx.getTranslateX();
double dy = tx.getTranslateY();
tx.preConcatenate(rtxi);
if (andTranslation) {
double dx = tx.getTranslateX();
double dy = tx.getTranslateY();
if (dx != 0 || dy != 0) {
tx.setTransform(tx.getScaleX(), tx.getShearY(),
tx.getShearX(), tx.getScaleY(), 0, 0);

88
jdk/test/java/awt/Graphics2D/DrawString/RotTransText.java Normal file
View File

@ -0,0 +1,88 @@
/*
* Copyright 2008 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 6683472
* @summary Transformed fonts using drawString and TextLayout should be in
* the same position.
*/
import java.awt.*;
import java.awt.font.*;
import java.awt.geom.*;
import java.awt.image.*;
import java.util.HashMap;
public class RotTransText {
public static void main(String[] args) {
int wid=400, hgt=400;
BufferedImage bi =
new BufferedImage(wid, hgt, BufferedImage.TYPE_INT_RGB);
Graphics2D g2d = bi.createGraphics();
g2d.setColor(Color.white);
g2d.fillRect(0, 0, wid, hgt);
int x=130, y=130;
String s = "Text";
int xt=90, yt=50;
for (int angle=0;angle<360;angle+=30) {
AffineTransform aff = AffineTransform.getTranslateInstance(50,90);
aff.rotate(angle * Math.PI/180.0);
Font fnt = new Font("SansSerif", Font.PLAIN, 60);
fnt = fnt.deriveFont(Font.PLAIN, aff);
g2d.setFont(fnt);
g2d.setColor(Color.blue);
g2d.drawString(s, x, y);
g2d.setColor(Color.red);
FontRenderContext frc = g2d.getFontRenderContext();
HashMap attrMap = new HashMap();
attrMap.put(TextAttribute.STRIKETHROUGH,
TextAttribute.STRIKETHROUGH_ON);
fnt = fnt.deriveFont(attrMap);
TextLayout tl = new TextLayout(s, fnt, frc);
tl.draw(g2d, (float)x, (float)y);
}
// Test BI: should be no blue: only red and white.
int red = Color.red.getRGB();
int blue = Color.blue.getRGB();
int white = Color.white.getRGB();
for (int px=0;px<wid;px++) {
for (int py=0;py<hgt;py++) {
int rgb = bi.getRGB(px, py);
if (rgb == blue || ( rgb != red && rgb != white)) {
throw new RuntimeException
("Unexpected color : " + Integer.toHexString(rgb) +
" at x=" + x + " y="+ y);
}
}
}
}
}