Roman Donchenko
cd576c7364
Merge pull request #2096 from kamjagin:master
11 years ago
Roman Donchenko
157202fc8d
Merge pull request #2094 from SpecLad:multimon-be-gone
11 years ago
Andrey Pavlenko
2d5723ccca
Merge pull request #2095 from ilya-lavrenov:tapi_mixchannels_fix
11 years ago
Andrey Pavlenko
967703c3ac
Merge pull request #2093 from SpecLad:merge-2.4
11 years ago
Andrey Pavlenko
8a456c5a6b
Merge pull request #2073 from KonstantinMatskevich:ocl_tapi_clahe
11 years ago
Miroslav Kobetski
3f07655231
Fix for bug #3469 CV_XADD failing in clang+nvcc combination
11 years ago
Andrey Pavlenko
8151571dd6
Merge pull request #2091 from ilya-lavrenov:tapi_convertScaleAbs
11 years ago
Ilya Lavrenov
3e1bec5248
added OpenCL version of cv::patchNaNs
11 years ago
Ilya Lavrenov
a2e683d133
fixed umat access
11 years ago
Roman Donchenko
4ce684e61c
Merge pull request #2087 from ilya-lavrenov:remap_sse2_cond
11 years ago
Roman Donchenko
795c108f2b
Fixed MinGW build by declaring the minimal required Windows version.
...
Also deleted miscellaneous remaining multimon cruft.
Deleted #include <winuser.h>, because <windows.h> includes it
already.
This should have a nice side effect of preventing us from
accidentally using any Windows API that's too new.
11 years ago
Roman Donchenko
6811d2ab24
Merge pull request #2086 from ilya-lavrenov:mul_fix
11 years ago
Roman Donchenko
5f9c117d78
Merge pull request #2085 from severin-lemaignan:emscripten
11 years ago
Roman Donchenko
6d4c80083e
Merge pull request #2089 from ilya-lavrenov:tapi_examples
11 years ago
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
11 years ago
Ilya Lavrenov
5db1754d49
SSE2 optimization of cv::remap doesn't work with big images
11 years ago
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.
11 years ago
Roman Donchenko
e33759b358
Merge commit '46be47cb4b8' into merge-2.4 (-s ours)
11 years ago
Roman Donchenko
1312eca220
Merge commit '0566ab4d3d' into merge-2.4
...
Conflicts:
modules/core/src/system.cpp
11 years ago
Roman Donchenko
82e2e6dbc3
Merge commit '719149877e' into merge-2.4 (-s ours)
11 years ago
Roman Donchenko
7f795e964f
Merge commit 'ee36717d' into merge-2.4
11 years ago
Roman Donchenko
9dfb96389c
Merge commit '4b885e206' into merge-2.4
11 years ago
Roman Donchenko
d611509842
Merge commit '709e8e8e0' into merge-2.4
11 years ago
Ilya Lavrenov
09d25e11c6
fixed bug #3341
11 years ago
Roman Donchenko
09e154d214
Merge commit '60906d917' into merge-2.4
...
Conflicts:
modules/ts/src/cuda_perf.cpp
11 years ago
Roman Donchenko
2cdbf6c0b6
Merge commit '8fe79738c' into merge-2.4
11 years ago
Roman Donchenko
39fb8e03d7
Merge commit 'b94963d38' into merge-2.4
...
Conflicts:
cmake/OpenCVGenAndroidMK.cmake
11 years ago
Roman Donchenko
ce7a2f7edc
Merge commit '24be7b26c' into merge-2.4 (-s ours)
11 years ago
Roman Donchenko
0e552ea6e2
Merge commit '1acc1085d' into merge-2.4
11 years ago
Roman Donchenko
2de4ad0598
Merge commit 'edce617a5' into merge-2.4 (-s ours)
11 years ago
Roman Donchenko
9b7e77ccda
Merge commit '83cdd43a' into merge-2.4
...
Conflicts:
modules/core/include/opencv2/core/version.hpp
11 years ago
Roman Donchenko
8c589438d1
Merge commit 'f22d9a23' into merge-2.4 (-s ours)
11 years ago
Roman Donchenko
a0c98dcefa
Merge pull request #2092 from alalek:fix_mingw_warn
11 years ago
Konstantin Matskevich
55634c1f52
fix
11 years ago
Alexander Alekhin
44970ddf56
eliminate MINGW pragma warning
11 years ago
Ilya Lavrenov
c4c913ff13
converted CPU-based example to T-API (Mat 2 UMat, etc)
11 years ago
Ilya Lavrenov
6b64257c81
added OpenCL version of cv::scaleAdd
11 years ago
Ilya Lavrenov
abcf8d9e61
implemented OpenCL version of cv::convertScaleAbs
11 years ago
Ilya Lavrenov
63e4af8536
added the first T-API example - CamShift tracking
11 years ago
Andrey Pavlenko
4a6c2ce378
Merge pull request #2081 from ilya-lavrenov:tapi_perf
11 years ago
Andrey Pavlenko
dbaf125fcd
Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels
11 years ago
Andrey Pavlenko
0913dd7ffa
Merge pull request #2055 from vbystricky:ocl_sepFilter2D
11 years ago
Ilya Lavrenov
bb7e96311e
disabled cv::split perf test
11 years ago
Roman Donchenko
05b9c991dd
Merge pull request #2083 from jet47:gpu_android_tests
11 years ago
Roman Donchenko
46be47cb4b
Merge pull request #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix
11 years ago
Roman Donchenko
2d2312d742
Merge pull request #2077 from ilya-lavrenov:tapi_context
11 years ago
Ilya Lavrenov
31e6251793
added new perf tests to core
11 years ago
Roman Donchenko
4eb9b9d6cf
Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix
11 years ago
Vladislav Vinogradov
53494ba397
increase thresholds for some tests
11 years ago
Vladislav Vinogradov
15678efe84
disable 2 problematic tests
11 years ago