profile/ivi/opencv.git
11 years agoMerge remote-tracking branch 'origin/2.4'
Roman Donchenko [Mon, 17 Jun 2013 12:57:31 +0000 (16:57 +0400)]
Merge remote-tracking branch 'origin/2.4'

Original pull requests:
#996 from jet47:gpu-nvcuvid-libraries
#995 from jet47:fix-bug-2985
#999 from snosov1:unreliable-results-fix
#1005 from alekcac:doc_fix
#1004 from jet47:fix-bug-3068
#987 from jet47:bug-3085-fix
#969 from pengx17:2.4_binary_cache
#929 from dominikrose:mingw-libdc1394-2-windows
#1000 from ivan-korolev:fix_sift_bug_2892
#1001 from ivan-korolev:fix_stitching_bug_2405
#998 from asmorkalov:android_cmake_mips_fix
#993 from ivan-korolev:fix_videostab_bug_3023
#988 from snosov1:3071-fix
#986 from pengx17:2.4_initiated_context
#982 from pengx17:2.4_fix_two_bugs
#981 from SeninAndrew:ximea_camera_support_fix
#991 from asmorkalov:android_javadoc_fix
#972 from jet47:mog2-params-bug-2168
#980 from SpecLad:include-config
#973 from pengx17:2.4_oclclahe
#903 from aks2:2.4
#968 from asmorkalov:android_na_cproj_fix
#971 from SpecLad:matchers-ctor
#970 from asmorkalov:dshow_valid_check_fix
#965 from apavlenko:fix_java_empty_mats

Conflicts:
cmake/OpenCVModule.cmake
modules/core/src/matmul.cpp
modules/gpu/CMakeLists.txt
modules/ocl/include/opencv2/ocl/ocl.hpp
modules/ocl/perf/perf_imgproc.cpp
modules/ocl/src/imgproc.cpp
modules/ocl/src/initialization.cpp
modules/stitching/src/matchers.cpp
modules/video/src/video_init.cpp
modules/videostab/src/global_motion.cpp

11 years agoMerge pull request #977 from jet47:gpucodec-refactoring
Roman Donchenko [Fri, 14 Jun 2013 12:24:23 +0000 (16:24 +0400)]
Merge pull request #977 from jet47:gpucodec-refactoring

11 years agoMerge pull request #978 from jet47:gpuarithm-refactoring
Roman Donchenko [Fri, 14 Jun 2013 12:24:03 +0000 (16:24 +0400)]
Merge pull request #978 from jet47:gpuarithm-refactoring

11 years agoMerge pull request #996 from jet47:gpu-nvcuvid-libraries
Roman Donchenko [Fri, 14 Jun 2013 12:23:01 +0000 (16:23 +0400)]
Merge pull request #996 from jet47:gpu-nvcuvid-libraries

11 years agoMerge pull request #995 from jet47:fix-bug-2985
Roman Donchenko [Fri, 14 Jun 2013 12:22:47 +0000 (16:22 +0400)]
Merge pull request #995 from jet47:fix-bug-2985

11 years agoMerge pull request #999 from snosov1:unreliable-results-fix
Roman Donchenko [Fri, 14 Jun 2013 12:19:50 +0000 (16:19 +0400)]
Merge pull request #999 from snosov1:unreliable-results-fix

11 years agoMerge pull request #1005 from alekcac:doc_fix
Roman Donchenko [Fri, 14 Jun 2013 11:53:35 +0000 (15:53 +0400)]
Merge pull request #1005 from alekcac:doc_fix

11 years agoMerge pull request #1004 from jet47:fix-bug-3068
Roman Donchenko [Fri, 14 Jun 2013 11:52:56 +0000 (15:52 +0400)]
Merge pull request #1004 from jet47:fix-bug-3068

11 years agoMerge pull request #1003 from vhdirk:gstreamerfixes
Roman Donchenko [Fri, 14 Jun 2013 11:51:03 +0000 (15:51 +0400)]
Merge pull request #1003 from vhdirk:gstreamerfixes

11 years agoMerge pull request #987 from jet47:bug-3085-fix
Roman Donchenko [Fri, 14 Jun 2013 11:49:33 +0000 (15:49 +0400)]
Merge pull request #987 from jet47:bug-3085-fix

