Changeset 14331 in josm for trunk/src/org/openstreetmap


Ignore:
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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

    r14328 r14331  
    3434import java.util.Base64;
    3535import java.util.Collection;
     36import java.util.EnumMap;
    3637import java.util.HashMap;
    3738import java.util.HashSet;
     
    315316
    316317    /** small cache of critical images used in many parts of the application */
    317     private static final Map<OsmPrimitiveType, ImageIcon> osmPrimitiveTypeCache = new HashMap<>();
     318    private static final Map<OsmPrimitiveType, ImageIcon> osmPrimitiveTypeCache = new EnumMap<>(OsmPrimitiveType.class);
    318319
    319320    /** larger cache of critical padded image icons used in many parts of the application */
     
    16341635        }
    16351636
    1636         if (realWidth == 0 || realHeight == 0) {
     1637        int roundedWidth = Math.round(realWidth);
     1638        int roundedHeight = Math.round(realHeight);
     1639        if (roundedWidth <= 0 || roundedHeight <= 0) {
     1640            Logging.error("createImageFromSvg: {0} {1} realWidth={2} realHeight={3}",
     1641                    svg.getXMLBase(), dim, Float.toString(realWidth), Float.toString(realHeight));
    16371642            return null;
    16381643        }
    1639         BufferedImage img = new BufferedImage(Math.round(realWidth), Math.round(realHeight), BufferedImage.TYPE_INT_ARGB);
     1644        BufferedImage img = new BufferedImage(roundedWidth, roundedHeight, BufferedImage.TYPE_INT_ARGB);
    16401645        Graphics2D g = img.createGraphics();
    16411646        g.setClip(0, 0, img.getWidth(), img.getHeight());
Note: See TracChangeset for help on using the changeset viewer.