Andrey Kamaev
6846f881a2
Move OpenCL SURF to nonfree module
2013-03-21 17:59:35 +04:00
Andrey Kamaev
91ac9688a8
Allow OpenCL acceleration in every OpenCV module
2013-03-21 17:57:01 +04:00
Andrey Kamaev
d28df08eb0
Refactor OpenCL search
2013-03-21 17:56:59 +04:00
Andrey Kamaev
00d8ad9e7e
Merge pull request #632 from pengx17:2.4
2013-03-15 10:34:43 +04:00
Andrey Kamaev
18ca645fd2
Merge pull request #631 from bitwangyaoyao:2.4_stereo
2013-03-15 10:34:27 +04:00
Andrey Kamaev
ecf770d49d
Merge pull request #638 from bitwangyaoyao:2.4_fixErode
2013-03-14 11:41:02 +04:00
Andrey Kamaev
5f3eb0fc49
Merge pull request #628 from bitwangyaoyao:2.4_fixMoments
2013-03-14 11:40:47 +04:00
yao
084385cf38
Fix a bug in ocl::Erode/Dilate, simplify the host logic
2013-03-12 16:45:43 +08:00
peng xiao
3a565e001e
Remove unnecessary HAVE_OPENCL macro block.
2013-03-12 09:10:15 +08:00
yao
f8985bb7fc
fix warnings on Linux
2013-03-12 08:55:50 +08:00
peng xiao
34998b6034
Add ocl::SURF accurate test.
...
The test cases are ported from gpu module (masked version is still
missing).
Key point direction definition is synchronized with cv::SURF.
nonfree module dependency is added into ocl module's cmake file.
2013-03-11 18:35:30 +08:00
yao
3f81a152b9
remove the OpenCL define
2013-03-11 17:21:31 +08:00
yao
0f0a4c3099
add stereoBM function
2013-03-11 17:10:58 +08:00
yao
7f0d6d42f0
fix mismatch on NV OCL and some AMD GPUs
2013-03-08 10:30:01 +08:00
yao
65bb4250a4
Fix a bug in addWeighted x64 mode
...
And a potential problem in remap
2013-03-01 18:08:53 +08:00
Vadim Pisarevsky
a910360689
Merge pull request #586 from bitwangyaoyao:2.4_FixBFMatcher
2013-03-01 10:55:11 +04:00
yao
82b9854837
fix compile warnings
2013-03-01 08:47:20 +08:00
Andrey Kamaev
fba0e6fc5c
Merge pull request #587 from bitwangyaoyao:2.4_fixHog
2013-02-28 18:06:28 +04:00
Andrey Kamaev
4811988caf
Merge pull request #585 from bitwangyaoyao:2.4_SURF
2013-02-28 18:06:14 +04:00
Andrey Kamaev
d0e340bc80
Merge pull request #582 from bitwangyaoyao:2.4_fixBlend
2013-02-28 15:43:51 +04:00
yao
f12369a53c
Fix ocl::HOG crash on Intel OCL
2013-02-28 16:56:39 +08:00
yao
f791344810
linux warning fix
2013-02-28 14:37:37 +08:00
yao
504008dbe0
Fix ocl::bruteforcematcher crash on Intel OCL
2013-02-28 14:31:08 +08:00
yao
7c1f1d8837
fix bug #2787
2013-02-28 14:05:36 +08:00
yao
69eebdd608
fix the blend crash in some cases
2013-02-28 09:03:10 +08:00
Andrey Kamaev
0a8711d76b
Merge pull request #576 from bitwangyaoyao:2.4_customMat2
2013-02-27 19:33:54 +04:00
Andrey Kamaev
af13c8604d
Merge pull request #568 from bitwangyaoyao:2.4_moments
2013-02-27 19:33:26 +04:00
yao
cbff75db9e
fix build errors
2013-02-27 21:56:03 +08:00
yao
9ccf27c7f5
add interfaces enable custom oclMat device memory type
2013-02-27 17:32:32 +08:00
Andrey Kamaev
b836e3c65b
Merge pull request #556 from bitwangyaoyao:2.4_SURF
2013-02-27 11:37:04 +04:00
Andrey Kamaev
f03c04c151
Merge pull request #554 from bitwangyaoyao:2.4_impvInterFrame
2013-02-27 11:36:40 +04:00
Andrey Kamaev
c54c7c8b2c
Merge pull request #553 from bitwangyaoyao:2.4_perfTest
2013-02-27 11:36:23 +04:00
yao
dba2ec0539
remove the compile warnings
2013-02-27 14:53:27 +08:00
yao
6df23428af
Add moments function
2013-02-27 13:45:16 +08:00
yao
9ec5333a9b
pyrlk also take advantages of cl_image support detection
2013-02-27 10:45:07 +08:00
yao
da47ccec9c
Put the cl_image support detection in utils
2013-02-27 10:24:03 +08:00
Andrey Kamaev
dcf7a69430
Merge pull request #555 from bitwangyaoyao:2.4_fixFft
2013-02-26 18:31:17 +04:00
yao
04faaa9e35
Fix ocl::dft the compile warning on Linux
2013-02-26 21:18:51 +08:00
yao
3ff5689fe5
Merge branch '2.4_fixFft' of https://github.com/bitwangyaoyao/opencv into 2.4
2013-02-26 20:30:42 +08:00
yao
ea433cc496
remove the device specific logic
2013-02-26 17:53:08 +08:00
yao
62f8b0fc48
Fix ocl::dft error when program end on Linux
2013-02-26 17:44:19 +08:00
yao
0ac7f0d374
Simplify the bind texture logic of interpolate frame function
2013-02-26 17:12:03 +08:00
yao
e3a715882e
fix the mismatch of perf_test, add a performance sample for ocl module
2013-02-26 16:52:30 +08:00
Andrey Kamaev
6082f351ab
Merge pull request #541 from bitwangyaoyao:2.4_fixCvtColor
2013-02-25 14:04:02 +04:00
Andrey Kamaev
b6cdc849db
Merge pull request #540 from hgaspar:244
2013-02-25 14:03:36 +04:00
yao
59ebf4ed9f
Fix the ocl::cvtColor mismatch on some devices
2013-02-25 15:19:39 +08:00
hgaspar
60981565fa
updated the ocl module introduction
2013-02-24 22:34:44 -05:00
Andrey Kamaev
cfd019e2a2
Merge pull request #537 from bitwangyaoyao:2.4_fixWarpAffine
2013-02-24 15:26:42 +04:00
Andrey Kamaev
7047c23489
Merge pull request #535 from bitwangyaoyao:2.4_clean
2013-02-24 15:26:24 +04:00
yao
f1a5c1328c
remove the empty implementation when HAVE_OPENCL not defined
2013-02-23 20:50:03 +08:00
yao
b7ebedc23e
fix mismatch of WarpAffine
2013-02-23 17:43:10 +08:00
yao
9bbf170054
some cleanup
2013-02-23 15:34:43 +08:00
yao
720eaf1e1a
fix the haar kernel problems on Nvidia and Intel OCL
2013-02-23 15:19:46 +08:00
yao
d050159f07
Remove the perf running from ocl::matchTemplate accuracy tests
2013-02-23 14:30:04 +08:00
Andrey Kamaev
051aa4cb98
Merge pull request #530 from bitwangyaoyao:2.4_fixEqHist
2013-02-22 16:40:06 +04:00
Andrey Kamaev
58f546dd93
Merge pull request #529 from bitwangyaoyao:2.4_fixGemm
2013-02-22 16:39:50 +04:00
Andrey Kamaev
3406832aa2
Merge pull request #528 from bitwangyaoyao:2.4_fixPyrLK
2013-02-22 16:35:30 +04:00
Andrey Kamaev
b1975fb13d
Merge pull request #527 from bitwangyaoyao:2.4_fixMeanShift
2013-02-22 16:35:18 +04:00
yao
1a488c0542
fix the warning on Linux when OpenCL 1.2 not supported
2013-02-22 18:33:16 +08:00
yao
7810254198
Fix ocl::equalizeHist mismatch
2013-02-22 15:48:31 +08:00
yao
3316d0bfb2
Fix the compiling errors of gemm on Linux
2013-02-22 15:05:49 +08:00
yao
2e3f4fdada
fix pyrLK's mismatch on Linux
2013-02-22 11:23:43 +08:00
yao
f4ef0c1598
fix meanShift mismatch on none-double GPUs
2013-02-22 10:13:20 +08: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
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
Andy Maloney
2075236757
If generating a bin file (second half of conditional), make sure the file is closed
...
(Also fix spelling in comment)
2013-02-10 21:55:20 -05:00
Andrey Kamaev
3ed6c09485
Merge pull request #428 from bitwangyaoyao:2.4_erode_dilate
2013-02-08 18:48:37 +04:00
Andrey Kamaev
4f4fe553bc
Merge pull request #450 from bitwangyaoyao:2.4_dft
2013-02-08 18:43:34 +04:00
yao
0b365f6aa5
add +-*/ operators to oclMat
2013-02-08 11:41:46 +08:00
yao
4d6827212d
some bugs fix in using AmdFft library
2013-02-08 10:46:43 +08:00
Andrey Kamaev
7cdede0c55
Merge pull request #438 from bitwangyaoyao:2.4_fixwarings
2013-02-06 14:04:28 +04:00
yao
e31e924cf7
remove the warnings in accuracy test
2013-02-06 09:12:40 +08:00
Andrey Kamaev
fe0516c877
Merge pull request #432 from bitwangyaoyao:2.4_blend
2013-02-05 14:53:49 +04:00
yao
568b935246
remove a warning on Linux
...
fix a error in doc
2013-02-05 17:16:40 +08: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
f489eb9a5d
Fix build warnings in OpenCL samples
2013-01-30 17:25:03 +04:00
Andy Maloney
5bd56e7464
Fix mem leak and mismatched new/delete
2013-01-28 17:57:19 -05: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
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
b401c6a0c3
Fix discrepancies between function signatures in headers and documentation
2012-12-26 18:24:50 +04:00