11 years agoMerge pull request #983 from HapeMask:python3-compatibility
Roman Donchenko [Fri, 14 Jun 2013 11:48:37 +0000 (15:48 +0400)]
Merge pull request #983 from HapeMask:python3-compatibility

11 years agoMerge pull request #969 from pengx17:2.4_binary_cache
Roman Donchenko [Fri, 14 Jun 2013 11:47:23 +0000 (15:47 +0400)]
Merge pull request #969 from pengx17:2.4_binary_cache

11 years agoMerge pull request #929 from dominikrose:mingw-libdc1394-2-windows
Roman Donchenko [Fri, 14 Jun 2013 11:46:23 +0000 (15:46 +0400)]
Merge pull request #929 from dominikrose:mingw-libdc1394-2-windows

11 years agoMerge pull request #1000 from ivan-korolev:fix_sift_bug_2892
Roman Donchenko [Fri, 14 Jun 2013 09:50:01 +0000 (13:50 +0400)]
Merge pull request #1000 from ivan-korolev:fix_sift_bug_2892

11 years agoMerge pull request #1001 from ivan-korolev:fix_stitching_bug_2405
Roman Donchenko [Fri, 14 Jun 2013 09:47:32 +0000 (13:47 +0400)]
Merge pull request #1001 from ivan-korolev:fix_stitching_bug_2405

11 years agoFix bug with indices
Alexander Shishkov [Fri, 14 Jun 2013 09:12:35 +0000 (13:12 +0400)]
Fix bug with indices

11 years agofix for bug #3068 (PCA::computeVar for double input):
Vladislav Vinogradov [Fri, 14 Jun 2013 08:53:44 +0000 (12:53 +0400)]
fix for bug #3068 (PCA::computeVar for double input):

The matrix g  can have CV_32F or CV_64F type,  but g.at uses only float template.
This fix adds specialization for double type.

11 years agoFix a bug caused by NDEBUG macro; it is now removed.
peng xiao [Fri, 14 Jun 2013 08:37:00 +0000 (16:37 +0800)]
Fix a bug caused by NDEBUG macro; it is now removed.
Revise some descriptions of the enums.

11 years agoMerge pull request #990 from asmorkalov:pthread_build_fix
Roman Donchenko [Fri, 14 Jun 2013 07:48:05 +0000 (11:48 +0400)]
Merge pull request #990 from asmorkalov:pthread_build_fix

11 years agoMerge pull request #976 from PeterMinin:num_detections
Roman Donchenko [Fri, 14 Jun 2013 07:23:59 +0000 (11:23 +0400)]
Merge pull request #976 from PeterMinin:num_detections

11 years agoFixed a bug #2405
Ivan Korolev [Fri, 14 Jun 2013 06:43:20 +0000 (10:43 +0400)]
Fixed a bug #2405

11 years agoMerge pull request #998 from asmorkalov:android_cmake_mips_fix
Andrey Pavlenko [Fri, 14 Jun 2013 06:17:23 +0000 (10:17 +0400)]
Merge pull request #998 from asmorkalov:android_cmake_mips_fix

11 years agoFixed a bug #2892
Ivan Korolev [Fri, 14 Jun 2013 04:21:42 +0000 (08:21 +0400)]
Fixed a bug #2892

11 years agoAdd a new variant of detectMultiScale with output arguments 'objects' and 'numDetecti...
Peter Minin [Fri, 14 Jun 2013 00:25:17 +0000 (04:25 +0400)]
Add a new variant of detectMultiScale with output arguments 'objects' and 'numDetections'; factor most of detectMultiScale's code into 2 protected methods

11 years agoUpdated usage of METH_X definitions for python 3.
Gabe Schwartz [Mon, 10 Jun 2013 21:29:36 +0000 (17:29 -0400)]
Updated usage of METH_X definitions for python 3.
Python 3 requires METH_VARARGS | METH_KEYWORDS, not just METH_KEYWORDS.

11 years agoUpdated cmake files to use print().
Gabe Schwartz [Wed, 12 Jun 2013 20:04:34 +0000 (16:04 -0400)]
Updated cmake files to use print().
In these cases, just using print() is enough to ensure py2/3
compatibility.

11 years agoUpdated cv2.cpp to support Python 3 API.
Gabe Schwartz [Wed, 12 Jun 2013 20:03:34 +0000 (16:03 -0400)]
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.

11 years agoUpdated generator and parser to support Python 3.
Gabe Schwartz [Wed, 12 Jun 2013 20:02:30 +0000 (16:02 -0400)]
Updated generator and parser to support Python 3.

