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

merged gpunonfree and nonfree module

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-03-18 16:14:37 +04:00
parent 3b065e38be
commit 0a65f2f4af
40 changed files with 300 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/gpu/surf_keypoint_matcher.cpp
View File

@@ -2,13 +2,13 @@
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_GPUNONFREE
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/core/core.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/gpu/gpu.hpp"
#include "opencv2/gpunonfree/gpunonfree.hpp"
#include "opencv2/nonfree/gpu.hpp"
using namespace std;
using namespace cv;
@@ -91,7 +91,7 @@ int main(int argc, char* argv[])
int main()
{
std::cerr << "OpenCV was built without gpunonfree module" << std::endl;
std::cerr << "OpenCV was built without nonfree module" << std::endl;
return 0;
}