Bugzilla#54120: Prevented NPEs when FOP asks Batik for AWT fonts for AFP output

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1407393 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java b/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
index 49f5a1b75b17a887a0b5585ddd09282f6995c296..c41271caa7e92c4b2cf7614637b79a2f5eecff6b 100644 (file)
--- a/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
+++ b/src/java/org/apache/fop/svg/AbstractFOPTextPainter.java
@@ -336,7 +336,7 @@ public abstract class AbstractFOPTextPainter implements TextPainter {
 
     private Font getFont(AttributedCharacterIterator aci) {
         Font[] fonts = ACIUtils.findFontsForBatikACI(aci, nativeTextHandler.getFontInfo());
-        return fonts[0];
+        return fonts == null ? null : fonts[0];
     }
 
     private float getStringWidth(String str, Font font) {
@@ -360,6 +360,9 @@ public abstract class AbstractFOPTextPainter implements TextPainter {
     }
 
     private boolean hasUnsupportedGlyphs(String str, Font font) {
+         if (font == null) {
+            return true;
+         }
         for (int i = 0; i < str.length(); i++) {
             char c = str.charAt(i);
             if (!((c == ' ') || (c == '\n') || (c == '\r') || (c == '\t'))) {

diff --git a/status.xml b/status.xml
index bcf8c2475610f73a09a7b06b4b17d0aaecbfb2de..990a15f5e6b0a2f111ff2ac6ef4058d91c6c63b9 100644 (file)
--- a/status.xml
+++ b/status.xml
@@ -59,6 +59,10 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Fonts" dev="MH" type="add" fixes-bug="54120">
+        Created a simple mechanism to avoid NPEs when AWT fonts are requested from Batik
+        for AFP output.
+      </action>
       <action context="Renderers" dev="VH" type="add" fixes-bug="54081">
         PDF accessibility: properly tag hyphenated words.
       </action>