platform/upstream/opencv.git
10 years ago[HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated...
Adi Shavit [Sun, 12 Jan 2014 07:33:08 +0000 (09:33 +0200)]
[HighGUI] Updated mouse wheel delta to reside within the 'flags' variable. Updated C++ API.

10 years agoAdded support for mouse-wheel events on Windows.
Adi Shavit [Tue, 7 Jan 2014 19:17:57 +0000 (21:17 +0200)]
Added support for mouse-wheel events on Windows.
To be used in the mouse callback like this:
    if (CV_EVENT_MOUSEWHEEL == CV_GET_MOUSEWHEEL_EVENT(event))
    {
       int delta= CV_GET_WHEEL_DELTA(event);
       // use delta...
    }

10 years agoSmall fix for extracting mouse coordinates on Windows, in a way that will always...
Adi Shavit [Sun, 5 Jan 2014 15:21:59 +0000 (17:21 +0200)]
Small fix for extracting mouse coordinates on Windows, in a way that will always work with multiple monitors.
This is the way recommended by Microsoft.

10 years agoMerge pull request #2147 from ilya-lavrenov:tapi_sqrt
Andrey Pavlenko [Tue, 14 Jan 2014 07:34:02 +0000 (11:34 +0400)]
Merge pull request #2147 from ilya-lavrenov:tapi_sqrt

10 years agodeleted extra arg in case of power=0.5
Ilya Lavrenov [Mon, 13 Jan 2014 15:58:27 +0000 (19:58 +0400)]
deleted extra arg in case of power=0.5

10 years agoMerge pull request #2136 from SpecLad:python-ver
Roman Donchenko [Mon, 13 Jan 2014 14:16:59 +0000 (18:16 +0400)]
Merge pull request #2136 from SpecLad:python-ver

10 years agoMerge pull request #2138 from alekcac:python_tutorial_fix
Roman Donchenko [Mon, 13 Jan 2014 12:32:41 +0000 (16:32 +0400)]
Merge pull request #2138 from alekcac:python_tutorial_fix

10 years agoMerge pull request #2121 from ilya-lavrenov:tapi_perf
Roman Donchenko [Mon, 13 Jan 2014 12:30:33 +0000 (16:30 +0400)]
Merge pull request #2121 from ilya-lavrenov:tapi_perf

10 years agoMerge pull request #2135 from alalek:ocl_runtime_cleanup_2
Andrey Pavlenko [Sat, 11 Jan 2014 13:15:21 +0000 (17:15 +0400)]
Merge pull request #2135 from alalek:ocl_runtime_cleanup_2

10 years agoMerge pull request #2112 from ilya-lavrenov:tapi_stitching
Andrey Pavlenko [Sat, 11 Jan 2014 12:39:21 +0000 (16:39 +0400)]
Merge pull request #2112 from ilya-lavrenov:tapi_stitching

10 years agochanged code in python tutorial, these functions don’t return image
Alexander Shishkov [Sat, 11 Jan 2014 12:35:41 +0000 (16:35 +0400)]
changed code in python tutorial, these functions don’t return image

10 years agoadded NORM_L2SQR type to cv::norm
Ilya Lavrenov [Tue, 7 Jan 2014 16:32:22 +0000 (20:32 +0400)]
added NORM_L2SQR type to cv::norm

10 years agoadded cv::PSNR performance test
Ilya Lavrenov [Tue, 7 Jan 2014 16:17:45 +0000 (20:17 +0400)]
added cv::PSNR performance test

10 years agoadded some performance tests
Ilya Lavrenov [Tue, 7 Jan 2014 11:08:48 +0000 (15:08 +0400)]
added some performance tests

10 years agoadded mask support to cv::norm, cv::meanStdDev
Ilya Lavrenov [Sun, 5 Jan 2014 20:12:13 +0000 (00:12 +0400)]
added mask support to cv::norm, cv::meanStdDev

10 years agoDon't use PYTHON_VERSION_STRING when searching for Python libraries
Roman Donchenko [Fri, 10 Jan 2014 14:40:47 +0000 (18:40 +0400)]
Don't use PYTHON_VERSION_STRING when searching for Python libraries

It may be an arbitrary string, and, for example, in Ubuntu 13.10
it's set to "2.7.5+", which breaks the find script.

10 years agoupdated docs according to the last changes
Ilya Lavrenov [Thu, 9 Jan 2014 13:00:08 +0000 (17:00 +0400)]
updated docs according to the last changes

10 years agoreplaced Mat by Input/Output arrays
Ilya Lavrenov [Thu, 9 Jan 2014 11:21:07 +0000 (15:21 +0400)]
replaced Mat by Input/Output arrays

10 years agoadded OpenCL accelerated warpers
Ilya Lavrenov [Wed, 1 Jan 2014 19:46:19 +0000 (23:46 +0400)]
added OpenCL accelerated warpers

10 years agoMerge pull request #2105 from ilya-lavrenov:norm
Roman Donchenko [Fri, 10 Jan 2014 14:12:08 +0000 (18:12 +0400)]
Merge pull request #2105 from ilya-lavrenov:norm

10 years agocore/ocl: runtime, remove unused declarations
Alexander Alekhin [Thu, 9 Jan 2014 15:07:39 +0000 (19:07 +0400)]
core/ocl: runtime, remove unused declarations

10 years agofixed case with zero mask
Ilya Lavrenov [Thu, 9 Jan 2014 13:32:13 +0000 (17:32 +0400)]
fixed case with zero mask

10 years agoMerge pull request #2128 from alalek:ocl_cleanup_runtime
Andrey Pavlenko [Thu, 9 Jan 2014 13:08:48 +0000 (17:08 +0400)]
Merge pull request #2128 from alalek:ocl_cleanup_runtime

10 years agoMerge pull request #2129 from ilya-lavrenov:mix_fix
Roman Donchenko [Thu, 9 Jan 2014 13:04:03 +0000 (17:04 +0400)]
Merge pull request #2129 from ilya-lavrenov:mix_fix

10 years agoMerge pull request #2119 from d-schmidt:patch-1
Roman Donchenko [Thu, 9 Jan 2014 10:44:06 +0000 (14:44 +0400)]
Merge pull request #2119 from d-schmidt:patch-1

10 years agofixed cv::mixChannels perf test
Ilya Lavrenov [Thu, 9 Jan 2014 10:26:44 +0000 (14:26 +0400)]
fixed cv::mixChannels perf test

10 years agoMerge pull request #2126 from yinghau76:master
Roman Donchenko [Thu, 9 Jan 2014 10:00:52 +0000 (14:00 +0400)]
Merge pull request #2126 from yinghau76:master

10 years agoadded mask support to cv::norm, cv::meanStdDev
Ilya Lavrenov [Sun, 5 Jan 2014 20:12:13 +0000 (00:12 +0400)]
added mask support to cv::norm, cv::meanStdDev

10 years agocore/ocl: cleanup unused files
Alexander Alekhin [Thu, 9 Jan 2014 09:47:04 +0000 (13:47 +0400)]
core/ocl: cleanup unused files

10 years agoMerge tag '3.0-ocl-tech-preview' (-s ours)
Roman Donchenko [Thu, 9 Jan 2014 08:42:58 +0000 (12:42 +0400)]
Merge tag '3.0-ocl-tech-preview' (-s ours)

10 years agoMerge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
Roman Donchenko [Thu, 9 Jan 2014 08:41:57 +0000 (12:41 +0400)]
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix

10 years agoMerge pull request #2103 from ilya-lavrenov:typo
Roman Donchenko [Thu, 9 Jan 2014 08:38:55 +0000 (12:38 +0400)]
Merge pull request #2103 from ilya-lavrenov:typo

10 years agoMerge pull request #2102 from Nerei:compilatin_for_windows
Roman Donchenko [Thu, 9 Jan 2014 08:35:30 +0000 (12:35 +0400)]
Merge pull request #2102 from Nerei:compilatin_for_windows

10 years agoFix compiler error with Android NDK r8e
Patrick Tsai [Thu, 9 Jan 2014 06:41:44 +0000 (14:41 +0800)]
Fix compiler error with Android NDK r8e

Original error without the fix:

opencv/modules/objdetect/src/cascadedetect.cpp: In member function 'bool cv::CascadeClassifierImpl::ocl_detectSingleScale(const cv::_InputArray&, cv::Size, int, double, cv::Size)':
/opencv/modules/objdetect/src/cascadedetect.cpp:1215:
error: no matching function for call to 'cv::ocl::Kernel::args(cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, int, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::ocl::KernelArg, cv::Size&, int&, float, cv::Rect&, cv::Size&, cv::CascadeClassifierImpl::<anonymous enum>)'

10 years agoUpdate py_face_detection.rst
David Schmidt [Mon, 6 Jan 2014 23:11:33 +0000 (00:11 +0100)]
Update py_face_detection.rst

bug in example

10 years agofixed cv::mixChannels OpenCL version
Ilya Lavrenov [Mon, 6 Jan 2014 10:41:57 +0000 (14:41 +0400)]
fixed cv::mixChannels OpenCL version

10 years agofixed overflow for cv::norm NORM_L2
Ilya Lavrenov [Wed, 1 Jan 2014 19:46:19 +0000 (23:46 +0400)]
fixed overflow for cv::norm NORM_L2

10 years agofixed typo
Ilya Lavrenov [Wed, 1 Jan 2014 15:41:14 +0000 (19:41 +0400)]
fixed typo

10 years agocompilation for windows
Anatoly Baksheev [Wed, 1 Jan 2014 11:38:59 +0000 (15:38 +0400)]
compilation for windows

10 years agoMerge pull request #1957 from Nerei:format_declaration_by_default
Vadim Pisarevsky [Tue, 31 Dec 2013 11:54:59 +0000 (15:54 +0400)]
Merge pull request #1957 from Nerei:format_declaration_by_default

10 years agoSet the version status to "-tp", for "technical preview".
Roman Donchenko [Tue, 31 Dec 2013 11:37:47 +0000 (15:37 +0400)]
Set the version status to "-tp", for "technical preview".

10 years agoMerge pull request #2096 from kamjagin:master
Roman Donchenko [Tue, 31 Dec 2013 07:53:24 +0000 (11:53 +0400)]
Merge pull request #2096 from kamjagin:master

10 years agoMerge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
Andrey Pavlenko [Mon, 30 Dec 2013 20:35:39 +0000 (00:35 +0400)]
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix

10 years agoMerge pull request #2093 from SpecLad:merge-2.4
Andrey Pavlenko [Mon, 30 Dec 2013 20:26:22 +0000 (00:26 +0400)]
Merge pull request #2093 from SpecLad:merge-2.4

10 years agoMerge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
Andrey Pavlenko [Mon, 30 Dec 2013 20:17:33 +0000 (00:17 +0400)]
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe

10 years agoFix for bug #3469 CV_XADD failing in clang+nvcc combination
Miroslav Kobetski [Mon, 30 Dec 2013 16:00:17 +0000 (17:00 +0100)]
Fix for bug #3469 CV_XADD failing in clang+nvcc combination

10 years agoMerge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
Andrey Pavlenko [Mon, 30 Dec 2013 15:54:26 +0000 (19:54 +0400)]
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs

10 years agoadded OpenCL version of cv::patchNaNs
Ilya Lavrenov [Sun, 29 Dec 2013 21:21:04 +0000 (01:21 +0400)]
added OpenCL version of cv::patchNaNs

10 years agofixed umat access
Ilya Lavrenov [Mon, 30 Dec 2013 15:27:06 +0000 (19:27 +0400)]
fixed umat access

10 years agoMerge pull request #2085 from severin-lemaignan:emscripten
Roman Donchenko [Mon, 30 Dec 2013 13:56:59 +0000 (17:56 +0400)]
Merge pull request #2085 from severin-lemaignan:emscripten

10 years agoMerge pull request #2089 from ilya-lavrenov:tapi_examples
Roman Donchenko [Mon, 30 Dec 2013 13:42:49 +0000 (17:42 +0400)]
Merge pull request #2089 from ilya-lavrenov:tapi_examples

10 years agoMerge commit '05b9c991dd' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 13:30:59 +0000 (17:30 +0400)]
Merge commit '05b9c991dd' into merge-2.4

