yao
|
dec6a3b080
|
make boxfilter kernel compile on Mac GPU OCL
|
2013-04-15 16:46:25 +08:00 |
|
Andrey Kamaev
|
2ae3ab11e3
|
Merge pull request #814 from taka-no-me:gtest_r652
|
2013-04-15 12:13:16 +04:00 |
|
Andrey Kamaev
|
f7641be434
|
Merge pull request #812 from bitwangyaoyao:master_uhp
|
2013-04-15 12:12:46 +04:00 |
|
Andrey Kamaev
|
0df6dc16a5
|
Merge pull request #811 from pengx17:2.4_ocl_bfmatcher_newtype
|
2013-04-15 12:12:18 +04:00 |
|
peng xiao
|
06a4bad809
|
Merge ocl and/or/xor operators into one kernel each.
|
2013-04-15 10:36:03 +08:00 |
|
Andrey Kamaev
|
802d004bbb
|
Fix build issues
|
2013-04-13 16:53:59 +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 |
|
Andrey Kamaev
|
9deea80b83
|
Update gtest to upstream r652
It is already marked as a gtest 1.7.0
|
2013-04-13 16:29:05 +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
|
f2dc445412
|
Merge branch '2.4_ocl_bfmatcher_newtype' of https://github.com/pengx17/opencv into 2.4_ocl_bfmatcher_newtype
|
2013-04-13 14:09:21 +08:00 |
|
Peng Xiao
|
6b6b1c9cbf
|
Allow more query/train types for ocl::bfmatcher
|
2013-04-13 14:08:58 +08:00 |
|
Peng Xiao
|
d9de84091c
|
Allow more input query/train types for ocl::bfmatcher
RadiusMatch for HammingDist cannot pass yet.
|
2013-04-13 13:42:26 +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 |
|
Peng Xiao
|
6a40383aee
|
Add HammingDist test case
|
2013-04-13 11:07:26 +08:00 |
|
Andrey Kamaev
|
298ccf6487
|
Turn pyopencv_to and pyopencv_from into templates
This protects from unwanted implicit conversions between types at compile time.
|
2013-04-13 01:02:57 +04:00 |
|
Andrey Kamaev
|
8b294c6c90
|
Remove documentation for old python wrapper
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
f886651cf0
|
Drop old python samples and tests
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
b2ba8b9969
|
Drop old python interface
|
2013-04-12 19:37:40 +04:00 |
|
Andrey Kamaev
|
909d6fcf51
|
Move legacy part of opencv_contrib to separate header
|
2013-04-12 19:37:40 +04: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
|
abe2ea59ed
|
Merge pull request #802 from SpecLad:shebang
|
2013-04-12 15:00:28 +04:00 |
|
Andrey Kamaev
|
36028bd8ad
|
Merge pull request #808 from bitwangyaoyao:2.4_mac
|
2013-04-12 14:59:45 +04:00 |
|
Andrey Kamaev
|
d2de68c14c
|
Merge pull request #804 from gpsinghsandhu:staticCast
|
2013-04-12 14:59:26 +04:00 |
|
Andrey Kamaev
|
b696d49d5a
|
Merge pull request #801 from kirill-kornyakov:lkdemo-fix
|
2013-04-12 14:59:11 +04:00 |
|
Andrey Kamaev
|
8406312571
|
Remove C API from OpenCL module
|
2013-04-12 14:37:02 +04:00 |
|
Andrey Kamaev
|
4296b456e5
|
Add missed constants for reduce operation
|
2013-04-12 14:37:02 +04:00 |
|
Andrey Kamaev
|
bd59bc3e4a
|
Remove ifdef __cplusplus from nonfree headers
|
2013-04-12 14:37:02 +04:00 |
|
Andrey Kamaev
|
5e048d1fa5
|
Move C API of opencv_objdetect to separate file
Also move cv::linemod to own header
|
2013-04-12 14:37:01 +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
|
3d39087a67
|
Merge pull request #806 from bitwangyaoyao:2.4_fix
|
2013-04-12 13:46:33 +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
|
1bea9ee26c
|
Rename test case category and code clean up.
|
2013-04-12 16:54:06 +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
|
5eb551b340
|
Remove my test codes.
|
2013-04-12 16:21:52 +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 |
|
yao
|
61e041673e
|
remove the OpenCL Dir finding in CMake
|
2013-04-12 14:44:55 +08:00 |
|
peng xiao
|
7586145235
|
Remove unused kernels.
|
2013-04-12 14:32:13 +08:00 |
|