Commit Graph

227 Commits

Author SHA1 Message Date
Vadim Pisarevsky
fd83f2f5ca Merge pull request #819 from bitwangyaoyao:2.4_haarBuf 2013-05-13 22:36:10 +04:00
peng xiao
e5ea018185 Let surf.ocl use the new queryDeviceInfo interface. 2013-05-09 17:19:51 +08:00
peng xiao
bfa0f02303 Rewrite queryDeviceInfo interface.
Previously the function may cause some unsafe issue. It is fixed now by introducing a template parameter.
2013-05-09 17:15:26 +08:00
peng xiao
355bc691fc Add OpenCL version 1.2 query into ocl::Context::supportsFeature().
Add backwards portability for OpenCL 1.1 when OpenCV executables
are compiled with OpenCL 1.2 profile support.
2013-05-02 14:44:59 +08:00
peng xiao
bb4b410512 Add ocl::PlatformName to ocl::Info. 2013-04-25 15:00:50 +08:00
Peng Xiao
7b08d5ec69 Add OpenCL stereo CSBP implementation 2013-04-20 00:34:37 +08:00
Andrey Kamaev
8fdab9f631 Merge branch '2.4' 2013-04-17 12:07:17 +04:00
yao
69a0b5dde5 Add OclCascadeClassifierBuf interface 2013-04-15 17:24:30 +08:00
yao
40d0e0eda0 use host data when DEVICE_MEM_UHP is set (the risk of vary align size is owned by users) 2013-04-13 14:58:49 +08:00
Andrey Kamaev
3b364330ad Merge branch '2.4' 2013-04-12 15:35:38 +04:00
Andrey Kamaev
b0933dd473 Merge pull request #803 from taka-no-me:split_c_cpp3 2013-04-12 15:01:48 +04:00
Andrey Kamaev
8406312571 Remove C API from OpenCL module 2013-04-12 14:37:02 +04:00
peng xiao
aec7a67d0f Fix a bug of ocl::Canny when src/dst using the same buffer. 2013-04-12 11:10:47 +08:00
peng xiao
242955ce22 Format ocl::Canny header 2013-04-12 11:01:56 +08:00
Andrey Kamaev
9ba25e9d09 Merge pull request #742 from bitwangyaoyao:2.4_fix 2013-04-11 11:33:45 +04:00
Andrey Kamaev
913e6833d5 Merge pull request #785 from taka-no-me:split_c_cpp2 2013-04-09 08:53:50 +04:00
Andrey Kamaev
288a0634c2 Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
peng xiao
77501f3ed0 ocl: Add dft based convolve implementation.
Match template in ocl module now can be utilized with dft based
convolve. Note this feature needs OpenCV to be built with clAmdFft
library.
2013-04-08 15:19:44 +08:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
yao
5022bc8c25 move the "cpu device checking" from supportsFeatures() to queryDeviceInfo() 2013-04-05 09:17:14 +08:00
peng xiao
7758322fd3 Fix some build errors. 2013-04-03 16:42:44 +08:00
peng xiao
ecea583afd Add ocl::stereobp function.
OpenCL StereoBeliefPropagation, ported from GPU implementation.
2013-04-03 15:57:26 +08:00
yao
fd4a6f0af0 make the sparse method give correct results on CPU ocl
Add CL_CPU to supportsFeature check
simplify the logic of pyrlk
2013-04-03 13:23:04 +08:00
yao
f3254b28f2 use clflush replaces clfinish 2013-04-02 14:41:02 +08:00
Andrey Kamaev
f77a375354 Merge branch '2.4' 2013-03-29 19:38:35 +04:00
Andrey Kamaev
49f6dad13f Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
peng xiao
0c19a07bf4 Add a function to query ocl device info
Currently the function only supports wavefront size query
2013-03-26 15:36:49 +08:00
Andrey Kamaev
be7bbe3aa9 Drop cv:: prefix from cv::String used inside the cv namespace 2013-03-22 22:14:50 +04:00
Andrey Kamaev
2ad7b97f1c All modules (except ocl and gpu) compiles and pass tests 2013-03-22 22:14:26 +04:00
Andrey Kamaev
1ca8f33b4e Merge branch '2.4' 2013-03-21 23:11:54 +04:00
Andrey Kamaev
4bd721ad3b Fix build errors 2013-03-21 18:37:34 +04:00
Andrey Kamaev
7b8ad4cb04 Refactor OpenCL initialization and allow to use ocl module witout explicit setup 2013-03-21 18:18:15 +04:00
Andrey Kamaev
6846f881a2 Move OpenCL SURF to nonfree module 2013-03-21 17:59:35 +04:00
Andrey Kamaev
a42a0f5fca Added compatibility headers 2013-03-13 17:26:56 +04:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
2013-03-13 17:26:56 +04:00
yao
0f0a4c3099 add stereoBM function 2013-03-11 17:10:58 +08:00
Andrey Kamaev
891d7da6ee Merge branch '2.4' 2013-02-28 11:17:06 +04:00
Andrey Kamaev
0a8711d76b Merge pull request #576 from bitwangyaoyao:2.4_customMat2 2013-02-27 19:33:54 +04:00
yao
9ccf27c7f5 add interfaces enable custom oclMat device memory type 2013-02-27 17:32:32 +08:00
yao
6df23428af Add moments function 2013-02-27 13:45:16 +08:00
Andrey Kamaev
2a6fb2867e Remove all using directives for STL namespace and members
Made all STL usages explicit to be able automatically find all usages of
particular class or function.
2013-02-25 15:04:17 +04:00
Andrey Kamaev
0b8a6da817 Merge branch '2.4' 2013-02-22 17:33:30 +04:00
Andrey Kamaev
c17e9ef7ba Repair binary compatibility of ocl module 2013-02-22 01:58:01 +04:00
yao
429ae44ae3 add openCLExecuteKernelInterop method 2013-02-20 17:46:43 +08:00
Andrey Kamaev
637397f621 Merge branch '2.4' 2013-02-20 12:31:16 +04:00
Andrey Kamaev
c6f6f9ab35 Merge pull request #451 from bitwangyaoyao:2.4_operator 2013-02-18 18:04:44 +04:00
yao
9613135e8d fix compiling errors on Linux
more operators use oclMatExpr
2013-02-16 18:41:43 +08:00
yao
69fd2d8273 add oclMatExpr class to prevent extra allocations 2013-02-16 11:05:23 +08:00
yao
0b365f6aa5 add +-*/ operators to oclMat 2013-02-08 11:41:46 +08:00
Andrey Kamaev
c527340cb6 Merge branch 2.4 2013-02-04 17:15:55 +04:00
yao
a639a1ae5c add setDeviceEx interface
simplify the logic of save binary
2013-02-04 15:06:36 +08:00
Andrey Kamaev
57d3152cd0 Merge branch '2.4' 2013-01-31 14:35:27 +04:00
Andrey Kamaev
f489eb9a5d Fix build warnings in OpenCL samples 2013-01-30 17:25:03 +04:00
Andrey Kamaev
f4e27bcbbc Merge branch '2.4' 2013-01-25 16:30:36 +04:00
Andrey Kamaev
9509dfd1de Fix OpenCL build warnings 2013-01-25 16:19:59 +04:00
yao
f6d82773f9 fix bug #2674 2013-01-23 14:48:04 +04:00
Suenghoon Park
06da75ffe0 Merge branch 'master' of git://github.com/Itseez/opencv into ocl_hough 2013-01-15 12:21:25 -05:00
Andrey Kamaev
b401c6a0c3 Fix discrepancies between function signatures in headers and documentation 2012-12-26 18:24:50 +04:00
Suenghoon Park
e1c6564d5e fixed a typo in ocl.hpp 2012-12-24 18:41:51 -05:00
Suenghoon Park
13c44dd318 finished ocl::HoughCircles 2012-12-14 03:25:46 -05:00
Suenghoon Park
3a04cfedab added HoughCircles in ocl.hpp 2012-12-13 02:35:31 -05:00
NikoKJ
9ccdd17376 eliminate all the warnings on win32 and win64
add a new function abssum
fix the bug of test and perf because someone remove non-free module from cmakelist.txt
2012-10-30 13:01:42 +04:00
Niko
5df77a841e remove redundant OPENCL_DIR flag
remove as much warnings as possible
use enum instead of MACRO for ocl.hpp
add command line parser in accuracy test and perf test
some bug fix for arthim functions
2012-10-22 15:14:22 +08:00
niko
97156897b2 format files to ANSI C style with coolformat
change the download channels to oclchannles()
fix bugs of arithm functions
perf fix of bilateral
bug fix of split test case
add build_warps functions
2012-10-11 16:22:47 +08:00
niko
0abe7f3196 many bugs fix for intel's HD4000
from my svn 855
2012-09-21 16:51:45 +08:00
yao
78e89890b0 add PyrLK to ocl module 2012-09-17 09:48:34 +08:00
yao
656f06fa74 add bruteForceMatcher to ocl module 2012-09-12 11:40:13 +08:00
niko
23244a3565 rename all the perf test files
fix the channel 3 bug in matrix operation
perf and buf fix for LUT haardetect convertC3C4 resize warpaffine copytom settom
add convovle
remove stereo
2012-09-12 10:31:09 +08:00
yao
0fdb55a54d update some of the functions in ocl module to the latest version 2012-09-03 17:03:37 +08:00
niko
6f6e990988 use mutex provided by opencv itself
add getoclcontext and getoclcommandqueue so that other opencl program can interactive with opencv ocl module
correct haar test cases
add face detection sample
2012-08-31 14:08:52 +08:00
niko
b929012583 performance fix of convertC3C4
add OCL 1.2 feature for setTo
bug fix of integral
replace the error code -217 with suitable MACRO
simplify tests, no need apply a new context for each test case
add more control for tests in utility.hpp
2012-08-30 16:14:35 +08:00
yao
fa5113f303 add Canny to ocl module 2012-08-10 11:59:47 +08:00
yao
64e9cf5d75 add SURF and HOG to ocl module 2012-08-08 15:55:39 +08:00
yao
c03ac12fcd Add dft and gemm to ocl module, using AMD's clAmdFft and clAmdBlas libraries 2012-08-07 16:33:46 +08:00
yao
0db69fbe19 Add blend, columnsum, pyrUp/down, matchTemplate for ocl module 2012-08-06 15:00:27 +08:00
niko
8eeacc8cc8 performance and bug fix for addWeighted cartToPolar div exp log resize setTo
add channel 3 support
add fast way Between CPU and GPU for the data which is aligned
2012-08-03 14:08:36 +08:00
Vadim Pisarevsky
9f4efab40a merged ocl module from ocl branch (it's not quite usable yet; at least on Mac) 2012-07-16 17:08:14 +00:00