Conflicts:
modules/cuda/test/test_objdetect.cpp
modules/gpu/perf/perf_core.cpp
modules/gpu/perf/perf_video.cpp
modules/gpu/test/test_core.cpp

10 years ago[emscripten] Do not link to system libraries
Séverin Lemaignan [Sat, 28 Dec 2013 10:05:00 +0000 (11:05 +0100)]
[emscripten] Do not link to system libraries

This is not meaningful when compiling to javascript, and causes warning
at linking stage.

10 years agoMerge commit '46be47cb4b8' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:52:16 +0000 (16:52 +0400)]
Merge commit '46be47cb4b8' into merge-2.4 (-s ours)

10 years agoMerge commit '0566ab4d3d' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:51:46 +0000 (16:51 +0400)]
Merge commit '0566ab4d3d' into merge-2.4

Conflicts:
modules/core/src/system.cpp

10 years agoMerge commit '719149877e' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:50:09 +0000 (16:50 +0400)]
Merge commit '719149877e' into merge-2.4 (-s ours)

10 years agoMerge commit 'ee36717d' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:49:39 +0000 (16:49 +0400)]
Merge commit 'ee36717d' into merge-2.4

10 years agoMerge commit '4b885e206' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:48:45 +0000 (16:48 +0400)]
Merge commit '4b885e206' into merge-2.4

