Changeset 7676 in josm for trunk/src/com/kitfox/svg/Group.java

Timestamp:

2014-10-30T11:39:47+01:00 (9 years ago)

Author:

stoecker

Message:

update SVG code to current SVN (fix line endings), see #10479

File:

• trunk/src/com/kitfox/svg/Group.java (modified) (2 diffs)

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

@@ -160 +160 @@
         //Do not process offscreen groups
         boolean ignoreClip = diagram.ignoringClipHeuristic();
-        if (!ignoreClip && outsideClip(g))
-        {
-            return;
-        }
+//        if (!ignoreClip && outsideClip(g))
+//        {
+//            return;
+//        }
 
         beginLayer(g);
@@ -271 +271 @@
                 RenderableElement rendEle = (RenderableElement) ele;
                 Rectangle2D bounds = rendEle.getBoundingBox();
-                if (bounds != null)
+                if (bounds != null && (bounds.getWidth() != 0 || bounds.getHeight() != 0))
                 {
                     if (retRect == null)
                     {
                         retRect = bounds;
-                    } else
+                    }
+                    else
                     {
-                        retRect = retRect.createUnion(bounds);
+                        if (retRect.getWidth() != 0 || retRect.getHeight() != 0)
+                        {
+                            retRect = retRect.createUnion(bounds);
+                        }
                     }
                 }