Bugzilla #36505:

Several fixes for SVG painting in the Java2DRenderer.
Updated SVG test case to test additional features.
Submitted by: Richard Wheeldon <richardw.at.geoquip-rnd.demon.co.uk>

Comments and changes by jeremias:
Added an additional SVG image with an intrinsic size and modified the test case to use and test that, too.
I'll commit this patch because it improves the current situation but I'm not happy with the current state of Java2DRenderer.renderSVGDocument(). Creating inverse transformation matrices is surely not the right way to do this. The matrix should be saved and restored instead.
Furthermore, renderSVGDocument should be extracted into a Java2DSVGHandler like it is done for the other renderers.

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

diff --git a/src/java/org/apache/fop/render/java2d/Java2DRenderer.java b/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
index b807d8cede0f63b277679d2ac4b73bdd0ee8179d..56c30ac7ffcd1277518f3fecfd5d1b6307a6deed 100644 (file)
--- a/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
+++ b/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
@@ -48,7 +48,6 @@ import java.util.Map;
 
 import org.apache.batik.bridge.BridgeContext;
 import org.apache.batik.bridge.GVTBuilder;
-import org.apache.batik.bridge.ViewBox;
 import org.apache.batik.dom.svg.SVGDOMImplementation;
 import org.apache.batik.gvt.GraphicsNode;
 import org.apache.fop.apps.FOPException;
@@ -1096,15 +1095,21 @@ public abstract class Java2DRenderer extends AbstractRenderer implements Printab
                     "svg graphic could not be built: " + e.getMessage(), e);
             return;
         }
-        float w = (float) ctx.getDocumentSize().getWidth() * 1000f;
-        float h = (float) ctx.getDocumentSize().getHeight() * 1000f;
+
+        // If no viewbox is defined in the svg file, a viewbox of 100x100 is
+        // assumed, as defined in SVGUserAgent.getViewportSize()
+        float iw = (float) ctx.getDocumentSize().getWidth() * 1000f;
+        float ih = (float) ctx.getDocumentSize().getHeight() * 1000f;
+
+        float w = (float) pos.getWidth();
+        float h = (float) pos.getHeight();
 
         // correct integer roundoff
         state.getGraph().translate(x / 1000, y / 1000);
 
         SVGSVGElement svg = ((SVGDocument) doc).getRootElement();
-        AffineTransform at = ViewBox.getPreserveAspectRatioTransform(svg,
-                w / 1000f, h / 1000f);
+        // Aspect ratio preserved by layout engine, not here
+        AffineTransform at = AffineTransform.getScaleInstance(w / iw, h / ih);
         AffineTransform inverse = null;
         try {
             inverse = at.createInverse();
@@ -1125,10 +1130,7 @@ public abstract class Java2DRenderer extends AbstractRenderer implements Printab
             state.getGraph().transform(inverse);
         }
         // correct integer roundoff
