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

4
samples/gpu/performance/CMakeLists.txt
View File

@@ -10,8 +10,8 @@ endif()
add_executable(${the_target} ${sources} ${headers})
target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_GPU_SAMPLES_REQUIRED_DEPS})
if(HAVE_opencv_gpunonfree)
target_link_libraries(${the_target} opencv_gpunonfree opencv_nonfree)
if(HAVE_opencv_nonfree)
target_link_libraries(${the_target} opencv_nonfree)
endif()
set_target_properties(${the_target} PROPERTIES

6
samples/gpu/performance/tests.cpp
View File

@@ -8,8 +8,8 @@
#include "performance.h"
#include "opencv2/opencv_modules.hpp"
#ifdef HAVE_OPENCV_GPUNONFREE
#include "opencv2/gpunonfree/gpunonfree.hpp"
#ifdef HAVE_OPENCV_NONFREE
#include "opencv2/nonfree/gpu.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#endif
@@ -271,7 +271,7 @@ TEST(meanShift)
}
}
#ifdef HAVE_OPENCV_GPUNONFREE
#ifdef HAVE_OPENCV_NONFREE
TEST(SURF)
{