keiron 02/02/19 05:03:15 Modified: src/org/apache/fop/svg PDFTranscoder.java PDFTextElementBridge.java PDFTextPainter.java Log: fixed compile error add extra check for text drawing, seems to have a problem with large fonts and may have nulll size Revision Changes Path 1.15 +2 -6 xml-fop/src/org/apache/fop/svg/PDFTranscoder.java Index: PDFTranscoder.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/PDFTranscoder.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- PDFTranscoder.java 15 Nov 2001 08:12:36 -0000 1.14 +++ PDFTranscoder.java 19 Feb 2002 13:03:14 -0000 1.15 @@ -1,5 +1,5 @@ /* - * $Id: PDFTranscoder.java,v 1.14 2001/11/15 08:12:36 keiron Exp $ + * $Id: PDFTranscoder.java,v 1.15 2002/02/19 13:03:14 keiron Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -95,9 +95,6 @@ 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. * @@ -123,7 +120,7 @@ * millimeter conversion factor. * * @author <a href="mailto:[EMAIL PROTECTED]">Keiron Liddle</a> - * @version $Id: PDFTranscoder.java,v 1.14 2001/11/15 08:12:36 keiron Exp $ + * @version $Id: PDFTranscoder.java,v 1.15 2002/02/19 13:03:14 keiron Exp $ */ public class PDFTranscoder extends XMLAbstractTranscoder { @@ -177,7 +174,6 @@ // build the GVT tree GVTBuilder builder = new GVTBuilder(); - ImageRendererFactory rendFactory = new StaticRendererFactory(); BridgeContext ctx = new BridgeContext(userAgent); TextPainter textPainter = null; textPainter = new StrokingTextPainter(); 1.2 +4 -1 xml-fop/src/org/apache/fop/svg/PDFTextElementBridge.java Index: PDFTextElementBridge.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/PDFTextElementBridge.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- PDFTextElementBridge.java 9 Nov 2001 11:32:42 -0000 1.1 +++ PDFTextElementBridge.java 19 Feb 2002 13:03:15 -0000 1.2 @@ -1,5 +1,5 @@ /* - * $Id: PDFTextElementBridge.java,v 1.1 2001/11/09 11:32:42 keiron Exp $ + * $Id: PDFTextElementBridge.java,v 1.2 2002/02/19 13:03:15 keiron Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -66,6 +66,9 @@ // Font size, in user space units. float fs = TextUtilities.convertFontSize(element, ctx, cssDecl, uctx); if(((int)fs) != fs) { + return false; + } + if(fs > 36) { return false; } 1.9 +6 -2 xml-fop/src/org/apache/fop/svg/PDFTextPainter.java Index: PDFTextPainter.java =================================================================== RCS file: /home/cvs/xml-fop/src/org/apache/fop/svg/PDFTextPainter.java,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- PDFTextPainter.java 9 Nov 2001 11:32:42 -0000 1.8 +++ PDFTextPainter.java 19 Feb 2002 13:03:15 -0000 1.9 @@ -1,5 +1,5 @@ /* - * $Id: PDFTextPainter.java,v 1.8 2001/11/09 11:32:42 keiron Exp $ + * $Id: PDFTextPainter.java,v 1.9 2002/02/19 13:03:15 keiron Exp $ * Copyright (C) 2001 The Apache Software Foundation. All rights reserved. * For details on use and redistribution please refer to the * LICENSE file included with these sources. @@ -36,7 +36,7 @@ * Renders the attributed character iterator of a <tt>TextNode</tt>. * * @author <a href="mailto:[EMAIL PROTECTED]">Keiron Liddle</a> - * @version $Id: PDFTextPainter.java,v 1.8 2001/11/09 11:32:42 keiron Exp $ + * @version $Id: PDFTextPainter.java,v 1.9 2002/02/19 13:03:15 keiron Exp $ */ public class PDFTextPainter implements TextPainter { FontState fontState; @@ -74,12 +74,16 @@ (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);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]