Roman Donchenko
|
ea3dd9d5e7
|
Merge pull request #2103 from ilya-lavrenov:typo
|
2014-01-09 12:38:55 +04:00 |
|
Roman Donchenko
|
4e35ebb52f
|
Merge pull request #2102 from Nerei:compilatin_for_windows
|
2014-01-09 12:35:30 +04:00 |
|
Ilya Lavrenov
|
0c49360318
|
fixed typo
|
2014-01-01 19:41:14 +04:00 |
|
Anatoly Baksheev
|
c2dd7fd762
|
compilation for windows
|
2014-01-01 15:39:21 +04:00 |
|
Vadim Pisarevsky
|
1c3bfae212
|
Merge pull request #1957 from Nerei:format_declaration_by_default
|
2013-12-31 15:55:00 +04:00 |
|
Roman Donchenko
|
cd576c7364
|
Merge pull request #2096 from kamjagin:master
|
2013-12-31 11:53:25 +04:00 |
|
Andrey Pavlenko
|
2d5723ccca
|
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
|
2013-12-31 00:35:39 +04:00 |
|
Andrey Pavlenko
|
967703c3ac
|
Merge pull request #2093 from SpecLad:merge-2.4
|
2013-12-31 00:26:22 +04:00 |
|
Andrey Pavlenko
|
8a456c5a6b
|
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
|
2013-12-31 00:17:33 +04:00 |
|
Miroslav Kobetski
|
3f07655231
|
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
|
2013-12-30 17:00:17 +01:00 |
|
Andrey Pavlenko
|
8151571dd6
|
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
|
2013-12-30 19:54:27 +04:00 |
|
Ilya Lavrenov
|
3e1bec5248
|
added OpenCL version of cv::patchNaNs
|
2013-12-30 19:53:03 +04:00 |
|
Ilya Lavrenov
|
a2e683d133
|
fixed umat access
|
2013-12-30 19:37:20 +04:00 |
|
Roman Donchenko
|
5f9c117d78
|
Merge pull request #2085 from severin-lemaignan:emscripten
|
2013-12-30 17:57:00 +04:00 |
|
Roman Donchenko
|
6d4c80083e
|
Merge pull request #2089 from ilya-lavrenov:tapi_examples
|
2013-12-30 17:42:50 +04:00 |
|
Roman Donchenko
|
cdc10defa3
|
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
|
2013-12-30 17:30:59 +04:00 |
|
Séverin Lemaignan
|
9e13e3a5a4
|
[emscripten] Do not link to system libraries
This is not meaningful when compiling to javascript, and causes warning
at linking stage.
|
2013-12-30 14:04:36 +01:00 |
|
Roman Donchenko
|
e33759b358
|
Merge commit '46be47cb4b8' into merge-2.4 (-s ours)
|
2013-12-30 16:52:16 +04:00 |
|
Roman Donchenko
|
1312eca220
|
Merge commit '0566ab4d3d' into merge-2.4
Conflicts:
modules/core/src/system.cpp
|
2013-12-30 16:51:46 +04:00 |
|
Roman Donchenko
|
82e2e6dbc3
|
Merge commit '719149877e' into merge-2.4 (-s ours)
|
2013-12-30 16:50:09 +04:00 |
|
Roman Donchenko
|
7f795e964f
|
Merge commit 'ee36717d' into merge-2.4
|
2013-12-30 16:49:39 +04:00 |
|
Roman Donchenko
|
9dfb96389c
|
Merge commit '4b885e206' into merge-2.4
|
2013-12-30 16:48:45 +04:00 |
|
Roman Donchenko
|
d611509842
|
Merge commit '709e8e8e0' into merge-2.4
|
2013-12-30 16:48:30 +04:00 |
|
Roman Donchenko
|
09e154d214
|
Merge commit '60906d917' into merge-2.4
Conflicts:
modules/ts/src/cuda_perf.cpp
|
2013-12-30 16:47:05 +04:00 |
|
Roman Donchenko
|
2cdbf6c0b6
|
Merge commit '8fe79738c' into merge-2.4
|
2013-12-30 16:41:10 +04:00 |
|
Roman Donchenko
|
39fb8e03d7
|
Merge commit 'b94963d38' into merge-2.4
Conflicts:
cmake/OpenCVGenAndroidMK.cmake
|
2013-12-30 16:39:51 +04:00 |
|
Roman Donchenko
|
ce7a2f7edc
|
Merge commit '24be7b26c' into merge-2.4 (-s ours)
|
2013-12-30 16:38:52 +04:00 |
|
Roman Donchenko
|
0e552ea6e2
|
Merge commit '1acc1085d' into merge-2.4
|
2013-12-30 16:37:39 +04:00 |
|
Roman Donchenko
|
2de4ad0598
|
Merge commit 'edce617a5' into merge-2.4 (-s ours)
|
2013-12-30 16:37:26 +04:00 |
|
Roman Donchenko
|
9b7e77ccda
|
Merge commit '83cdd43a' into merge-2.4
Conflicts:
modules/core/include/opencv2/core/version.hpp
|
2013-12-30 16:36:35 +04:00 |
|
Roman Donchenko
|
8c589438d1
|
Merge commit 'f22d9a23' into merge-2.4 (-s ours)
|
2013-12-30 16:34:59 +04:00 |
|
Konstantin Matskevich
|
55634c1f52
|
fix
|
2013-12-30 13:06:32 +04:00 |
|
Ilya Lavrenov
|
c4c913ff13
|
converted CPU-based example to T-API (Mat 2 UMat, etc)
|
2013-12-30 03:19:17 +04:00 |
|
Ilya Lavrenov
|
6b64257c81
|
added OpenCL version of cv::scaleAdd
|
2013-12-29 18:46:25 +04:00 |
|
Ilya Lavrenov
|
abcf8d9e61
|
implemented OpenCL version of cv::convertScaleAbs
|
2013-12-29 18:01:19 +04:00 |
|
Ilya Lavrenov
|
63e4af8536
|
added the first T-API example - CamShift tracking
|
2013-12-29 14:36:59 +04:00 |
|
Andrey Pavlenko
|
4a6c2ce378
|
Merge pull request #2081 from ilya-lavrenov:tapi_perf
|
2013-12-28 22:06:12 +04:00 |
|
Andrey Pavlenko
|
dbaf125fcd
|
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
|
2013-12-28 22:05:49 +04:00 |
|
Andrey Pavlenko
|
0913dd7ffa
|
Merge pull request #2055 from vbystricky:ocl_sepFilter2D
|
2013-12-27 22:38:08 +04:00 |
|
Ilya Lavrenov
|
bb7e96311e
|
disabled cv::split perf test
|
2013-12-27 21:57:20 +04:00 |
|
Roman Donchenko
|
05b9c991dd
|
Merge pull request #2083 from jet47:gpu_android_tests
|
2013-12-27 21:09:18 +04:00 |
|
Roman Donchenko
|
46be47cb4b
|
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
|
2013-12-27 20:53:42 +04:00 |
|
Roman Donchenko
|
2d2312d742
|
Merge pull request #2077 from ilya-lavrenov:tapi_context
|
2013-12-27 20:23:57 +04:00 |
|
Ilya Lavrenov
|
31e6251793
|
added new perf tests to core
|
2013-12-27 20:02:12 +04:00 |
|
Roman Donchenko
|
4eb9b9d6cf
|
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix
|
2013-12-27 19:58:57 +04:00 |
|
Vladislav Vinogradov
|
53494ba397
|
increase thresholds for some tests
|
2013-12-27 18:20:14 +04:00 |
|
Vladislav Vinogradov
|
15678efe84
|
disable 2 problematic tests
|
2013-12-27 18:20:01 +04:00 |
|
Vladislav Vinogradov
|
8399568edf
|
disabled GEMM test if library was built without CUBLAS
|
2013-12-27 18:19:29 +04:00 |
|
Roman Donchenko
|
0566ab4d3d
|
Merge pull request #2078 from ilya-lavrenov:warn
|
2013-12-27 18:17:21 +04:00 |
|
Alexander Smorkalov
|
df63060e4d
|
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
|
2013-12-27 18:04:10 +04:00 |
|