fixed compile error

add extra check for text drawing, seems to have a problem with
large fonts and may have nulll size

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

diff --git a/src/org/apache/fop/svg/PDFTextElementBridge.java b/src/org/apache/fop/svg/PDFTextElementBridge.java
index a4a3759ed09937f41466ed378fc6cd67906aca32..7d9aee21d9931eb98c2c78c95a8773e64738e681 100644 (file)
--- a/src/org/apache/fop/svg/PDFTextElementBridge.java
+++ b/src/org/apache/fop/svg/PDFTextElementBridge.java
@@ -68,6 +68,9 @@ public class PDFTextElementBridge extends SVGTextElementBridge {
         if(((int)fs) != fs) {
             return false;
         }
+        if(fs > 36) {
+            return false;
+        }
 
         Element nodeElement;
         for (Node n = element.getFirstChild();

diff --git a/src/org/apache/fop/svg/PDFTextPainter.java b/src/org/apache/fop/svg/PDFTextPainter.java
index dce7d5231dbea68890c1e52e4dce1d0fff87e1b9..692986bcdab9ca7b19fae4b41c6d3f40396a5fba 100644 (file)
--- a/src/org/apache/fop/svg/PDFTextPainter.java
+++ b/src/org/apache/fop/svg/PDFTextPainter.java
@@ -74,12 +74,16 @@ public class PDFTextPainter implements TextPainter {
             (Vector)aci.getAttribute(GVTAttributedCharacterIterator.TextAttribute.GVT_FONT_FAMILIES);
         Paint forg = (Paint)aci.getAttribute(TextAttribute.FOREGROUND);
         Float size = (Float)aci.getAttribute(TextAttribute.SIZE);
+        if(size == null) {
+            return;
+        }
         Stroke stroke =
             (Stroke)aci.getAttribute(GVTAttributedCharacterIterator.TextAttribute.STROKE);
         Float xpos =
             (Float)aci.getAttribute(GVTAttributedCharacterIterator.TextAttribute.X);
         Float ypos =
             (Float)aci.getAttribute(GVTAttributedCharacterIterator.TextAttribute.Y);
+System.out.println("data:" + size + ":" + forg + ":" + xpos + ":" + ypos);
 
         Float posture = (Float)aci.getAttribute(TextAttribute.POSTURE);
         Float taWeight = (Float)aci.getAttribute(TextAttribute.WEIGHT);

diff --git a/src/org/apache/fop/svg/PDFTranscoder.java b/src/org/apache/fop/svg/PDFTranscoder.java
index dea3df6d2bf335201126cf344ea4d840470a9a51..54ba7a3d39838986d4c62f78f4caed1937e98119 100644 (file)
--- a/src/org/apache/fop/svg/PDFTranscoder.java
+++ b/src/org/apache/fop/svg/PDFTranscoder.java
@@ -95,9 +95,6 @@ import org.w3c.dom.svg.SVGAElement;
 import org.w3c.dom.svg.SVGDocument;
 import org.w3c.dom.svg.SVGSVGElement;
 
-// <!> FIXME : Those import clauses will change with new design
-import org.apache.batik.gvt.renderer.StaticRendererFactory;
-
 /**
  * This class enables to transcode an input to a pdf document.
  *
@@ -177,7 +174,6 @@ public class PDFTranscoder extends XMLAbstractTranscoder {
 
         // build the GVT tree
         GVTBuilder builder = new GVTBuilder();
-        ImageRendererFactory rendFactory = new StaticRendererFactory();
         BridgeContext ctx = new BridgeContext(userAgent);
         TextPainter textPainter = null;
         textPainter = new StrokingTextPainter();