Commit Graph

944 Commits

Author SHA1 Message Date
yao
568b935246 remove a warning on Linux
fix a error in doc
2013-02-05 17:16:40 +08:00
Andrey Kamaev
c527340cb6 Merge branch 2.4 2013-02-04 17:15:55 +04:00
yao
9711ef6dee blend use vector to optimize 2013-02-04 17:29:20 +08:00
Andrey Kamaev
650609aaeb Merge pull request #429 from bitwangyaoyao:2.4_setdevEx 2013-02-04 12:03:24 +04:00
yao
a639a1ae5c add setDeviceEx interface
simplify the logic of save binary
2013-02-04 15:06:36 +08:00
yao
3c5cb4931e simplify the kernel logic when using rect kernel or without ROI 2013-02-04 13:33:27 +08:00
Andy Maloney
bc68dfb4e8 Remove unused vars 2013-02-01 18:09:58 -05: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
78a338159d Merge branch '2.4' 2013-01-29 14:17:13 +04:00
Andy Maloney
5bd56e7464 Fix mem leak and mismatched new/delete 2013-01-28 17:57:19 -05:00
Andrey Kamaev
d3aef0d378 Fix OpenCL build warnings 2013-01-25 18:41:06 +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
Andrey Kamaev
ed949bc211 Merge pull request #324 from bitwangyaoyao:2.4_cvtcolor 2013-01-25 00:53:42 +04:00
Andrey Kamaev
20de2f35f9 Merge pull request #325 from bitwangyaoyao:2.4_fixcanny 2013-01-25 00:46:35 +04:00
Andrey Kamaev
f9ed0037b3 Merge pull request #327 from bitwangyaoyao:2.4_vs2012 2013-01-25 00:46:20 +04:00
Andrey Kamaev
d5b15d6523 Fix ocl build warnings 2013-01-24 17:08:30 +04:00
yao
2aae501234 make ocl module compile on VS2012 2013-01-24 15:45:29 +08:00
yao
d574e6dc09 fix canny crash in bug #2279 2013-01-24 14:58:41 +08:00
yao
4f778436b5 ocl::cvtColor support YUV and YCbCr formats 2013-01-24 14:33:28 +08:00
Andrey Kamaev
311d799344 Merge pull request #299 from branch 'bitwangyaoyao_ocl' into 2.4 2013-01-23 14:50:29 +04:00
yao
e05112a364 some host side optimizations to ocl::GaussianBlur 2013-01-23 14:48:04 +04:00
yao
9060365f5e use format on filtering.cpp 2013-01-23 14:48:04 +04:00
yao
56c1a7fab6 make oclHaarDetectObjects running on more ocl platforms 2013-01-23 14:48:04 +04:00
yao
b5bd2cde9e A few optimizations to ocl::pyrLK::sparse, make it running on more OCL platforms 2013-01-23 14:48:04 +04:00
yao
f6d82773f9 fix bug #2674 2013-01-23 14:48:04 +04:00
Andrey Kamaev
f3f55b30b0 Merge pull request #267 from pclove1:ocl_hough 2013-01-19 12:02:14 +04:00
Andrey Kamaev
dc0788c864 Merge branch 2.4 2013-01-17 18:39:20 +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
Alexander Smorkalov
8cb0343f4c Documentation build warning fixes.
Invalid links and refences fixed.
SpaeseMat class documentation updated.
2013-01-14 17:58:27 +04:00
Andrey Kamaev
084b1c7969 Merge branch 2.4 2013-01-11 15:45:23 +04:00
Suenghoon Park
4f965296fc modified performance test for ocl::HoughCircles 2012-12-28 16:32:10 -05:00
Suenghoon Park
0afa9cede5 removed personal info from the license header 2012-12-28 10:08:28 -05:00
Suenghoon Park
8a1d6a1bb2 added documentation for ocl::HoughCircles 2012-12-26 17:40:26 -05:00
Suenghoon Park
b1faa46d3a added performance test 2012-12-26 16:49:58 -05:00
Andrey Kamaev
b401c6a0c3 Fix discrepancies between function signatures in headers and documentation 2012-12-26 18:24:50 +04:00
Suenghoon Park
78202100df added unit test for HoughCircles 2012-12-24 22:53:27 -05: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
0656f13107 removed useless comments in buildPointList_gpu() 2012-12-13 02:43:13 -05:00
Suenghoon Park
3a04cfedab added HoughCircles in ocl.hpp 2012-12-13 02:35:31 -05:00
Suenghoon Park
ad86b80375 finished buildPointList 2012-12-13 02:33:21 -05:00
NikoKJ
95869a6081 fix the compilation bug of main.cpp in perf test and accuracy test on ocl module. It caused by the incompatibility of command line parser class in core.hpp between master branch and 2.4 branch. 2012-11-07 13:49:09 +08:00
marina.kolpakova
334f6344dd Merge pull request #120 from NikoKJ:ocl2.4.3 2012-11-01 19:16:22 +04:00
Vadim Pisarevsky
849a8c8d20 fixed many errors in warnings in rst docs; added ocl module description (by Niko Li) 2012-10-31 15:15:51 +04:00
NikoKJ
2045c85ad5 a minor bug fix for brute force 2012-10-31 16:01:56 +08: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
Andrey Kamaev
63397e825c Cleanup CMakeLists.txt of ocl module 2012-10-25 14:55:37 +04:00
Andrey Kamaev
ecb707ca7b Convert cl2cpp.py script to cmake
New version removes inner comments and empty lines
2012-10-22 17:19:55 +04:00
Andrey Kamaev
769f61f8c7 Merge pull request #55 from vpisarev/ocl_fixes 2012-10-22 16:40:18 +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
Andrey Kamaev
461b69f6ee Eliminate discrepancies between signatures in documentation and OpenCV headers
All errors were found by doc/check_docs2.py
2012-10-17 21:24:55 +04:00
OpenCV Buildbot
04384a71e4 Normalize line endings and whitespace 2012-10-17 15:32:23 +04:00
vpisarev
f75946a16a made opencv_ocl module build with VS2012 2012-10-17 15:08:03 +04:00
KOLANICH
c1f2b1fcc4 replaced python build script with WSH one for windows platforms 2012-10-12 23:03:30 +04: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
bitwangyaoyao
09359982b1 some optimizations to ocl::pyrDown, PyrLK and Canny 2012-09-24 20:28:35 +08:00
niko
0abe7f3196 many bugs fix for intel's HD4000
from my svn 855
2012-09-21 16:51:45 +08:00
yao
2e36338636 remove warnings of some functions in ocl module 2012-09-20 09:23:11 +08:00
yao
d38359620e some optimizations to ocl::blend 2012-09-19 10:52:25 +08:00
yao
310bd8701c a little optimizations to ocl::pyrDown 2012-09-18 17:57:37 +08:00
yao
78e89890b0 add PyrLK to ocl module 2012-09-17 09:48:34 +08:00
yao
9efd7019ad A more reasonable verify method for ocl::HOG accuracy test 2012-09-14 17:07:29 +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
7d83db7d4d fix ocl::columnsum bug 2012-09-10 14:52:28 +08:00
yao
1b6639aa3d A little optimization on ocl/pyrdown, ocl/canny 2012-09-06 14:39:20 +08:00
yao
8f8a69d6f5 fix bug of ocl::canny 2012-09-04 08:51:08 +08:00
niko
11b403900e add channel 3 for test/main.cpp
add remap
2012-09-03 18:07:31 +08:00
yao
c8bfc0fd89 A little fix to ocl accuracy tests, make them more uniformed 2012-09-03 17:23:13 +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
niko
e7f4dd1a2e temp build fix because the new core.hpp impact on this project 2012-08-20 10:06:41 +08:00
niko
2e685dcf0a performance & bug fix for resize erode dilate sobel remap 2012-08-17 15:47:02 +08:00
bitwangyaoyao
fa78459c56 fix ocl/match_template compiling error on Linux 2012-08-11 13:10:43 +08:00
yao
fa5113f303 add Canny to ocl module 2012-08-10 11:59:47 +08:00
niko
37ca6d378b add performance test code for ocl module 2012-08-08 17:09:29 +08:00
yao
64e9cf5d75 add SURF and HOG to ocl module 2012-08-08 15:55:39 +08:00
Andrey Kamaev
8aa2d6cddc Fix several documentation build warnings 2012-08-07 18:00:09 +04: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
7d97e8112a fix bugs in tests, set device for each test case
Signed-off-by: yao <bitwangyaoyao@gmail.com>
2012-08-06 15:51:27 +08:00
yao
0db69fbe19 Add blend, columnsum, pyrUp/down, matchTemplate for ocl module 2012-08-06 15:00:27 +08:00
yao
687d7639a8 Merge branch 'master' of git://code.opencv.org/opencv 2012-08-03 15:44:15 +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
yao
1eedcea58d for test
Signed-off-by: yao <bitwangyaoyao@gmail.com>
2012-08-02 11:34:11 +08:00
niko
cf04fed369 fix the compilation bugs 2012-07-30 14:34: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
Vadim Pisarevsky
462d4a1dae opencl module is not ready for trunk yet 2011-07-07 16:40:44 +00:00
salmanulhaq
1e691daab4 ocl folder contains the gpu implementations 2011-07-07 16:35:20 +00:00
salmanulhaq
fe86d25694 renamed gpu to ocl 2011-07-07 16:21:20 +00:00
salmanulhaq
e22ad8050b OclMat implementation 2011-07-07 16:20:43 +00:00
salmanulhaq
64de562db2 Update OclMat to match GpuMat. Include ref counting, opearators, Scalar initialization. Tested for Intel OCL SDK. 2011-07-07 16:06:26 +00:00