platform/upstream/opencv.git
10 years agoMerge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4
Roman Donchenko [Mon, 9 Jun 2014 10:29:44 +0000 (14:29 +0400)]
Merge pull request #2834 from atinfinity:pullreq/140606-TickMeter-2.4

10 years agoMerge pull request #2818 from StevenPuttemans:fix_linux_tutorial
Roman Donchenko [Mon, 9 Jun 2014 09:37:38 +0000 (13:37 +0400)]
Merge pull request #2818 from StevenPuttemans:fix_linux_tutorial

10 years agofixed calculation method of "cv::TickMeter"
atinfinity [Fri, 6 Jun 2014 22:29:22 +0000 (07:29 +0900)]
fixed calculation method of "cv::TickMeter"

10 years agofix typo in linux tutorial
StevenPuttemans [Mon, 2 Jun 2014 07:35:19 +0000 (09:35 +0200)]
fix typo in linux tutorial

10 years agoMerge pull request #2771 from SpecLad:pvs-checks-opencv
Roman Donchenko [Thu, 29 May 2014 10:50:42 +0000 (14:50 +0400)]
Merge pull request #2771 from SpecLad:pvs-checks-opencv

10 years agoMerge pull request #2796 from berak:b_3674_24
Alexander Alekhin [Wed, 28 May 2014 09:28:30 +0000 (13:28 +0400)]
Merge pull request #2796 from berak:b_3674_24