10 years agoMerge commit '709e8e8e0' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:48:30 +0000 (16:48 +0400)]
Merge commit '709e8e8e0' into merge-2.4

10 years agoMerge commit '60906d917' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:47:05 +0000 (16:47 +0400)]
Merge commit '60906d917' into merge-2.4

Conflicts:
modules/ts/src/cuda_perf.cpp

10 years agoMerge commit '8fe79738c' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:41:10 +0000 (16:41 +0400)]
Merge commit '8fe79738c' into merge-2.4

10 years agoMerge commit 'b94963d38' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:39:51 +0000 (16:39 +0400)]
Merge commit 'b94963d38' into merge-2.4

Conflicts:
cmake/OpenCVGenAndroidMK.cmake

10 years agoMerge commit '24be7b26c' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:38:52 +0000 (16:38 +0400)]
Merge commit '24be7b26c' into merge-2.4 (-s ours)

10 years agoMerge commit '1acc1085d' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:37:39 +0000 (16:37 +0400)]
Merge commit '1acc1085d' into merge-2.4

10 years agoMerge commit 'edce617a5' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:37:26 +0000 (16:37 +0400)]
Merge commit 'edce617a5' into merge-2.4 (-s ours)

10 years agoMerge commit '83cdd43a' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:36:35 +0000 (16:36 +0400)]
Merge commit '83cdd43a' into merge-2.4

