* Fix loading issue with opencv_face (issue bytedeco/javacv#470)

bytedeco · Jul 29, 2016 · dbbb313 · dbbb313
1 parent f7d4abf
commit dbbb313
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix loading issue with `opencv_face` ([issue bytedeco/javacv#470](https://github.com/bytedeco/javacv/issues/470)
  * Fix presets for CUDA 7.5 on the `linux-ppc64le` platform
  * Upgrade presets for TensorFlow 0.9.0
  * Set default options in `tensorflow/cppbuild.sh` to prevent console reads during build

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_face.java
@@ -8,6 +8,11 @@
 
 import static org.bytedeco.javacpp.opencv_core.*;
 import static org.bytedeco.javacpp.opencv_imgproc.*;
+import static org.bytedeco.javacpp.opencv_imgcodecs.*;
+import static org.bytedeco.javacpp.opencv_videoio.*;
+import static org.bytedeco.javacpp.opencv_highgui.*;
+import static org.bytedeco.javacpp.opencv_ml.*;
+import static org.bytedeco.javacpp.opencv_objdetect.*;
 
 public class opencv_face extends org.bytedeco.javacpp.presets.opencv_face {
     static { Loader.load(); }

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_face.java b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_face.java
@@ -31,7 +31,7 @@
  *
  * @author Samuel Audet
  */
-@Properties(inherit = opencv_imgproc.class, value = {
+@Properties(inherit = opencv_objdetect.class, value = {
     @Platform(include = {"<opencv2/face/predict_collector.hpp>", "<opencv2/face.hpp>", "<opencv2/face/facerec.hpp>"}, link = "opencv_face@.3.1"),
     @Platform(value = "windows", link = "opencv_face310")},
         target = "org.bytedeco.javacpp.opencv_face")