10 years ago2 fixed unassigned reshapes in em (#3674)
berak [Wed, 28 May 2014 08:37:16 +0000 (10:37 +0200)]
2 fixed unassigned reshapes in em (#3674)

10 years agoMerge pull request #2793 from alalek:run_android_env
Roman Donchenko [Tue, 27 May 2014 09:35:10 +0000 (13:35 +0400)]
Merge pull request #2793 from alalek:run_android_env

10 years agorun.py: propagate OPENCV* env variables only with --android_propagate_opencv_env...
Alexander Alekhin [Mon, 26 May 2014 10:32:52 +0000 (14:32 +0400)]
run.py: propagate OPENCV* env variables only with --android_propagate_opencv_env flag

10 years agorun.py: added --android_env parameter
Alexander Alekhin [Sun, 25 May 2014 21:19:16 +0000 (01:19 +0400)]
run.py: added --android_env parameter

10 years agoMerge pull request #2742 from StevenPuttemans:feature_3176
Roman Donchenko [Thu, 22 May 2014 14:03:56 +0000 (18:03 +0400)]
Merge pull request #2742 from StevenPuttemans:feature_3176

10 years agoAdded more info on the data input variable of kmeans
StevenPuttemans [Tue, 13 May 2014 12:35:08 +0000 (14:35 +0200)]
Added more info on the data input variable of kmeans

10 years agoFixed several problems found by PVS-Studio.
Roman Donchenko [Tue, 20 May 2014 09:54:00 +0000 (13:54 +0400)]
Fixed several problems found by PVS-Studio.

This fixes all problems from the article "Checking OpenCV with PVS-Studio"
<http://www.viva64.com/en/b/0191/> that are not already fixed and are
not in 3rdparty or the legacy module.

The problems fixed are two instances of useless code and one instance
of unspecified behavior (right-shifting a negative number).

10 years agoMerge pull request #2768 from SpecLad:useless-loop
Roman Donchenko [Tue, 20 May 2014 07:50:29 +0000 (11:50 +0400)]
Merge pull request #2768 from SpecLad:useless-loop

10 years agoRemove a useless loop that copies an array to itself
Roman Donchenko [Mon, 19 May 2014 13:38:30 +0000 (17:38 +0400)]
Remove a useless loop that copies an array to itself

10 years agoMerge pull request #2509 from euphrat:mog2_bgimg_gray
Vadim Pisarevsky [Mon, 19 May 2014 13:36:38 +0000 (17:36 +0400)]
Merge pull request #2509 from euphrat:mog2_bgimg_gray

10 years agoMerge pull request #2701 from thoinvil:BugfixFilterEngineApplyROI
Vadim Pisarevsky [Mon, 19 May 2014 13:34:45 +0000 (17:34 +0400)]
Merge pull request #2701 from thoinvil:BugfixFilterEngineApplyROI

10 years agoMerge pull request #2739 from StevenPuttemans:bug_1523
Vadim Pisarevsky [Mon, 19 May 2014 13:33:36 +0000 (17:33 +0400)]
Merge pull request #2739 from StevenPuttemans:bug_1523

10 years agoMerge pull request #2738 from kevmitch:2.4
Vadim Pisarevsky [Mon, 19 May 2014 13:33:22 +0000 (17:33 +0400)]
Merge pull request #2738 from kevmitch:2.4

10 years agoMerge pull request #2744 from jet47:kmeans-fix
Vadim Pisarevsky [Mon, 19 May 2014 13:33:09 +0000 (17:33 +0400)]
Merge pull request #2744 from jet47:kmeans-fix

10 years agoMerge pull request #2754 from thoinvil:patch-1
Roman Donchenko [Mon, 19 May 2014 11:41:27 +0000 (15:41 +0400)]
Merge pull request #2754 from thoinvil:patch-1

10 years agofix coordinate problem with large images - bug 1523
StevenPuttemans [Tue, 13 May 2014 09:43:02 +0000 (11:43 +0200)]
fix coordinate problem with large images - bug 1523

10 years agoMerge pull request #2735 from StevenPuttemans:bug_2000
Roman Donchenko [Mon, 19 May 2014 10:25:46 +0000 (14:25 +0400)]
Merge pull request #2735 from StevenPuttemans:bug_2000

10 years agoadded documentation for findContours
StevenPuttemans [Mon, 12 May 2014 14:45:42 +0000 (16:45 +0200)]
added documentation for findContours

10 years agoMerge pull request #2733 from StevenPuttemans:bug_2162
Roman Donchenko [Mon, 19 May 2014 09:04:54 +0000 (13:04 +0400)]
Merge pull request #2733 from StevenPuttemans:bug_2162

10 years agoMerge pull request #2719 from yashdv:patch-1
Roman Donchenko [Mon, 19 May 2014 09:00:32 +0000 (13:00 +0400)]
Merge pull request #2719 from yashdv:patch-1

10 years agoMerge pull request #2753 from shahurik:2.4
Roman Donchenko [Fri, 16 May 2014 13:40:41 +0000 (17:40 +0400)]
Merge pull request #2753 from shahurik:2.4

10 years agoadd additional tests for different input cases
Vladislav Vinogradov [Thu, 15 May 2014 08:08:38 +0000 (12:08 +0400)]
add additional tests for different input cases

10 years agouse more accurate reshape
Vladislav Vinogradov [Thu, 15 May 2014 08:08:01 +0000 (12:08 +0400)]
use more accurate reshape

10 years agoAdded condition to 1st test in cv::GaussianBlur
thoinvil [Thu, 15 May 2014 06:40:13 +0000 (08:40 +0200)]
Added condition to 1st test in cv::GaussianBlur

Consistent with the test made in cv::boxFilter, it adjusts the kernel size to the source size only if the border is not BORDER_CONSTANT and if BORDER_ISOLATED is set. Otherwise, the source has to be considered possibly in a larger image (i.e. the source being a ROI) in witch the kernel should apply.

10 years agoFix svm intro tutorial
Vlad Shakhuro [Thu, 8 May 2014 14:14:48 +0000 (18:14 +0400)]
Fix svm intro tutorial

10 years agoMerge pull request #2743 from StevenPuttemans:bugfix_3549
Roman Donchenko [Wed, 14 May 2014 15:49:27 +0000 (19:49 +0400)]
Merge pull request #2743 from StevenPuttemans:bugfix_3549

10 years agoMerge pull request #2747 from jet47:gpu-resize-stream-fix
Roman Donchenko [Wed, 14 May 2014 12:34:47 +0000 (16:34 +0400)]
Merge pull request #2747 from jet47:gpu-resize-stream-fix

10 years agoMerge pull request #2745 from yashdv:patch-3
Roman Donchenko [Wed, 14 May 2014 08:38:43 +0000 (12:38 +0400)]
Merge pull request #2745 from yashdv:patch-3

10 years agoMerge pull request #2748 from jet47:fix-bug-3690
Roman Donchenko [Wed, 14 May 2014 08:35:04 +0000 (12:35 +0400)]
Merge pull request #2748 from jet47:fix-bug-3690

10 years agofix bug #3690
Vladislav Vinogradov [Wed, 14 May 2014 06:47:28 +0000 (10:47 +0400)]
fix bug #3690

removed invalid condition, it is always false

10 years agofix cv::gpu::resize function
Vladislav Vinogradov [Wed, 14 May 2014 06:31:28 +0000 (10:31 +0400)]
fix cv::gpu::resize function

add missing stream parameter to call_resize_linear_glob

10 years agofixed a syntax error in cap_giganetix.cpp
Yash Vadalia [Tue, 13 May 2014 14:29:37 +0000 (19:59 +0530)]
fixed a syntax error in cap_giganetix.cpp

Ticket 3458 (http://code.opencv.org/issues/3458)

10 years agoAdded doc for LinearPolar Transform
Yash Vadalia [Sun, 11 May 2014 13:39:37 +0000 (19:09 +0530)]
Added doc for LinearPolar Transform

10 years agofix cv::kmeans function
Vladislav Vinogradov [Tue, 13 May 2014 13:59:20 +0000 (17:59 +0400)]
fix cv::kmeans function

reshape input matrix, since the function works with data
as with [N x dims] matrix

10 years agoadding bugfix 3549
StevenPuttemans [Tue, 13 May 2014 13:34:30 +0000 (15:34 +0200)]
adding bugfix 3549

10 years agoMerge pull request #2737 from jet47:fix-opencv-cmake-config
Roman Donchenko [Tue, 13 May 2014 10:39:09 +0000 (14:39 +0400)]
Merge pull request #2737 from jet47:fix-opencv-cmake-config

10 years agoMerge pull request #2731 from StevenPuttemans:bug_2626
Roman Donchenko [Tue, 13 May 2014 10:21:36 +0000 (14:21 +0400)]
Merge pull request #2731 from StevenPuttemans:bug_2626

10 years agoMerge pull request #2730 from StevenPuttemans:bug_2740
Roman Donchenko [Tue, 13 May 2014 10:19:42 +0000 (14:19 +0400)]
Merge pull request #2730 from StevenPuttemans:bug_2740

10 years agoMerge pull request #2729 from StevenPuttemans:bug_3252
Roman Donchenko [Tue, 13 May 2014 10:17:09 +0000 (14:17 +0400)]
Merge pull request #2729 from StevenPuttemans:bug_3252

10 years agoMerge pull request #2728 from StevenPuttemans:bug_3434
Roman Donchenko [Tue, 13 May 2014 10:15:37 +0000 (14:15 +0400)]
Merge pull request #2728 from StevenPuttemans:bug_3434

10 years agodoc: update/clarify behaviour of mask in floodFill
Kevin Mitchell [Mon, 12 May 2014 21:48:34 +0000 (14:48 -0700)]
doc: update/clarify behaviour of mask in floodFill

Clarify how the mask parameter is set on output and how this is
affected by the flags parameter.

resolves Feature #2942

10 years agoFixing as suggested in bug 2626, made naming same for both C, C++ and python API
StevenPuttemans [Mon, 12 May 2014 13:39:40 +0000 (15:39 +0200)]
Fixing as suggested in bug 2626, made naming same for both C, C++ and python API

10 years agoMerge pull request #2699 from GregoryMorse:patch-1
Roman Donchenko [Tue, 13 May 2014 07:58:25 +0000 (11:58 +0400)]
Merge pull request #2699 from GregoryMorse:patch-1

10 years agoMerge pull request #2692 from 1Hyena:2.4
Roman Donchenko [Tue, 13 May 2014 07:56:12 +0000 (11:56 +0400)]
Merge pull request #2692 from 1Hyena:2.4

10 years agoMerge pull request #2727 from StevenPuttemans:bug_3484
Roman Donchenko [Tue, 13 May 2014 07:55:16 +0000 (11:55 +0400)]
Merge pull request #2727 from StevenPuttemans:bug_3484

10 years agofix OpenCVConfig.cmake template - missing parentheses
Vladislav Vinogradov [Tue, 13 May 2014 07:37:21 +0000 (11:37 +0400)]
fix OpenCVConfig.cmake template - missing parentheses

10 years agoChanged ostringstream to ostream for new print_params and added the old
1Hyena [Mon, 12 May 2014 20:01:44 +0000 (23:01 +0300)]
Changed ostringstream to ostream for new print_params and added the old
version of print_params for backwards compatibility.

10 years agoMerge pull request #2714 from asmorkalov:ocv_cmake_config
Roman Donchenko [Mon, 12 May 2014 14:53:10 +0000 (18:53 +0400)]
Merge pull request #2714 from asmorkalov:ocv_cmake_config

10 years agoMerge pull request #2721 from zarrabeitia:2.4
Roman Donchenko [Mon, 12 May 2014 14:48:01 +0000 (18:48 +0400)]
Merge pull request #2721 from zarrabeitia:2.4

10 years agofixed bug 2626
StevenPuttemans [Mon, 12 May 2014 13:39:40 +0000 (15:39 +0200)]
fixed bug 2626

10 years agofix bug 3434
StevenPuttemans [Mon, 12 May 2014 12:47:10 +0000 (14:47 +0200)]
fix bug 3434

10 years agobug 2740 added fix
StevenPuttemans [Mon, 12 May 2014 13:26:56 +0000 (15:26 +0200)]
bug 2740 added fix

10 years agofix bug 3252
StevenPuttemans [Mon, 12 May 2014 13:01:15 +0000 (15:01 +0200)]
fix bug 3252

10 years agofixed bug 3484
StevenPuttemans [Mon, 12 May 2014 12:40:12 +0000 (14:40 +0200)]
fixed bug 3484

10 years agoFix non-Android cross compilation with OpenCVConfig.cmake
Alexander Smorkalov [Thu, 8 May 2014 11:55:30 +0000 (15:55 +0400)]
Fix non-Android cross compilation with OpenCVConfig.cmake

10 years agoMerge pull request #2717 from StevenPuttemans:2.4
Roman Donchenko [Mon, 12 May 2014 11:14:53 +0000 (15:14 +0400)]
Merge pull request #2717 from StevenPuttemans:2.4

10 years agohighgui: fix segfault on CvCapture_GStreamer::retrieveFrame
Luis Zarrabeitia [Sun, 11 May 2014 23:00:14 +0000 (19:00 -0400)]
highgui: fix segfault on CvCapture_GStreamer::retrieveFrame

CvCapture_GStreamer::retrieveFrame assumes that RGB videos are 24BPP.
This is not necesarily the case, unless we explicitly tell GStreamer
that we want 24BPP RGB streams.

Adding bpp=(int)24 to the appsink caps.

10 years agoadd suggestion of feature 2619
StevenPuttemans [Fri, 9 May 2014 11:44:12 +0000 (13:44 +0200)]
add suggestion of feature 2619

10 years agoMerge pull request #2706 from ilya-lavrenov:ipp_2.4_warnings
Alexander Alekhin [Thu, 8 May 2014 13:04:17 +0000 (17:04 +0400)]
Merge pull request #2706 from ilya-lavrenov:ipp_2.4_warnings

10 years agoMerge pull request #2708 from StevenPuttemans:2.4
Alexander Alekhin [Thu, 8 May 2014 13:02:40 +0000 (17:02 +0400)]
Merge pull request #2708 from StevenPuttemans:2.4

10 years agoMerge pull request #2712 from jet47:subtract-fix-3rd-attempt
Alexander Alekhin [Thu, 8 May 2014 11:44:51 +0000 (15:44 +0400)]
Merge pull request #2712 from jet47:subtract-fix-3rd-attempt

10 years agofixed IPP related warnings
Ilya Lavrenov [Wed, 7 May 2014 13:33:34 +0000 (17:33 +0400)]
fixed IPP related warnings

10 years agofinally fix cv::subtract
Vladislav Vinogradov [Thu, 8 May 2014 07:59:30 +0000 (11:59 +0400)]
finally fix cv::subtract

10 years agofixed wrong download link in tutorial
StevenPuttemans [Thu, 8 May 2014 08:45:51 +0000 (10:45 +0200)]
fixed wrong download link in tutorial

10 years agoBugfix #3668 removed the comment
thoinvil [Wed, 7 May 2014 16:27:08 +0000 (18:27 +0200)]
Bugfix #3668 removed the comment

10 years agofix output matrix allocation in cv::subtract
Vladislav Vinogradov [Wed, 7 May 2014 15:52:35 +0000 (19:52 +0400)]
fix output matrix allocation in cv::subtract

10 years agoMerge pull request #2703 from jet47:subtract-create-dst-mat
Alexander Alekhin [Wed, 7 May 2014 12:50:50 +0000 (16:50 +0400)]
Merge pull request #2703 from jet47:subtract-create-dst-mat

10 years agofix cv::subtract function:
Vladislav Vinogradov [Wed, 7 May 2014 09:15:19 +0000 (13:15 +0400)]
fix cv::subtract function:

call dst.create(...) before using it

10 years agoMerge pull request #2693 from mvukad:bugfix_ippmorphop
Alexander Alekhin [Wed, 7 May 2014 09:15:07 +0000 (13:15 +0400)]
Merge pull request #2693 from mvukad:bugfix_ippmorphop

10 years agoWinRT core compatibility fixes
GregoryMorse [Mon, 5 May 2014 20:59:07 +0000 (04:59 +0800)]
WinRT core compatibility fixes

Update system.cpp

Update system.cpp

Update system.cpp

Update matching.cpp

Update matching.cpp

10 years agoBugfix #3668 in FilterEngine::apply(), use the ROI properly
Thierry Hoinville [Tue, 6 May 2014 13:33:07 +0000 (15:33 +0200)]
Bugfix #3668 in FilterEngine::apply(), use the ROI properly

10 years agoMerge pull request #2636 from atrebbi:#3653
Alexander Alekhin [Mon, 5 May 2014 14:00:17 +0000 (18:00 +0400)]
Merge pull request #2636 from atrebbi:#3653

10 years agoMerge pull request #2696 from PhilLab:2.4
Alexander Alekhin [Mon, 5 May 2014 13:08:47 +0000 (17:08 +0400)]
Merge pull request #2696 from PhilLab:2.4

10 years agoUpdated documentation: library names
PhilLab [Mon, 5 May 2014 10:16:48 +0000 (12:16 +0200)]
Updated documentation: library names

updated the library names to OpenCV version 2.4.9

10 years agoFixed bug in IPPMorphOp function when looping over elements of the morphology kernel.
Michael Vukadinovic [Thu, 1 May 2014 18:52:49 +0000 (11:52 -0700)]
Fixed bug in IPPMorphOp function when looping over elements of the morphology kernel.

10 years agoAutotuned_index now prints all info into logger instead of couting it.
1Hyena [Thu, 1 May 2014 17:55:49 +0000 (20:55 +0300)]
Autotuned_index now prints all info into logger instead of couting it.

10 years agoMerge pull request #2659 from adrians:docs_pull_1
Roman Donchenko [Mon, 28 Apr 2014 07:36:12 +0000 (11:36 +0400)]
Merge pull request #2659 from adrians:docs_pull_1

10 years agoDocumentation - minor fix-ups
Adrian Stratulat [Wed, 23 Apr 2014 17:30:27 +0000 (17:30 +0000)]
Documentation - minor fix-ups

10 years agoMerge pull request #2640 from a-wi:2.4
Roman Donchenko [Tue, 22 Apr 2014 08:01:47 +0000 (12:01 +0400)]
Merge pull request #2640 from a-wi:2.4

10 years agoFix for issue #3645 (http://code.opencv.org/issues/3645).
Artur Wieczorek [Sun, 20 Apr 2014 19:37:29 +0000 (21:37 +0200)]
Fix for issue #3645 (code.opencv.org/issues/3645).
Implement missing features in CvCaptureCAM_VFW class.

Implemented missing CvCaptureCAM_VFW::setProperty() member function (handling CV_CAP_PROP_FRAME_WIDTH, CV_CAP_PROP_FRAME_HEIGHT, CV_CAP_PROP_FPS properties).
Extended CvCaptureCAM_VFW::setProperty()/getProperty() functions to handle also CV_CAP_PROP_FPS property.
Minor refactoring of CvCaptureCAM_VFW class.

10 years agofix for compiling 2.4 opencv with xcode 5.1
Alessandro Trebbi [Fri, 18 Apr 2014 11:42:47 +0000 (13:42 +0200)]
fix for compiling 2.4 opencv with xcode 5.1

10 years agoMerge pull request #2544 from alalek:perf_report_regressions
Andrey Pavlenko [Tue, 15 Apr 2014 12:17:39 +0000 (16:17 +0400)]
Merge pull request #2544 from alalek:perf_report_regressions

10 years agoMerge pull request #2016 from pemmanuelviel:kmeansppSquareDist
Vadim Pisarevsky [Tue, 15 Apr 2014 09:31:47 +0000 (13:31 +0400)]
Merge pull request #2016 from pemmanuelviel:kmeansppSquareDist

10 years agoMerge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos
Roman Donchenko [Fri, 11 Apr 2014 10:15:26 +0000 (14:15 +0400)]
Merge pull request #2571 from MartinChodakowski:fix-old-python-doc-typos

10 years agoMerge pull request #2579 from maksqwe:test_operations_fix
Roman Donchenko [Fri, 11 Apr 2014 10:14:33 +0000 (14:14 +0400)]
Merge pull request #2579 from maksqwe:test_operations_fix

10 years agoMerge pull request #2603 from maksqwe:unused_fix_2.4
Roman Donchenko [Fri, 11 Apr 2014 10:14:04 +0000 (14:14 +0400)]
Merge pull request #2603 from maksqwe:unused_fix_2.4

10 years agoMerge pull request #2575 from rold2007:Bugfix_1437
Vadim Pisarevsky [Thu, 10 Apr 2014 09:31:33 +0000 (13:31 +0400)]
Merge pull request #2575 from rold2007:Bugfix_1437

10 years agoMerge pull request #2599 from maksqwe:test_calibration_2.4
Vadim Pisarevsky [Thu, 10 Apr 2014 09:30:36 +0000 (13:30 +0400)]
Merge pull request #2599 from maksqwe:test_calibration_2.4

10 years agoMerge pull request #2591 from Nerei:viz_cloud_shading_support
Vadim Pisarevsky [Thu, 10 Apr 2014 09:29:58 +0000 (13:29 +0400)]
Merge pull request #2591 from Nerei:viz_cloud_shading_support

10 years agoremove unused variables in CV_KDTreeTest_CPP::findNeighbors()
Maks Naumov [Wed, 9 Apr 2014 20:07:48 +0000 (23:07 +0300)]
remove unused variables in CV_KDTreeTest_CPP::findNeighbors()

10 years agoremove unused variable in TEST_P()
Maks Naumov [Wed, 9 Apr 2014 20:06:06 +0000 (23:06 +0300)]
remove unused variable in TEST_P()

10 years agoremove unused variable in OCL_PERF_TEST_P()
Maks Naumov [Wed, 9 Apr 2014 20:04:29 +0000 (23:04 +0300)]
remove unused variable in OCL_PERF_TEST_P()

10 years agoremove unused variable in ocl_moments()
Maks Naumov [Wed, 9 Apr 2014 20:01:49 +0000 (23:01 +0300)]
remove unused variable in ocl_moments()

10 years agoremove unused variable in findCorners_caller()
Maks Naumov [Wed, 9 Apr 2014 19:59:52 +0000 (22:59 +0300)]
remove unused variable in findCorners_caller()