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
|
||
|---|---|---|
| .. | ||
| _static | ||
| _themes/blue | ||
| pattern_tools | ||
| py_tutorials | ||
| tutorials | ||
| user_guide | ||
| vidsurv | ||
| acircles_pattern.png | ||
| check_docs2.py | ||
| check_docs_whitelist.txt | ||
| check_docs.py | ||
| CMakeLists.txt | ||
| conf.py | ||
| Doxyfile.in | ||
| haartraining.htm | ||
| mymath.sty | ||
| ocv.py | ||
| opencv_cheatsheet.tex | ||
| opencv-logo2.png | ||
| opencv-logo-white.png | ||
| opencv-logo.png | ||
| opencv.bib | ||
| opencv.ico | ||
| opencv.jpg | ||
| packaging.txt | ||
| patch_refman_latex.py | ||
| pattern.png | ||
| reformat.py | ||
