pre-merge
Merge branch 'gsoc' of https://github.com/Bellaktris/opencv_contrib into inpainting
images -> vectors in xphoto/inpainting
high resolution images support
tiny changes
fix merge with upstream
warning & error fixes
-||-
warning & error fixes
-||-
error fix
Merge pull request #92 from Bellaktris/inpainting

Inpainting