StevenPuttemans [Thu, 29 Jan 2015 12:41:54 +0000 (13:41 +0100)]
add annotation tool master branch
Vadim Pisarevsky [Thu, 29 Jan 2015 05:35:46 +0000 (05:35 +0000)]
Merge pull request #3603 from alalek:ocl_svm
Vadim Pisarevsky [Wed, 28 Jan 2015 18:51:52 +0000 (18:51 +0000)]
Merge pull request #3637 from wangyan42164:LBP_mad24_opt
Vadim Pisarevsky [Wed, 28 Jan 2015 18:51:32 +0000 (18:51 +0000)]
Merge pull request #3638 from jet47:remove-cuda-module
Vadim Pisarevsky [Wed, 28 Jan 2015 18:50:58 +0000 (18:50 +0000)]
Merge pull request #3639 from cbenhagen:patch-1
Vadim Pisarevsky [Wed, 28 Jan 2015 18:50:39 +0000 (18:50 +0000)]
Merge pull request #3645 from SeninAndrew:mp-msvs-fix
Andrew Senin [Sun, 25 Jan 2015 17:56:33 +0000 (21:56 +0400)]
Fix for Visual Studio multiprocess builds for CMake versions > 2.8
Vadim Pisarevsky [Mon, 26 Jan 2015 09:44:59 +0000 (09:44 +0000)]
Merge pull request #3642 from ilya-lavrenov:linux_x86
Vadim Pisarevsky [Mon, 26 Jan 2015 09:44:31 +0000 (09:44 +0000)]
Merge pull request #3643 from jet47:find-cuda-fix
Vladislav Vinogradov [Mon, 26 Jan 2015 07:24:53 +0000 (10:24 +0300)]
FindCUDA fix : do not unset CACHE variables on first call
This will allow to override CUDA CMake variables from first CMake call,
like cmake -DCUDA_TOOLKIT_ROOT_DIR=... -DCUDA_CUDA_LIBRARY=...
Alexander Alekhin [Fri, 2 Jan 2015 00:33:40 +0000 (03:33 +0300)]
ocl: OpenCL SVM support
Vladislav Vinogradov [Fri, 23 Jan 2015 16:17:00 +0000 (19:17 +0300)]
fix FindCUDA CMake module:
do not unset variables if CUDA_TOOLKIT_TARGET_DIR is not defined
Alexander Alekhin [Thu, 1 Jan 2015 22:59:36 +0000 (01:59 +0300)]
UMat: added USAGE_ALLOCATE_SHARED_MEMORY
Ilya Lavrenov [Fri, 23 Jan 2015 14:26:43 +0000 (17:26 +0300)]
fix for -m32
Vladislav Vinogradov [Thu, 22 Jan 2015 13:36:16 +0000 (16:36 +0300)]
exclude compactPoints and calcWobbleSuppressionMaps from compilation
if they are not needed
Ben Hagen [Thu, 22 Jan 2015 13:17:43 +0000 (14:17 +0100)]
Do not blacklist GStreamer on Apple
Vladislav Vinogradov [Fri, 16 Jan 2015 08:11:40 +0000 (11:11 +0300)]
fix videostab compilation without CUDA
Vladislav Vinogradov [Thu, 15 Jan 2015 16:00:54 +0000 (19:00 +0300)]
restore CUDA module introduction
put it into core documentation
Vladislav Vinogradov [Thu, 15 Jan 2015 13:18:48 +0000 (16:18 +0300)]
fix cudalegacy sanity test
Vladislav Vinogradov [Thu, 15 Jan 2015 13:14:13 +0000 (16:14 +0300)]
remove cuda module
Vladislav Vinogradov [Thu, 15 Jan 2015 13:09:53 +0000 (16:09 +0300)]
move the rest cuda functions to cuda legacy
Vladislav Vinogradov [Thu, 15 Jan 2015 11:28:49 +0000 (14:28 +0300)]
move vstab related CUDA routines to vstab module
Vladislav Vinogradov [Thu, 15 Jan 2015 08:18:46 +0000 (11:18 +0300)]
move labeling routines from cuda to cudalegacy
Vadim Pisarevsky [Thu, 22 Jan 2015 09:45:19 +0000 (09:45 +0000)]
Merge pull request #3635 from jet47:cuda-optflow-refactoring
Vadim Pisarevsky [Thu, 22 Jan 2015 09:44:29 +0000 (09:44 +0000)]
Merge pull request #3505 from karelknoest:lsd_subpixel
Vadim Pisarevsky [Thu, 22 Jan 2015 09:43:33 +0000 (09:43 +0000)]
Merge pull request #3629 from nstiurca:matx-fix
Yan Wang [Thu, 22 Jan 2015 08:36:16 +0000 (16:36 +0800)]
Optimize runLBPClassifierStumpSimple by built-in mad24.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
Vadim Pisarevsky [Wed, 21 Jan 2015 13:07:53 +0000 (13:07 +0000)]
Merge pull request #3633 from mshabunin:fix-gdal-warning
Vladislav Vinogradov [Mon, 12 Jan 2015 08:26:07 +0000 (11:26 +0300)]
remove unused function from pyrlk_optical_flow sample
Vladislav Vinogradov [Wed, 31 Dec 2014 12:37:25 +0000 (15:37 +0300)]
remove obsolete gpu optical flow samples
Vladislav Vinogradov [Wed, 31 Dec 2014 12:37:09 +0000 (15:37 +0300)]
fix gpu samples compilation
Vladislav Vinogradov [Wed, 31 Dec 2014 12:36:51 +0000 (15:36 +0300)]
fix videostab module compilation
Vladislav Vinogradov [Wed, 31 Dec 2014 12:36:44 +0000 (15:36 +0300)]
fix superres module compilation
Vladislav Vinogradov [Wed, 31 Dec 2014 12:36:31 +0000 (15:36 +0300)]
fix cudaoptflow tests build
Vladislav Vinogradov [Wed, 31 Dec 2014 12:36:15 +0000 (15:36 +0300)]
refactor cudaoptflow public API:
* use opaque algorithm interfaces
* add stream support
Vladislav Vinogradov [Wed, 31 Dec 2014 12:35:23 +0000 (15:35 +0300)]
move obsolete algorithms from cudaoptflow to cudalegacy
Vladislav Vinogradov [Wed, 31 Dec 2014 08:27:51 +0000 (11:27 +0300)]
simplify TVL1 accuracy test to reduce run time
Vladislav Vinogradov [Wed, 31 Dec 2014 08:27:31 +0000 (11:27 +0300)]
remove unused memory transfer from TVL1 CUDA implementation
it caused runtime failures
Maksim Shabunin [Wed, 21 Jan 2015 11:01:21 +0000 (14:01 +0300)]
Fixed GDAL loader check
Vadim Pisarevsky [Wed, 21 Jan 2015 10:48:22 +0000 (10:48 +0000)]
Merge pull request #3521 from ana-GT:registration_openni2
Vadim Pisarevsky [Wed, 21 Jan 2015 10:46:53 +0000 (10:46 +0000)]
Merge pull request #3589 from JBosch:master
Vadim Pisarevsky [Wed, 21 Jan 2015 10:46:23 +0000 (10:46 +0000)]
Merge pull request #3591 from ilya-lavrenov:sse_avx
Vadim Pisarevsky [Wed, 21 Jan 2015 10:44:11 +0000 (10:44 +0000)]
Merge pull request #3622 from nagua:fix_find_gstreamer
Vadim Pisarevsky [Wed, 21 Jan 2015 10:43:50 +0000 (10:43 +0000)]
Merge pull request #3625 from wangyan42164:ocl_cascade_deadlock
Vadim Pisarevsky [Wed, 21 Jan 2015 10:40:46 +0000 (10:40 +0000)]
Merge pull request #3626 from jet47:cuda-bgsegm-refactoring
Maksim Shabunin [Wed, 21 Jan 2015 09:53:50 +0000 (12:53 +0300)]
Fixed build warning in GDAL support module
Nicu Știurcă [Wed, 21 Jan 2015 04:58:05 +0000 (23:58 -0500)]
fix whitespace
Nicu Știurcă [Wed, 21 Jan 2015 04:44:03 +0000 (23:44 -0500)]
fix _OutputArray::assign() for _OutputArrays of type MATX when data types differ
Ilya Lavrenov [Mon, 12 Jan 2015 07:59:31 +0000 (10:59 +0300)]
sqsum
karelknoest [Mon, 29 Dec 2014 13:53:17 +0000 (14:53 +0100)]
Improved documentation and method comment to clarify that LineSegmentDetector::detect method accepts both Vec4i and Vec4f as return vector.
karelknoest [Thu, 11 Dec 2014 09:30:24 +0000 (10:30 +0100)]
Let LineSegmentDetector output line segment coordinates in float precision, as supported by the LSD algorithm.
Vadim Pisarevsky [Tue, 20 Jan 2015 13:29:32 +0000 (13:29 +0000)]
Merge pull request #3600 from jet47:cuda-objdetect-module
Vadim Pisarevsky [Tue, 20 Jan 2015 12:59:34 +0000 (12:59 +0000)]
Merge pull request #3598 from caraffi:bug4108_testCasesLinkError
Vadim Pisarevsky [Tue, 20 Jan 2015 12:47:51 +0000 (12:47 +0000)]
Merge pull request #3568 from ilya-lavrenov:neon_runtime
Vadim Pisarevsky [Tue, 20 Jan 2015 12:37:44 +0000 (12:37 +0000)]
Merge pull request #3611 from jet47:fix-gpumat-setto
Vadim Pisarevsky [Tue, 20 Jan 2015 12:35:36 +0000 (12:35 +0000)]
Merge pull request #3610 from jet47:fix-ocv_add_module-3.0
Vadim Pisarevsky [Tue, 20 Jan 2015 12:31:14 +0000 (12:31 +0000)]
Merge pull request #3616 from marvins:gdal-fixes
Vadim Pisarevsky [Tue, 20 Jan 2015 12:30:42 +0000 (12:30 +0000)]
Merge pull request #3624 from jet47:fix-arm-linux-toolchain
Vadim Pisarevsky [Tue, 20 Jan 2015 12:27:19 +0000 (12:27 +0000)]
Merge pull request #3627 from cbenhagen:patch-1
Vadim Pisarevsky [Tue, 20 Jan 2015 12:18:04 +0000 (12:18 +0000)]
Merge pull request #3628 from cbenhagen:patch-2
Yan Wang [Mon, 19 Jan 2015 07:50:16 +0000 (15:50 +0800)]
Avoid deadlock becasue some work item couldn't reach barrier in loop
and unsynchronized.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
Nicu Știurcă [Mon, 19 Jan 2015 20:26:51 +0000 (15:26 -0500)]
implement _OutputArray::assign() for _OutputArrays of type MATX
Ben Hagen [Mon, 19 Jan 2015 20:57:23 +0000 (21:57 +0100)]
make PlaneTracker class more thread-safe
Ben Hagen [Mon, 19 Jan 2015 20:51:19 +0000 (21:51 +0100)]
store user-provided data in PlaneTracker class
Vadim Pisarevsky [Mon, 19 Jan 2015 13:42:36 +0000 (13:42 +0000)]
Merge pull request #3569 from ilya-lavrenov:sse_mul
Vladislav Vinogradov [Tue, 30 Dec 2014 14:35:25 +0000 (17:35 +0300)]
move obsolete algorithms from cudabgsegm to cudalegacy:
* GMG
* FGD
Vadim Pisarevsky [Mon, 19 Jan 2015 11:10:48 +0000 (11:10 +0000)]
Merge pull request #3544 from jet47:cuda-warping-refactoring
Vadim Pisarevsky [Mon, 19 Jan 2015 11:09:58 +0000 (11:09 +0000)]
Merge pull request #3563 from cjmayo:pyexamples
Vadim Pisarevsky [Mon, 19 Jan 2015 11:03:44 +0000 (11:03 +0000)]
Merge pull request #3554 from wangyan42164:match_template_mask
Vadim Pisarevsky [Mon, 19 Jan 2015 10:54:25 +0000 (10:54 +0000)]
Merge pull request #3570 from a-wi:Win32_UI_commctrl_defs_v3
Vadim Pisarevsky [Mon, 19 Jan 2015 10:53:42 +0000 (10:53 +0000)]
Merge pull request #3582 from ptzafrir:fix_samples
Vadim Pisarevsky [Mon, 19 Jan 2015 10:50:52 +0000 (10:50 +0000)]
Merge pull request #3615 from jaybosamiya:grabcuttypo
Vadim Pisarevsky [Mon, 19 Jan 2015 10:49:53 +0000 (10:49 +0000)]
Merge pull request #3606 from jet47:warnings-fix
Vadim Pisarevsky [Mon, 19 Jan 2015 10:49:08 +0000 (10:49 +0000)]
Merge pull request #3608 from jet47:cmake-CMP0054-fix
Vadim Pisarevsky [Mon, 19 Jan 2015 10:48:44 +0000 (10:48 +0000)]
Merge pull request #3605 from jet47:cuda-photo-refactoring
Vadim Pisarevsky [Mon, 19 Jan 2015 10:48:18 +0000 (10:48 +0000)]
Merge pull request #3596 from jet47:cuda-features2d-refactoring
Vadim Pisarevsky [Mon, 19 Jan 2015 10:47:49 +0000 (10:47 +0000)]
Merge pull request #3594 from asmorkalov:opencv4tegra_support
Vladislav Vinogradov [Mon, 19 Jan 2015 07:43:49 +0000 (10:43 +0300)]
Fix arm linux toolchain file
Use find_program() to set CMAKE_C_COMPILER and CMAKE_CXX_COMPILER.
Originally the variables was set to compiler name, without absolute path.
CMake 3.0 tries to find them in CMAKE_FIND_ROOT_PATH (since
CMAKE_FIND_ROOT_PATH_MODE_PROGRAM was set to ONLY) and fails.
Nicolas Riebesel [Sun, 18 Jan 2015 19:27:09 +0000 (20:27 +0100)]
Corrected the WITH_GSTREAMER and WITH_GSTREAMER_0_10 semantic
Alexander Smorkalov [Fri, 16 Jan 2015 10:22:51 +0000 (13:22 +0300)]
Accuracy fix for blenaders in stitching module.
Marvin Smith [Sun, 18 Jan 2015 04:37:51 +0000 (20:37 -0800)]
Fixed compile warning from redefined macro.
Marvin Smith [Sun, 18 Jan 2015 03:28:58 +0000 (19:28 -0800)]
Updated gdal tutorial to include comments.
Marvin Smith [Sun, 18 Jan 2015 00:59:56 +0000 (16:59 -0800)]
Updating CMake to get GDAL working again on OS X.
Jay Bosamiya [Sat, 17 Jan 2015 17:23:30 +0000 (22:53 +0530)]
Fix typo
Vladislav Vinogradov [Fri, 16 Jan 2015 08:00:56 +0000 (11:00 +0300)]
fix ocv_add_module CMake macro:
it tries to remove 'opencv_' prefix from 'name' variable, but
it creates new variable with the same name as module
Yan Wang [Wed, 24 Dec 2014 06:02:53 +0000 (14:02 +0800)]
Add template match with mask.
Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
Vladislav Vinogradov [Thu, 15 Jan 2015 16:33:27 +0000 (19:33 +0300)]
fix GpuMat::setTo method in case if mask is empty:
it might be called from _OutputArray::setTo
Vladislav Vinogradov [Thu, 15 Jan 2015 15:40:33 +0000 (18:40 +0300)]
Vladislav Vinogradov [Thu, 15 Jan 2015 14:20:35 +0000 (17:20 +0300)]
disable warnings caused by CUDA headers
Vladislav Vinogradov [Thu, 15 Jan 2015 14:17:35 +0000 (17:17 +0300)]
fix -Wsign-compare warnings
Vladislav Vinogradov [Thu, 15 Jan 2015 14:15:59 +0000 (17:15 +0300)]
fix documentation warnings
Vladislav Vinogradov [Thu, 15 Jan 2015 13:45:35 +0000 (16:45 +0300)]
refactor CUDA part of photo module
Vadim Pisarevsky [Thu, 15 Jan 2015 13:17:26 +0000 (13:17 +0000)]
Merge pull request #3572 from berak:python_samples_30
Vadim Pisarevsky [Thu, 15 Jan 2015 13:14:06 +0000 (13:14 +0000)]
Merge pull request #3557 from ilya-lavrenov:sse_add_weighted
Vadim Pisarevsky [Thu, 15 Jan 2015 13:12:51 +0000 (13:12 +0000)]
Merge pull request #3599 from a-wi:DShow_COM_interfaces_v3
Tzafrir [Tue, 6 Jan 2015 14:13:46 +0000 (16:13 +0200)]
add default file to load in case sample was run without command line arguments
Vadim Pisarevsky [Thu, 15 Jan 2015 11:44:35 +0000 (11:44 +0000)]
Merge pull request #3561 from jet47:cuda-arithm-refactoring
Vadim Pisarevsky [Thu, 15 Jan 2015 11:36:51 +0000 (11:36 +0000)]
Merge pull request #3574 from mikeizbicki:patch-1
Vadim Pisarevsky [Thu, 15 Jan 2015 11:27:11 +0000 (11:27 +0000)]
Merge pull request #3584 from nisargthakkar:UMatDimsZeroAfterRelease
Vadim Pisarevsky [Thu, 15 Jan 2015 11:24:53 +0000 (11:24 +0000)]
Merge pull request #3595 from timsat:error_messages