Changeset 19605 in josm

Timestamp:

2026-07-25T19:30:24+02:00 (14 hours ago)

Author:

stoecker

Message:

update JSVG to 2.1.0

Location:

trunk

Files:

• ivy.xml (modified) (1 diff)
• pom.xml (modified) (1 diff)
• src/org/openstreetmap/josm/actions/ShowStatusReportAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (3 diffs)

trunk/ivy.xml

@@ -32 +32 @@
         <dependency conf="api->default" org="com.adobe.xmp" name="xmpcore" rev="6.1.11"/>
         <dependency conf="api->default" org="com.drewnoakes" name="metadata-extractor" rev="2.19.0" transitive="false"/>
-        <dependency conf="api->default" org="com.github.weisj" name="jsvg" rev="1.7.0"/>
+        <dependency conf="api->default" org="com.github.weisj" name="jsvg" rev="2.1.0"/>
         <dependency conf="api->default" org="org.jetbrains" name="annotations" rev="24.1.0"/>
         <dependency conf="api->default" org="ch.poole" name="OpeningHoursParser" rev="0.29.0"/>

trunk/pom.xml

@@ -126 +126 @@
       <groupId>com.github.weisj</groupId>
       <artifactId>jsvg</artifactId>
+      <version>2.1.0</version>
       <scope>compile</scope>
     </dependency>

trunk/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java

@@ -173 +173 @@
                     "metadata-extractor2",
                     "signpost-core", "liboauth-signpost-java",
-                    "svgsalamander"
+                    "jsvg"
             }) {
                 String details = PlatformHookUnixoid.getPackageDetails(p);

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

@@ -7 +7 @@
 import java.awt.Cursor;
 import java.awt.Dimension;
+import java.awt.geom.Dimension2D;
 import java.awt.Graphics2D;
 import java.awt.GraphicsEnvironment;
@@ -79 +80 @@
 
 import com.github.weisj.jsvg.SVGDocument;
-import com.github.weisj.jsvg.geometry.size.FloatSize;
 import com.github.weisj.jsvg.parser.DocumentLimits;
 import com.github.weisj.jsvg.parser.LoaderContext;
@@ -1470 +1470 @@
             Logging.trace("createImageFromSvg: {0}", dim);
         }
-        FloatSize size = svg.size();
-        final float sourceWidth = size.width;
-        final float sourceHeight = size.height;
+        Dimension2D size = svg.size();
+        final double sourceWidth = size.getWidth();
+        final double sourceHeight = size.getHeight();
         if (sourceWidth <= 0 || sourceHeight <= 0) {
             Logging.error("createImageFromSvg: {0} sourceWidth={1} sourceHeight={2}", dim, sourceWidth, sourceHeight);