Changeset 14333 in josm

Timestamp:

2018-10-14T18:42:07+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16838 - render nested svg elements properly

see ​https://github.com/blackears/svgSalamander/issues/31

File:

• trunk/src/com/kitfox/svg/SVGRoot.java (modified) (3 diffs)

trunk/src/com/kitfox/svg/SVGRoot.java

@@ -201 +201 @@
         else if (viewBox != null)
         {
-            xx = (float)viewBox.x;
-            ww = (float)viewBox.width;
+            xx = viewBox.x;
+            ww = viewBox.width;
             width = new NumberWithUnits(ww, NumberWithUnits.UT_PX);
             x = new NumberWithUnits(xx, NumberWithUnits.UT_PX);
@@ -229 +229 @@
         else if (viewBox != null)
         {
-            yy = (float)viewBox.y;
-            hh = (float)viewBox.height;
+            yy = viewBox.y;
+            hh = viewBox.height;
             height = new NumberWithUnits(hh, NumberWithUnits.UT_PX);
             y = new NumberWithUnits(yy, NumberWithUnits.UT_PX);
@@ -264 +264 @@
     public void renderToViewport(Graphics2D g) throws SVGException
     {
+        render(g);
+    }
+
+    @Override
+    public void render(Graphics2D g) throws SVGException
+    {
         prepareViewport();