Alexander Alekhin
0655a2dc20
Merge pull request #5963 from KeySecure:master
2016-01-14 12:08:28 +00:00
Alexander Alekhin
cda8e449ec
Merge pull request #5954 from smidm:patch-1
2016-01-14 12:07:37 +00:00
Alexander Alekhin
3d2fc6c2fd
Merge pull request #5952 from alalek:ffmpeg_alloc_buffer
2016-01-13 17:31:32 +00:00
KeySecure
e6ac2ca3c9
make Xcode 7.2 happy.
2016-01-13 20:19:19 +08:00
Alexander Alekhin
e3690db4bd
Merge pull request #5949 from akarsakov:fixed_solvePnPRansac_input_handling
2016-01-12 17:58:07 +00:00
Alexander Alekhin
5a998335a6
Merge pull request #5943 from alalek:regression_5908
2016-01-12 17:15:15 +00:00
Matěj Šmíd
3e176bbfa0
fisheye documentation typo
2016-01-12 16:33:34 +01:00
Alexander Alekhin
285eb0a539
videoio ffmpeg: fix buffer allocation for unaligned frame sizes
2016-01-12 17:57:43 +03:00
Alexander Karsakov
e784ea7178
Fixed getSubset method to support Nx3 1-channel matrices as input (3xN 1-channel matrices doesn't supported at all).
2016-01-12 13:26:17 +03:00
Alexander Karsakov
0c9c7d5f3b
Added test for checking that solvePnPRansac accepts vector<Point3f> and Nx3 1-channel or 1xN/Nx1 3-channel matrices as input.
2016-01-12 12:13:28 +03:00
Alexander Alekhin
49d3e39bc4
test: added regression test for convexityDefects ( #5908 )
2016-01-11 19:47:36 +03:00
takacsd
1e0928633d
Add missing implementation to one of the Mat_<_Tp> constructor. ( #5945 )
2016-01-11 16:11:50 +01:00
Alexander Alekhin
7a62a8213b
Merge pull request #5914 from LaurentBerger:I5908
2016-01-11 13:00:17 +00:00
Alexander Alekhin
43033f0b1d
ts: move PARAM_TEST_CASE and GET_PARAM into ts.hpp
2016-01-11 15:36:52 +03:00
Alexander Alekhin
ec466ed1e0
Merge pull request #5936 from ejoebstl:master
2016-01-11 11:13:06 +00:00
Alexander Alekhin
a8b27ae303
Merge pull request #5910 from rokm:cuda-warnings
2016-01-11 11:11:27 +00:00
Emanuel Jöbstl
4e469f2866
Changed parameter order in documentation
...
Changed parameter order in documentation of findEssentialMat, because threshold and probability were switched.
2016-01-08 14:46:17 +00:00
Alexander Alekhin
345678770b
Merge pull request #5771 from dtmoodie:pyrlk
2016-01-04 14:28:31 +00:00
berak
5afd0e211e
ml: fix NormalBayesClassifier bulk prediction( #5911 )
2016-01-04 11:47:08 +01:00
Alexander Alekhin
1e4ad333a1
Merge pull request #5906 from berak:fix_marker
2016-01-04 05:31:00 +00:00
Alexander Alekhin
c06eaf83da
Merge pull request #5904 from GregoryMorse:master
2016-01-04 05:30:28 +00:00
Alexander Alekhin
76c9714516
Merge pull request #5883 from alalek:fix_5876
2016-01-04 05:28:41 +00:00
Alexander Alekhin
512e73db89
Merge pull request #5881 from alalek:fix_5878
2016-01-04 05:27:37 +00:00
Alexander Alekhin
9012ff4711
Merge pull request #5880 from alalek:fix_5863
2016-01-04 05:27:22 +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
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
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
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
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
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
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
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
94e4498cfd
Version for 3.1.0 release
2015-12-18 16:08:05 +03: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
