Move header files inside opencv2/surface_matching/, update the rest

modules/surface_matching/include/opencv2/surface_matching.hpp

@@ -38,7 +38,7 @@
 #ifndef __OPENCV_SURFACE_MATCHING_HPP__
 #define __OPENCV_SURFACE_MATCHING_HPP__
 
-#include "ppf_match_3d.hpp"
-#include "icp.hpp"
+#include "surface_matching/ppf_match_3d.hpp"
+#include "surface_matching/icp.hpp"
 
 #endif

modules/surface_matching/include/opencv2/icp.hpp → modules/surface_matching/include/opencv2/surface_matching/icp.hpp

@@ -51,7 +51,7 @@
 
 #include <opencv2/core.hpp>
 
-#include "surface_matching/pose_3d.hpp"
+#include "pose_3d.hpp"
 #include <vector>
 
 namespace cv

modules/surface_matching/include/opencv2/ppf_match_3d.hpp → modules/surface_matching/include/opencv2/surface_matching/ppf_match_3d.hpp

@@ -58,8 +58,8 @@ IEEE Computer Society Conference on Computer Vision and Pattern Recognition (CVP
 #include <opencv2/core.hpp>
 
 #include <vector>
-#include "surface_matching/pose_3d.hpp"
-#include "surface_matching/t_hash_int.hpp"
+#include "pose_3d.hpp"
+#include "t_hash_int.hpp"
 
 namespace cv
 {

modules/surface_matching/samples/ppf_load_match.cpp

@@ -38,9 +38,8 @@
 //
 // Author: Tolga Birdal <tbirdal AT gmail.com>
 
-#include "opencv2/ppf_match_3d.hpp"
+#include "opencv2/surface_matching.hpp"
 #include <iostream>
-#include "opencv2/icp.hpp"
 #include "opencv2/surface_matching/ppf_helpers.hpp"
 #include "opencv2/core/utility.hpp"
 

modules/surface_matching/src/precomp.hpp

@@ -42,8 +42,8 @@ the use of this software, even if advised of the possibility of such damage.
 #ifndef __OPENCV_SURFACE_MATCHING_PRECOMP_HPP__
 #define __OPENCV_SURFACE_MATCHING_PRECOMP_HPP__
 
-#include "opencv2/ppf_match_3d.hpp"
-#include "opencv2/icp.hpp"
+#include "opencv2/surface_matching/ppf_match_3d.hpp"
+#include "opencv2/surface_matching/icp.hpp"
 #include "opencv2/surface_matching/ppf_helpers.hpp"
 
 #include <string>