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 |
|
Vladislav Vinogradov
|
8399568edf
|
disabled GEMM test if library was built without CUBLAS
|
11 years ago |
|
Roman Donchenko
|
0566ab4d3d
|
Merge pull request #2078 from ilya-lavrenov:warn
|
11 years ago |
Alexander Smorkalov
|
df63060e4d
|
Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules.
|
11 years ago |
|
Alexander Smorkalov
|
4175916b2a
|
dynamicuda became private module.
|
11 years ago |
vbystricky
|
26d53c7435
|
Change threshold from 2.0 to 1.0 in the test
|
11 years ago |
|
vbystricky
|
b719ed79c2
|
Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR
|
11 years ago |
|
Andrey Pavlenko
|
80816f68f3
|
Merge pull request #2034 from pentschev:ocl_features2d_orb_master
|
11 years ago |
|
Andrey Pavlenko
|
5c25d821b1
|
Merge pull request #2063 from vpisarev:ocl_moments
|
11 years ago |
|
Andrey Pavlenko
|
01cd957495
|
Merge pull request #2076 from ilya-lavrenov:tapi_dft
|
11 years ago |
|
Andrey Pavlenko
|
d649f47eeb
|
Merge pull request #2072 from pengx17:patch-3
|
11 years ago |
|
Ilya Lavrenov
|
d014cb8fb4
|
fixed warning [-Wempty-body]
|
11 years ago |
|
Ilya Lavrenov
|
f221f57c7c
|
this commit prevents segfaults in case of opencl disabled
|
11 years ago |
|
Ilya Lavrenov
|
73c96cbd50
|
some fixes of cv::mixChannels
|
11 years ago |
|
Ilya Lavrenov
|
2eab07f0a4
|
disabled cv::dft opencl impl for CPU devices
|
11 years ago |
|
Ilya Lavrenov
|
52b8bb6761
|
fixed getUMatIndex
|
11 years ago |
|
Ilya Lavrenov
|
a7d2830d3f
|
added cv::mixChannels to T-API
|
11 years ago |
|
Roman Donchenko
|
c45492371a
|
Merge pull request #2036 from GregoryMorse:patch-1
|
11 years ago |
|
Roman Donchenko
|
719149877e
|
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
|
11 years ago |
|
Roman Donchenko
|
ee36717db4
|
Merge pull request #2037 from GregoryMorse:patch-2
|
11 years ago |
|
Alexander Smorkalov
|
c48777a1c3
|
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
|
11 years ago |
|
Konstantin Matskevich
|
a70a8e8680
|
CLAHE
|
11 years ago |
Peng Xiao
|
0ccc903647
|
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].
|
11 years ago |
Peter Andreas Entschev
|
07c5e33023
|
OCL: included ORB featured detector/descriptor extractor.
|
11 years ago |
