mirror of
https://github.com/opencv/opencv.git
synced 2025-07-25 06:38:42 +08:00
c54b8f9b00
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
|
||
|---|---|---|
| .. | ||
| opencl | ||
| test_affine3.cpp | ||
| test_affine3d_estimator.cpp | ||
| test_cameracalibration_artificial.cpp | ||
| test_cameracalibration_badarg.cpp | ||
| test_cameracalibration.cpp | ||
| test_chessboardgenerator.cpp | ||
| test_chessboardgenerator.hpp | ||
| test_chesscorners_badarg.cpp | ||
| test_chesscorners_timing.cpp | ||
| test_chesscorners.cpp | ||
| test_compose_rt.cpp | ||
| test_cornerssubpix.cpp | ||
| test_fisheye.cpp | ||
| test_fundam.cpp | ||
| test_homography_decomp.cpp | ||
| test_homography.cpp | ||
| test_main.cpp | ||
| test_modelest.cpp | ||
| test_posit.cpp | ||
| test_precomp.hpp | ||
| test_reproject_image_to_3d.cpp | ||
| test_solvepnp_ransac.cpp | ||
| test_stereomatching.cpp | ||
| test_undistort_badarg.cpp | ||
| test_undistort_points.cpp | ||
| test_undistort.cpp | ||