Issue #423 Fixed problems on DefineFont3/2 advance value size (Font with 20k height problem)

This commit is contained in:
Jindra Pet��k
2013-11-21 12:52:01 +01:00
parent defc4d7715
commit d6ec958486
2 changed files with 6 additions and 7 deletions
@@ -346,13 +346,13 @@ public class DefineFont2Tag extends FontTag {
if (fontFlagsHasLayout) {
Font fnt = new Font(fontName, fontStyle, getDivider() * 1024);
Font fnt = new Font(fontName, fontStyle, 1024);
if (!exists) {
fontBoundsTable.add(pos, shp.getBounds());
fontAdvanceTable.add(pos, (int) Math.round(fnt.createGlyphVector((new JPanel()).getFontMetrics(fnt).getFontRenderContext(), "" + character).getGlyphMetrics(0).getAdvanceX()));
fontAdvanceTable.add(pos, (int) getDivider() * Math.round(fnt.createGlyphVector((new JPanel()).getFontMetrics(fnt).getFontRenderContext(), "" + character).getGlyphMetrics(0).getAdvanceX()));
} else {
fontBoundsTable.set(pos, shp.getBounds());
fontAdvanceTable.set(pos, (int) Math.round(fnt.createGlyphVector((new JPanel()).getFontMetrics(fnt).getFontRenderContext(), "" + character).getGlyphMetrics(0).getAdvanceX()));
fontAdvanceTable.set(pos, (int) getDivider() * Math.round(fnt.createGlyphVector((new JPanel()).getFontMetrics(fnt).getFontRenderContext(), "" + character).getGlyphMetrics(0).getAdvanceX()));
}
}
if (!exists) {
@@ -342,14 +342,13 @@ public class DefineFont3Tag extends FontTag {
}
if (fontFlagsHasLayout) {
Font fnt = new Font(fontName, fontStyle, getDivider() * 1024);
Font fnt = new Font(fontName, fontStyle, 1024); //Not multiplied with divider as it causes problems to create font with height around 20k
if (!exists) {
fontBoundsTable.add(pos, shp.getBounds());
fontAdvanceTable.add(pos, (int) Math.round(fnt.createGlyphVector((new JPanel()).getFontMetrics(fnt).getFontRenderContext(), "" + character).getGlyphMetrics(0).getAdvanceX()));
fontAdvanceTable.add(pos, (int) getDivider() * Math.round(fnt.createGlyphVector((new JPanel()).getFontMetrics(fnt).getFontRenderContext(), "" + character).getGlyphMetrics(0).getAdvanceX()));
} else {
fontBoundsTable.set(pos, shp.getBounds());
fontAdvanceTable.set(pos, (int) Math.round(fnt.createGlyphVector((new JPanel()).getFontMetrics(fnt).getFontRenderContext(), "" + character).getGlyphMetrics(0).getAdvanceX()));
fontAdvanceTable.set(pos, (int) getDivider() * Math.round(fnt.createGlyphVector((new JPanel()).getFontMetrics(fnt).getFontRenderContext(), "" + character).getGlyphMetrics(0).getAdvanceX()));
}
}
if (!exists) {