bug fix
small changes
Merge branch 'gsoc' of https://github.com/Bellaktris/opencv_contrib into gsoc