Andrey Kamaev
|
28aefc4f5a
|
Merge pull request #817 from pengx17:2.4_ocl_bitwise_cleanup
|
2013-04-17 15:45:38 +04:00 |
|
Vladislav Vinogradov
|
54e7c76d99
|
fixed compilation errors
|
2013-04-17 15:24:53 +04:00 |
|
Roman Donchenko
|
bd6f80faf3
|
Redo the Sphinx check to do the same thing on all platforms.
This also fixes the bug where the Sphinx version gets detected as
"Sphinx vX.Y.Z" instead of "X.Y.Z" on Unix-like systems.
|
2013-04-17 12:33:11 +04:00 |
|
Andrey Kamaev
|
8fdab9f631
|
Merge branch '2.4'
|
2013-04-17 12:07:17 +04:00 |
|
tim36272
|
5ef3ef9c4a
|
Clarified floodfill documentation
Clarified what value floodfill sets pixels in the mask to when FOODFILL_MASK_ONLY is set.
|
2013-04-17 00:34:20 -07:00 |
|
Andrey Kamaev
|
f6848b66d6
|
Merge pull request #826 from pengx17:2.4_canny_clampfix
|
2013-04-17 11:09:49 +04:00 |
|
Andrey Kamaev
|
bf551df4cf
|
Merge pull request #825 from pengx17:2.4_query_cpu_wavesize
|
2013-04-17 11:09:37 +04:00 |
|
Andrey Kamaev
|
974f1f4895
|
Merge pull request #824 from taka-no-me:reduce_c_api_deps
|
2013-04-17 11:09:16 +04:00 |
|
Andrey Kamaev
|
5eff4f8340
|
Merge pull request #822 from taka-no-me:better_cv_enum
|
2013-04-17 11:08:58 +04:00 |
|
Andrey Pavlenko
|
8c40f0ccf2
|
fixing build and lint warnings
|
2013-04-16 15:30:43 +04:00 |
|
Andrey Kamaev
|
8f32902ce6
|
Minimize usages of legacy C API inside the library
|
2013-04-16 12:00:02 +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
|
c02095ae1c
|
Merge pull request #821 from taka-no-me:contributing
|
2013-04-16 10:16:14 +04:00 |
|
Andrey Kamaev
|
4223a59497
|
Merge pull request #809 from taka-no-me:drop_python1
|
2013-04-16 10:15:51 +04:00 |
|
Kevin Hughes
|
b141762070
|
added an example of using cv::VideoCapture to read image sequences like 000.pmg, 001.png ... 100.png etc.
|
2013-04-15 13:21:20 -04:00 |
|
Andrey Kamaev
|
96b008cd29
|
Eliminate the need of ::testsing::ValuesIn() for CV_ENUM
Also cv::, cv::gpu:: and cv::ocl:: namespace prefixes can be safely omitted
inside CV_ENUM and CV_FLAGS
|
2013-04-15 19:39:49 +04:00 |
|
Andrey Kamaev
|
ecf28cc21e
|
Add contributing page for Github
|
2013-04-15 16:57:58 +04:00 |
|
yao
|
69a0b5dde5
|
Add OclCascadeClassifierBuf interface
|
2013-04-15 17:24:30 +08:00 |
|
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 |
|