improve setup opencv

developmentseed · Nov 20, 2022 · 1e4e491 · 1e4e491
1 parent 3c31d2c
commit 1e4e491
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@ This functionality allows you to merge several geometries into one, the geometri
 
 ## Requirements
 
-- Java JDK 11.
+- Java JDK 11+.
 - JOSM 18193 or higher.
 
 ## Extra options

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -9,7 +9,7 @@ plugins {
 }
 
 group = "org.openstreetmap.josm.plugins.devseed.JosmMagicWand"
-version = "1.0-SNAPSHOT"
+version = "1.1"
 
 java {
     toolchain {

diff --git a/src/org/openstreetmap/josm/plugins/devseed/JosmMagicWand/MainJosmMagicWandPlugin.java b/src/org/openstreetmap/josm/plugins/devseed/JosmMagicWand/MainJosmMagicWandPlugin.java
@@ -12,7 +12,7 @@
 import org.openstreetmap.josm.gui.MapFrame;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.opencv.core.Core;
+import org.openstreetmap.josm.tools.Logging;
 
 import javax.swing.*;
 
@@ -31,8 +31,18 @@ public static LatLon eastNorth2latlon(EastNorth p) {
 
     public MainJosmMagicWandPlugin(PluginInformation info) {
         super(info);
-        nu.pattern.OpenCV.loadShared();
-        System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
+        try {
+            System.out.println(Double.parseDouble(System.getProperty("java.specification.version")));
+            if (Double.parseDouble(System.getProperty("java.specification.version")) >= 12) {
+                nu.pattern.OpenCV.loadLocally();
+            } else {
+                nu.pattern.OpenCV.loadShared();
+            }
+        } catch (Exception e) {
+            Logging.error(e.getMessage());
+            throw new RuntimeException(e);
+        }
+
         JMenu jToolmenu = MainApplication.getMenu().toolsMenu;
         jToolmenu.addSeparator();
         MainMenu.add(jToolmenu, new MergeSelectAction());