-        // currentState.getCurrentGraphics().translate(-x / 1000f, y / 1000f -
-        // pageHeight);
-        state.getGraph().translate(-(x + 500) / 1000,
-                (y + 500) / 1000 - pageHeight);
+        state.getGraph().translate(-(x + 500) / 1000, -(y + 500) / 1000);
     }
 
     /**

diff --git a/test/layoutengine/testcases/external-graphic_svg.xml b/test/layoutengine/testcases/external-graphic_svg.xml
index c51cb0e4d92b629c316bdac7408059ba0755ec77..5f13dc313965892c3ab2307933f9c4c87de0bab1 100644 (file)
--- a/test/layoutengine/testcases/external-graphic_svg.xml
+++ b/test/layoutengine/testcases/external-graphic_svg.xml
@@ -1,48 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2005 The Apache Software Foundation
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
-  <info>
-    <p>
-      This test checks external-graphics.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <fo:layout-master-set>
-        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
-          <fo:region-body/>
-        </fo:simple-page-master>
-      </fo:layout-master-set>
-      <fo:page-sequence master-reference="normal" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block>SVG external-graphic</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/img.svg"/>EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="100000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="100000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="100000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="100000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-  </checks>
-</testcase>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<!--\r
+  Copyright 2005 The Apache Software Foundation\r
+\r
+  Licensed under the Apache License, Version 2.0 (the "License");\r
+  you may not use this file except in compliance with the License.\r
+  You may obtain a copy of the License at\r
+\r
+       http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+  Unless required by applicable law or agreed to in writing, software\r
+  distributed under the License is distributed on an "AS IS" BASIS,\r
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+  See the License for the specific language governing permissions and\r
+  limitations under the License.\r
+-->\r
+<!-- $Id$ -->\r
+<testcase>\r
+  <info>\r
+    <p>\r
+      This test checks external-graphics.\r
+    </p>\r
+  </info>\r
+  <fo>\r
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">\r
+      <fo:layout-master-set>\r
+        <fo:simple-page-master master-name="normal" page-width="10in" page-height="15in">\r
+          <fo:region-body/>\r
+        </fo:simple-page-master>\r
+      </fo:layout-master-set>\r
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">\r
+        <fo:flow flow-name="xsl-region-body">\r
+          <fo:block text-align="left">2 inch wide SVG external-graphic on LHS</fo:block>\r
+          <fo:block text-align="left">\r
+            <fo:external-graphic src="../../resources/images/img.svg" content-width="2in" scaling="uniform" />EOG\r
+          </fo:block>\r
+          <fo:block text-align="right">4 inch wide SVG external-graphic on RHS</fo:block>\r
+          <fo:block text-align="right">\r
+            <fo:external-graphic src="../../resources/images/img.svg" content-width="4in" scaling="uniform" />EOG\r
+          </fo:block>\r
+          <fo:block text-align="center">6 inch wide SVG external-graphic in center, non-uniformly squeezed to a height of 4in.</fo:block>\r
+          <fo:block text-align="center">\r
+            <fo:external-graphic src="../../resources/images/img.svg" content-width="6in" content-height="4in" scaling="non-uniform" />EOG\r
+          </fo:block>\r
+          <fo:block text-align="left">SVG external-graphic with an intrinsic size (16ptx16pt)</fo:block>\r
+          <fo:block text-align="left">\r
+            <fo:external-graphic src="../../resources/images/img-w-size.svg"/>EOG\r
+          </fo:block>\r
+          <fo:block>EOF</fo:block>\r
+        </fo:flow>\r
+      </fo:page-sequence>\r
+    </fo:root>\r
+  </fo>\r
+  <checks>\r
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>\r
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>\r
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>\r
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>\r
+    <eval expected="0 0 144000 144000" xpath="//flow/block[2]/lineArea/viewport/image/@pos"/>\r
+    \r
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>\r
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>\r
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>\r
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>\r
+    <eval expected="0 0 288000 288000" xpath="//flow/block[4]/lineArea/viewport/image/@pos"/>\r
+\r
+    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>\r
+    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>\r
+    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>\r
+    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>\r
+    <eval expected="0 0 432000 288000" xpath="//flow/block[6]/lineArea/viewport/image/@pos"/>\r
+\r
+    <!-- TODO: This evaluates nicely to 16000mpt with 72dpi in the FOUserAgent but will result \r
+         in 16080 for 300dpi which is caused by rounding errors because pixels are used internally. -->\r
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>\r
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>\r
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>\r
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>\r
+    <eval expected="0 0 16000 16000" xpath="//flow/block[8]/lineArea/viewport/image/@pos"/>\r
+  </checks>\r
+</testcase>\r

diff --git a/test/resources/images/img-w-size.svg b/test/resources/images/img-w-size.svg
new file mode 100644 (file)
index 0000000..503490b
--- /dev/null
+++ b/test/resources/images/img-w-size.svg
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<!--
+  Copyright 2005 The Apache Software Foundation
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<!-- This SVG is the same as img.svg but with an intrinsic size. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="16pt" height="16pt">
+  <g style="fill:red; stroke:#000000">
+    <rect x="0" y="0" width="15" height="15"/>
+    <rect x="5" y="5" width="15" height="15"/>
+  </g>
+</svg>