platform/upstream/opencv.git
9 years agofix ellipse fitting notice
StevenPuttemans [Mon, 23 Feb 2015 14:05:55 +0000 (15:05 +0100)]
fix ellipse fitting notice

9 years agoMerge pull request #3679 from mshabunin:remove-algorithm-factory
Vadim Pisarevsky [Thu, 19 Feb 2015 18:43:58 +0000 (18:43 +0000)]
Merge pull request #3679 from mshabunin:remove-algorithm-factory

9 years agoMerge pull request #3718 from mshabunin:image-max-width
Vadim Pisarevsky [Thu, 19 Feb 2015 18:36:27 +0000 (18:36 +0000)]
Merge pull request #3718 from mshabunin:image-max-width

9 years agoMerge pull request #3719 from theodr:document_findnonzero_function
Vadim Pisarevsky [Thu, 19 Feb 2015 18:36:09 +0000 (18:36 +0000)]
Merge pull request #3719 from theodr:document_findnonzero_function

9 years agodocumenting findnonzero() function
theodore [Thu, 19 Feb 2015 16:57:52 +0000 (17:57 +0100)]
documenting findnonzero() function

9 years agoadding documentation for the findnonzero() function
theodore [Thu, 19 Feb 2015 16:38:44 +0000 (17:38 +0100)]
adding documentation for the findnonzero() function

9 years agoMerge branch 'master' of https://github.com/theodr/opencv
theodore [Thu, 19 Feb 2015 12:28:03 +0000 (13:28 +0100)]
Merge branch 'master' of https://github.com/theodr/opencv

9 years agoReduce variable scope
Dmitry-Me [Mon, 16 Feb 2015 12:39:52 +0000 (15:39 +0300)]
Reduce variable scope

9 years agoFixed doc error in optical flow
Nisarg Thakkar [Tue, 17 Feb 2015 16:44:57 +0000 (22:14 +0530)]
Fixed doc error in optical flow

9 years agoDocumentation: set max-width property for inserted images
Maksim Shabunin [Wed, 18 Feb 2015 15:19:36 +0000 (18:19 +0300)]
Documentation: set max-width property for inserted images

9 years agoMerge pull request #3702 from Dmitry-Me:reduceVariableScope
Vadim Pisarevsky [Wed, 18 Feb 2015 13:55:58 +0000 (13:55 +0000)]
Merge pull request #3702 from Dmitry-Me:reduceVariableScope

9 years agoMerge pull request #3711 from nisargthakkar:optical_flow_doc_fix
Vadim Pisarevsky [Wed, 18 Feb 2015 13:52:09 +0000 (13:52 +0000)]
Merge pull request #3711 from nisargthakkar:optical_flow_doc_fix

9 years agoMerge pull request #3703 from BKNio:fixing_bad_alloc
Vadim Pisarevsky [Wed, 18 Feb 2015 13:50:14 +0000 (13:50 +0000)]
Merge pull request #3703 from BKNio:fixing_bad_alloc

9 years agoMerge pull request #3714 from uqtimes:fixUIImageToMat
Vadim Pisarevsky [Wed, 18 Feb 2015 13:49:14 +0000 (13:49 +0000)]
Merge pull request #3714 from uqtimes:fixUIImageToMat

9 years agoMerge pull request #3716 from mshabunin:fix-vs-solution-build
Vadim Pisarevsky [Wed, 18 Feb 2015 13:48:18 +0000 (13:48 +0000)]
Merge pull request #3716 from mshabunin:fix-vs-solution-build

9 years agoMerge pull request #3715 from mshabunin:enable-stl
Vadim Pisarevsky [Wed, 18 Feb 2015 12:12:14 +0000 (12:12 +0000)]
Merge pull request #3715 from mshabunin:enable-stl

9 years agoMerge pull request #3706 from exeltior:patch-1
Vadim Pisarevsky [Wed, 18 Feb 2015 11:30:05 +0000 (11:30 +0000)]
Merge pull request #3706 from exeltior:patch-1

