* Fix loading issue with opencv_xfeatures2d (issue bytedeco/javacv…

…#316)
bytedeco · Feb 1, 2016 · b7e4121 · b7e4121
1 parent 7b23eff
commit b7e4121
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,5 @@
 
+ * Fix loading issue with `opencv_xfeatures2d` ([issue bytedeco/javacv#316](https://github.com/bytedeco/javacv/issues/316))
  * Virtualize all `Solver` classes from Caffe ([issue #143](https://github.com/bytedeco/javacpp-presets/issues/143))
  * Work around GSL not loading on Android ([issue bytedeco/javacpp#55](https://github.com/bytedeco/javacpp/issues/55))
  * Fix Android builds of FFmpeg, FFTW, GSL, Leptonica, and Tesseract causing errors under Mac OS X ([issue #45](https://github.com/bytedeco/javacpp-presets/issues/45))

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java b/opencv/src/main/java/org/bytedeco/javacpp/opencv_xfeatures2d.java
@@ -14,6 +14,9 @@
 import static org.bytedeco.javacpp.opencv_flann.*;
 import static org.bytedeco.javacpp.opencv_ml.*;
 import static org.bytedeco.javacpp.opencv_features2d.*;
+import static org.bytedeco.javacpp.opencv_calib3d.*;
+import static org.bytedeco.javacpp.opencv_video.*;
+import static org.bytedeco.javacpp.opencv_shape.*;
 
 public class opencv_xfeatures2d extends org.bytedeco.javacpp.presets.opencv_xfeatures2d {
     static { Loader.load(); }

diff --git a/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_xfeatures2d.java b/opencv/src/main/java/org/bytedeco/javacpp/presets/opencv_xfeatures2d.java
@@ -32,7 +32,7 @@
  *
  * @author Jarek Sacha
  */
-@Properties(inherit = opencv_features2d.class, value = {
+@Properties(inherit = {opencv_calib3d.class, opencv_features2d.class, opencv_shape.class}, value = {
     @Platform(include = {"<opencv2/xfeatures2d.hpp>", "<opencv2/xfeatures2d/nonfree.hpp>"}, link = "opencv_xfeatures2d@.3.1"),
     @Platform(value = "windows", link = "opencv_xfeatures2d310")},
         target = "org.bytedeco.javacpp.opencv_xfeatures2d")