Vladislav Vinogradov
|
54e7c76d99
|
fixed compilation errors
|
2013-04-17 15:24:53 +04:00 |
|
Andrey Kamaev
|
8fdab9f631
|
Merge branch '2.4'
|
2013-04-17 12:07:17 +04:00 |
|
Andrey Kamaev
|
f6848b66d6
|
Merge pull request #826 from pengx17:2.4_canny_clampfix
|
2013-04-17 11:09:49 +04:00 |
|
peng xiao
|
0f7d7100e5
|
Add clamping for y dimension.
|
2013-04-16 15:49:15 +08:00 |
|
peng xiao
|
6f63a5d8d5
|
Let wave_size=1 on CPU.
|
2013-04-16 14:41:30 +08:00 |
|
Andrey Kamaev
|
f7641be434
|
Merge pull request #812 from bitwangyaoyao:master_uhp
|
2013-04-15 12:12:46 +04:00 |
|
Andrey Kamaev
|
6168bf0062
|
Merge pull request #813 from bitwangyaoyao:master_fix
|
2013-04-13 16:34:07 +04:00 |
|
Andrey Kamaev
|
a54a307386
|
Merge pull request #810 from pengx17:master_fix_ocl_tmflag
|
2013-04-13 16:33:53 +04:00 |
|
yao
|
2f781a53a9
|
Fix arithm's substract mismatch caused by incomplete merge
|
2013-04-13 15:57:12 +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 |
|
Peng Xiao
|
6dd6013546
|
Use a faster way to count 1's (used by Hamming)
|
2013-04-13 14:34:30 +08:00 |
|
Peng Xiao
|
6b6b1c9cbf
|
Allow more query/train types for ocl::bfmatcher
|
2013-04-13 14:08:58 +08:00 |
|
Peng Xiao
|
1db20099a9
|
Enable runtime type definition in kernels
|
2013-04-13 12:50:17 +08:00 |
|
Peng Xiao
|
fd1528795e
|
Pass query type T into kernel
|
2013-04-13 11:39:13 +08:00 |
|
Peng Xiao
|
63813e83ae
|
Untabify
|
2013-04-13 11:22:22 +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
|
36028bd8ad
|
Merge pull request #808 from bitwangyaoyao:2.4_mac
|
2013-04-12 14:59:45 +04:00 |
|
Andrey Kamaev
|
8406312571
|
Remove C API from OpenCL module
|
2013-04-12 14:37:02 +04:00 |
|
Vadim Pisarevsky
|
03e2a52e2c
|
Merge pull request #807 from pengx17:2.4_ocl_bfm_opt
|
2013-04-12 13:46:55 +04:00 |
|
Vadim Pisarevsky
|
c019d06de3
|
Merge pull request #805 from pengx17:master_canny_fix
|
2013-04-12 13:46:07 +04:00 |
|
Vadim Pisarevsky
|
5a2c5227f4
|
Merge pull request #798 from pengx17:master_ocl_mleak
|
2013-04-12 13:45:44 +04:00 |
|
Vadim Pisarevsky
|
a770d04e78
|
Merge pull request #781 from bitwangyaoyao:2.4_fixerr
|
2013-04-12 13:44:59 +04:00 |
|
yao
|
719e8674ad
|
fix the compile errors on Mac
|
2013-04-12 17:38:59 +08:00 |
|
peng xiao
|
2338a895f5
|
Capitalize macro namings.
|
2013-04-12 16:56:49 +08:00 |
|
peng xiao
|
c9d8eb7a84
|
Fix build error on linux.
|
2013-04-12 16:52:21 +08:00 |
|
peng xiao
|
6eefd276cf
|
Further optimize bfmatcher by passing macros.
|
2013-04-12 16:51:36 +08:00 |
|
peng xiao
|
113b7584e0
|
Optimize bfmatcher by passing macros.
|
2013-04-12 16:50:30 +08:00 |
|
peng xiao
|
1e49c00f4b
|
Replace create with ensureSizeIsEnough thus buffer objects can be reused.
|
2013-04-12 16:47:44 +08:00 |
|
peng xiao
|
4f328d8388
|
Fix a potential bug of ocl::CannyBuf.
The program would crash if release is called twice.
|
2013-04-12 15:43:33 +08:00 |
|
peng xiao
|
7586145235
|
Remove unused kernels.
|
2013-04-12 14:32:13 +08:00 |
|
peng xiao
|
33361929fe
|
Fix a compilation error when HAVE_CLAMDFFT is on.
|
2013-04-12 11:36:17 +08: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
|
a2f4b301f3
|
Fix an incorrect type cast.
|
2013-04-11 16:59:32 +08:00 |
|
Andrey Kamaev
|
9ba25e9d09
|
Merge pull request #742 from bitwangyaoyao:2.4_fix
|
2013-04-11 11:33:45 +04:00 |
|
Andrey Kamaev
|
c98c246fc2
|
Move border type constants and Moments class to core module
|
2013-04-10 19:14:24 +04:00 |
|
peng xiao
|
3fea2620e6
|
Fix some compilation errors and warnings.
|
2013-04-08 16:22:20 +08: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 |
|
yao
|
7726e273a9
|
merge add and sub into one set of kernels
|
2013-04-06 13:37:36 +08:00 |
|
Andrey Kamaev
|
67073daf19
|
Merge branch '2.4'
|
2013-04-05 21:11:59 +04:00 |
|
yao
|
bee970ab94
|
remove the C3 kernels in arithm, as the oclMat will never store 3 channels data
|
2013-04-05 21:29:29 +08:00 |
|
Andrey Kamaev
|
72e49dc790
|
Merge pull request #777 from taka-no-me:ocl_win_hang
|
2013-04-05 13:00:03 +04:00 |
|
Andrey Kamaev
|
a2d27429e4
|
Merge pull request #775 from bitwangyaoyao:2.4_fixerr
|
2013-04-05 12:59:45 +04:00 |
|
Andrey Kamaev
|
3400d83778
|
Workaround hanging of ocl module when ocl API in not really used
|
2013-04-05 11:01:28 +04:00 |
|
yao
|
5022bc8c25
|
move the "cpu device checking" from supportsFeatures() to queryDeviceInfo()
|
2013-04-05 09:17:14 +08:00 |
|
yao
|
bcc086baa9
|
fix all redefine build errors on some Intel OCL
|
2013-04-05 08:15:05 +08:00 |
|
Andrey Kamaev
|
d4bb421ce2
|
Fix findEssentialMat function
Also remove all usages of std::complex from OpenCV modules
|
2013-04-03 17:25:00 +04:00 |
|
peng xiao
|
917138f565
|
Fix compilation errors.
|
2013-04-03 17:36:05 +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 |
|