Skip to content

Commit e8c7d98

Browse files
committed
Update PdfTrueType font and CidFont.
1 parent 615a6aa commit e8c7d98

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

basics/src/main/java/com/itextpdf/basics/font/CidFont.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,18 @@ public class CidFont extends FontProgram {
1919
CidFont(String fontName, Set<String> cmaps) {
2020
compatibleCmaps = cmaps;
2121
initializeCidFontNameAndStyle(fontName);
22+
Map<String, Object> fontDesc = CidFontProperties.getAllFonts().get(fontNames.getFontName());
23+
if (fontDesc == null) {
24+
throw new PdfException("no.such.predefined.font.1").setMessageParams(fontName);
25+
}
26+
initializeCidFontProperties(fontDesc);
2227
avgWidth = 0;
2328
for(int code : hMetrics.getKeys()) {
2429
avgWidth += hMetrics.get(code);
2530
}
2631
if (hMetrics.size() != 0) {
2732
avgWidth /= hMetrics.size();
2833
}
29-
Map<String, Object> fontDesc = CidFontProperties.getAllFonts().get(fontNames.getFontName());
30-
if (fontDesc == null) {
31-
throw new PdfException("no.such.predefined.font.1").setMessageParams(fontName);
32-
}
33-
initializeCidFontProperties(fontDesc);
3434
}
3535

3636
CidFont(String fontName, Set<String> cmaps, Map<String, Object> fontDescription) {

core/src/main/java/com/itextpdf/core/font/PdfTrueTypeFont.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ public class PdfTrueTypeFont extends PdfSimpleFont<TrueTypeFont> {
2626

2727
PdfTrueTypeFont(TrueTypeFont ttf, String encoding, boolean embedded) {
2828
super();
29-
newFont = false;
3029
setFontProgram(ttf);
3130
this.embedded = embedded;
3231
FontNames fontNames = ttf.getFontNames();

0 commit comments

Comments
 (0)