warning resolutions cont'd
Merge branch 'add_surface_matching_gsoc' of https://github.com/tolgabirdal/opencv_contrib into add_surface_matching_gsoc