Fixed dependency from opencv_nonfree in Java bindings

2012-04-18 12:58:42 +00:00
parent f6bddd23af
commit 78ee81c409
3 changed files with 31 additions and 17 deletions
--- a/modules/java/src/cpp/jni_part.cpp
+++ b/modules/java/src/cpp/jni_part.cpp
@@ -21,4 +21,16 @@ JNI_OnUnload(JavaVM *vm, void *reserved)
  //do nothing
 }

-} // extern "C"
+} // extern "C"
+
+#include "opencv2/opencv_modules.hpp"
+
+#if HAVE_OPENCV_MODULES_NONFREE
+#include "opencv2/nonfree/nonfree.hpp"
+static bool makeUseOfNonfree = initModule_nonfree();
+#endif
+
+#if HAVE_OPENCV_MODULES_FEATURES2D
+#include "opencv2/features2d/features2d.hpp"
+static bool makeUseOfNonfree = initModule_features2d();
+#endif