generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed problem with SURF loading in Python tests

Browse Source
This commit is contained in:
Alexander Shishkov 2012-04-09 11:45:36 +00:00
parent a68d0278ba
commit b79dfaf078
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/nonfree/include/opencv2/nonfree/nonfree.hpp
View File

@ -48,7 +48,7 @@
namespace cv
{
CV_EXPORTS bool initModule_nonfree(void);
CV_EXPORTS_W bool initModule_nonfree();
}

1
modules/python/CMakeLists.txt
View File

@ -31,6 +31,7 @@ set(opencv_hdrs
"${OPENCV_MODULE_opencv_ml_LOCATION}/include/opencv2/ml/ml.hpp"
"${OPENCV_MODULE_opencv_features2d_LOCATION}/include/opencv2/features2d/features2d.hpp"
"${OPENCV_MODULE_opencv_nonfree_LOCATION}/include/opencv2/nonfree/features2d.hpp"
"${OPENCV_MODULE_opencv_nonfree_LOCATION}/include/opencv2/nonfree/nonfree.hpp"
"${OPENCV_MODULE_opencv_calib3d_LOCATION}/include/opencv2/calib3d/calib3d.hpp"
"${OPENCV_MODULE_opencv_objdetect_LOCATION}/include/opencv2/objdetect/objdetect.hpp")

8
modules/python/src2/cv2.cpp
View File

@ -18,9 +18,15 @@
#include "opencv2/video/tracking.hpp"
#include "opencv2/video/background_segm.hpp"
#include "opencv2/photo/photo.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree/nonfree.hpp"
static bool makeUseOfNonfree = cv::initModule_nonfree();
#endif
using cv::flann::IndexParams;
using cv::flann::SearchParams;