Commits · 029dfbc89de765ccad40345a37f6dd2c0aa61b18 · submodule / opencv

01 Jan, 2016 1 commit

opencv_core: CUDA: check if __CUDA_ARCH__ is defined before comparing it · 029dfbc8

Rok Mandeljc authored Jan 01, 2016

Changed statements of type "#if __CUDA_ARCH__ >= 200" to
"#if defined __CUDA_ARCH__ && __CUDA_ARCH__ >= 200" in order to
avoid warnings about __CUDA_ARCH__ being undefined.

029dfbc8

24 Dec, 2015 2 commits
- Merge pull request #5840 from paroj:v4ldefault · 8d79285d
  Alexander Alekhin authored Dec 24, 2015
  
  8d79285d
- Merge pull request #5860 from Dikay900:patch-1 · 5fa64235
  Alexander Alekhin authored Dec 24, 2015
  
  5fa64235
23 Dec, 2015 7 commits
- Merge pull request #5868 from atinfinity:pullreq/151223-FindTBB-VS2015 · 9c58741d
  Alexander Alekhin authored Dec 23, 2015
  
  9c58741d
- Merge pull request #5866 from Dikay900:patch-2 · a4aeba37
  Alexander Alekhin authored Dec 23, 2015
  
  a4aeba37
- Merge pull request #5865 from Dikay900:fix_matcopy_shape · 8c545c05
  Alexander Alekhin authored Dec 23, 2015
  
  8c545c05
- Merge pull request #5856 from Dikay900:fix_rgb2luv_doc · f26d0c58
  Alexander Alekhin authored Dec 23, 2015
  
  f26d0c58
- changed to find TBB library(VS2015) · d16723f4
  atinfinity authored Dec 23, 2015
  
  d16723f4
- fix uninitialized matrix in EM::predict fixes #5443 · 1ba2286c
  Philip authored Dec 23, 2015
```
fixes #5443
```
  1ba2286c
- fix mat copy in shape · bb78b01a
  Dikay900 authored Dec 23, 2015
```
fixes #5643
```
  bb78b01a
22 Dec, 2015 3 commits
- fix probably copy paste like error in rgb2luv doc · a7d3e304
  Dikay900 authored Dec 22, 2015
```
fixes #5689
```
  a7d3e304
- Merge pull request #5854 from Dikay900:em_predict_fix · f550ddb3
  Alexander Alekhin authored Dec 22, 2015
  
  f550ddb3
- [master] Fixed PCH warning during ARM crosscompilation · e85b2357
  Philip authored Dec 22, 2015
```
#5858 for master
```
  e85b2357
21 Dec, 2015 7 commits
- fix reshape call not being an inplace method · 4f3b58d1
  Dikay900 authored Dec 21, 2015
```
fixes #5853 #4740
```
  4f3b58d1
- Merge pull request #5843 from jia-kai:disable-dlopen-opencl · afdbd855
  Alexander Alekhin authored Dec 21, 2015
  
  afdbd855
- Merge pull request #5848 from IshankGulati:broken-link-fix · 92363227
  Alexander Alekhin authored Dec 21, 2015
  
  92363227
- path to videocapture-get changed · fb63cbb7
  Ishank gulati authored Dec 21, 2015
  
  fb63cbb7
- Merge tag '3.1.0' · 4cfe2b4d
  Alexander Alekhin authored Dec 21, 2015
```
OpenCV 3.1.0
```
  4cfe2b4d
- define g_haveOpenCL only when HAVE_OPENCL is set · 22599a28
  jiakai authored Dec 21, 2015
  
  22599a28
- do not open libopencl by dlopen if HAVE_OPENCL is not set · 387214a3
  jiakai authored Dec 21, 2015
  
  387214a3
20 Dec, 2015 1 commit
- make sure cap_v4l is used by default on Linux · 96654f00
  Pavel Rojtberg authored Dec 20, 2015
```
cap_v4l is better maintained and generally the code is in
better shape than cap_libv4l.
```
  96654f00
18 Dec, 2015 18 commits
- Fix java version++ · 92387b1e
  Maksim Shabunin authored Dec 18, 2015
  
  92387b1e
- Version++ for android · 8d1f5b54
  Maksim Shabunin authored Dec 18, 2015
  
  8d1f5b54
- fix android pack · 4e669f59
  Alexander Alekhin authored Dec 18, 2015
  
  4e669f59
- fix MSVS2010 builds · 2f4b334e
  Alexander Alekhin authored Dec 18, 2015
  
  2f4b334e
- Version for 3.1.0 release · 94e4498c
  Alexander Alekhin authored Dec 18, 2015
  
  94e4498c
- Merge pull request #5835 from alalek:fix_winpack · b4432c4f
  Alexander Alekhin authored Dec 18, 2015
  
  b4432c4f
- ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings) · 3ee90a1f
  Alexander Alekhin authored Dec 18, 2015
  
  3ee90a1f
- python: add launch script for winpack python demo · 613b2893
  Alexander Alekhin authored Dec 18, 2015
  
  613b2893
- Merge pull request #5834 from alalek:fix_winpack_include_path · 4fa91e46
  Alexander Alekhin authored Dec 18, 2015
  
  4fa91e46
- Merge pull request #5832 from alalek:python_samples · 34957bcf
  Alexander Alekhin authored Dec 18, 2015
  
  34957bcf
- fix include path for windows package · d34297b5
  Alexander Alekhin authored Dec 18, 2015
  
  d34297b5
- Merge pull request #5821 from alalek:build_framework · 97dc5be8
  Vadim Pisarevsky authored Dec 18, 2015
  
  97dc5be8
- Merge pull request #5801 from enpe:matlab-switch · ec0e43a9
  Alexander Alekhin authored Dec 18, 2015
  
  ec0e43a9
- rename samples/{python2 -> python} · a8e29224
  Alexander Alekhin authored Dec 17, 2015
  
  a8e29224
- change links from samples/python2 to samples/python · 323e24e3
  Alexander Alekhin authored Dec 16, 2015
  
  323e24e3
- Merge pull request #5802 from bastelflp:py3samples_docstr · 2ecb4892
  Vadim Pisarevsky authored Dec 18, 2015
  
  2ecb4892
- Merge pull request #5825 from GregoryMorse:master · d02627ea
  Vadim Pisarevsky authored Dec 18, 2015
  
  d02627ea
- Removed outdated tutorial link · 0c5d9e18
  flp authored Dec 18, 2015
  
  0c5d9e18
17 Dec, 2015 1 commit
- merge Win10/VS2015 changes · af5bec70
  Gregory Morse authored Dec 17, 2015
  
  af5bec70