Changeset 33958 in osm for applications/editors

Timestamp:

2017-12-21T16:43:46+01:00 (7 years ago)

Author:

donvip

Message:

fix #josm15683 - fix initialization of JAI/JAI-EXT (patch by george-hopkins)

File:

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

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

@@ -12 +12 @@
 import javax.media.jai.OperationRegistry;
 
+import org.geotools.image.ImageWorker;
 import org.geotools.referencing.CRS;
 import org.opengis.referencing.FactoryException;
@@ -41 +42 @@
         // See https://www.java.net/node/666373
         System.setProperty("com.sun.media.jai.disableMediaLib", "true");
+
+        // As JAI-Ext will replace the operation registry, it needs to be loaded before we modify it later on
+        if (ImageWorker.isJaiExtEnabled()) {
+            Logging.debug("geotools: load JAI-Ext operations");
+        }
 
         // As the JAI jars are bundled in the geotools plugin, JAI initialization does not work,