11 years agoadd multiruns to fix "unreliable results" error
Sergei Nosov [Thu, 13 Jun 2013 17:14:42 +0000 (21:14 +0400)]
add multiruns to fix "unreliable results" error

11 years agoMerge pull request #993 from ivan-korolev:fix_videostab_bug_3023
Roman Donchenko [Thu, 13 Jun 2013 12:57:12 +0000 (16:57 +0400)]
Merge pull request #993 from ivan-korolev:fix_videostab_bug_3023

11 years agoMerge pull request #988 from snosov1:3071-fix
Roman Donchenko [Thu, 13 Jun 2013 12:56:40 +0000 (16:56 +0400)]
Merge pull request #988 from snosov1:3071-fix

11 years agoMerge pull request #986 from pengx17:2.4_initiated_context
Roman Donchenko [Thu, 13 Jun 2013 12:55:55 +0000 (16:55 +0400)]
Merge pull request #986 from pengx17:2.4_initiated_context

11 years agoMerge pull request #982 from pengx17:2.4_fix_two_bugs
Roman Donchenko [Thu, 13 Jun 2013 12:55:12 +0000 (16:55 +0400)]
Merge pull request #982 from pengx17:2.4_fix_two_bugs

11 years agoMerge pull request #981 from SeninAndrew:ximea_camera_support_fix
Roman Donchenko [Thu, 13 Jun 2013 12:54:45 +0000 (16:54 +0400)]
Merge pull request #981 from SeninAndrew:ximea_camera_support_fix

11 years agoFix build problems on MIPS and Linaro NDK.
Alexander Smorkalov [Thu, 13 Jun 2013 12:51:45 +0000 (16:51 +0400)]
Fix build problems on MIPS and Linaro NDK.

Merged android.toolchain.cmake from project
https://github.com/taka-no-me/android-cmake
commit: fd1f7055f8b7338644d58d9a2015a784dfa3a5ca

11 years agolink with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled
Vladislav Vinogradov [Thu, 13 Jun 2013 12:46:34 +0000 (16:46 +0400)]
link with nvcuvenc and ffmpeg libraries only if WITH_NVCUVID is enabled

11 years agoMerge pull request #991 from asmorkalov:android_javadoc_fix
Roman Donchenko [Thu, 13 Jun 2013 12:30:14 +0000 (16:30 +0400)]
Merge pull request #991 from asmorkalov:android_javadoc_fix

11 years agofix for bug #2985:
Vladislav Vinogradov [Thu, 13 Jun 2013 12:13:46 +0000 (16:13 +0400)]
fix for bug #2985:

OPENCLAMDBLAS and OPENCLAMDFFT never detected under linux.
lib64/import and lib32/import is the path on Windows but not Linux.
for CLAMDBLAS library we should use CLAMDBLAS_PATH (not CLAMDFFT_PATH)

