Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jdk
changeset 297:94d65e427402
6692979: VM Crash when shearing text + rect over a range of values
Reviewed-by: igor, tdv
author | prr |
---|---|
date | Fri, 25 Apr 2008 10:40:11 -0700 |
parents | ff8302a9936b |
children | 48b7638b8e69 |
files | src/share/classes/sun/font/FileFontStrike.java test/java/awt/font/Rotate/Shear.java |
diffstat | 2 files changed, 72 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/font/FileFontStrike.java Fri Apr 25 10:37:07 2008 -0700 +++ b/src/share/classes/sun/font/FileFontStrike.java Fri Apr 25 10:40:11 2008 -0700 @@ -217,7 +217,12 @@ * "maximumSizeForGetImageWithAdvance". * This should be no greater than OutlineTextRender.THRESHOLD. */ - getImageWithAdvance = at.getScaleY() <= 48.0; + double maxSz = 48.0; + getImageWithAdvance = + Math.abs(at.getScaleX()) <= maxSz && + Math.abs(at.getScaleY()) <= maxSz && + Math.abs(at.getShearX()) <= maxSz && + Math.abs(at.getShearY()) <= maxSz; /* Some applications request advance frequently during layout. * If we are not getting and caching the image with the advance,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/awt/font/Rotate/Shear.java Fri Apr 25 10:40:11 2008 -0700 @@ -0,0 +1,66 @@ +/* + * 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 6692979 + * @summary Verify no crashes with extreme shears. + */ + +import javax.swing.*; +import java.awt.*; +import java.awt.font.*; +import java.awt.geom.*; +public class Shear extends Component { + + public static void main(String[] args) { + JFrame f = new JFrame(); + f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.getContentPane().add("Center", new Shear()); + f.pack(); + f.setVisible(true); + } + + public Dimension getPreferredSize() { + return new Dimension(400,300); + } + + public void paint(Graphics g) { + Graphics2D g2 = (Graphics2D)g; + + g.setColor(Color.white); + g.fillRect(0,0,400,300); + g.setColor(Color.black); + Font origFont = new Font(Font.DIALOG, Font.BOLD, 30); + for (int i=0;i<=360;i++) { + double sv = i*180.0/Math.PI; + AffineTransform tx = AffineTransform.getShearInstance(sv, sv); + Font font = origFont.deriveFont(tx); + g.setFont(font); + GlyphVector gv = + font.createGlyphVector(g2.getFontRenderContext(), "JavaFX"); + //System.out.println(gv.getVisualBounds()); + g.drawString("JavaFX", 100, 100); + } + } +}