platform/upstream/opencv.git
10 years agoenabled tests
Ilya Lavrenov [Mon, 20 Jan 2014 14:09:43 +0000 (18:09 +0400)]
enabled tests

10 years agoMerge pull request #2141 from ilya-lavrenov:perf_warp
Roman Donchenko [Thu, 16 Jan 2014 14:03:21 +0000 (18:03 +0400)]
Merge pull request #2141 from ilya-lavrenov:perf_warp

10 years agoRevert "replaced sprintf with cv::format"
Roman Donchenko [Thu, 16 Jan 2014 13:58:26 +0000 (17:58 +0400)]
Revert "replaced sprintf with cv::format"

Fixing build breakage.

This reverts commit b83eff7ecf0a3a8a9d706168150d569c94f0b71e.

10 years agoMerge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d
Roman Donchenko [Thu, 16 Jan 2014 12:44:24 +0000 (16:44 +0400)]
Merge pull request #2151 from KonstantinMatskevich:testdata_path_calib3d

10 years agoreplaced sprintf with cv::format
Konstantin Matskevich [Thu, 16 Jan 2014 12:18:02 +0000 (16:18 +0400)]
replaced sprintf with cv::format

10 years agoMerge pull request #2127 from apavlenko:perf_cascades
Roman Donchenko [Thu, 16 Jan 2014 08:37:02 +0000 (12:37 +0400)]
Merge pull request #2127 from apavlenko:perf_cascades

10 years agoadded perf test for cv::Canny
Ilya Lavrenov [Mon, 13 Jan 2014 15:46:00 +0000 (19:46 +0400)]
added perf test for cv::Canny

10 years agochanged testdata path for calib3d
Konstantin Matskevich [Wed, 15 Jan 2014 11:08:09 +0000 (15:08 +0400)]
changed testdata path for calib3d

10 years agoMerge pull request #2150 from ilya-lavrenov:tapi_cvtcolor
Andrey Pavlenko [Wed, 15 Jan 2014 09:45:28 +0000 (13:45 +0400)]
Merge pull request #2150 from ilya-lavrenov:tapi_cvtcolor

10 years agoadding old cascade
Andrey Pavlenko [Tue, 14 Jan 2014 19:15:50 +0000 (23:15 +0400)]
adding old cascade

10 years agofixing compilation if `WITH_OPENCL=OFF`
Andrey Pavlenko [Tue, 14 Jan 2014 13:50:00 +0000 (17:50 +0400)]
fixing compilation if `WITH_OPENCL=OFF`

10 years agofixed cv::cvtColor
Ilya Lavrenov [Tue, 14 Jan 2014 12:15:42 +0000 (16:15 +0400)]
fixed cv::cvtColor

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 agoadded perf test for cv::sqrBoxFilter
Ilya Lavrenov [Mon, 13 Jan 2014 14:51:49 +0000 (18:51 +0400)]
added perf test for cv::sqrBoxFilter

10 years agofixed cv::integral perf test
Ilya Lavrenov [Mon, 13 Jan 2014 14:36:25 +0000 (18:36 +0400)]
fixed cv::integral perf test

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 agoadded perf test for cv::Moments
Ilya Lavrenov [Mon, 13 Jan 2014 13:50:14 +0000 (17:50 +0400)]
added perf test for cv::Moments

10 years agoswitching to `CL_PERF_TEST_P`, adding `safeFinish()` to flush CL queue
Andrey Pavlenko [Mon, 13 Jan 2014 12:58:36 +0000 (16:58 +0400)]
switching to `CL_PERF_TEST_P`, adding `safeFinish()` to flush CL queue

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 agoadded perf tests for cv::medianBlur
Ilya Lavrenov [Mon, 13 Jan 2014 11:59:24 +0000 (15:59 +0400)]
added perf tests for cv::medianBlur

10 years agoadded perf tests for cv::morphologyEx
Ilya Lavrenov [Mon, 13 Jan 2014 11:43:09 +0000 (15:43 +0400)]
added perf tests for cv::morphologyEx

10 years agoadded perf tests for cv::dilate
Ilya Lavrenov [Mon, 13 Jan 2014 11:30:35 +0000 (15:30 +0400)]
added perf tests for cv::dilate

10 years agoadded perf tests for filters
Ilya Lavrenov [Mon, 13 Jan 2014 11:26:50 +0000 (15:26 +0400)]
added perf tests for filters

10 years agoadded perf tests to some imgproc functions
Ilya Lavrenov [Mon, 13 Jan 2014 11:01:52 +0000 (15:01 +0400)]
added perf tests to some imgproc functions

10 years agoadded perf test for cv::cvtColor, pyr operations
Ilya Lavrenov [Mon, 13 Jan 2014 10:14:22 +0000 (14:14 +0400)]
added perf test for cv::cvtColor, pyr operations

10 years agoadded perf tests for cv::blendLinear
Ilya Lavrenov [Mon, 13 Jan 2014 10:06:15 +0000 (14:06 +0400)]
added perf tests for cv::blendLinear

10 years agoadded perf tests for T-API warp operations
Ilya Lavrenov [Mon, 13 Jan 2014 09:09:58 +0000 (13:09 +0400)]
added perf tests for T-API warp operations

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 agoadding Haar & LBP cascades perf test using UMat, removing old incomplete test
Andrey Pavlenko [Thu, 9 Jan 2014 20:08:15 +0000 (00:08 +0400)]
adding Haar & LBP cascades perf test using UMat, removing old incomplete test

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