From d4b44928ccd29919c0da8aa054b4af53736d0999 Mon Sep 17 00:00:00 2001 From: Patrick Corless Date: Sun, 28 Feb 2021 21:43:07 -0700 Subject: [PATCH] GH-80 fix DW width conversion. --- .../org/icepdf/core/pobjects/fonts/zfont/CompositeFont.java | 2 +- .../icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType2.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/CompositeFont.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/CompositeFont.java index 7328a166e..bb10f44a7 100644 --- a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/CompositeFont.java +++ b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/CompositeFont.java @@ -150,7 +150,7 @@ protected void parseWidths() { } if (library.getObject(entries, DW_KEY) != null) { defaultWidth = - ((Number) library.getObject(entries, DW_KEY)).floatValue(); + ((Number) library.getObject(entries, DW_KEY)).floatValue() * 0.001f; } if (fontDescriptor != null) { diff --git a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType2.java b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType2.java index 8791bec3b..de40782b1 100644 --- a/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType2.java +++ b/core/core-awt/src/main/java/org/icepdf/core/pobjects/fonts/zfont/fontFiles/ZFontType2.java @@ -120,7 +120,7 @@ public FontFile deriveFont(float defaultWidth, float[] widths) { if (widths != null) { font.widths = widths; } - font.defaultWidth = defaultWidth * 0.001f; + font.defaultWidth = defaultWidth; return font; }