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 |
|
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
|
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 |
|
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 |
|
Alexander Smorkalov
|
4175916b2a
|
dynamicuda became private module.
|
2013-12-27 17:19:38 +04:00 |
|
vbystricky
|
26d53c7435
|
Change threshold from 2.0 to 1.0 in the test
|
2013-12-27 16:26:34 +04:00 |
|
vbystricky
|
b719ed79c2
|
Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR
|
2013-12-27 16:21:32 +04:00 |
|
Andrey Pavlenko
|
80816f68f3
|
Merge pull request #2034 from pentschev:ocl_features2d_orb_master
|
2013-12-27 15:49:28 +04:00 |
|
Andrey Pavlenko
|
5c25d821b1
|
Merge pull request #2063 from vpisarev:ocl_moments
|
2013-12-27 15:44:12 +04:00 |
|
Andrey Pavlenko
|
01cd957495
|
Merge pull request #2076 from ilya-lavrenov:tapi_dft
|
2013-12-27 15:38:51 +04:00 |
|
Andrey Pavlenko
|
d649f47eeb
|
Merge pull request #2072 from pengx17:patch-3
|
2013-12-27 15:36:24 +04:00 |
|
Ilya Lavrenov
|
d014cb8fb4
|
fixed warning [-Wempty-body]
|
2013-12-27 14:44:58 +04:00 |
|
Ilya Lavrenov
|
f221f57c7c
|
this commit prevents segfaults in case of opencl disabled
|
2013-12-27 14:02:03 +04:00 |
|
Ilya Lavrenov
|
73c96cbd50
|
some fixes of cv::mixChannels
|
2013-12-27 13:59:55 +04:00 |
|
Ilya Lavrenov
|
2eab07f0a4
|
disabled cv::dft opencl impl for CPU devices
|
2013-12-27 13:39:29 +04:00 |
|
Ilya Lavrenov
|
52b8bb6761
|
fixed getUMatIndex
|
2013-12-27 13:18:31 +04:00 |
|
Ilya Lavrenov
|
a7d2830d3f
|
added cv::mixChannels to T-API
|
2013-12-27 13:14:37 +04:00 |
|
Roman Donchenko
|
c45492371a
|
Merge pull request #2036 from GregoryMorse:patch-1
|
2013-12-27 12:44:02 +04:00 |
|
Roman Donchenko
|
719149877e
|
Merge pull request #2074 from asmorkalov:android_nonfree_cuda
|
2013-12-27 12:43:49 +04:00 |
|
Roman Donchenko
|
ee36717db4
|
Merge pull request #2037 from GregoryMorse:patch-2
|
2013-12-27 12:11:52 +04:00 |
|
Alexander Smorkalov
|
c48777a1c3
|
CUDA dependency in nonfree nodule removed. OpenCV.mk generation fixed.
|
2013-12-27 11:18:10 +04:00 |
|
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].
|
2013-12-27 11:54:08 +08:00 |
|
Peter Andreas Entschev
|
07c5e33023
|
OCL: included ORB featured detector/descriptor extractor.
|
2013-12-26 22:36:24 -02:00 |
|
Vadim Pisarevsky
|
48c7378c8f
|
improved performance of moments (on 720p or larger images)
|
2013-12-26 23:29:04 +04:00 |
|
Andrey Pavlenko
|
41fd711ab0
|
Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix
|
2013-12-26 23:07:25 +04:00 |
|
Andrey Pavlenko
|
4b885e2067
|
Merge pull request #2068 from akarsakov:disable_ipp
|
2013-12-26 22:41:52 +04:00 |
|
Vadim Pisarevsky
|
e97dd57dc7
|
hopefully fixed test failures and complains from the doc builder
|
2013-12-26 22:00:29 +04:00 |
|
Alexander Smorkalov
|
4f6f6e8cac
|
static function qualifier replaced on inline to enable kernel compilation with OpenCL 1.1 embedded profile.
|
2013-12-26 21:20:32 +04:00 |
|
Andrey Pavlenko
|
4644a864a5
|
Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject
|
2013-12-26 20:37:34 +04:00 |
|
Alexander Karsakov
|
6ef0253fb7
|
Disabled some IPP implementation since it breaks tests
|
2013-12-26 19:53:53 +04:00 |
|