Changeset 36015 in osm for applications/editors/josm/plugins/geotools/src

Timestamp:

2022-08-23T20:06:58+02:00 (2 years ago)

Author:

taylor.smock

Message:

Fix #22303: Open drone image as background image

• Add additional files to be merged in META-INF for JAI (this fixes an issue where ShadedRelief could not be found). This is done by modifying build.xml to concat multiple files with the same path and name in different jar files together
• Add CompressorSpi and DecompressorSpi so that compressed image formats can be read. This requires us to call CompressionRegistry#registerApplicationClasspathSpis with the geotools plugin classloader.

File:

• applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java (modified) (4 diffs)

applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java

@@ -12 +12 @@
 import javax.media.jai.OperationRegistry;
 
+import it.geosolutions.imageio.compression.CompressionRegistry;
 import org.geotools.image.ImageWorker;
 import org.geotools.referencing.CRS;
@@ -38 +39 @@
     }
 
-    private void initJAI() {
+    private static void initJAI() {
         // Disable mediaLib searching that produces unwanted errors
         // See https://www.java.net/node/666373
@@ -50 +51 @@
         // As the JAI jars are bundled in the geotools plugin, JAI initialization does not work,
         // so we need to perform the tasks described here ("Initialization and automatic loading of registry objects"):
-        // https://docs.oracle.com//cd/E17802_01/products/products/java-media/jai/forDevelopers/jai-apidocs/javax/media/jai/OperationRegistry.html
+        // https://docs.oracle.com/cd/E17802_01/products/products/java-media/jai/forDevelopers/jai-apidocs/javax/media/jai/OperationRegistry.html
         OperationRegistry registry = JAI.getDefaultInstance().getOperationRegistry();
         if (registry == null) {
@@ -92 +93 @@
     }
 
-    private void initGeoTools() {
+    private static void initGeoTools() {
         // Force Axis order. Fix #8248
         // See http://docs.geotools.org/stable/userguide/library/referencing/order.html
         System.setProperty("org.geotools.referencing.forceXY", "true");
+        // Force registration of compression. Fix #22303.
+        CompressionRegistry.getDefaultInstance().registerApplicationClasspathSpis();
     }
 
-    private void checkEPSG() {
+    private static void checkEPSG() {
         try {
             CRS.decode("EPSG:4326");