aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremias Maerki <jeremias@apache.org>2008-01-28 22:05:39 +0000
committerJeremias Maerki <jeremias@apache.org>2008-01-28 22:05:39 +0000
commit88b4aa8d1986c176be86985eabdebab9c7523743 (patch)
tree64a96b64202fd291cad61bdba8bb2880cd4f0cd0
parent2b3848ca79cd31efc510c58ecbd74bfc38ebf56d (diff)
downloadxmlgraphics-fop-88b4aa8d1986c176be86985eabdebab9c7523743.tar.gz
xmlgraphics-fop-88b4aa8d1986c176be86985eabdebab9c7523743.zip
Bugfix for invalid numTables entry in subset TrueType fonts if there was no "fpgm" table (Example: FreeSerif).
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@616080 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java7
-rw-r--r--status.xml3
2 files changed, 8 insertions, 2 deletions
diff --git a/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java b/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
index 170aec194..c12a7900f 100644
--- a/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
+++ b/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java
@@ -21,8 +21,8 @@ package org.apache.fop.fonts.truetype;
import java.io.IOException;
import java.util.Iterator;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
/**
@@ -71,7 +71,10 @@ public class TTFSubSetFile extends TTFFile {
* Create the directory table
*/
private void createDirectory() {
- int numTables = 9;
+ int numTables = 8;
+ if (hasFpgm()) {
+ numTables++;
+ }
// Create the TrueType header
writeByte((byte)0);
writeByte((byte)1);
diff --git a/status.xml b/status.xml
index 2622f4063..60f0819c2 100644
--- a/status.xml
+++ b/status.xml
@@ -28,6 +28,9 @@
<changes>
<release version="FOP Trunk">
+ <action context="Fonts" dev="JM" type="fix">
+ Bugfix for invalid numTables entry in subset TrueType fonts if there was no "fpgm" table.
+ </action>
<action context="Renderers" dev="JM" type="add">
Added support for the natural language indentifier ("Lang" in the document catalog)
for PDF documents based on the language/country values on fo:page-sequence.