Skip to content
Permalink
Browse files
8255387: Japanese characters were printed upside down on AIX
Reviewed-by: prr, serb
  • Loading branch information
Toshio Nakamura authored and Phil Race committed Dec 10, 2020
1 parent 0a3e446 commit 53e537c7386c301638f040f29c8f5f725621bc18
Showing with 166 additions and 2 deletions.
  1. +3 −2 src/java.desktop/share/native/libfontmanager/freetypeScaler.c
  2. +163 −0 test/jdk/java/awt/font/Rotate/MirrorTest.java
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2019, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2020, 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
@@ -529,7 +529,8 @@ Java_sun_font_FreetypeFontScaler_createScalerContextNative(
*/
if ((aa != TEXT_AA_ON) && (fm != TEXT_FM_ON) &&
!context->doBold && !context->doItalize &&
(context->transform.yx == 0) && (context->transform.xy == 0))
(context->transform.yx == 0) && (context->transform.xy == 0) &&
(context->transform.xx > 0) && (context->transform.yy > 0))
{
context->useSbits = 1;
}
@@ -0,0 +1,163 @@
/*
* Copyright (c) 2020, 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 MirrorTest
* @bug 8255387
* @summary Mirrored characters should be drawn correctly
* @run main MirrorTest
*/

import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.GraphicsEnvironment;
import java.awt.Point;
import java.awt.RenderingHints;
import java.awt.geom.AffineTransform;
import java.awt.image.BufferedImage;

public class MirrorTest {
static String target = "\u3042";
static final int SIZE = 50;
static final int SHIFT = 20;
static final int LIMIT = 5;

static Point getCenterOfGravity(BufferedImage img) {
int count = 0;
int sx = 0;
int sy = 0;
for (int y = 0; y < SIZE; y++) {
for (int x = 0; x < SIZE; x++) {
int c = img.getRGB(x, y) & 0xFFFFFF;
if (c == 0) {
count++;
sx += x;
sy += y;
}
}
}
if (count == 0) {
return null;
} else {
return new Point(sx/count, sy/count);
}
}

static BufferedImage drawNormal(Font font) {
BufferedImage image = new BufferedImage(SIZE, SIZE,
BufferedImage.TYPE_BYTE_BINARY);
Graphics2D g2d = image.createGraphics();
g2d.setColor(Color.white);
g2d.fillRect(0, 0, image.getWidth(), image.getHeight());
g2d.setColor(Color.black);
//Set antialias on not to use embedded bitmap for reference
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);

g2d.setFont(font);
FontMetrics fm = g2d.getFontMetrics();
g2d.drawString(target, SHIFT, SHIFT+fm.getAscent());
g2d.dispose();
return image;
}

static BufferedImage drawVerticalMirror(Font font) {
BufferedImage image = new BufferedImage(SIZE, SIZE,
BufferedImage.TYPE_BYTE_BINARY);
Graphics2D g2d = image.createGraphics();
g2d.setColor(Color.white);
g2d.fillRect(0, 0, image.getWidth(), image.getHeight());
g2d.setColor(Color.black);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_OFF);

AffineTransform base = g2d.getTransform();
AffineTransform trans = new AffineTransform(1.0, 0, 0, -1.0, 0, 0);
trans.concatenate(base);
g2d.setTransform(trans);

g2d.setFont(font);
FontMetrics fm = g2d.getFontMetrics();
g2d.drawString(target, SHIFT, SHIFT-image.getHeight()+fm.getAscent());
g2d.dispose();
return image;
}

static BufferedImage drawHorizontalMirror(Font font) {
BufferedImage image = new BufferedImage(SIZE, SIZE,
BufferedImage.TYPE_BYTE_BINARY);
Graphics2D g2d = image.createGraphics();
g2d.setColor(Color.white);
g2d.fillRect(0, 0, image.getWidth(), image.getHeight());
g2d.setColor(Color.black);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_OFF);

AffineTransform base = g2d.getTransform();
AffineTransform trans = new AffineTransform(-1.0, 0, 0, 1.0, 0, 0);
trans.concatenate(base);
g2d.setTransform(trans);

g2d.setFont(font);
FontMetrics fm = g2d.getFontMetrics();
g2d.drawString(target, SHIFT-image.getWidth(), SHIFT+fm.getAscent());
g2d.dispose();
return image;
}

public static void main(String[] args) {
GraphicsEnvironment ge =
GraphicsEnvironment.getLocalGraphicsEnvironment();
Font fonts[] = ge.getAllFonts();

for (Font font: fonts) {
if (!font.canDisplay(target.charAt(0))) {
continue;
}
font = font.deriveFont(12.0f);
BufferedImage img1 = drawNormal(font);
BufferedImage img2 = drawVerticalMirror(font);
BufferedImage img3 = drawHorizontalMirror(font);
Point p1 = getCenterOfGravity(img1);
Point p2 = getCenterOfGravity(img2);
Point p3 = getCenterOfGravity(img3);
if (p1 == null || p2 == null || p3 == null ) {
continue;
}
p2.y = SIZE - p2.y - 2; // Back from vertical mirror
p3.x = SIZE - p3.x - 2; // Back from horizontal mirror

if (Math.abs(p1.x - p2.x) > LIMIT ||
Math.abs(p1.y - p2.y) > LIMIT ||
Math.abs(p1.x - p3.x) > LIMIT ||
Math.abs(p1.y - p3.y) > LIMIT) {
System.out.println("Error: "+p1+","+p2+","+p3);
throw new RuntimeException(
"Incorrect mirrored character with " + font);
}
}
}
}

1 comment on commit 53e537c

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 53e537c Dec 10, 2020

Please sign in to comment.