[FOray-commit] SF.net SVN: foray: [7716] trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java

[<vic...@us...>]

Revision: 7716
Author:   victormote
Date:     2006-06-19 15:36:04 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/foray/?rev=7716&view=rev

Log Message:
-----------
Use the right ContentStream method for SVG.

Modified Paths:
--------------
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-19 22:29:06 UTC (rev 7715)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-06-19 22:36:04 UTC (rev 7716)
@@ -29,12 +29,12 @@
 
 package org.foray.render.pdf;
 
-import org.axsl.areaR.AreaRException;
 import org.foray.common.StringUtilPre5;
 import org.foray.output.OutputConfig;
 import org.foray.render.PrintRenderer;
 
 import org.axsl.areaR.Area;
+import org.axsl.areaR.AreaRException;
 import org.axsl.areaR.BasicLinkArea;
 import org.axsl.areaR.BookmarkArea;
 import org.axsl.areaR.BookmarkTitleArea;
@@ -48,6 +48,7 @@
 import org.axsl.common.Constants;
 import org.axsl.fontR.FontUse;
 import org.axsl.graphicR.Graphic;
+import org.axsl.graphicR.GraphicException;
 import org.axsl.graphicR.SVGGraphic;
 import org.axsl.pdfW.PDFColor;
 import org.axsl.pdfW.PDFContentStream;
@@ -64,6 +65,8 @@
 
 import org.apache.commons.logging.Log;
 
+import org.w3c.dom.svg.SVGDocument;
+
 import java.awt.Color;
 import java.awt.Rectangle;
 import java.awt.geom.Line2D;
@@ -236,11 +239,19 @@
                 contentRectangle);
         Rectangle2D.Float pdfClipRectangle = convertMillipointRectangle(
                 clipRectangle);
+        SVGDocument svgDocument;
+        try {
+            svgDocument = graphic.getSVGDocument();
+        } catch (GraphicException e) {
+            /* For some reason the SVGDocument is not usable. There is nothing
+             * to do. */
+            return;
+        }
         FontUse font = area.getPrimaryFont();
         float fontSize = area.traitFontSize()/1000;
         float letterSpacing = area.actualLetterSpacing() / 1000f;
-        getContentStream().drawGraphic(pdfContentRectangle, pdfClipRectangle,
-                graphic, font, fontSize, letterSpacing,
+        getContentStream().drawSVGDocument(svgDocument, pdfContentRectangle,
+                pdfClipRectangle, font, fontSize, letterSpacing,
                 getStrokeSVGText());
     }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.