From babe4b46267d5a069e0825557d44daad4b128b96 Mon Sep 17 00:00:00 2001
From: zhangyang <zhangyang618@126.com>
Date: Thu, 10 Aug 2023 18:06:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0macos=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                            | 13 +++++++------
 src/main/java/cn/ck/CameraDetection.java           |  8 ++++++++
 src/main/java/cn/ck/ObjectDetection_1_25200_n.java |  8 ++++++++
 src/main/java/cn/ck/ObjectDetection_n_7.java       |  6 ++++++
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 73a403c..b70aaed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,6 +11,7 @@
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
+        <opencv.version>4.6.0-0</opencv.version>
     </properties>
 
     <dependencies>
@@ -20,19 +21,19 @@
         <version>1.15.1</version>
     </dependency>
 
-<!--        <dependency>
-            <groupId>com.microsoft.onnxruntime</groupId>
-            <artifactId>onnxruntime_gpu</artifactId>
-            <version>1.14.0</version>
-        </dependency>-->
-
     <dependency>
         <groupId>org.opencv</groupId>
         <artifactId>opencv</artifactId>
         <version>4.6.0</version>
         <scope>system</scope>
         <systemPath>${project.basedir}/src/main/resources/lib/opencv-460.jar</systemPath>
+
     </dependency>
+        <dependency>
+            <groupId>org.openpnp</groupId>
+            <artifactId>opencv</artifactId>
+            <version>${opencv.version}</version>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file
diff --git a/src/main/java/cn/ck/CameraDetection.java b/src/main/java/cn/ck/CameraDetection.java
index ed48fc1..addeb11 100644
--- a/src/main/java/cn/ck/CameraDetection.java
+++ b/src/main/java/cn/ck/CameraDetection.java
@@ -15,6 +15,7 @@ import org.opencv.imgproc.Imgproc;
 import org.opencv.videoio.VideoCapture;
 import org.opencv.videoio.Videoio;
 
+import java.net.URL;
 import java.nio.FloatBuffer;
 import java.util.HashMap;
 
@@ -25,6 +26,10 @@ import java.util.HashMap;
 public class CameraDetection {
 
 
+//    static {
+//        nu.pattern.OpenCV.loadShared();
+//    }
+
     public static void main(String[] args) throws OrtException {
 
         System.load(ClassLoader.getSystemResource("lib/opencv_java460.dll").getPath());
@@ -32,6 +37,9 @@ public class CameraDetection {
 
         String model_path = "src\\main\\resources\\model\\yolov7-tiny.onnx";
 
+        // mac or linux
+        // String model_path = "src/main/resources/model/yolov7-tiny.onnx";
+
         String[] labels = {
                 "person", "bicycle", "car", "motorcycle", "airplane", "bus", "train",
                 "truck", "boat", "traffic light", "fire hydrant", "stop sign", "parking meter",
diff --git a/src/main/java/cn/ck/ObjectDetection_1_25200_n.java b/src/main/java/cn/ck/ObjectDetection_1_25200_n.java
index 565164c..6e3dd30 100644
--- a/src/main/java/cn/ck/ObjectDetection_1_25200_n.java
+++ b/src/main/java/cn/ck/ObjectDetection_1_25200_n.java
@@ -33,9 +33,17 @@ public class ObjectDetection_1_25200_n {
         System.load(url.getPath());
     }
 
+
+//    static {
+//        // mac or linux
+//        nu.pattern.OpenCV.loadShared();
+//    }
+
     public static void main(String[] args) throws OrtException {
 
         String model_path = "src\\main\\resources\\model\\helmet_1_25200_n.onnx";
+        // mac or linux
+        // String model_path = "src/main/resources/model/helmet_1_25200_n.onnx";
 
         float confThreshold = 0.35F;
 
diff --git a/src/main/java/cn/ck/ObjectDetection_n_7.java b/src/main/java/cn/ck/ObjectDetection_n_7.java
index 0465672..166ba60 100644
--- a/src/main/java/cn/ck/ObjectDetection_n_7.java
+++ b/src/main/java/cn/ck/ObjectDetection_n_7.java
@@ -29,9 +29,15 @@ public class ObjectDetection_n_7 {
         System.load(url.getPath());
     }
 
+//    static {
+//        nu.pattern.OpenCV.loadShared();
+//    }
+
     public static void main(String[] args) throws OrtException {
 
         String model_path = "src\\main\\resources\\model\\helmet_n_7.onnx";
+        // mac or linux
+        //String model_path = "src/main/resources/model/helmet_n_7.onnx";
 
         // 加载ONNX模型
         OrtEnvironment environment = OrtEnvironment.getEnvironment();
-- 
Gitee