9 years agoExclude object libraries from visual studio solution build
Maksim Shabunin [Wed, 18 Feb 2015 11:16:54 +0000 (14:16 +0300)]
Exclude object libraries from visual studio solution build

9 years agoFixed cmake issues
Maksim Shabunin [Wed, 18 Feb 2015 09:44:48 +0000 (12:44 +0300)]
Fixed cmake issues

9 years agoEnabled STL usage within the library
Maksim Shabunin [Wed, 18 Feb 2015 09:36:50 +0000 (12:36 +0300)]
Enabled STL usage within the library

9 years agoiOS: fix crash from overrelease in UIImageToMat
UQ Times [Wed, 18 Feb 2015 04:30:08 +0000 (13:30 +0900)]
iOS: fix crash from overrelease in UIImageToMat

- previous pull request: https://github.com/Itseez/opencv/pull/3340

9 years agoFixed doc error in optical flow
Nisarg Thakkar [Tue, 17 Feb 2015 16:44:57 +0000 (22:14 +0530)]
Fixed doc error in optical flow

9 years agoUpdated ml module interfaces and documentation
Maksim Shabunin [Wed, 11 Feb 2015 10:24:14 +0000 (13:24 +0300)]
Updated ml module interfaces and documentation

9 years agoUpdate mser.cpp
exeltior [Mon, 16 Feb 2015 17:17:41 +0000 (18:17 +0100)]
Update mser.cpp

Need to initialize boolean variable pass2Only, otherwise the result is not predictable

9 years agoMerge pull request #3664 from wangyan42164:ocl_cascasde_barrier
Vadim Pisarevsky [Mon, 16 Feb 2015 15:42:26 +0000 (15:42 +0000)]
Merge pull request #3664 from wangyan42164:ocl_cascasde_barrier

9 years agofixig std::bad_alloc
Ahmatnurov Dinar [Mon, 16 Feb 2015 13:28:33 +0000 (16:28 +0300)]
fixig std::bad_alloc
if points0 is empty checkVector(2) return -1, it causes the exception

9 years agoReduce variable scope
Dmitry-Me [Mon, 16 Feb 2015 12:39:52 +0000 (15:39 +0300)]
Reduce variable scope

9 years agoRemove deprecated methods from cv::Algorithm
Maksim Shabunin [Thu, 5 Feb 2015 14:40:15 +0000 (17:40 +0300)]
Remove deprecated methods from cv::Algorithm

9 years agoMerge pull request #3650 from StevenPuttemans:fix_tutorials_master
Vadim Pisarevsky [Mon, 16 Feb 2015 11:45:37 +0000 (11:45 +0000)]
Merge pull request #3650 from StevenPuttemans:fix_tutorials_master

9 years agoMerge pull request #3666 from mshabunin:meta-module
Vadim Pisarevsky [Mon, 16 Feb 2015 11:43:30 +0000 (11:43 +0000)]
Merge pull request #3666 from mshabunin:meta-module

9 years agoMerge pull request #3685 from alalek:ocl_android_default_off
Vadim Pisarevsky [Mon, 16 Feb 2015 11:31:02 +0000 (11:31 +0000)]
Merge pull request #3685 from alalek:ocl_android_default_off

9 years agoMerge pull request #3696 from Dmitry-Me:shouldPassByReference
Vadim Pisarevsky [Mon, 16 Feb 2015 11:29:22 +0000 (11:29 +0000)]
Merge pull request #3696 from Dmitry-Me:shouldPassByReference

9 years agoMerge pull request #3701 from jet47:internal-namespace
Vadim Pisarevsky [Mon, 16 Feb 2015 11:27:05 +0000 (11:27 +0000)]
Merge pull request #3701 from jet47:internal-namespace

