commit 50d9f7230e8b29c0e054563495e7f5824405cfb0
author Matthias Becker <ma.becker@sap.com> Fri Aug 28 19:48:54 2015 +0200
committer Matthias Becker <ma.becker@sap.com> Mon Aug 31 11:15:30 2015 -0400
tree d19f234abbf6615527c0418e1cd1aa79c69f8810
parent bd12657602e4357e9a9017d86f07c1997471459f

bug 476195: Fix for SVGs without width and height

Change-Id: Id8da9d537bc336028851693a745a3dc84f78f682
Signed-off-by: Matthias Becker <ma.becker@sap.com>

bundles/org.eclipse.ui.images.renderer/src/main/java/org/eclipse/ui/images/renderer/RenderMojo.java

diff --git a/bundles/org.eclipse.ui.images.renderer/src/main/java/org/eclipse/ui/images/renderer/RenderMojo.java b/bundles/org.eclipse.ui.images.renderer/src/main/java/org/eclipse/ui/images/renderer/RenderMojo.java
index 362614e..66b6d96 100644
--- a/bundles/org.eclipse.ui.images.renderer/src/main/java/org/eclipse/ui/images/renderer/RenderMojo.java
+++ b/bundles/org.eclipse.ui.images.renderer/src/main/java/org/eclipse/ui/images/renderer/RenderMojo.java
@@ -48,8 +48,6 @@
 import com.jhlabs.image.ContrastFilter;
 import com.jhlabs.image.GrayscaleFilter;
 import com.jhlabs.image.HSBAdjustFilter;
-import com.jhlabs.image.PointFilter;
-import com.jhlabs.image.TransferFilter;
 
 /**
  * <p>Mojo which renders SVG icons into PNG format.</p>
@@ -157,9 +155,35 @@
         Element svgDocumentNode = svgDocument.getDocumentElement();
         String nativeWidthStr = svgDocumentNode.getAttribute("width");
         String nativeHeightStr = svgDocumentNode.getAttribute("height");
+        int nativeWidth = -1;
+        int nativeHeight = -1;
 
-        int nativeWidth = Integer.parseInt(nativeWidthStr);
-        int nativeHeight = Integer.parseInt(nativeHeightStr);
+        try{
+            if (nativeWidthStr != "" && nativeHeightStr != ""){
+                nativeWidth = Integer.parseInt(nativeWidthStr);
+                nativeHeight = Integer.parseInt(nativeHeightStr);
+            } else {
+                // Vector graphics editing programs don't always output height and width attributes on SVG.
+                // As fall back: parse the viewBox attribute (which is almost always set).
+                String viewBoxStr = svgDocumentNode.getAttribute("viewBox");
+                if (viewBoxStr == ""){
+                    log.error("Icon defines neither width/height nor a viewBox, skipping: " + icon.nameBase);
+                    failedIcons.add(icon);
+                    return;
+                }
+                String[] splitted = viewBoxStr.split(" ");
+                String xStr = splitted[0];
+                String yStr = splitted[1];
+                String widthStr = splitted[2];
+                String heightStr = splitted[3];
+                nativeWidth = Integer.parseInt(widthStr) - Integer.parseInt(xStr);
+                nativeHeight = Integer.parseInt(heightStr) - Integer.parseInt(yStr); 
+            }
+        }catch (NumberFormatException e){
+            log.error("Dimension could not be parsed ( "+e.getMessage()+ "), skipping: " + icon.nameBase);
+            failedIcons.add(icon);
+            return;
+        }
 
         int outputWidth = (int) (nativeWidth * outputScale);
         int outputHeight = (int) (nativeHeight * outputScale);