Contrib module is added to java wrappers; fixed algorithm initialisation for python bindings

2012-07-05 07:58:40 +00:00
parent b1eba01afb
commit 620d122fc2
5 changed files with 52 additions and 6 deletions
--- a/modules/java/generator/src/cpp/jni_part.cpp
+++ b/modules/java/generator/src/cpp/jni_part.cpp
@@ -18,6 +18,10 @@
 #  include "opencv2/ml/ml.hpp"
 #endif

+#ifdef HAVE_OPENCV_CONTRIB
+#  include "opencv2/contrib/contrib.hpp"
+#endif
+
 extern "C" {

 JNIEXPORT jint JNICALL
@@ -40,6 +44,9 @@ JNI_OnLoad(JavaVM* vm, void* )
 #ifdef HAVE_OPENCV_ML
    init &= cv::initModule_ml();
 #endif
+    #ifdef HAVE_OPENCV_CONTRIB
+    init &= cv::initModule_contrib();
+#endif

    if(!init)
        return -1;