Commits · e33759b358a113ad97dd89779cd3c2bed7e29465 · submodule / opencv · GitLab

30 Dec, 2013 14 commits
- Merge commit '46be47cb ' into merge-2.4 (-s ours) · e33759b3
  Roman Donchenko authored Dec 30, 2013
  
  e33759b3
- Merge commit '0566ab4d' into merge-2.4 · 1312eca2
  Roman Donchenko authored Dec 30, 2013
```
Conflicts:
	modules/core/src/system.cpp
```
  1312eca2
- Merge commit '71914987 ' into merge-2.4 (-s ours) · 82e2e6db
  Roman Donchenko authored Dec 30, 2013
  
  82e2e6db
- Merge commit 'ee36717d ' into merge-2.4 · 7f795e96
  Roman Donchenko authored Dec 30, 2013
  
  7f795e96
- Merge commit '4b885e20 ' into merge-2.4 · 9dfb9638
  Roman Donchenko authored Dec 30, 2013
  
  9dfb9638
- 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 24 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 #2080 from asmorkalov:ocv_dynamic_cuda_deviceinfo_fix · 46be47cb
  Roman Donchenko authored Dec 27, 2013
  
  46be47cb
- 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
- Merge pull request #2082 from asmorkalov:dynamicuda_internal_fix · 4eb9b9d6
  Roman Donchenko authored Dec 27, 2013
  
  4eb9b9d6
- Merge pull request #2078 from ilya-lavrenov:warn · 0566ab4d
  Roman Donchenko authored Dec 27, 2013
  
  0566ab4d
- Bugfix for DeviceInfoFuncTable in dynamicuda amd core modules. · df63060e
  Alexander Smorkalov authored Dec 27, 2013
  
  df63060e
- dynamicuda became private module. · 4175916b
  Alexander Smorkalov authored Dec 27, 2013
  
  4175916b
- 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
- Merge pull request #2072 from pengx17:patch-3 · d649f47e
  Andrey Pavlenko authored Dec 27, 2013
  
  d649f47e
- fixed warning [-Wempty-body] · d014cb8f
  Ilya Lavrenov authored Dec 27, 2013
  
  d014cb8f
- 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
- Merge pull request #2036 from GregoryMorse:patch-1 · c4549237
  Roman Donchenko authored Dec 27, 2013
  
  c4549237
- Merge pull request #2074 from asmorkalov:android_nonfree_cuda · 71914987
  Roman Donchenko authored Dec 27, 2013
  
  71914987
- Merge pull request #2037 from GregoryMorse:patch-2 · ee36717d
  Roman Donchenko authored Dec 27, 2013
  
  ee36717d