Commits · d61150984242938ca836f3a0ea129d946bfc58ec · submodule / opencv · GitLab

30 Dec, 2013 9 commits
- Merge commit '709e8e8e ' into merge-2.4 · d6115098
  Roman Donchenko authored Dec 30, 2013
  
  d6115098
- Merge commit '60906d91' into merge-2.4 · 09e154d2
  Roman Donchenko authored Dec 30, 2013
```
Conflicts:
	modules/ts/src/cuda_perf.cpp
```
  09e154d2
- Merge commit '8fe79738 ' into merge-2.4 · 2cdbf6c0
  Roman Donchenko authored Dec 30, 2013
  
  2cdbf6c0
- Merge commit 'b94963d3' into merge-2.4 · 39fb8e03
  Roman Donchenko authored Dec 30, 2013
```
Conflicts:
	cmake/OpenCVGenAndroidMK.cmake
```
  39fb8e03
- Merge commit '24be7b26 ' into merge-2.4 (-s ours) · ce7a2f7e
  Roman Donchenko authored Dec 30, 2013
  
  ce7a2f7e
- Merge commit '1acc1085 ' into merge-2.4 · 0e552ea6
  Roman Donchenko authored Dec 30, 2013
  
  0e552ea6
- Merge commit 'edce617a ' into merge-2.4 (-s ours) · 2de4ad05
  Roman Donchenko authored Dec 30, 2013
  
  2de4ad05
- Merge commit '83cdd43a' into merge-2.4 · 9b7e77cc
  Roman Donchenko authored Dec 30, 2013
```
Conflicts:
	modules/core/include/opencv2/core/version.hpp
```
  9b7e77cc
- Merge commit 'f22d9a23 ' into merge-2.4 (-s ours) · 8c589438
  Roman Donchenko authored Dec 30, 2013
  
  8c589438
28 Dec, 2013 2 commits
- Merge pull request #2081 from ilya-lavrenov:tapi_perf · 4a6c2ce3
  Andrey Pavlenko authored Dec 28, 2013
  
  4a6c2ce3
- Merge pull request #2075 from ilya-lavrenov:tapi_mixchannels · dbaf125f
  Andrey Pavlenko authored Dec 28, 2013
  
  dbaf125f
27 Dec, 2013 15 commits
- Merge pull request #2055 from vbystricky:ocl_sepFilter2D · 0913dd7f
  Andrey Pavlenko authored Dec 27, 2013
  
  0913dd7f
- disabled cv::split perf test · bb7e9631
  Ilya Lavrenov authored Dec 27, 2013
  
  bb7e9631
- Merge pull request #2077 from ilya-lavrenov:tapi_context · 2d2312d7
  Roman Donchenko authored Dec 27, 2013
  
  2d2312d7
- added new perf tests to core · 31e62517
  Ilya Lavrenov authored Dec 27, 2013
  
  31e62517
- Change threshold from 2.0 to 1.0 in the test · 26d53c74
  vbystricky authored Dec 27, 2013
  
  26d53c74
- Change sprintf to cv::format, and EXPECT_MAT_NEAR to OCL_EXPECT_MATS_NEAR · b719ed79
  vbystricky authored Dec 27, 2013
  
  b719ed79
- Merge pull request #2034 from pentschev:ocl_features2d_orb_master · 80816f68
  Andrey Pavlenko authored Dec 27, 2013
  
  80816f68
- Merge pull request #2063 from vpisarev:ocl_moments · 5c25d821
  Andrey Pavlenko authored Dec 27, 2013
  
  5c25d821
- Merge pull request #2076 from ilya-lavrenov:tapi_dft · 01cd9574
  Andrey Pavlenko authored Dec 27, 2013
  
  01cd9574
- this commit prevents segfaults in case of opencl disabled · f221f57c
  Ilya Lavrenov authored Dec 27, 2013
  
  f221f57c
- some fixes of cv::mixChannels · 73c96cbd
  Ilya Lavrenov authored Dec 27, 2013
  
  73c96cbd
- disabled cv::dft opencl impl for CPU devices · 2eab07f0
  Ilya Lavrenov authored Dec 27, 2013
  
  2eab07f0
- fixed getUMatIndex · 52b8bb67
  Ilya Lavrenov authored Dec 27, 2013
  
  52b8bb67
- added cv::mixChannels to T-API · a7d2830d
  Ilya Lavrenov authored Dec 26, 2013
  
  a7d2830d
- OCL: included ORB featured detector/descriptor extractor. · 07c5e330
  Peter Andreas Entschev authored Dec 21, 2013
  
  07c5e330
26 Dec, 2013 14 commits
- improved performance of moments (on 720p or larger images) · 48c7378c
  Vadim Pisarevsky authored Dec 26, 2013
  
  48c7378c
- hopefully fixed test failures and complains from the doc builder · e97dd57d
  Vadim Pisarevsky authored Dec 26, 2013
  
  e97dd57d
- Merge pull request #2065 from ilya-lavrenov:tapi_calcBackProject · 4644a864
  Andrey Pavlenko authored Dec 26, 2013
  
  4644a864
- Merge pull request #2066 from ilya-lavrenov:tapi_ocl · fd6a7449
  Andrey Pavlenko authored Dec 26, 2013
  
  fd6a7449
- Merge pull request #2028 from KonstantinMatskevich:ocl_tapi_morphology · a9812955
  Andrey Pavlenko authored Dec 26, 2013
  
  a9812955
- added cv::calcBackProject for 2-dimensional histograms · b23edc34
  Ilya Lavrenov authored Dec 26, 2013
  
  b23edc34
- Merge pull request #2054 from alalek:ocl_tapi_dev_selection · c8a52daa
  Andrey Pavlenko authored Dec 26, 2013
  
  c8a52daa
- hope last fix · ca9810e8
  Konstantin Matskevich authored Dec 26, 2013
  
  ca9810e8
- fixed warning [ -Wreorder ] · 5b3520fa
  Ilya Lavrenov authored Dec 26, 2013
  
  5b3520fa
- removed unnecessary data copying · fc1f9ab2
  Ilya Lavrenov authored Dec 26, 2013
  
  fc1f9ab2
- Merge pull request #2057 from asmorkalov:android_cuda_sample · 709e8e8e
  Roman Donchenko authored Dec 26, 2013
  
  709e8e8e
- ported cv::calcBackProject to T-API · d64bea00
  Ilya Lavrenov authored Dec 23, 2013
  
  d64bea00
- CUDA support check added. · cea9a974
  Alexander Smorkalov authored Dec 25, 2013
  
  cea9a974
- New sample for CUDA on Android added. · b3eee494
  Alexander Smorkalov authored Dec 23, 2013
  
  b3eee494