Commits · 4fbd2ef87a638f44b47ed786a9e4d9cd058d6f77 · submodule / opencv

21 Jan, 2014 3 commits
- Merge pull request #1290 from mbarnach:bow_desc · 4fbd2ef8
  Andrey Pavlenko authored Jan 21, 2014
  
  4fbd2ef8
- Merge pull request #2177 from ilya-lavrenov:ocl_superres · 9eca3ec8
  Andrey Pavlenko authored Jan 21, 2014
  
  9eca3ec8
- skip OCL tests if OpenCL isn't available · ac2e6139
  Ilya Lavrenov authored Jan 20, 2014
  
  ac2e6139
20 Jan, 2014 12 commits
- Merge pull request #2158 from KonstantinMatskevich:testdata_path_calib3d · 494f7e36
  Andrey Pavlenko authored Jan 20, 2014
  
  494f7e36
- Merge pull request #2167 from ilya-lavrenov:tapi_kern_warn · 801d2d0a
  Andrey Pavlenko authored Jan 20, 2014
  
  801d2d0a
- Merge pull request #2163 from ilya-lavrenov:tapi_channels · a509819b
  Roman Donchenko authored Jan 20, 2014
  
  a509819b
- Merge pull request #2173 from Nerei:viz · 9710b25c
  Roman Donchenko authored Jan 20, 2014
  
  9710b25c
- Merge pull request #2176 from SpecLad:merge-2.4 · 9dc93ce3
  Roman Donchenko authored Jan 20, 2014
  
  9dc93ce3
- review comments · ac035b9b
  Anatoly Baksheev authored Jan 20, 2014
  
  ac035b9b
- Merge pull request #2165 from ilya-lavrenov:tapi_upload · 69ba0c53
  Andrey Pavlenko authored Jan 20, 2014
  
  69ba0c53
- Merge remote-tracking branch 'origin/2.4' into merge-2.4 · e45fd939
  Roman Donchenko authored Jan 20, 2014
```
Conflicts:
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/cl_runtime/clamdblas_runtime.cpp
	modules/ocl/src/cl_runtime/clamdfft_runtime.cpp
	modules/ocl/src/cl_runtime/generator/template/clamdblas_runtime.cpp.in
	modules/ocl/src/cl_runtime/generator/template/clamdfft_runtime.cpp.in
```
  e45fd939
- Merge pull request #2164 from ilya-lavrenov:excess_commas_semicolons_v2 · 087371c0
  Roman Donchenko authored Jan 20, 2014
  
  087371c0
- added cv::[extract|insert]Channel to T-API · 5d18cf99
  Ilya Lavrenov authored Jan 17, 2014
  
  5d18cf99
- Merge pull request #2160 from SpecLad:norm-assert · 8386ce2b
  Roman Donchenko authored Jan 20, 2014
  
  8386ce2b
- Merge pull request #2174 from Nerei:yet_another_fix_for_pr2172 · d47f3258
  Roman Donchenko authored Jan 20, 2014
  
  d47f3258
19 Jan, 2014 25 commits
- closing window · 4cc8f701
  Anatoly Baksheev authored Jan 19, 2014
  
  4cc8f701
- fixed white spaces · 4e180070
  Anatoly Baksheev authored Jan 18, 2014
  
  4e180070
- fixed documentation warnings · d29c3d2f
  Anatoly Baksheev authored Jan 18, 2014
  
  d29c3d2f
- disabled Ubuntu workaround code for Windows · 8f15a8ab
  Anatoly Baksheev authored Jan 18, 2014
  
  8f15a8ab
- implemented workaround of a problem with x-server for ubuntu · 0d12fb03
  Anatoly Baksheev authored Jan 18, 2014
  
  0d12fb03
- fixed warnigns and compiler errors for Ubuntu · 7410593d
  Anatoly Baksheev authored Jan 18, 2014
  
  7410593d
- merged background color with background gradient methods, updated tests to show… · d7ca0bb7
  Anatoly Baksheev authored Jan 18, 2014
```
merged background color with background gradient methods, updated tests to show description of scene
```
  d7ca0bb7
- resolved problem with multiple spin()/spinOnce() · 16281027
  Anatoly Baksheev authored Jan 18, 2014
  
  16281027
- minor iteractor refactoring · 57d5ad51
  Anatoly Baksheev authored Jan 18, 2014
  
  57d5ad51
- added test for textured mesh · ffad7b69
  Anatoly Baksheev authored Jan 13, 2014
  
  ffad7b69
- updated for compatibility with VTK6.0 · 8d327fa4
  Anatoly Baksheev authored Jan 13, 2014
  
  8d327fa4
- updated mesh reading (texture support) · e472d45d
  Anatoly Baksheev authored Jan 13, 2014
  
  e472d45d
- added support of texture for mesh · 625c35a9
  Anatoly Baksheev authored Jan 12, 2014
  
  625c35a9
- added painted cloud widget · 74206e01
  Anatoly Baksheev authored Jan 12, 2014
  
  74206e01
- improved background gradient · 30860958
  Anatoly Baksheev authored Jan 12, 2014
  
  30860958
- by default enabled tests vtk · b0ca93b2
  Anatoly Baksheev authored Jan 12, 2014
  
  b0ca93b2
- set background texture method · d7c30281
  Anatoly Baksheev authored Jan 12, 2014
  
  d7c30281
- refactored WGrid · e2ef558c
  Anatoly Baksheev authored Jan 12, 2014
  
  e2ef558c
- refactoed plane · 658f4a7d
  Anatoly Baksheev authored Jan 12, 2014
  
  658f4a7d
- addeed test for text 2d/3d · 53b82186
  Anatoly Baksheev authored Jan 11, 2014
  
  53b82186
- added cone implementation · bb891f05
  Anatoly Baksheev authored Jan 11, 2014
  
  bb891f05
- updated cylinder and cube · 08f50314
  Anatoly Baksheev authored Jan 11, 2014
  
  08f50314
- refactored circle · c0cc5512
  Anatoly Baksheev authored Jan 11, 2014
  
  c0cc5512
- refactored arrow · dac27c99
  Anatoly Baksheev authored Jan 11, 2014
  
  dac27c99
- implemented showImage · 1449823b
  Anatoly Baksheev authored Jan 11, 2014
  
  1449823b