Roman Donchenko [Thu, 9 Jan 2014 08:41:57 +0000 (12:41 +0400)]
Merge pull request #2116 from ilya-lavrenov:tapi_mixchannels_fix
Roman Donchenko [Thu, 9 Jan 2014 08:38:55 +0000 (12:38 +0400)]
Merge pull request #2103 from ilya-lavrenov:typo
Roman Donchenko [Thu, 9 Jan 2014 08:35:30 +0000 (12:35 +0400)]
Merge pull request #2102 from Nerei:compilatin_for_windows
Ilya Lavrenov [Mon, 6 Jan 2014 10:41:57 +0000 (14:41 +0400)]
fixed cv::mixChannels OpenCL version
Ilya Lavrenov [Wed, 1 Jan 2014 15:41:14 +0000 (19:41 +0400)]
fixed typo
Anatoly Baksheev [Wed, 1 Jan 2014 11:38:59 +0000 (15:38 +0400)]
compilation for windows
Vadim Pisarevsky [Tue, 31 Dec 2013 11:54:59 +0000 (15:54 +0400)]
Merge pull request #1957 from Nerei:format_declaration_by_default
Roman Donchenko [Tue, 31 Dec 2013 07:53:24 +0000 (11:53 +0400)]
Merge pull request #2096 from kamjagin:master
Andrey Pavlenko [Mon, 30 Dec 2013 20:35:39 +0000 (00:35 +0400)]
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
Andrey Pavlenko [Mon, 30 Dec 2013 20:26:22 +0000 (00:26 +0400)]
Merge pull request #2093 from SpecLad:merge-2.4
Andrey Pavlenko [Mon, 30 Dec 2013 20:17:33 +0000 (00:17 +0400)]
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
Miroslav Kobetski [Mon, 30 Dec 2013 16:00:17 +0000 (17:00 +0100)]
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
Andrey Pavlenko [Mon, 30 Dec 2013 15:54:26 +0000 (19:54 +0400)]
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
Ilya Lavrenov [Sun, 29 Dec 2013 21:21:04 +0000 (01:21 +0400)]
added OpenCL version of cv::patchNaNs
Ilya Lavrenov [Mon, 30 Dec 2013 15:27:06 +0000 (19:27 +0400)]
fixed umat access
Roman Donchenko [Mon, 30 Dec 2013 13:56:59 +0000 (17:56 +0400)]
Merge pull request #2085 from severin-lemaignan:emscripten
Roman Donchenko [Mon, 30 Dec 2013 13:42:49 +0000 (17:42 +0400)]
Merge pull request #2089 from ilya-lavrenov:tapi_examples
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
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.
Roman Donchenko [Mon, 30 Dec 2013 12:52:16 +0000 (16:52 +0400)]
Merge commit '
46be47cb4b8' into merge-2.4 (-s ours)
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
Roman Donchenko [Mon, 30 Dec 2013 12:50:09 +0000 (16:50 +0400)]
Merge commit '
719149877e' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:49:39 +0000 (16:49 +0400)]
Merge commit '
ee36717d' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:48:45 +0000 (16:48 +0400)]
Merge commit '
4b885e206' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:48:30 +0000 (16:48 +0400)]
Merge commit '
709e8e8e0' 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
Roman Donchenko [Mon, 30 Dec 2013 12:41:10 +0000 (16:41 +0400)]
Merge commit '
8fe79738c' 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
Roman Donchenko [Mon, 30 Dec 2013 12:38:52 +0000 (16:38 +0400)]
Merge commit '
24be7b26c' into merge-2.4 (-s ours)
Roman Donchenko [Mon, 30 Dec 2013 12:37:39 +0000 (16:37 +0400)]
Merge commit '
1acc1085d' into merge-2.4
Roman Donchenko [Mon, 30 Dec 2013 12:37:26 +0000 (16:37 +0400)]
Merge commit '
edce617a5' into merge-2.4 (-s ours)
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
Roman Donchenko [Mon, 30 Dec 2013 12:34:59 +0000 (16:34 +0400)]
Merge commit '
f22d9a23' into merge-2.4 (-s ours)
Konstantin Matskevich [Mon, 30 Dec 2013 09:06:32 +0000 (13:06 +0400)]
fix
Ilya Lavrenov [Sun, 29 Dec 2013 10:36:30 +0000 (14:36 +0400)]
converted CPU-based example to T-API (Mat 2 UMat, etc)
Ilya Lavrenov [Sun, 29 Dec 2013 14:46:25 +0000 (18:46 +0400)]
added OpenCL version of cv::scaleAdd
Ilya Lavrenov [Sun, 29 Dec 2013 14:01:01 +0000 (18:01 +0400)]
implemented OpenCL version of cv::convertScaleAbs
Ilya Lavrenov [Sat, 28 Dec 2013 22:28:43 +0000 (02:28 +0400)]
added the first T-API example - CamShift tracking
Andrey Pavlenko [Sat, 28 Dec 2013 18:06:12 +0000 (22:06 +0400)]
Merge pull request #2081 from ilya-lavrenov:tapi_perf
Andrey Pavlenko [Sat, 28 Dec 2013 18:05:49 +0000 (22:05 +0400)]
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
Andrey Pavlenko [Fri, 27 Dec 2013 18:38:08 +0000 (22:38 +0400)]
Merge pull request #2055 from vbystricky:ocl_sepFilter2D
Ilya Lavrenov [Fri, 27 Dec 2013 17:57:20 +0000 (21:57 +0400)]
disabled cv::split perf test
Roman Donchenko [Fri, 27 Dec 2013 17:09:18 +0000 (21:09 +0400)]
Merge pull request #2083 from jet47:gpu_android_tests
Roman Donchenko [Fri, 27 Dec 2013 16:53:42 +0000 (20:53 +0400)]
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
Roman Donchenko [Fri, 27 Dec 2013 16:23:56 +0000 (20:23 +0400)]
Merge pull request #2077 from ilya-lavrenov:tapi_context
Ilya Lavrenov [Fri, 27 Dec 2013 12:33:18 +0000 (16:33 +0400)]
added new perf tests to core
Roman Donchenko [Fri, 27 Dec 2013 15:58:57 +0000 (19:58 +0400)]
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix
Vladislav Vinogradov [Fri, 27 Dec 2013 14:20:14 +0000 (18:20 +0400)]
increase thresholds for some tests
Vladislav Vinogradov [Fri, 27 Dec 2013 14:20:01 +0000 (18:20 +0400)]
disable 2 problematic tests
Vladislav Vinogradov [Fri, 27 Dec 2013 14:19:29 +0000 (18:19 +0400)]
disabled GEMM test if library was built without CUBLAS
Roman Donchenko [Fri, 27 Dec 2013 14:17:21 +0000 (18:17 +0400)]
Merge pull request #2078 from ilya-lavrenov:warn
Alexander Smorkalov [Fri, 27 Dec 2013 12:49:26 +0000 (16:49 +0400)]
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
Alexander Smorkalov [Fri, 27 Dec 2013 13:19:38 +0000 (17:19 +0400)]
dynamicuda became private module.
vbystricky [Fri, 27 Dec 2013 12:26:34 +0000 (16:26 +0400)]
Change threshold from 2.0 to 1.0 in the test
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
Andrey Pavlenko [Fri, 27 Dec 2013 11:49:27 +0000 (15:49 +0400)]
Merge pull request #2034 from pentschev:ocl_features2d_orb_master
Andrey Pavlenko [Fri, 27 Dec 2013 11:44:11 +0000 (15:44 +0400)]
Merge pull request #2063 from vpisarev:ocl_moments
Andrey Pavlenko [Fri, 27 Dec 2013 11:38:51 +0000 (15:38 +0400)]
Merge pull request #2076 from ilya-lavrenov:tapi_dft
Andrey Pavlenko [Fri, 27 Dec 2013 11:36:24 +0000 (15:36 +0400)]
Merge pull request #2072 from pengx17:patch-3
Ilya Lavrenov [Fri, 27 Dec 2013 10:44:58 +0000 (14:44 +0400)]
fixed warning [-Wempty-body]
Ilya Lavrenov [Fri, 27 Dec 2013 10:02:03 +0000 (14:02 +0400)]
this commit prevents segfaults in case of opencl disabled
Ilya Lavrenov [Fri, 27 Dec 2013 09:59:55 +0000 (13:59 +0400)]
some fixes of cv::mixChannels
Ilya Lavrenov [Fri, 27 Dec 2013 09:39:29 +0000 (13:39 +0400)]
disabled cv::dft opencl impl for CPU devices
Ilya Lavrenov [Fri, 27 Dec 2013 09:18:31 +0000 (13:18 +0400)]
fixed getUMatIndex
Ilya Lavrenov [Thu, 26 Dec 2013 14:48:43 +0000 (18:48 +0400)]
added cv::mixChannels to T-API
Roman Donchenko [Fri, 27 Dec 2013 08:44:02 +0000 (12:44 +0400)]
Merge pull request #2036 from GregoryMorse:patch-1
Roman Donchenko [Fri, 27 Dec 2013 08:43:49 +0000 (12:43 +0400)]
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
Roman Donchenko [Fri, 27 Dec 2013 08:11:51 +0000 (12:11 +0400)]
Merge pull request #2037 from GregoryMorse:patch-2
Alexander Smorkalov [Fri, 27 Dec 2013 07:18:10 +0000 (11:18 +0400)]
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
Konstantin Matskevich [Thu, 26 Dec 2013 12:46:08 +0000 (16:46 +0400)]
CLAHE
Peng Xiao [Fri, 27 Dec 2013 03:54:08 +0000 (11:54 +0800)]
fixed a buffer overrun of ocl canny
the `map` buffer does not have the same size with CUDA and index starts at [1, 1] instead of [0, 0].
Peter Andreas Entschev [Sat, 21 Dec 2013 01:04:58 +0000 (23:04 -0200)]
OCL: included ORB featured detector/descriptor extractor.
Vadim Pisarevsky [Thu, 26 Dec 2013 19:29:04 +0000 (23:29 +0400)]
improved performance of moments (on 720p or larger images)
Andrey Pavlenko [Thu, 26 Dec 2013 19:07:24 +0000 (23:07 +0400)]
Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix
Andrey Pavlenko [Thu, 26 Dec 2013 18:41:52 +0000 (22:41 +0400)]
Merge pull request #2068 from akarsakov:disable_ipp
Vadim Pisarevsky [Thu, 26 Dec 2013 18:00:29 +0000 (22:00 +0400)]
hopefully fixed test failures and complains from the doc builder
Alexander Smorkalov [Thu, 26 Dec 2013 17:20:32 +0000 (21:20 +0400)]
static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.
Andrey Pavlenko [Thu, 26 Dec 2013 16:37:33 +0000 (20:37 +0400)]
Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject
Alexander Karsakov [Thu, 26 Dec 2013 15:53:53 +0000 (19:53 +0400)]
Disabled some IPP implementation since it breaks tests
Andrey Pavlenko [Thu, 26 Dec 2013 15:38:56 +0000 (19:38 +0400)]
Merge pull request #2061 from apavlenko:2.4_fix_build_vs12
Andrey Pavlenko [Thu, 26 Dec 2013 15:38:01 +0000 (19:38 +0400)]
Merge pull request #2066 from ilya-lavrenov:tapi_ocl
Andrey Pavlenko [Thu, 26 Dec 2013 15:20:12 +0000 (19:20 +0400)]
Merge pull request #2028 from KonstantinMatskevich:ocl_tapi_morphology
Ilya Lavrenov [Thu, 26 Dec 2013 12:17:06 +0000 (16:17 +0400)]
added cv::calcBackProject for 2-dimensional histograms
Roman Donchenko [Thu, 26 Dec 2013 13:47:09 +0000 (17:47 +0400)]
Merge pull request #2064 from dpen2000:patch-2
Andrey Pavlenko [Thu, 26 Dec 2013 13:27:05 +0000 (17:27 +0400)]
Merge pull request #2054 from alalek:ocl_tapi_dev_selection
Konstantin Matskevich [Thu, 26 Dec 2013 13:16:55 +0000 (17:16 +0400)]
hope last fix
Ilya Lavrenov [Thu, 26 Dec 2013 13:14:20 +0000 (17:14 +0400)]
fixed warning [ -Wreorder ]
Ilya Lavrenov [Thu, 26 Dec 2013 13:13:26 +0000 (17:13 +0400)]
removed unnecessary data copying
Roman Donchenko [Thu, 26 Dec 2013 12:59:56 +0000 (16:59 +0400)]
Merge pull request #2057 from asmorkalov:android_cuda_sample
Andrey Pavlenko [Thu, 26 Dec 2013 11:49:12 +0000 (15:49 +0400)]
removing legacy stuff
GregoryMorse [Sun, 22 Dec 2013 16:28:50 +0000 (00:28 +0800)]
Update CMakeLists.txt
WinRT native C++ support allowing building of static libraries
Update CMakeLists.txt
Update OpenCVCRTLinkage.cmake
Update OpenCVCRTLinkage.cmake
Ilya Lavrenov [Mon, 23 Dec 2013 13:37:41 +0000 (17:37 +0400)]
ported cv::calcBackProject to T-API
Alexander Smorkalov [Wed, 25 Dec 2013 13:50:15 +0000 (17:50 +0400)]
CUDA support check added.
Alexander Smorkalov [Mon, 23 Dec 2013 11:20:09 +0000 (15:20 +0400)]
New sample for CUDA on Android added.
Roman Donchenko [Thu, 26 Dec 2013 10:39:51 +0000 (14:39 +0400)]
Merge pull request #2060 from asmorkalov:ocv_ts_cuda
dpen2000 [Thu, 26 Dec 2013 10:36:24 +0000 (10:36 +0000)]
Fix python sample path
Roman Donchenko [Thu, 26 Dec 2013 10:21:21 +0000 (14:21 +0400)]
Merge pull request #2056 from asmorkalov:java_core_cuda_wrappers
Roman Donchenko [Thu, 26 Dec 2013 10:16:29 +0000 (14:16 +0400)]
Merge pull request #2050 from asmorkalov:android_mk_fix2
Andrey Pavlenko [Thu, 26 Dec 2013 09:35:59 +0000 (13:35 +0400)]
eliminating VS2013 build warnings
Vadim Pisarevsky [Thu, 26 Dec 2013 09:25:00 +0000 (13:25 +0400)]
tuned the speed for OpenCL-based moments (still slower than the single-thread SSE2 CPU code :( )