11 years agoFix compiler error due to missing pthread header (Issue #2953)
Alexander Smorkalov [Thu, 13 Jun 2013 08:19:25 +0000 (12:19 +0400)]
Fix compiler error due to missing pthread header (Issue #2953)

11 years agoFixed a bug related to video stabilization crashes with a blank video (Bug #3023)
Ivan Korolev [Thu, 13 Jun 2013 09:41:43 +0000 (13:41 +0400)]
Fixed a bug related to video stabilization crashes with a blank video (Bug #3023)

11 years agoallow for arbitraty number of sources and sinks
Dirk Van Haerenborgh [Thu, 13 Jun 2013 09:16:33 +0000 (11:16 +0200)]
allow for arbitraty number of sources and sinks

11 years agoJavadoc waring fix.
Alexander Smorkalov [Thu, 13 Jun 2013 08:40:14 +0000 (12:40 +0400)]
Javadoc waring fix.

11 years agoMerge pull request #696 from znah:detect_method
Roman Donchenko [Thu, 13 Jun 2013 08:01:56 +0000 (12:01 +0400)]
Merge pull request #696 from znah:detect_method

11 years agoFixes bug #3071.
Sergei Nosov [Thu, 13 Jun 2013 07:51:45 +0000 (11:51 +0400)]
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.

11 years agofix for Bug #3085:
Vladislav Vinogradov [Thu, 13 Jun 2013 06:22:56 +0000 (10:22 +0400)]
fix for Bug #3085:

weights array is only allocated for (l_count+1) elements,
but then weights[l_count+1] element is accessed.

11 years agoAdd a function to query if global OpenCL context is initialized.
peng xiao [Thu, 13 Jun 2013 02:46:12 +0000 (10:46 +0800)]
Add a function to query if global OpenCL context is initialized.

11 years agogstreamer: cleaning up resources
Dirk Van Haerenborgh [Wed, 12 Jun 2013 14:58:16 +0000 (16:58 +0200)]
gstreamer: cleaning up resources

11 years agoFix two bugs related to opencl context.
Peng Xiao [Wed, 12 Jun 2013 05:55:20 +0000 (13:55 +0800)]
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.

11 years agoFixed Ximea cameras support
Andrew Senin [Tue, 11 Jun 2013 17:17:31 +0000 (21:17 +0400)]
Fixed Ximea cameras support

11 years agoMerge pull request #972 from jet47:mog2-params-bug-2168
Roman Donchenko [Tue, 11 Jun 2013 14:21:52 +0000 (18:21 +0400)]
Merge pull request #972 from jet47:mog2-params-bug-2168

11 years agoMerge pull request #980 from SpecLad:include-config
Roman Donchenko [Tue, 11 Jun 2013 14:18:14 +0000 (18:18 +0400)]
Merge pull request #980 from SpecLad:include-config

11 years agoMerge pull request #973 from pengx17:2.4_oclclahe
Roman Donchenko [Tue, 11 Jun 2013 14:17:56 +0000 (18:17 +0400)]
Merge pull request #973 from pengx17:2.4_oclclahe

11 years agoMerge pull request #966 from berak:master
Roman Donchenko [Tue, 11 Jun 2013 14:17:07 +0000 (18:17 +0400)]
Merge pull request #966 from berak:master

11 years agoupdated documentation
Vladislav Vinogradov [Tue, 11 Jun 2013 11:45:04 +0000 (15:45 +0400)]
updated documentation

11 years agorefactored gpu::convolve function:
Vladislav Vinogradov [Fri, 26 Apr 2013 08:40:03 +0000 (12:40 +0400)]
refactored gpu::convolve function:

* converted it to Algorithm
* old API still can be used for source compatibility (marked as deprecated)

11 years agoswitched to Input/Output Array in Fourier operations
Vladislav Vinogradov [Fri, 26 Apr 2013 07:33:46 +0000 (11:33 +0400)]
switched to Input/Output Array in Fourier operations

11 years agoswitched to Input/Output Array in gpu::gemm
Vladislav Vinogradov [Fri, 26 Apr 2013 08:22:56 +0000 (12:22 +0400)]
switched to Input/Output Array in gpu::gemm

11 years agoswitched to Input/Output Array in reductions operations
Vladislav Vinogradov [Fri, 26 Apr 2013 10:40:44 +0000 (14:40 +0400)]
switched to Input/Output Array in reductions operations

11 years agoswitched to Input/Output Array in gpu::copyMakeBorder
Vladislav Vinogradov [Thu, 25 Apr 2013 12:56:19 +0000 (16:56 +0400)]
switched to Input/Output Array in gpu::copyMakeBorder

11 years agorefactored gpu::LUT function:
Vladislav Vinogradov [Fri, 26 Apr 2013 08:39:02 +0000 (12:39 +0400)]
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)

11 years agoswitched to Input/Output Array in transpose/flip operations
Vladislav Vinogradov [Thu, 25 Apr 2013 12:09:51 +0000 (16:09 +0400)]
switched to Input/Output Array in transpose/flip operations

11 years agoswitched to Input/Output Array in split/merge operations
Vladislav Vinogradov [Thu, 25 Apr 2013 12:02:41 +0000 (16:02 +0400)]
switched to Input/Output Array in split/merge operations

11 years agoswitched to Input/Output Array in cart<->polar operations
Vladislav Vinogradov [Thu, 25 Apr 2013 11:46:45 +0000 (15:46 +0400)]
switched to Input/Output Array in cart<->polar operations

11 years agoswitched to Input/Output Array in gpu::threshold
Vladislav Vinogradov [Thu, 25 Apr 2013 11:33:19 +0000 (15:33 +0400)]
switched to Input/Output Array in gpu::threshold

11 years agoswitched to Input/Output Array in gpu::addWeighted
Vladislav Vinogradov [Thu, 25 Apr 2013 11:28:29 +0000 (15:28 +0400)]
switched to Input/Output Array in gpu::addWeighted

11 years agoswitched to Input/Output Array in min/max operations
Vladislav Vinogradov [Thu, 25 Apr 2013 11:23:44 +0000 (15:23 +0400)]
switched to Input/Output Array in min/max operations

11 years agoswitched to Input/Output Array in shift operations
Vladislav Vinogradov [Thu, 25 Apr 2013 11:10:13 +0000 (15:10 +0400)]
switched to Input/Output Array in shift operations

11 years agoswitched to Input/Output Array in bitwise logical operations
Vladislav Vinogradov [Thu, 25 Apr 2013 11:02:22 +0000 (15:02 +0400)]
switched to Input/Output Array in bitwise logical operations

11 years agoswitched to Input/Output Array in gpu::compare
Vladislav Vinogradov [Thu, 25 Apr 2013 10:20:57 +0000 (14:20 +0400)]
switched to Input/Output Array in gpu::compare

11 years agoswitched to Input/Output Array in abs, sqr, sqrt, exp, log, pow
Vladislav Vinogradov [Thu, 25 Apr 2013 09:49:45 +0000 (13:49 +0400)]
switched to Input/Output Array in abs, sqr, sqrt, exp, log, pow

11 years agoswitched to Input/Output Array in gpu::absdiff
Vladislav Vinogradov [Thu, 25 Apr 2013 09:37:44 +0000 (13:37 +0400)]
switched to Input/Output Array in gpu::absdiff

11 years agoswitched to Input/Output Array in gpu::divide
Vladislav Vinogradov [Fri, 26 Apr 2013 10:39:58 +0000 (14:39 +0400)]
switched to Input/Output Array in gpu::divide

11 years agoswitched to Input/Output Array in gpu::multiply
Vladislav Vinogradov [Thu, 25 Apr 2013 08:55:38 +0000 (12:55 +0400)]
switched to Input/Output Array in gpu::multiply

11 years agoadded arithm_op function to reduce code duplication
Vladislav Vinogradov [Thu, 25 Apr 2013 08:21:26 +0000 (12:21 +0400)]
added arithm_op function to reduce code duplication

11 years agoswitched to Input/Output Array in gpu::subtract
Vladislav Vinogradov [Thu, 25 Apr 2013 08:08:36 +0000 (12:08 +0400)]
switched to Input/Output Array in gpu::subtract

11 years agoswitched to Input/Output Array in gpu::add
Vladislav Vinogradov [Thu, 25 Apr 2013 08:07:57 +0000 (12:07 +0400)]
switched to Input/Output Array in gpu::add

11 years agorefactored VideoReader (convert it to abstract interface)
Vladislav Vinogradov [Tue, 11 Jun 2013 09:05:02 +0000 (13:05 +0400)]
refactored VideoReader (convert it to abstract interface)

also refactored VideoSource interface (made it simplier, now it has only 2 abstract methods)

11 years agorefactored VideoWriter class (convert it to abstract interface)
Vladislav Vinogradov [Mon, 22 Apr 2013 10:04:27 +0000 (14:04 +0400)]
refactored VideoWriter class (convert it to abstract interface)

11 years agoMerge pull request #903 from aks2:2.4
Roman Donchenko [Tue, 11 Jun 2013 13:35:38 +0000 (17:35 +0400)]
Merge pull request #903 from aks2:2.4

11 years agoMerge pull request #899 from LeszekSwirski:fix-drawingdoc
Roman Donchenko [Tue, 11 Jun 2013 13:30:16 +0000 (17:30 +0400)]
Merge pull request #899 from LeszekSwirski:fix-drawingdoc

11 years agoMerge pull request #975 from SpecLad:merge-2.4
Roman Donchenko [Tue, 11 Jun 2013 13:28:26 +0000 (17:28 +0400)]
Merge pull request #975 from SpecLad:merge-2.4

11 years agoUse anonymous enumerations instead of constants
Peng Xiao [Tue, 11 Jun 2013 12:32:55 +0000 (20:32 +0800)]
Use anonymous enumerations instead of constants

11 years agoMerge pull request #974 from jet47:gpu-core-refactoring
Roman Donchenko [Tue, 11 Jun 2013 08:05:56 +0000 (12:05 +0400)]
Merge pull request #974 from jet47:gpu-core-refactoring

11 years agoMerge pull request #968 from asmorkalov:android_na_cproj_fix
Roman Donchenko [Tue, 11 Jun 2013 07:59:31 +0000 (11:59 +0400)]
Merge pull request #968 from asmorkalov:android_na_cproj_fix

11 years agoMerge remote-tracking branch 'origin/2.4' into merge-2.4
Roman Donchenko [Mon, 10 Jun 2013 14:18:01 +0000 (18:18 +0400)]
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

11 years agoadded missing <iostream> header
Vladislav Vinogradov [Mon, 10 Jun 2013 13:47:55 +0000 (17:47 +0400)]
added missing <iostream> header

11 years agoRevert "Add a variant of detectMultiScale with an argument 'weights'"
Roman Donchenko [Mon, 10 Jun 2013 13:06:34 +0000 (17:06 +0400)]
Revert "Add a variant of detectMultiScale with an argument 'weights'"

It was merged by mistake.

This reverts commit ab6be9b7b7691967e42297aa6d3a67fb07597fd8.

11 years agofixed documentation build
Vladislav Vinogradov [Mon, 10 Jun 2013 11:52:01 +0000 (15:52 +0400)]
fixed documentation build

11 years agoMerge pull request #958 from apavlenko:fix_java_mixchannels
Roman Donchenko [Mon, 10 Jun 2013 11:51:29 +0000 (15:51 +0400)]
Merge pull request #958 from apavlenko:fix_java_mixchannels

11 years agoMerge pull request #856 from ericgreveson:master
Vadim Pisarevsky [Mon, 10 Jun 2013 11:25:07 +0000 (15:25 +0400)]
Merge pull request #856 from ericgreveson:master

11 years agoMerge pull request #961 from PeterMinin:detected_objects_weight
Vadim Pisarevsky [Mon, 10 Jun 2013 11:22:46 +0000 (15:22 +0400)]
Merge pull request #961 from PeterMinin:detected_objects_weight

11 years agoMerge pull request #971 from SpecLad:matchers-ctor
Roman Donchenko [Mon, 10 Jun 2013 11:06:31 +0000 (15:06 +0400)]
Merge pull request #971 from SpecLad:matchers-ctor

11 years agoMerge pull request #970 from asmorkalov:dshow_valid_check_fix
Roman Donchenko [Mon, 10 Jun 2013 11:06:14 +0000 (15:06 +0400)]
Merge pull request #970 from asmorkalov:dshow_valid_check_fix

11 years agoBug #3044 cap_dshow.cpp forgotten validity check fixed.
Alexander Smorkalov [Mon, 10 Jun 2013 20:29:45 +0000 (13:29 -0700)]
Bug #3044 cap_dshow.cpp forgotten validity check fixed.

11 years agoMerge pull request #965 from apavlenko:fix_java_empty_mats
Roman Donchenko [Mon, 10 Jun 2013 11:03:31 +0000 (15:03 +0400)]
Merge pull request #965 from apavlenko:fix_java_empty_mats

11 years agoAdd ocl CLACH implementation.
Peng Xiao [Mon, 10 Jun 2013 10:37:48 +0000 (18:37 +0800)]
Add ocl CLACH implementation.
Test cases (accuracy and performance) are provided.

11 years agofixing Java wrapper for mixChannels
Andrey Pavlenko [Mon, 10 Jun 2013 10:37:01 +0000 (14:37 +0400)]
fixing Java wrapper for mixChannels
'dst' should be treated as an input arg (epilog not needed)

11 years agoadded missing BackgroundSubtractorMOG2 parameters
Vladislav Vinogradov [Mon, 10 Jun 2013 09:41:46 +0000 (13:41 +0400)]
added missing BackgroundSubtractorMOG2 parameters

11 years agoErase MatchPairsBody's copy constructor.
Roman Donchenko [Mon, 10 Jun 2013 09:30:23 +0000 (13:30 +0400)]
Erase MatchPairsBody's copy constructor.

It's the same as the implicitly defined one, and it causes a -Wextra warning
(not initializing the base class in a copy constructor).

11 years agorenamed gpu_private.hpp to private.gpu.hpp
Vladislav Vinogradov [Thu, 30 May 2013 07:11:40 +0000 (11:11 +0400)]
renamed gpu_private.hpp to private.gpu.hpp