* Fix loading issue with opencv_cudaobjdetect and `opencv_cudaoptf…

…low` on Windows (issue #592)
bytedeco · Jul 28, 2018 · 1211840 · 1211840
1 parent d8f1a0b
commit 1211840
Show file tree

Hide file tree

Showing 41 changed files with 42 additions and 38 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,6 @@
 
+ * Fix loading issue with `opencv_cudaobjdetect` and `opencv_cudaoptflow` on Windows ([issue #592](https://github.com/bytedeco/javacpp-presets/issues/592))
+
 ### July 17, 2018 version 1.4.2
  * Fix FFmpeg build of libvpx with Linux on ARM ([issue #586](https://github.com/bytedeco/javacpp-presets/issues/586))
  * Enable MediaCodec acceleration for FFmpeg on Android ([pull #589](https://github.com/bytedeco/javacpp-presets/pull/589))

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_aruco.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_aruco.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_bgsegm.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_bgsegm.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_bioinspired.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_bioinspired.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_calib3d.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_core.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaarithm.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaarithm.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudafilters.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudafilters.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaimgproc.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaimgproc.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaobjdetect.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaobjdetect.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaoptflow.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudaoptflow.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudawarping.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_cudawarping.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_dnn.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_dnn.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_features2d.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_flann.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_highgui.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_img_hash.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_img_hash.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgcodecs.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_imgproc.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_ml.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_objdetect.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_optflow.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_phase_unwrapping.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_phase_unwrapping.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_photo.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_plot.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_plot.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_saliency.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_saliency.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_shape.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_stitching.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_structured_light.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_structured_light.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_superres.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_text.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_text.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_tracking.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_tracking.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_video.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videoio.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_videostab.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_ximgproc.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_ximgproc.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_xphoto.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_xphoto.java
@@ -1,4 +1,4 @@
-// Targeted by JavaCPP version 1.4.2: DO NOT EDIT THIS FILE
+// Targeted by JavaCPP version 1.4.3-SNAPSHOT: DO NOT EDIT THIS FILE
 
 package org.bytedeco.javacpp;
 

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaobjdetect.java b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaobjdetect.java
@@ -47,6 +47,7 @@
         @Platform(
             value = "windows",
             link = "opencv_cudaobjdetect342",
+            preload = "opencv_cudalegacy342",
             extension = "-gpu"
         )
     },

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaoptflow.java b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_cudaoptflow.java
@@ -46,6 +46,7 @@
         @Platform(
             value = "windows",
             link = "opencv_cudaoptflow342",
+            preload = "opencv_cudalegacy342",
             extension = "-gpu"
         )
     },