Changeset 10787 in josm for trunk/src/com/kitfox/svg/ShapeElement.java

Timestamp:

2016-08-12T03:16:58+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13291 - upgrade to svgSalamander v1.1.0 (patched)

now detects two invalid SVG files: presets/sport/volleyball.svg and presets/shop/diy_store.svg

File:

• trunk/src/com/kitfox/svg/ShapeElement.java (modified) (4 diffs)

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

@@ -76 +76 @@
     }
 
+    @Override
     abstract public void render(java.awt.Graphics2D g) throws SVGException;
 
@@ -85 +86 @@
      */
 
+    @Override
     void pick(Point2D point, boolean boundingBox, List retVec) throws SVGException
     {
@@ -95 +97 @@
     }
 
+    @Override
     void pick(Rectangle2D pickArea, AffineTransform ltw, boolean boundingBox, List retVec) throws SVGException
     {
@@ -161 +164 @@
                         if (ele != null)
                         {
-                            fillPaint = ((FillElement)ele).getPaint(bounds, xform);
+                            try {
+                                fillPaint = ((FillElement)ele).getPaint(bounds, xform);
+                            } catch (IllegalArgumentException e) {
+                                throw new SVGException(e);
+                            }
                         }
                     }