aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/java/org/apache/fop/fonts/type1/PFMFile.java8
-rw-r--r--status.xml3
2 files changed, 10 insertions, 1 deletions
diff --git a/src/java/org/apache/fop/fonts/type1/PFMFile.java b/src/java/org/apache/fop/fonts/type1/PFMFile.java
index d2d587d90..d1a3d79ff 100644
--- a/src/java/org/apache/fop/fonts/type1/PFMFile.java
+++ b/src/java/org/apache/fop/fonts/type1/PFMFile.java
@@ -481,7 +481,13 @@ public class PFMFile {
* @return The width of a character.
*/
public int getCharWidth(short which) {
- return extentTable[which - dfFirstChar];
+ if (extentTable != null) {
+ return extentTable[which - dfFirstChar];
+ } else {
+ //Fixed-width font (PFM may have no extent table)
+ //we'll just use the average width
+ return this.dfAvgWidth;
+ }
}
}
diff --git a/status.xml b/status.xml
index e0f436c5c..acb5cd647 100644
--- a/status.xml
+++ b/status.xml
@@ -58,6 +58,9 @@
documents. Example: the fix of marks layering will be such a case when it's done.
-->
<release version="FOP Trunk" date="TBD">
+ <action context="Code" dev="CB" type="fix">
+ Bugfix: support PFM Files with no extent table.
+ </action>
<action context="Code" dev="AD" type="fix" fixes-bug="46960">
Bugfix: previously retrieved markers were not cleared if the new marker was empty.
</action>