Changeset 14331 in josm

Timestamp:

2018-10-14T17:02:51+02:00 (6 years ago)

Author:

Don-vip

Message:

see #14319, see #16838 - fix regressions introduced in svgSalamander 1.1.2

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

Location:

trunk/src

Files:

• com/kitfox/svg/Tspan.java (modified) (1 diff)
• com/kitfox/svg/util/FontSystem.java (modified) (4 diffs)
• com/kitfox/svg/xml/XMLParseUtil.java (modified) (2 diffs)
• org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

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

@@ -234 +234 @@
         }
 
+        if (font == null)
+        {
+            font = FontSystem.createFont("Serif", fontStyle, fontWeight, fontStyle);
+        }
+
         AffineTransform xform = new AffineTransform();
 

trunk/src/com/kitfox/svg/util/FontSystem.java

@@ -48 +48 @@
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Locale;
 
 /**
@@ -58 +59 @@
     FontMetrics fm;
 
-    HashMap<String, Glyph> glyphCache = new HashMap<String, Glyph>();
+    HashMap<String, Glyph> glyphCache = new HashMap<>();
     
-    static HashSet<String> sysFontNames = new HashSet<String>();
+    static HashSet<String> sysFontNames = new HashSet<>();
 
     public static boolean checkIfSystemFontExists(String fontName)
@@ -66 +67 @@
         if (sysFontNames.isEmpty())
         {
-            for (String name: GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames())
+            for (String name: GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames(Locale.ENGLISH))
             {
                 sysFontNames.add(name);
@@ -80 +81 @@
         for (String fontName: families)
         {
-            if (checkIfSystemFontExists(fontName))
+            String javaFontName = mapJavaFontName(fontName);
+            if (checkIfSystemFontExists(javaFontName))
             {
-                return new FontSystem(fontName, fontStyle, fontWeight, fontSize);
+                return new FontSystem(javaFontName, fontStyle, fontWeight, fontSize);
             }
         }
 
         return null;
+    }
+
+    private static String mapJavaFontName(String fontName) {
+        if ("serif".equals(fontName)) {
+            return java.awt.Font.SERIF;
+        } else if ("sans-serif".equals(fontName)) {
+            return java.awt.Font.SANS_SERIF;
+        } else if ("monospace".equals(fontName)) {
+            return java.awt.Font.MONOSPACED;
+        } else {
+            return fontName;
+        }
     }
 

trunk/src/com/kitfox/svg/xml/XMLParseUtil.java

@@ -56 +56 @@
     static final Matcher fpMatch = Pattern.compile("([-+]?((\\d*\\.\\d+)|(\\d+))([eE][+-]?\\d+)?)(\\%|in|cm|mm|pt|pc|px|em|ex)?").matcher("");
     static final Matcher intMatch = Pattern.compile("[-+]?\\d+").matcher("");
+    static final Matcher quoteMatch = Pattern.compile("^'|'$").matcher("");
 
     /** Creates a new instance of XMLParseUtil */
@@ -320 +321 @@
 
             String key = styles[i].substring(0, colon).trim();
-            String value = styles[i].substring(colon + 1).trim();
+            String value = quoteMatch.reset(styles[i].substring(colon + 1).trim()).replaceAll("");
 
             map.put(key, new StyleAttribute(key, value));

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -34 +34 @@
 import java.util.Base64;
 import java.util.Collection;
+import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -315 +316 @@
 
     /** small cache of critical images used in many parts of the application */
-    private static final Map<OsmPrimitiveType, ImageIcon> osmPrimitiveTypeCache = new HashMap<>();
+    private static final Map<OsmPrimitiveType, ImageIcon> osmPrimitiveTypeCache = new EnumMap<>(OsmPrimitiveType.class);
 
     /** larger cache of critical padded image icons used in many parts of the application */
@@ -1634 +1635 @@
         }
 
-        if (realWidth == 0 || realHeight == 0) {
+        int roundedWidth = Math.round(realWidth);
+        int roundedHeight = Math.round(realHeight);
+        if (roundedWidth <= 0 || roundedHeight <= 0) {
+            Logging.error("createImageFromSvg: {0} {1} realWidth={2} realHeight={3}",
+                    svg.getXMLBase(), dim, Float.toString(realWidth), Float.toString(realHeight));
             return null;
         }
-        BufferedImage img = new BufferedImage(Math.round(realWidth), Math.round(realHeight), BufferedImage.TYPE_INT_ARGB);
+        BufferedImage img = new BufferedImage(roundedWidth, roundedHeight, BufferedImage.TYPE_INT_ARGB);
         Graphics2D g = img.createGraphics();
         g.setClip(0, 0, img.getWidth(), img.getHeight());