Update opencv-stitching samples to latest release version of OpenCV

bytedeco · Sep 9, 2020 · 95a656b · 95a656b
1 parent 8a0c77a
commit 95a656b
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 17 deletions.
diff --git a/opencv-stitching-jlink/pom.xml b/opencv-stitching-jlink/pom.xml
@@ -1,8 +1,8 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.bytedeco.javacpp-presets.opencv</groupId>
+    <groupId>org.bytedeco</groupId>
     <artifactId>opencv-stitching-jlink</artifactId>
-    <version>1.5.4-SNAPSHOT</version>
+    <version>1.5.4</version>
     <properties>
         <outputModule>org.bytedeco.samples.stitching</outputModule>
         <exec.mainClass>org.bytedeco.samples.Stitching</exec.mainClass>
@@ -13,7 +13,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv-platform</artifactId>
-            <version>4.3.0-1.5.4-SNAPSHOT</version>
+            <version>4.4.0-1.5.4</version>
         </dependency>
     </dependencies>
 
@@ -38,7 +38,7 @@
             <plugin>
                 <groupId>org.bytedeco</groupId>
                 <artifactId>javacpp</artifactId>
-                <version>1.5.4-SNAPSHOT</version>
+                <version>1.5.4</version>
                 <executions>
                     <execution>
                         <id>javacpp-validate</id>

diff --git a/opencv-stitching-native/pom.xml b/opencv-stitching-native/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.bytedeco</groupId>
     <artifactId>opencv-stitching-native</artifactId>
-    <version>1.5.4-SNAPSHOT</version>
+    <version>1.5.4</version>
     <properties>
         <graalvm.version>20.1.0</graalvm.version>
         <exec.mainClass>org.bytedeco.samples.Stitching</exec.mainClass>
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv-platform</artifactId>
-            <version>4.3.0-1.5.4-SNAPSHOT</version>
+            <version>4.4.0-1.5.4</version>
         </dependency>
     </dependencies>
 

diff --git a/opencv-stitching/README.md b/opencv-stitching/README.md
@@ -3,7 +3,7 @@ Sample project for using OpenCV from a generated Java binding made with [Bytedec
 On the command line, run:
 
 ```bash
-$ mvn clean install exec:java -Dexec.mainClass=Stitching \
+$ mvn clean compile exec:java -Dexec.mainClass=Stitching \
     -Dexec.args="panorama_image1.jpg panorama_image2.jpg \
     --output panorama_stitched.jpg --try_use_gpu yes"
 ```

diff --git a/opencv-stitching/pom.xml b/opencv-stitching/pom.xml
@@ -1,16 +1,16 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.bytedeco.javacpp-presets.opencv</groupId>
+  <groupId>org.bytedeco</groupId>
   <artifactId>opencv-stitching</artifactId>
-  <version>1.4</version>
+  <version>1.5.4</version>
   <properties>
     <exec.mainClass>Stitching</exec.mainClass>
   </properties>
   <dependencies>
     <dependency>
-      <groupId>org.bytedeco.javacpp-presets</groupId>
+      <groupId>org.bytedeco</groupId>
       <artifactId>opencv-platform</artifactId>
-      <version>3.4.0-1.4</version>
+      <version>4.4.0-1.5.4</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/opencv-stitching/src/main/java/Stitching.java b/opencv-stitching/src/main/java/Stitching.java
@@ -40,11 +40,12 @@
 //
 //M*/
 
-import static org.bytedeco.javacpp.opencv_core.Mat;
-import static org.bytedeco.javacpp.opencv_core.MatVector;
-import static org.bytedeco.javacpp.opencv_imgcodecs.imread;
-import static org.bytedeco.javacpp.opencv_imgcodecs.imwrite;
-import static org.bytedeco.javacpp.opencv_stitching.Stitcher;
+import org.bytedeco.opencv.opencv_core.Mat;
+import org.bytedeco.opencv.opencv_core.MatVector;
+import org.bytedeco.opencv.opencv_stitching.Stitcher;
+import static org.bytedeco.opencv.global.opencv_imgcodecs.imread;
+import static org.bytedeco.opencv.global.opencv_imgcodecs.imwrite;
+import static org.bytedeco.opencv.global.opencv_stitching.createStitcher;
 
 public class Stitching {
     static boolean try_use_gpu = false;
@@ -58,7 +59,7 @@ public static void main(String[] args) {
         }
 
         Mat pano = new Mat();
-        Stitcher stitcher = Stitcher.createDefault(try_use_gpu);
+        Stitcher stitcher = createStitcher(try_use_gpu);
         int status = stitcher.stitch(imgs, pano);
 
         if (status != Stitcher.OK) {