abidrahmank
2dd3bf116e
ANDed waitkey result with 0xFF for x64 systems
2013-05-27 10:30:30 +05:30
abidrahmank
ca09ba6852
Bug #2960 : docs about CV_BGR2GRAY
2013-05-25 01:50:41 +05:30
abidrahmank
98960bf201
A new python sample on grabcut
2013-05-25 00:55:31 +05:30
yao
fad96b95ad
add results verification to facedetect and hog samples
2013-05-24 15:52:33 +08:00
yao
c58e0d5d73
fix hog
2013-05-24 13:46:21 +08:00
Roman Donchenko
56121d01ea
Merge pull request #911 from jrdi:patch-1
2013-05-23 15:17:55 +04:00
Roman Donchenko
cfa985db43
Merge pull request #917 from SpecLad:cuda-4-build
2013-05-23 15:15:00 +04:00
yao
036b0579f1
remove the images in ocl sample folder
2013-05-23 18:12:09 +08:00
yao
33a3a19207
add two samples
2013-05-23 18:10:38 +08:00
Roman Donchenko
dad58d8940
Fix a build error which manifests when building with CUDA < 5.
2013-05-23 14:00:13 +04:00
yao
d45f9ef866
fix Linux build errors
2013-05-23 17:58:50 +08:00
Roman Donchenko
4da0cdb959
Merge pull request #914 from SpecLad:master
2013-05-23 13:54:57 +04:00
yao
a223b5624f
fix pyrLK's mismatch on Intel GPUs
2013-05-23 10:55:08 +08:00
Roman Donchenko
324cafdda6
Merge pull request #904 from ograycode:2.4
2013-05-22 18:46:40 +04:00
Roman Donchenko
5e0e1fac87
Merge commit 'b51a1a7d' (PR #895 from 2.4)
...
Conflicts:
modules/ocl/CMakeLists.txt
modules/ocl/perf/perf_color.cpp
modules/ocl/perf/perf_match_template.cpp
modules/ocl/perf/precomp.cpp
modules/ocl/perf/precomp.hpp
2013-05-22 18:28:28 +04:00
Jan Machacek
46b770f255
Fixed include name in OpenCL on OS X
2013-05-22 13:22:16 +01:00
Jordi Villar
ee29b0454c
fix parenthesis
2013-05-22 13:57:43 +03:00
Andrey Pavlenko
61567adc5d
Merge pull request #797 from vhdirk:installheaders
2013-05-22 13:54:20 +04:00
Roman Donchenko
7efb24917f
Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex
2013-05-22 12:57:04 +04:00
Roman Donchenko
519ee72f6f
Merge pull request #905 from bitwangyaoyao:2.4_TVL1
2013-05-22 12:08:16 +04:00
Roman Donchenko
b5c013682b
Merge pull request #907 from SpecLad:master
2013-05-22 12:03:28 +04:00
peng xiao
b4a4a05bdc
Add ocl's good features to track implementation.
...
Additional notes with this commit:
1. Add cornerHarris_dxdy and cornerMinEigenVal_dxdy to get
the interim dx and dy output of Sobel operator;
2. Add minMax_buf to allow user to reuse buffers in minMax;
3. Fix an error when either min or max pointer fed into minMax is NULL;
4. Corner sorter temporarily uses C++ STL's quick sort. A parallel
selection sort in OpneCL is contained in the implementation but disabled
due to poor performance at the moment.
5. Accuracy test for ocl gfft.
2013-05-22 13:46:42 +08:00
Roman Donchenko
029fce10c9
Merge remote-tracking branch 'origin/2.4'
...
Conflicts:
3rdparty/libjasper/CMakeLists.txt
cmake/OpenCVDetectOpenCL.cmake
modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
modules/imgproc/src/floodfill.cpp
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/arithm.cpp
modules/ocl/src/haar.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/ocl/src/matrix_operations.cpp
modules/ocl/src/mcwutil.cpp
modules/ocl/src/opencl/arithm_bitwise_and_mask.cl
modules/ocl/src/opencl/arithm_bitwise_and_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_mask.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_or.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar.cl
modules/ocl/src/opencl/arithm_bitwise_or_scalar_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor.cl
modules/ocl/src/opencl/arithm_bitwise_xor_mask.cl
modules/ocl/src/opencl/arithm_bitwise_xor_scalar.cl
modules/ocl/src/stereobm.cpp
modules/ocl/test/precomp.hpp
modules/python/src2/api
modules/ts/src/ts_func.cpp
samples/gpu/bgfg_segm.cpp
2013-05-21 17:19:23 +04:00
Andrey Pavlenko
d4255b7f75
Merge pull request #902 from apavlenko:fix_run_py
2013-05-21 14:07:32 +04:00
alex77git
445860d619
(typo)
2013-05-20 13:19:36 +02:00
alex77git
c8abaea368
(tab to space) 2x
2013-05-20 12:06:25 +02:00
Vadim Pisarevsky
cbbc82a789
Merge pull request #882 from pengx17:2.4_rewrite_query_info
2013-05-20 14:01:03 +04:00
Vadim Pisarevsky
b51a1a7d15
Merge pull request #895 from bitwangyaoyao:2.4_perf
2013-05-20 14:00:47 +04:00
Leszek Swirski
7542d66dbd
Fix drawing documentation referring to C API macros
2013-05-20 10:56:06 +01:00
Roman Donchenko
389be67605
Merge pull request #853 from icylord:2.4
2013-05-20 12:11:47 +04:00
yao
d8b192c84d
Fix the mismatch on NV GPUs
2013-05-20 14:46:17 +08:00
ograycode
97e9368e75
Simple set of the camera index to allow the user to change it after the object has been initialized.
2013-05-19 22:04:56 -04:00
alex77git
bc59428b3a
Bug #2966 , insert CV_Assert(size.width>0 && size.height>0); in imshow()
2013-05-20 02:28:40 +02:00
alex77git
6e7b1ef252
Bug #2967 , void DescriptorMatcher::radiusMatch() // description unclear,
...
only file: common_interfaces_of_descriptor_matchers.rst
2013-05-20 02:26:58 +02:00
alex77git
44a2b109b7
Bug #2967 , basic_structures.rst, fix 2 typos
2013-05-20 02:24:09 +02:00
Andrey Pavlenko
4af104aaae
'aapt' tool moved in SDK r22, adding support to run.py
2013-05-19 14:57:21 +04:00
ericgreveson
e7995b4d5d
Take account of multi-channel matrices when comparing histograms
...
Ensure that all channels are considered when comparing multi-channel histograms
2013-05-18 23:31:22 +02:00
Vadim Pisarevsky
aee6a617a6
Merge pull request #897 from bitwangyaoyao:2.4_TVL1
2013-05-19 00:23:24 +04:00
Vadim Pisarevsky
416eaf2ae1
Merge pull request #896 from jet47:removed-vibe-master
2013-05-17 14:44:49 +04:00
yao
04399a27d0
fix a warning
2013-05-17 15:44:22 +08:00
yao
4162ebfad3
add OpticalFlowDual_TVL1_OCL function
2013-05-17 15:34:22 +08:00
Vladislav Vinogradov
49a4f27d42
removed VIBE implementation
2013-05-17 11:27:00 +04:00
yao
03c55db4fb
fix the waring in gemm test
2013-05-17 13:19:09 +08:00
yao
5f20fce6fd
add accuracy tests while running perf
2013-05-17 13:18:46 +08:00
Andrey Pavlenko
528db00095
Merge pull request #892 from jet47:removed-vibe
2013-05-16 18:44:07 +04:00
Vladislav Vinogradov
ec52096e30
removed VIBE implementation
2013-05-16 13:47:24 +04:00
Leszek Swirski
0e8c2b0395
Fix visibility of g_linked_ptr_mutex on Windows
...
Reverts some changes in b8ed00bd64
2013-05-15 14:42:28 +01:00
Vadim Pisarevsky
7d9041460a
Merge pull request #885 from pengx17:2.4_bfmatcher_ocl
2013-05-15 14:21:50 +04:00
Vadim Pisarevsky
4d866ea32e
Merge pull request #884 from pengx17:2.4_pyrup_fix
2013-05-15 14:18:54 +04:00
Dominik Rose
66c9029fd5
libdc1394 - removed validation for msvc compiler in CMakeLists.txt
2013-05-15 12:15:16 +02:00