9 years agouse full qualified name for all internal namespaces to prevent ambiguous symbol errors
Vladislav Vinogradov [Mon, 16 Feb 2015 08:31:21 +0000 (11:31 +0300)]
use full qualified name for all internal namespaces to prevent ambiguous symbol errors

9 years agoParameters should have been passed by reference
Dmitry-Me [Thu, 12 Feb 2015 14:32:43 +0000 (17:32 +0300)]
Parameters should have been passed by reference

9 years agoSupport for compound modules, support for contrib_world
Maksim Shabunin [Mon, 19 Jan 2015 15:03:29 +0000 (18:03 +0300)]
Support for compound modules, support for contrib_world

9 years agoMerge pull request #3687 from Dmitry-Me:fixPossibleNullPtrDeref
Vadim Pisarevsky [Tue, 10 Feb 2015 12:17:11 +0000 (12:17 +0000)]
Merge pull request #3687 from Dmitry-Me:fixPossibleNullPtrDeref

9 years agoMerge pull request #3684 from SeninAndrew:master
Vadim Pisarevsky [Tue, 10 Feb 2015 12:03:52 +0000 (12:03 +0000)]
Merge pull request #3684 from SeninAndrew:master

9 years agoMerge pull request #3688 from jet47:test-script-optional-color-3.0
Vadim Pisarevsky [Tue, 10 Feb 2015 12:02:36 +0000 (12:02 +0000)]
Merge pull request #3688 from jet47:test-script-optional-color-3.0

9 years agomake color output in run_test script optional
Vladislav Vinogradov [Mon, 9 Feb 2015 12:24:46 +0000 (15:24 +0300)]
make color output in run_test script optional

9 years agoFix possible null pointer dereference
Dmitry-Me [Mon, 9 Feb 2015 09:38:02 +0000 (12:38 +0300)]
Fix possible null pointer dereference

9 years agoMerge pull request #3681 from jet47:fix-run-tests-script-3.0
Vadim Pisarevsky [Sun, 8 Feb 2015 17:07:28 +0000 (17:07 +0000)]
Merge pull request #3681 from jet47:fix-run-tests-script-3.0

9 years agoocl: disable OpenCL by default for Android builds
Alexander Alekhin [Sun, 8 Feb 2015 10:08:14 +0000 (13:08 +0300)]
ocl: disable OpenCL by default for Android builds

