You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/08/30 21:28:02 UTC

svn commit: r264833 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java

Author: jeremias
Date: Tue Aug 30 12:27:58 2005
New Revision: 264833

URL: http://svn.apache.org/viewcvs?rev=264833&view=rev
Log:
Some clean-up.

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java?rev=264833&r1=264832&r2=264833&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java Tue Aug 30 12:27:58 2005
@@ -264,7 +264,6 @@
              */
             PDFRenderer renderer = (PDFRenderer)context.getRenderer();
             renderer.saveGraphicsState();
-            //pdfInfo.currentStream.add("q\n");
             renderer.setColor(Color.black, false, null);
             renderer.setColor(Color.black, true, null);
             // transform so that the coordinates (0,0) is from the top left
@@ -274,16 +273,13 @@
                               + yOffset / 1000f + " cm\n");
 
             SVGSVGElement svg = ((SVGDocument)doc).getRootElement();
-            AffineTransform at = ViewBox.getPreserveAspectRatioTransform(svg, w / 1000f, h / 1000f);
+            //AffineTransform at = ViewBox.getPreserveAspectRatioTransform(svg, w / 1000f, h / 1000f);
+            AffineTransform at = ViewBox.getPreserveAspectRatioTransform(svg,
+                    pdfInfo.width / 1000f, pdfInfo.height / 1000f);
             if (false && !at.isIdentity()) {
                 double[] vals = new double[6];
                 at.getMatrix(vals);
-                pdfInfo.currentStream.add(PDFNumber.doubleOut(vals[0], 5) + " "
-                                + PDFNumber.doubleOut(vals[1], 5) + " "
-                                + PDFNumber.doubleOut(vals[2], 5) + " "
-                                + PDFNumber.doubleOut(vals[3], 5) + " "
-                                + PDFNumber.doubleOut(vals[4]) + " "
-                                + PDFNumber.doubleOut(vals[5]) + " cm\n");
+                pdfInfo.currentStream.add(CTMHelper.toPDFString(at, false) + " cm\n");
             }
 
             if (pdfInfo.pdfContext == null) {
@@ -309,7 +305,6 @@
                                        + e.getMessage(), e);
             }
 
-            //pdfInfo.currentStream.add("Q\n");
             renderer.restoreGraphicsState();
             pdfInfo.pdfState.pop();
         }



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org