Alexander Alekhin
9012ff4711
Merge pull request #5880 from alalek:fix_5863
2016-01-04 05:27:22 +00:00
Alexander Alekhin
f9e2b036a5
Merge pull request #5873 from paroj:cpprodrigues
2016-01-04 05:27:00 +00:00
LaurentBerger
8531e6d9fc
May be it can solve issue 5908
2016-01-02 21:06:51 +01:00
Rok Mandeljc
029dfbc89d
opencv_core: CUDA: check if __CUDA_ARCH__ is defined before comparing it
...
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.
2016-01-01 23:48:57 +01:00
berak
2d1cb14e61
fix cv::MARKER_TRIANGLE_UP
2016-01-01 10:10:01 +01:00
Gregory Morse
5427ede6a1
WinRT consistency
2015-12-31 14:31:26 +01:00
Alexander Alekhin
cdb9c60dcb
gpu samples: fix REMOVE_ITEM error
2015-12-31 02:24:54 +03:00
Dan Moodie
66738d748f
Modified sparse pyrlk optical flow to allow input of an image pyramid which thus allows caching of image pyramids on successive calls.
...
Added unsigned char support for 1, 3, 4 channel images.
2015-12-29 10:48:14 -05:00
Dan Moodie
64a57f7c38
Support for opengl2 in vtk 7.1
2015-12-28 14:04:02 -05:00
Alexander Alekhin
17e4d33b0e
added regression test for #5876
2015-12-25 16:16:34 +03:00
Pavel Rojtberg
4db6d9986d
also port Rodrigues in Affine to Matx expressions
...
so results are numerically equivalent
2015-12-25 13:47:10 +01:00
Alexander Alekhin
6997d423c8
fix normalize in case of inplace operations
...
fixes #5876
2015-12-25 15:33:06 +03:00
HMM@T430s-x64
6b4d4a85b5
solve videoio/src/cap_mjpeg_decoder.cpp compiling problem using VS 2008
...
fixes #5878
2015-12-25 13:57:26 +03:00
Alexander Alekhin
3d85e7ac0d
features2d agast: clear in/out keypoints container
...
fixes #5863
2015-12-25 13:49:24 +03:00
Pavel Rojtberg
ac481e6174
calib3d: port Rodrigues to cpp primitives
2015-12-24 21:34:34 +01:00
Alexander Alekhin
8d79285d02
Merge pull request #5840 from paroj:v4ldefault
2015-12-24 10:08:59 +00:00
Alexander Alekhin
5fa64235b1
Merge pull request #5860 from Dikay900:patch-1
2015-12-24 09:08:06 +00:00
Alexander Alekhin
9c58741dba
Merge pull request #5868 from atinfinity:pullreq/151223-FindTBB-VS2015
2015-12-23 16:16:31 +00:00
Alexander Alekhin
a4aeba37fb
Merge pull request #5866 from Dikay900:patch-2
2015-12-23 16:14:53 +00:00
Alexander Alekhin
8c545c055d
Merge pull request #5865 from Dikay900:fix_matcopy_shape
2015-12-23 16:14:36 +00:00
Alexander Alekhin
f26d0c5857
Merge pull request #5856 from Dikay900:fix_rgb2luv_doc
2015-12-23 16:14:06 +00:00
atinfinity
d16723f493
changed to find TBB library(VS2015)
2015-12-23 23:45:33 +09:00
Philip
1ba2286c6d
fix uninitialized matrix in EM::predict fixes #5443
...
fixes #5443
2015-12-23 11:19:48 +01:00
Dikay900
bb78b01ace
fix mat copy in shape
...
fixes #5643
2015-12-23 10:48:36 +01:00
Dikay900
a7d3e30404
fix probably copy paste like error in rgb2luv doc
...
fixes #5689
2015-12-22 22:45:51 +01:00
Alexander Alekhin
f550ddb3fd
Merge pull request #5854 from Dikay900:em_predict_fix
2015-12-22 15:15:53 +00:00
Alexander Alekhin
24dbb43c09
pkg-config: modules list contains only OpenCV modules ( fixes #5852 )
2015-12-22 17:28:38 +03:00
Philip
e85b23573b
[master] Fixed PCH warning during ARM crosscompilation
...
#5858 for master
2015-12-22 15:24:02 +01:00
Dikay900
4f3b58d1e7
fix reshape call not being an inplace method
...
fixes #5853 #4740
2015-12-21 21:10:35 +01:00
Alexander Alekhin
afdbd855ee
Merge pull request #5843 from jia-kai:disable-dlopen-opencl
2015-12-21 15:47:15 +00:00
Alexander Alekhin
923632272f
Merge pull request #5848 from IshankGulati:broken-link-fix
2015-12-21 15:46:41 +00:00
Ishank gulati
fb63cbb74b
path to videocapture-get changed
2015-12-21 19:30:37 +05:30
Alexander Alekhin
4cfe2b4dea
Merge tag '3.1.0'
...
OpenCV 3.1.0
2015-12-21 14:24:46 +03:00
jiakai
22599a2812
define g_haveOpenCL only when HAVE_OPENCL is set
2015-12-21 16:42:38 +08:00
jiakai
387214a3c5
do not open libopencl by dlopen if HAVE_OPENCL is not set
2015-12-21 12:04:00 +08:00
Pavel Rojtberg
96654f0084
make sure cap_v4l is used by default on Linux
...
cap_v4l is better maintained and generally the code is in
better shape than cap_libv4l.
2015-12-20 01:19:48 +01:00
Maksim Shabunin
92387b1ef8
Fix java version++
2015-12-18 18:02:16 +03:00
Maksim Shabunin
8d1f5b5490
Version++ for android
2015-12-18 17:57:07 +03:00
Alexander Alekhin
4e669f59a0
fix android pack
2015-12-18 17:38:04 +03:00
Alexander Alekhin
2f4b334ef2
fix MSVS2010 builds
2015-12-18 17:23:17 +03:00
Alexander Alekhin
94e4498cfd
Version for 3.1.0 release
2015-12-18 16:08:05 +03:00
Alexander Alekhin
b4432c4fd7
Merge pull request #5835 from alalek:fix_winpack
2015-12-18 13:02:18 +00:00
Alexander Alekhin
3ee90a1ff4
ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)
2015-12-18 15:59:02 +03:00
Alexander Alekhin
613b289325
python: add launch script for winpack python demo
2015-12-18 15:59:02 +03:00
Alexander Alekhin
4fa91e468b
Merge pull request #5834 from alalek:fix_winpack_include_path
2015-12-18 11:55:57 +00:00
Alexander Alekhin
34957bcfed
Merge pull request #5832 from alalek:python_samples
2015-12-18 11:38:27 +00:00
Alexander Alekhin
d34297b516
fix include path for windows package
2015-12-18 13:50:35 +03:00
Vadim Pisarevsky
97dc5be841
Merge pull request #5821 from alalek:build_framework
2015-12-18 10:12:55 +00:00
Alexander Alekhin
ec0e43a95b
Merge pull request #5801 from enpe:matlab-switch
2015-12-18 09:34:36 +00:00
Alexander Alekhin
a8e2922467
rename samples/{python2 -> python}
2015-12-18 11:00:32 +03:00
