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

Timestamp:

2016-08-12T03:16:58+02:00 (10 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/Tspan.java (modified) (3 diffs)

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

@@ -231 +231 @@
         {
             font = new FontSystem(fontFamily, fontStyle, fontWeight, (int)fontSize);
-//            addShapeSysFont(addShape, font, fontFamily, fontSize, letterSpacing, cursor);
-//            return;
-        }
-
-        FontFace fontFace = font.getFontFace();
-        int ascent = fontFace.getAscent();
-        float fontScale = fontSize / (float) ascent;
+        }
 
         AffineTransform xform = new AffineTransform();
-
-        strokeWidthScalar = 1f / fontScale;
 
         float cursorX = (float)cursor.getX();
         float cursorY = (float)cursor.getY();
     
-//        int i = 0;
-
         String drawText = this.text;
         drawText = drawText.trim();
@@ -267 +257 @@
                 cursorY += dy[i];
             }
-  //          i++;
             
             xform.setToIdentity();
             xform.setToTranslation(cursorX, cursorY);
-            xform.scale(fontScale, fontScale);
             if (rotate != null)
             {
@@ -287 +275 @@
             }
 
-            cursorX += fontScale * glyph.getHorizAdvX() + letterSpacing;
+            cursorX += glyph.getHorizAdvX() + letterSpacing;
         }