Conflicts:
modules/core/include/opencv2/core/version.hpp

10 years agoMerge commit 'f22d9a23' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:34:59 +0000 (16:34 +0400)]
Merge commit 'f22d9a23' into merge-2.4 (-s ours)

10 years agofix
Konstantin Matskevich [Mon, 30 Dec 2013 09:06:32 +0000 (13:06 +0400)]
fix

10 years agoconverted CPU-based example to T-API (Mat 2 UMat, etc)
Ilya Lavrenov [Sun, 29 Dec 2013 10:36:30 +0000 (14:36 +0400)]
converted CPU-based example to T-API (Mat 2 UMat, etc)

10 years agoadded OpenCL version of cv::scaleAdd
Ilya Lavrenov [Sun, 29 Dec 2013 14:46:25 +0000 (18:46 +0400)]
added OpenCL version of cv::scaleAdd

10 years agoimplemented OpenCL version of cv::convertScaleAbs
Ilya Lavrenov [Sun, 29 Dec 2013 14:01:01 +0000 (18:01 +0400)]
implemented OpenCL version of cv::convertScaleAbs

10 years agoadded the first T-API example - CamShift tracking
Ilya Lavrenov [Sat, 28 Dec 2013 22:28:43 +0000 (02:28 +0400)]
added the first T-API example - CamShift tracking

10 years agoMerge pull request #2081 from ilya-lavrenov:tapi_perf
Andrey Pavlenko [Sat, 28 Dec 2013 18:06:12 +0000 (22:06 +0400)]
Merge pull request #2081 from ilya-lavrenov:tapi_perf

10 years agoMerge pull request #2075 from ilya-lavrenov:tapi_mixchannels
Andrey Pavlenko [Sat, 28 Dec 2013 18:05:49 +0000 (22:05 +0400)]
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels

10 years agoMerge pull request #2055 from vbystricky:ocl_sepFilter2D
Andrey Pavlenko [Fri, 27 Dec 2013 18:38:08 +0000 (22:38 +0400)]
Merge pull request #2055 from vbystricky:ocl_sepFilter2D

10 years agodisabled cv::split perf test
Ilya Lavrenov [Fri, 27 Dec 2013 17:57:20 +0000 (21:57 +0400)]
disabled cv::split perf test

10 years agoMerge pull request #2083 from jet47:gpu_android_tests
Roman Donchenko [Fri, 27 Dec 2013 17:09:18 +0000 (21:09 +0400)]
Merge pull request #2083 from jet47:gpu_android_tests

10 years agoMerge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
Roman Donchenko [Fri, 27 Dec 2013 16:53:42 +0000 (20:53 +0400)]
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix

10 years agoMerge pull request #2077 from ilya-lavrenov:tapi_context
Roman Donchenko [Fri, 27 Dec 2013 16:23:56 +0000 (20:23 +0400)]
Merge pull request #2077 from ilya-lavrenov:tapi_context

