Alexander Alekhin a7b954f655 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-08-23 19:24:37 +03:00
..
doc	Add Matplotlib Perceptually Uniform Sequential colormaps (viridis, plasma, inferno, magma, cividis, twilight and twilight shifted).	2019-01-06 22:48:06 +01:00
include/opencv2	Fix issue with solvePnPRansac and Nx3 1-channel input when the number of points is 5. Try to uniform the input shape of projectPoints and undistortPoints.	2019-05-22 14:19:16 +02:00
misc/java	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-05-23 19:50:20 +03:00
perf	Fix modules/ typos	2019-08-16 17:34:29 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2019-08-23 19:24:37 +03:00
test	Fix modules/ typos	2019-08-16 17:34:29 +03:00
CMakeLists.txt	Merge pull request #14994 from terfendail:wintr_undistort	2019-07-18 19:32:51 +03:00