Vladislav Vinogradov
fcfcd4cbce
refactored box filter
2013-06-14 17:25:56 +04:00
Roman Donchenko
71db862dc2
Merge pull request #977 from jet47:gpucodec-refactoring
2013-06-14 16:24:24 +04:00
Roman Donchenko
2fc49ac564
Merge pull request #978 from jet47:gpuarithm-refactoring
2013-06-14 16:24:03 +04:00
Roman Donchenko
4bc4f4aa1f
Merge pull request #1003 from vhdirk:gstreamerfixes
2013-06-14 15:51:03 +04:00
Roman Donchenko
d998e38a12
Merge pull request #983 from HapeMask:python3-compatibility
2013-06-14 15:48:37 +04:00
Roman Donchenko
130794d41c
Merge pull request #990 from asmorkalov:pthread_build_fix
2013-06-14 11:48:05 +04:00
Roman Donchenko
83fa4d38a4
Merge pull request #976 from PeterMinin:num_detections
2013-06-14 11:24:00 +04:00
Peter Minin
7d70399d72
Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods
2013-06-14 04:25:17 +04:00
Gabe Schwartz
bb209193c9
Updated usage of METH_X definitions for python 3.
...
Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS.
2013-06-13 20:10:01 -04:00
Gabe Schwartz
bce1b352e7
Updated cmake files to use print().
...
In these cases, just using print() is enough to ensure py2/3
compatibility.
2013-06-13 20:10:01 -04:00
Gabe Schwartz
fb9781b97b
Updated cv2.cpp to support Python 3 API.
...
Added a header with defines to enable the module to compile with either
python 2 or 3 without changes.
2013-06-13 20:10:01 -04:00
Gabe Schwartz
931ebab822
Updated generator and parser to support Python 3.
2013-06-13 18:39:47 -04:00
Alexander Smorkalov
37b67fa50d
Fix compiler error due to missing pthread header (Issue #2953 )
2013-06-13 16:11:39 +04:00
Dirk Van Haerenborgh
30f7f9717f
allow for arbitraty number of sources and sinks
2013-06-13 11:16:33 +02:00
Roman Donchenko
6faf00b8e5
Merge pull request #696 from znah:detect_method
2013-06-13 12:01:59 +04:00
Dirk Van Haerenborgh
6d66d11046
gstreamer: cleaning up resources
2013-06-12 16:58:16 +02: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
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
Roman Donchenko
81c6b46fc6
Merge pull request #974 from jet47:gpu-core-refactoring
2013-06-11 12:05:56 +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
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