Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8240756: [macos] SwingSet2:TableDemo:Printed Japanese characters were garbled #3619

Closed
wants to merge 11 commits into from
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2021, 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
@@ -81,17 +81,93 @@ public void drawString(final SunGraphics2D sg2d, final String s, final double x,
}
}

public void drawGlyphVector(final SunGraphics2D sg2d, final GlyphVector gV, final float x, final float y) {
final Font prevFont = sg2d.getFont();
sg2d.setFont(gV.getFont());
private boolean hasSlotData(GlyphVector gv) {
final int length = gv.getNumGlyphs();
for (int i = 0; i < length; i++) {
if (gv.getGlyphCode(i) >= 0x1000000) { // SLOTMASK 0xff000000
return true;
}
}
return false;
}

private Font getSlotFont(Font font, int slot) {
Font2D f2d = FontUtilities.getFont2D(font);
if (f2d instanceof CFont) {
CompositeFont cf = ((CFont)f2d).getCompositeFont2D();
PhysicalFont pf = cf.getSlotFont(slot);
Font f = new Font(pf.getFontName(null),
font.getStyle(), font.getSize());
return f;
}
return null;
}

private GlyphVector getGlyphVectorWithRange(final Font font, final GlyphVector gV, int start, int count) {
final int length = gV.getNumGlyphs();
toshiona marked this conversation as resolved.
Show resolved Hide resolved
int[] glyphs = new int[count];
for (int i = 0; i < count; i++) {
glyphs[i] = gV.getGlyphCode(start+i) & 0xFFFFFF;
}
// Positions should be null to recalculate by native methods,
// if GV was segmented.
StandardGlyphVector sgv = new StandardGlyphVector(font,
gV.getFontRenderContext(),
glyphs,
null, // positions
null, // indices
gV.getLayoutFlags());
return sgv;
}

private void drawGlyphVectorImpl(final SunGraphics2D sg2d, final GlyphVector gV, final float x, final float y) {
final long nativeStrikePtr = getNativeStrikePtr(sg2d);
if (OSXSurfaceData.IsSimpleColor(sg2d.paint) && nativeStrikePtr != 0) {
final OSXSurfaceData surfaceData = (OSXSurfaceData)sg2d.getSurfaceData();
surfaceData.drawGlyphs(this, sg2d, nativeStrikePtr, gV, x, y);
} else {
drawGlyphVectorAsShape(sg2d, gV, x, y);
}
}

public void drawGlyphVector(final SunGraphics2D sg2d, final GlyphVector gV, final float x, final float y) {
final Font prevFont = sg2d.getFont();
sg2d.setFont(gV.getFont());

if (hasSlotData(gV)) {
int currentSlot = 0;
final int length = gV.getNumGlyphs();
float[] positions = gV.getGlyphPositions(0, length, null);
int start = 0;
int count = 0;
GlyphVector rangeGV;
for (int i = 0; i < length; i++) {
int slot = gV.getGlyphCode(i) >> 24;
if (slot == currentSlot) {
count++;
} else {
if (i > 0) {
rangeGV = getGlyphVectorWithRange(sg2d.getFont(), gV,
start, count);
drawGlyphVectorImpl(sg2d,
rangeGV,
x + positions[start * 2],
y + positions[start * 2 + 1]);
}
start = i;
count = 1;
sg2d.setFont(getSlotFont(gV.getFont(), slot));
currentSlot = slot;
}
}
rangeGV = getGlyphVectorWithRange(sg2d.getFont(), gV, start, count);
drawGlyphVectorImpl(sg2d,
rangeGV,
x + positions[start * 2],
y + positions[start * 2 + 1]);
} else {
drawGlyphVectorImpl(sg2d, gV, x, y);
}
sg2d.setFont(prevFont);
}

@@ -0,0 +1,162 @@
/*
* Copyright (c) 2021, 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 8240756
* @summary Non-English characters are printed with wrong glyphs on MacOS
* @modules java.desktop/sun.java2d java.desktop/sun.java2d.loops java.desktop/sun.font
* @requires os.family == "mac"
* @run main MultiSlotFontTest
*/

import java.awt.Color;
import java.awt.Font;
import java.awt.Graphics;
import java.awt.Image;
import java.awt.RenderingHints;
import java.awt.font.FontRenderContext;
import java.awt.font.GlyphVector;
import java.awt.image.BufferedImage;
import sun.font.StandardGlyphVector;
import sun.java2d.OSXOffScreenSurfaceData;
import sun.java2d.OSXSurfaceData;
import sun.java2d.SunGraphics2D;
import sun.java2d.SurfaceData;
import sun.java2d.loops.SurfaceType;

public class MultiSlotFontTest {

private static final int width = 100;
private static final int height = 60;
private static final int LIMIT = 5;
private StandardGlyphVector gv;

private static final String[] TEST_STRINGS = {
"\u3042\u3044\u3046\u3048\u304A",
"a\u3042b\u3044c\u3046d",
"\u3042abcd",
"abcd\u3042",
};

public static void main(String[] args) throws Exception {
MultiSlotFontTest test = new MultiSlotFontTest();
}

public MultiSlotFontTest() {
BufferedImage img1, img2;

for (String str: TEST_STRINGS) {
img1 = createImage();
img2 = createImage();

callDrawGlyphVector(img1, str);
callDrawString(img2, str);

int diff = compareImages(img1, img2);
if (diff > LIMIT) {
debugOut(img1, img2);
throw new RuntimeException(
"Incorrect GlyphVector shape " +
diff + "," + str + "," + gv);
}
}
}

private void callDrawGlyphVector(BufferedImage image, String str) {
SurfaceData sd = OSXOffScreenSurfaceData.createDataIC(image,
SurfaceType.IntRgb);
SunGraphics2D g2d = new SunGraphics2D(sd,
Color.BLACK, Color.WHITE, null);
FontRenderContext frc = new FontRenderContext(null, false, false);
Font font = g2d.getFont();
gv = new StandardGlyphVector(font, str, frc);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_OFF);
g2d.drawGlyphVector(gv, 0.0f, (float)(height - 5));
g2d.dispose();
}

private void callDrawString(BufferedImage image, String str) {
SurfaceData sd = OSXOffScreenSurfaceData.createDataIC(image,
SurfaceType.IntRgb);
SunGraphics2D g2d = new SunGraphics2D(sd,
Color.BLACK, Color.WHITE, null);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_OFF);
g2d.drawString(str, 0.0f, (float)(height - 5));
g2d.dispose();
}

private static BufferedImage createImage() {
BufferedImage image = new BufferedImage(width, height,
BufferedImage.TYPE_INT_RGB);
Graphics g = image.createGraphics();
g.setColor(Color.WHITE);
g.fillRect(0, 0, width, height);
g.dispose();
return image;
}

private int getPixcelCount(BufferedImage img) {
int count = 0;
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
if ((img.getRGB(x, y) & 0xFFFFFF) == 0) {
count++;
}
}
}
return count;
}

private int compareImages(BufferedImage img1, BufferedImage img2) {
// Since positions can be shifted, check pixcel count.
int count1 = getPixcelCount(img1);
int count2 = getPixcelCount(img2);
return Math.abs(count1-count2);
}

private void debugOut(BufferedImage img1, BufferedImage img2) {
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
int c1 = img1.getRGB(x, y) & 0xFFFFFF;
int c2 = img2.getRGB(x, y) & 0xFFFFFF;
if (c1 != c2) {
if (c1==0) {
System.out.print("+");
} else {
System.out.print("*");
}
} else {
if (c1==0) {
System.out.print(".");
} else {
System.out.print(" ");
}
}
}
System.out.println();
}
}
}