__inline -> inline
cv::Mat -> Mat
Unify include guards
Move header files inside opencv2/surface_matching/, update the rest
Cosmetic changes