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
|
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 |
|
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 |
|
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 |
|
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
|
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 |
|
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 |
|
Andrey Pavlenko
|
f7b5e6544f
|
Merge pull request #2061 from apavlenko:2.4_fix_build_vs12
|
2013-12-26 19:38:57 +04:00 |
|
Andrey Pavlenko
|
fd6a74496b
|
Merge pull request #2066 from ilya-lavrenov:tapi_ocl
|
2013-12-26 19:38:01 +04:00 |
|
Andrey Pavlenko
|
a981295524
|
Merge pull request #2028 from KonstantinMatskevich:ocl_tapi_morphology
|
2013-12-26 19:20:12 +04:00 |
|
Ilya Lavrenov
|
b23edc34e9
|
added cv::calcBackProject for 2-dimensional histograms
|
2013-12-26 19:17:32 +04:00 |
|
Roman Donchenko
|
648facccd6
|
Merge pull request #2064 from dpen2000:patch-2
|
2013-12-26 17:47:09 +04:00 |
|
Andrey Pavlenko
|
c8a52daafd
|
Merge pull request #2054 from alalek:ocl_tapi_dev_selection
|
2013-12-26 17:27:06 +04:00 |
|
Konstantin Matskevich
|
ca9810e8aa
|
hope last fix
|
2013-12-26 17:16:55 +04:00 |
|
Ilya Lavrenov
|
5b3520fa46
|
fixed warning [ -Wreorder ]
|
2013-12-26 17:14:20 +04:00 |
|
Ilya Lavrenov
|
fc1f9ab236
|
removed unnecessary data copying
|
2013-12-26 17:13:26 +04:00 |
|
Roman Donchenko
|
709e8e8e07
|
Merge pull request #2057 from asmorkalov:android_cuda_sample
|
2013-12-26 16:59:56 +04:00 |
|
Andrey Pavlenko
|
734bf8babd
|
removing legacy stuff
|
2013-12-26 15:49:12 +04:00 |
|
Ilya Lavrenov
|
d64bea00b2
|
ported cv::calcBackProject to T-API
|
2013-12-26 14:58:50 +04:00 |
|
Alexander Smorkalov
|
cea9a97434
|
CUDA support check added.
|
2013-12-26 14:52:41 +04:00 |
|
Alexander Smorkalov
|
b3eee49451
|
New sample for CUDA on Android added.
|
2013-12-26 14:52:41 +04:00 |
|
Roman Donchenko
|
60906d9175
|
Merge pull request #2060 from asmorkalov:ocv_ts_cuda
|
2013-12-26 14:39:51 +04:00 |
|
dpen2000
|
d6a88397b4
|
Fix python sample path
|
2013-12-26 10:36:24 +00:00 |
|
Roman Donchenko
|
8fe79738ce
|
Merge pull request #2056 from asmorkalov:java_core_cuda_wrappers
|
2013-12-26 14:21:21 +04:00 |
|
Roman Donchenko
|
86aabf704f
|
Merge pull request #2050 from asmorkalov:android_mk_fix2
|
2013-12-26 14:16:29 +04:00 |
|