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

Merge branch '2.4'

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-21 20:59:18 +04:00
parent bbae05413d b6365699ee
commit 1ca8f33b4e
276 changed files with 11834 additions and 5170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/ocl/CMakeLists.txt
View File

@@ -17,10 +17,6 @@ if(BUILD_EXAMPLES AND OCV_DEPENDENCIES_FOUND)
ocv_include_directories(${OPENCL_INCLUDE_DIR})
endif()
if(CMAKE_COMPILER_IS_GNUCXX AND NOT ENABLE_NOISY_WARNINGS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function")
endif()
# ---------------------------------------------
# Define executable targets
# ---------------------------------------------

BIN
samples/ocl/aloe-L.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 720 KiB

BIN
samples/ocl/aloe-R.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 722 KiB

BIN
samples/ocl/aloe-disp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

1
samples/ocl/performance.cpp
View File

@@ -16,6 +16,7 @@
#define USE_OPENCL
#ifdef USE_OPENCL
#include "opencv2/ocl.hpp"
#include "opencv2/nonfree/ocl.hpp"
#endif
#define TAB " "

1
samples/ocl/surf_matcher.cpp
View File

@@ -50,6 +50,7 @@
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/ocl/ocl.hpp"
#include "opencv2/nonfree/nonfree.hpp"
#include "opencv2/nonfree/ocl.hpp"
#include "opencv2/calib3d/calib3d.hpp"
using namespace std;