9 years agoFixing XIMEA parameters mapping (issue #4176)
Andrew Senin [Fri, 6 Feb 2015 21:48:02 +0000 (00:48 +0300)]
Fixing XIMEA parameters mapping (issue #4176)

9 years agoMerge pull request #3656 from SeninAndrew:master
Vadim Pisarevsky [Fri, 6 Feb 2015 11:49:27 +0000 (11:49 +0000)]
Merge pull request #3656 from SeninAndrew:master

9 years agofix opencv_run_all_tests_unix.sh script:
Vladislav Vinogradov [Fri, 6 Feb 2015 09:36:18 +0000 (12:36 +0300)]
fix opencv_run_all_tests_unix.sh script:

use `bash` shell instead of `sh`, since on Ubuntu `sh` by default is `dash`,
and `dash` doesn't support `PIPESTATUS` feature used in this sctipt

9 years agoMerge pull request #3612 from guoyejun:fix_face_detect
Vadim Pisarevsky [Thu, 5 Feb 2015 07:50:13 +0000 (07:50 +0000)]
Merge pull request #3612 from guoyejun:fix_face_detect

9 years agoMerge pull request #3669 from vbystricky:fix_tr_cascade_boost
Vadim Pisarevsky [Thu, 5 Feb 2015 07:47:39 +0000 (07:47 +0000)]
Merge pull request #3669 from vbystricky:fix_tr_cascade_boost

9 years agoMerge pull request #3673 from jet47:colorize-run-test-script-3.0
Vadim Pisarevsky [Thu, 5 Feb 2015 07:36:14 +0000 (07:36 +0000)]
Merge pull request #3673 from jet47:colorize-run-test-script-3.0

9 years agoMerge pull request #3668 from mshabunin:fix-ann-memory-access
Vadim Pisarevsky [Thu, 5 Feb 2015 07:33:49 +0000 (07:33 +0000)]
Merge pull request #3668 from mshabunin:fix-ann-memory-access

9 years agoMerge pull request #3675 from alalek:fix_coreTlsData
Vadim Pisarevsky [Thu, 5 Feb 2015 07:32:58 +0000 (07:32 +0000)]
Merge pull request #3675 from alalek:fix_coreTlsData

9 years agocoreTlsData -> getCoreTlsData()
Alexander Alekhin [Wed, 4 Feb 2015 10:03:27 +0000 (13:03 +0300)]
coreTlsData -> getCoreTlsData()

9 years agocolorize opencv_run_all_tests_unix.sh script output
Vladislav Vinogradov [Wed, 4 Feb 2015 09:39:51 +0000 (12:39 +0300)]
colorize opencv_run_all_tests_unix.sh script output

9 years agoFix small error in traincascade application
VBystricky [Tue, 3 Feb 2015 17:29:27 +0000 (21:29 +0400)]
Fix small error in traincascade application

9 years agoFixed allocated vector size in ML ANN algorithm
Maksim Shabunin [Tue, 3 Feb 2015 15:11:25 +0000 (18:11 +0300)]
Fixed allocated vector size in ML ANN algorithm

- updated return value of points_classifier sample

9 years agoMerge pull request #3657 from BelBES:sb/tegra_optimization_fix
Vadim Pisarevsky [Mon, 2 Feb 2015 10:18:59 +0000 (10:18 +0000)]
Merge pull request #3657 from BelBES:sb/tegra_optimization_fix

9 years agoMerge pull request #3661 from StevenPuttemans:fix_models_2.4
Vadim Pisarevsky [Mon, 2 Feb 2015 10:15:39 +0000 (10:15 +0000)]
Merge pull request #3661 from StevenPuttemans:fix_models_2.4

9 years agoMerge pull request #3632 from theodr:dist_transf_tutorial
Vadim Pisarevsky [Mon, 2 Feb 2015 10:10:39 +0000 (10:10 +0000)]
Merge pull request #3632 from theodr:dist_transf_tutorial

9 years agoMerge pull request #3644 from mshabunin:ml-docs
Vadim Pisarevsky [Mon, 2 Feb 2015 10:08:40 +0000 (10:08 +0000)]
Merge pull request #3644 from mshabunin:ml-docs

9 years agoMerge pull request #3651 from mshabunin:shape-test
Vadim Pisarevsky [Mon, 2 Feb 2015 10:07:01 +0000 (10:07 +0000)]
Merge pull request #3651 from mshabunin:shape-test

9 years agoMerge pull request #3652 from alalek:ocl_message
Vadim Pisarevsky [Mon, 2 Feb 2015 10:04:39 +0000 (10:04 +0000)]
Merge pull request #3652 from alalek:ocl_message

9 years agoRemove unnecessary barrier in runHaarClassifier().
Yan Wang [Mon, 2 Feb 2015 08:55:11 +0000 (16:55 +0800)]
Remove unnecessary barrier in runHaarClassifier().

Signed-off-by: Yan Wang <yan.wang@linux.intel.com>
9 years agofixing wrong model sizes
StevenPuttemans [Sun, 1 Feb 2015 14:08:43 +0000 (15:08 +0100)]
fixing wrong model sizes

9 years agoHAVE_TEGRA_OPTIMIZATION was fixed
sergei [Fri, 30 Jan 2015 08:57:35 +0000 (11:57 +0300)]
HAVE_TEGRA_OPTIMIZATION was fixed

9 years agoFix for assert in compute when subimage is used (see issue #4149)
Andrew Senin [Thu, 29 Jan 2015 17:29:57 +0000 (21:29 +0400)]
Fix for assert in compute when subimage is used (see issue #4149)

9 years agoocl: print missing error message only if OPENCV_OPENCL_RUNTIME is used
Alexander Alekhin [Thu, 29 Jan 2015 10:16:31 +0000 (13:16 +0300)]
ocl: print missing error message only if OPENCV_OPENCL_RUNTIME is used

9 years agoMerge pull request #3603 from alalek:ocl_svm
Vadim Pisarevsky [Thu, 29 Jan 2015 05:35:46 +0000 (05:35 +0000)]
Merge pull request #3603 from alalek:ocl_svm

9 years agoMerge pull request #3637 from wangyan42164:LBP_mad24_opt
Vadim Pisarevsky [Wed, 28 Jan 2015 18:51:52 +0000 (18:51 +0000)]
Merge pull request #3637 from wangyan42164:LBP_mad24_opt

9 years agoMerge pull request #3638 from jet47:remove-cuda-module
Vadim Pisarevsky [Wed, 28 Jan 2015 18:51:32 +0000 (18:51 +0000)]
Merge pull request #3638 from jet47:remove-cuda-module

9 years agoMerge pull request #3639 from cbenhagen:patch-1
Vadim Pisarevsky [Wed, 28 Jan 2015 18:50:58 +0000 (18:50 +0000)]
Merge pull request #3639 from cbenhagen:patch-1

9 years agoMerge pull request #3645 from SeninAndrew:mp-msvs-fix
Vadim Pisarevsky [Wed, 28 Jan 2015 18:50:39 +0000 (18:50 +0000)]
Merge pull request #3645 from SeninAndrew:mp-msvs-fix

9 years agoFixed win64 compile warning
Maksim Shabunin [Wed, 28 Jan 2015 15:11:53 +0000 (18:11 +0300)]
Fixed win64 compile warning

9 years agoShape module tests refactored
Maksim Shabunin [Wed, 28 Jan 2015 10:20:04 +0000 (13:20 +0300)]
Shape module tests refactored

- common operations moved to separate class
- debug console messages removed
- test results are stored in memory instead of file

9 years agofixing tutorial errors master branch
StevenPuttemans [Wed, 28 Jan 2015 12:56:29 +0000 (13:56 +0100)]
fixing tutorial errors master branch

9 years agoImage Segmentation .cpp tutorial
tt [Wed, 21 Jan 2015 03:49:31 +0000 (04:49 +0100)]
Image Segmentation .cpp tutorial

Distance Transform tutorial fixes

Distance Transform fixes v.2

Distance Transform fixes v.3

Distance Transform fixes v.4

9 years agoFix for Visual Studio multiprocess builds for CMake versions > 2.8
Andrew Senin [Sun, 25 Jan 2015 17:56:33 +0000 (21:56 +0400)]
Fix for Visual Studio multiprocess builds for CMake versions > 2.8

9 years agoMerge pull request #3642 from ilya-lavrenov:linux_x86
Vadim Pisarevsky [Mon, 26 Jan 2015 09:44:59 +0000 (09:44 +0000)]
Merge pull request #3642 from ilya-lavrenov:linux_x86

9 years agoMerge pull request #3643 from jet47:find-cuda-fix
Vadim Pisarevsky [Mon, 26 Jan 2015 09:44:31 +0000 (09:44 +0000)]
Merge pull request #3643 from jet47:find-cuda-fix

9 years agoFindCUDA fix : do not unset CACHE variables on first call
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=...

9 years agoReorganized ML module documentation
Maksim Shabunin [Wed, 31 Dec 2014 11:18:50 +0000 (14:18 +0300)]
Reorganized ML module documentation

- fixed one BiB record
- moved algorithms overview to separate page
- added docs for some enumerations
- fixed some small documentation errors

9 years agoocl: OpenCL SVM support
Alexander Alekhin [Fri, 2 Jan 2015 00:33:40 +0000 (03:33 +0300)]
ocl: OpenCL SVM support

9 years agofix FindCUDA CMake module:
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

9 years agoUMat: added USAGE_ALLOCATE_SHARED_MEMORY
Alexander Alekhin [Thu, 1 Jan 2015 22:59:36 +0000 (01:59 +0300)]
UMat: added USAGE_ALLOCATE_SHARED_MEMORY

9 years agofix for -m32
Ilya Lavrenov [Fri, 23 Jan 2015 14:26:43 +0000 (17:26 +0300)]
fix for -m32

9 years agoexclude compactPoints and calcWobbleSuppressionMaps from compilation
Vladislav Vinogradov [Thu, 22 Jan 2015 13:36:16 +0000 (16:36 +0300)]
exclude compactPoints and calcWobbleSuppressionMaps from compilation

if they are not needed

9 years agoDo not blacklist GStreamer on Apple
Ben Hagen [Thu, 22 Jan 2015 13:17:43 +0000 (14:17 +0100)]
Do not blacklist GStreamer on Apple

9 years agofix videostab compilation without CUDA
Vladislav Vinogradov [Fri, 16 Jan 2015 08:11:40 +0000 (11:11 +0300)]
fix videostab compilation without CUDA

9 years agorestore CUDA module introduction
Vladislav Vinogradov [Thu, 15 Jan 2015 16:00:54 +0000 (19:00 +0300)]
restore CUDA module introduction

put it into core documentation

9 years agofix cudalegacy sanity test
Vladislav Vinogradov [Thu, 15 Jan 2015 13:18:48 +0000 (16:18 +0300)]
fix cudalegacy sanity test

9 years agoremove cuda module
Vladislav Vinogradov [Thu, 15 Jan 2015 13:14:13 +0000 (16:14 +0300)]
remove cuda module

9 years agomove the rest cuda functions to cuda legacy
Vladislav Vinogradov [Thu, 15 Jan 2015 13:09:53 +0000 (16:09 +0300)]
move the rest cuda functions to cuda legacy

9 years agomove vstab related CUDA routines to vstab module
Vladislav Vinogradov [Thu, 15 Jan 2015 11:28:49 +0000 (14:28 +0300)]
move vstab related CUDA routines to vstab module

9 years agomove labeling routines from cuda to cudalegacy
Vladislav Vinogradov [Thu, 15 Jan 2015 08:18:46 +0000 (11:18 +0300)]
move labeling routines from cuda to cudalegacy

9 years agoMerge pull request #3635 from jet47:cuda-optflow-refactoring
Vadim Pisarevsky [Thu, 22 Jan 2015 09:45:19 +0000 (09:45 +0000)]
Merge pull request #3635 from jet47:cuda-optflow-refactoring

9 years agoMerge pull request #3505 from karelknoest:lsd_subpixel
Vadim Pisarevsky [Thu, 22 Jan 2015 09:44:29 +0000 (09:44 +0000)]
Merge pull request #3505 from karelknoest:lsd_subpixel

9 years agoMerge pull request #3629 from nstiurca:matx-fix
Vadim Pisarevsky [Thu, 22 Jan 2015 09:43:33 +0000 (09:43 +0000)]
Merge pull request #3629 from nstiurca:matx-fix

9 years agoOptimize runLBPClassifierStumpSimple by built-in mad24.
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>
9 years agoMerge pull request #3633 from mshabunin:fix-gdal-warning
Vadim Pisarevsky [Wed, 21 Jan 2015 13:07:53 +0000 (13:07 +0000)]
Merge pull request #3633 from mshabunin:fix-gdal-warning

9 years agoremove unused function from pyrlk_optical_flow sample
Vladislav Vinogradov [Mon, 12 Jan 2015 08:26:07 +0000 (11:26 +0300)]
remove unused function from pyrlk_optical_flow sample

9 years agoremove obsolete gpu optical flow samples
Vladislav Vinogradov [Wed, 31 Dec 2014 12:37:25 +0000 (15:37 +0300)]
remove obsolete gpu optical flow samples