10 years agoadded new perf tests to core
Ilya Lavrenov [Fri, 27 Dec 2013 12:33:18 +0000 (16:33 +0400)]
added new perf tests to core

10 years agoMerge pull request #2082 from asmorkalov:dynamicuda_internal_fix
Roman Donchenko [Fri, 27 Dec 2013 15:58:57 +0000 (19:58 +0400)]
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix

10 years agoincrease thresholds for some tests
Vladislav Vinogradov [Fri, 27 Dec 2013 14:20:14 +0000 (18:20 +0400)]
increase thresholds for some tests

10 years agodisable 2 problematic tests
Vladislav Vinogradov [Fri, 27 Dec 2013 14:20:01 +0000 (18:20 +0400)]
disable 2 problematic tests

10 years agodisabled GEMM test if library was built without CUBLAS
Vladislav Vinogradov [Fri, 27 Dec 2013 14:19:29 +0000 (18:19 +0400)]
disabled GEMM test if library was built without CUBLAS

10 years agoMerge pull request #2078 from ilya-lavrenov:warn
Roman Donchenko [Fri, 27 Dec 2013 14:17:21 +0000 (18:17 +0400)]
Merge pull request #2078 from ilya-lavrenov:warn

10 years agoBugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
Alexander Smorkalov [Fri, 27 Dec 2013 12:49:26 +0000 (16:49 +0400)]
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.

10 years agodynamicuda became private module.
Alexander Smorkalov [Fri, 27 Dec 2013 13:19:38 +0000 (17:19 +0400)]
dynamicuda became private module.

10 years agoChange threshold from 2.0 to 1.0 in the test
vbystricky [Fri, 27 Dec 2013 12:26:34 +0000 (16:26 +0400)]
Change threshold from 2.0 to 1.0 in the test

10 years agoChange sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR
vbystricky [Fri, 27 Dec 2013 12:21:32 +0000 (16:21 +0400)]
Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR

10 years agoMerge pull request #2034 from pentschev:ocl_features2d_orb_master
Andrey Pavlenko [Fri, 27 Dec 2013 11:49:27 +0000 (15:49 +0400)]
Merge pull request #2034 from pentschev:ocl_features2d_orb_master

10 years agoMerge pull request #2063 from vpisarev:ocl_moments
Andrey Pavlenko [Fri, 27 Dec 2013 11:44:11 +0000 (15:44 +0400)]
Merge pull request #2063 from vpisarev:ocl_moments

10 years agoMerge pull request #2076 from ilya-lavrenov:tapi_dft
Andrey Pavlenko [Fri, 27 Dec 2013 11:38:51 +0000 (15:38 +0400)]
Merge pull request #2076 from ilya-lavrenov:tapi_dft

10 years agoMerge pull request #2072 from pengx17:patch-3
Andrey Pavlenko [Fri, 27 Dec 2013 11:36:24 +0000 (15:36 +0400)]
Merge pull request #2072 from pengx17:patch-3

10 years agofixed warning [-Wempty-body]
Ilya Lavrenov [Fri, 27 Dec 2013 10:44:58 +0000 (14:44 +0400)]
fixed warning [-Wempty-body]

10 years agothis commit prevents segfaults in case of opencl disabled
Ilya Lavrenov [Fri, 27 Dec 2013 10:02:03 +0000 (14:02 +0400)]
this commit prevents segfaults in case of opencl disabled

10 years agosome fixes of cv::mixChannels
Ilya Lavrenov [Fri, 27 Dec 2013 09:59:55 +0000 (13:59 +0400)]
some fixes of cv::mixChannels

10 years agodisabled cv::dft opencl impl for CPU devices
Ilya Lavrenov [Fri, 27 Dec 2013 09:39:29 +0000 (13:39 +0400)]
disabled cv::dft opencl impl for CPU devices

10 years agofixed getUMatIndex
Ilya Lavrenov [Fri, 27 Dec 2013 09:18:31 +0000 (13:18 +0400)]
fixed getUMatIndex

10 years agoadded cv::mixChannels to T-API
Ilya Lavrenov [Thu, 26 Dec 2013 14:48:43 +0000 (18:48 +0400)]
added cv::mixChannels to T-API

10 years agoMerge pull request #2036 from GregoryMorse:patch-1
Roman Donchenko [Fri, 27 Dec 2013 08:44:02 +0000 (12:44 +0400)]
Merge pull request #2036 from GregoryMorse:patch-1