Dirk Van Haerenborgh
30f7f9717f
allow for arbitraty number of sources and sinks
2013-06-13 11:16:33 +02:00
Alexander Smorkalov
83e9b0a87a
Javadoc waring fix.
2013-06-13 12:40:14 +04:00
Roman Donchenko
6faf00b8e5
Merge pull request #696 from znah:detect_method
2013-06-13 12:01:59 +04:00
Sergei Nosov
982ef83f80
Fixes bug #3071 .
...
If we have perfect matches (min_dist == 0.0), then strict comparison
fails. Making it non-strict results in treating perfect matches as
good.
2013-06-13 11:51:45 +04:00
Vladislav Vinogradov
e433145b7e
fix for Bug #3085 :
...
weights array is only allocated for (l_count+1) elements,
but then weights[l_count+1] element is accessed.
2013-06-13 10:22:56 +04:00
peng xiao
5fd724b54a
Add a function to query if global OpenCL context is initialized.
2013-06-13 10:46:12 +08:00
Dirk Van Haerenborgh
6d66d11046
gstreamer: cleaning up resources
2013-06-12 16:58:16 +02:00
Peng Xiao
d9ab22e4ed
Fix two bugs related to opencl context.
...
1. As getDevice will implicitly call setDevice, in getContext we should not need to call it again.
2. Fix an incorrect type casting.
2013-06-12 13:55:20 +08:00
Andrew Senin
8eb6decb25
Fixed Ximea cameras support
2013-06-11 21:17:31 +04:00
Roman Donchenko
98f6a4a615
Merge pull request #972 from jet47:mog2-params-bug-2168
2013-06-11 18:21:52 +04:00
Roman Donchenko
a4ecd32176
Merge pull request #980 from SpecLad:include-config
2013-06-11 18:18:14 +04:00
Roman Donchenko
572cfc99a8
Merge pull request #973 from pengx17:2.4_oclclahe
2013-06-11 18:17:57 +04:00
Roman Donchenko
1acbc7b7bd
Merge pull request #966 from berak:master
2013-06-11 18:17:07 +04:00
Vladislav Vinogradov
a3341006ee
updated documentation
2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
8461cb3f4b
refactored gpu::convolve function:
...
* converted it to Algorithm
* old API still can be used for source compatibility (marked as deprecated)
2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
26a4be89b1
switched to Input/Output Array in Fourier operations
2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
948661d722
switched to Input/Output Array in gpu::gemm
2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
8fcef225fb
switched to Input/Output Array in reductions operations
2013-06-11 17:58:05 +04:00
Vladislav Vinogradov
c52d56964c
switched to Input/Output Array in gpu::copyMakeBorder
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
539f367d0b
refactored gpu::LUT function:
...
* converted it to Algorithm, because implementation uses inner buffers and
requires preprocessing step
* new implementation splits preprocessing and transform,
what is more effecient
* old API still can be used for source compatibility (marked as deprecated)
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
0c50d0821f
switched to Input/Output Array in transpose/flip operations
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
3d8ca010b7
switched to Input/Output Array in split/merge operations
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
58c4d0eaeb
switched to Input/Output Array in cart<->polar operations
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
0a83817ace
switched to Input/Output Array in gpu::threshold
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
44ec450b53
switched to Input/Output Array in gpu::addWeighted
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
ec70282bf7
switched to Input/Output Array in min/max operations
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
f2aa6ebe15
switched to Input/Output Array in shift operations
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
d81f54db0b
switched to Input/Output Array in bitwise logical operations
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
04a1a6dd8f
switched to Input/Output Array in gpu::compare
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
b866890b27
switched to Input/Output Array in abs, sqr, sqrt, exp, log, pow
2013-06-11 17:58:04 +04:00
Vladislav Vinogradov
5ec8c51b98
switched to Input/Output Array in gpu::absdiff
2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
3ee12cbeb4
switched to Input/Output Array in gpu::divide
2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
4595e3aa3e
switched to Input/Output Array in gpu::multiply
2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
ffa25be3d2
added arithm_op function to reduce code duplication
2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
5330faf5a0
switched to Input/Output Array in gpu::subtract
2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
4ebbf69134
switched to Input/Output Array in gpu::add
2013-06-11 17:58:03 +04:00
Vladislav Vinogradov
76211709a3
refactored VideoReader (convert it to abstract interface)
...
also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)
2013-06-11 17:57:40 +04:00
Vladislav Vinogradov
e9a74c17f8
refactored VideoWriter class (convert it to abstract interface)
2013-06-11 17:57:39 +04:00
Roman Donchenko
3af21cad4c
Merge pull request #903 from aks2:2.4
2013-06-11 17:35:39 +04:00
Roman Donchenko
7a07f1a9e7
Merge pull request #899 from LeszekSwirski:fix-drawingdoc
2013-06-11 17:30:19 +04:00
Roman Donchenko
7c4e3715b3
Merge pull request #975 from SpecLad:merge-2.4
2013-06-11 17:28:26 +04:00
Peng Xiao
c8398c9fdc
Use anonymous enumerations instead of constants
2013-06-11 20:32:55 +08:00
Roman Donchenko
81c6b46fc6
Merge pull request #974 from jet47:gpu-core-refactoring
2013-06-11 12:05:56 +04:00
Roman Donchenko
a75fbb0031
Merge pull request #968 from asmorkalov:android_na_cproj_fix
2013-06-11 11:59:32 +04:00
Roman Donchenko
3bfc69740b
Merge remote-tracking branch 'origin/2.4' into merge-2.4
...
Merged pull requests:
#890 from caorong:patch-1
#893 from jet47:gpu-arm-fixes
#933 from pengx17:2.4_macfix_cont
#935 from pengx17:2.4_filter2d_fix
#936 from bitwangyaoyao:2.4_perf
#937 from bitwangyaoyao:2.4_fixPyrLK
#938 from pengx17:2.4_surf_sample
#939 from pengx17:2.4_getDevice
#940 from SpecLad:autolock
#941 from apavlenko:signed_char
#946 from bitwangyaoyao:2.4_samples2
#947 from jet47:fix-gpu-arm-build
#948 from jet47:cuda-5.5-support
#952 from SpecLad:jepg
#953 from jet47:fix-bug-3069
#955 from SpecLad:symlink
#957 from pengx17:2.4_fix_corner_detector
#959 from SpecLad:qt4-build
#960 from SpecLad:extra-modules
Conflicts:
modules/core/include/opencv2/core/core.hpp
modules/gpu/CMakeLists.txt
modules/gpu/include/opencv2/gpu/device/vec_math.hpp
modules/gpu/perf/perf_video.cpp
modules/gpuimgproc/src/cuda/hough.cu
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/src/pyrlk.cpp
samples/gpu/driver_api_multi.cpp
samples/gpu/driver_api_stereo_multi.cpp
samples/ocl/surf_matcher.cpp
2013-06-10 18:18:01 +04:00
Vladislav Vinogradov
4f0d72bf43
added missing <iostream> header
2013-06-10 17:47:55 +04:00
Roman Donchenko
d583a79869
Revert "Add a variant of detectMultiScale with an argument 'weights'"
...
It was merged by mistake.
This reverts commit ab6be9b7b7
2013-06-10 17:06:34 +04:00
Vladislav Vinogradov
564fd21e87
fixed documentation build
2013-06-10 15:52:01 +04:00
Roman Donchenko
e16af9bdc9
Merge pull request #958 from apavlenko:fix_java_mixchannels
2013-06-10 15:51:30 +04:00
Vadim Pisarevsky
1fe7ad850b
Merge pull request #856 from ericgreveson:master
2013-06-10 15:25:09 +04:00
