Update includes to match new COLMAP structure (#152)

Co-authored-by: Paul-Edouard Sarlin <paul.edouard.sarlin@gmail.com>
colmap · Jul 10, 2023 · b44ffd3 · b44ffd3
1 parent 743a4ac
commit b44ffd3
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 25 deletions.
diff --git a/estimators/essential_matrix.cc b/estimators/essential_matrix.cc
@@ -4,8 +4,8 @@
 #include <fstream>
 
 #include "colmap/base/camera.h"
-#include "colmap/base/essential_matrix.h"
-#include "colmap/base/pose.h"
+#include "colmap/geometry/essential_matrix.h"
+#include "colmap/geometry/pose.h"
 #include "colmap/estimators/essential_matrix.h"
 #include "colmap/optim/loransac.h"
 #include "colmap/util/random.h"

diff --git a/estimators/generalized_absolute_pose.cc b/estimators/generalized_absolute_pose.cc
@@ -4,9 +4,9 @@
 #include <fstream>
 
 #include "colmap/base/camera.h"
-#include "colmap/base/pose.h"
-#include "colmap/base/projection.h"
-#include "colmap/base/similarity_transform.h"
+#include "colmap/geometry/pose.h"
+#include "colmap/geometry/projection.h"
+#include "colmap/geometry/similarity_transform.h"
 #include "colmap/optim/ransac.h"
 #include "colmap/util/random.h"
 #include "colmap/util/misc.h"

diff --git a/estimators/two_view_geometry.cc b/estimators/two_view_geometry.cc
@@ -4,7 +4,7 @@
 #include <fstream>
 
 #include "colmap/base/camera.h"
-#include "colmap/base/pose.h"
+#include "colmap/geometry/pose.h"
 #include "colmap/estimators/two_view_geometry.h"
 #include "colmap/optim/loransac.h"
 #include "colmap/util/random.h"

diff --git a/homography_decomposition.cc b/homography_decomposition.cc
@@ -3,7 +3,7 @@
 #include <iostream>
 #include <fstream>
 
-#include "colmap/base/homography_matrix.h"
+#include "colmap/geometry/homography_matrix.h"
 
 using namespace colmap;
 

diff --git a/main.cc b/main.cc
@@ -4,7 +4,7 @@
 
 namespace py = pybind11;
 
-#include <colmap/base/pose.h>
+#include <colmap/geometry/pose.h>
 
 #include "estimators/absolute_pose.cc"
 #include "estimators/generalized_absolute_pose.cc"

diff --git a/pipeline/extract_features.cc b/pipeline/extract_features.cc
@@ -1,7 +1,7 @@
 // Author: Philipp Lindenberger (Phil26AT)
 
-#include "colmap/base/camera_models.h"
-#include "colmap/base/image_reader.h"
+#include "colmap/camera/models.h"
+#include "colmap/image/reader.h"
 #include "colmap/base/reconstruction.h"
 #include "colmap/controllers/incremental_mapper.h"
 #include "colmap/exe/feature.h"

diff --git a/pipeline/images.cc b/pipeline/images.cc
@@ -1,9 +1,9 @@
 // Author: Paul-Edouard Sarlin (skydes)
 
-#include "colmap/base/camera_models.h"
-#include "colmap/base/image_reader.h"
+#include "colmap/camera/models.h"
+#include "colmap/image/reader.h"
 #include "colmap/base/reconstruction.h"
-#include "colmap/base/undistortion.h"
+#include "colmap/image/undistortion.h"
 #include "colmap/controllers/incremental_mapper.h"
 #include "colmap/exe/feature.h"
 #include "colmap/exe/sfm.h"

diff --git a/pipeline/match_features.cc b/pipeline/match_features.cc
@@ -1,7 +1,7 @@
 // Author: Philipp Lindenberger (Phil26AT)
 
-#include "colmap/base/camera_models.h"
-#include "colmap/base/image_reader.h"
+#include "colmap/camera/models.h"
+#include "colmap/image/reader.h"
 #include "colmap/base/reconstruction.h"
 #include "colmap/controllers/incremental_mapper.h"
 #include "colmap/exe/feature.h"

diff --git a/pipeline/mvs.cc b/pipeline/mvs.cc
@@ -1,5 +1,5 @@
-#include "colmap/base/camera_models.h"
-#include "colmap/base/image_reader.h"
+#include "colmap/camera/models.h"
+#include "colmap/image/reader.h"
 #include "colmap/base/reconstruction.h"
 #include "colmap/controllers/incremental_mapper.h"
 #include "colmap/exe/feature.h"

diff --git a/pipeline/sfm.cc b/pipeline/sfm.cc
@@ -1,7 +1,7 @@
 // Author: Paul-Edouard Sarlin (skydes)
 
 #include "colmap/exe/sfm.h"
-#include "colmap/base/camera_models.h"
+#include "colmap/camera/models.h"
 #include "colmap/base/reconstruction.h"
 #include "colmap/controllers/incremental_mapper.h"
 #include "colmap/util/misc.h"

diff --git a/reconstruction/reconstruction.cc b/reconstruction/reconstruction.cc
@@ -1,8 +1,8 @@
 // Author: Philipp Lindenberger (Phil26AT)
 
 #include "colmap/base/reconstruction.h"
-#include "colmap/base/camera_models.h"
-#include "colmap/base/projection.h"
+#include "colmap/camera/models.h"
+#include "colmap/geometry/projection.h"
 #include "colmap/util/misc.h"
 #include "colmap/util/ply.h"
 #include "colmap/util/types.h"

diff --git a/reconstruction/utils.cc b/reconstruction/utils.cc
@@ -1,7 +1,7 @@
 // Author: Philipp Lindenberger (Phil26AT)
 
-#include "colmap/base/camera_models.h"
-#include "colmap/base/projection.h"
+#include "colmap/camera/models.h"
+#include "colmap/geometry/projection.h"
 #include "colmap/base/reconstruction.h"
 #include "colmap/util/misc.h"
 #include "colmap/util/ply.h"

diff --git a/transformations.cc b/transformations.cc
@@ -1,8 +1,8 @@
 // Author: Philipp Lindenberger (Phil26AT)
 
-#include "colmap/base/similarity_transform.h"
-#include "colmap/base/warp.h"
-#include "colmap/base/camera_models.h"
+#include "colmap/geometry/similarity_transform.h"
+#include "colmap/image/warp.h"
+#include "colmap/camera/models.h"
 
 using namespace colmap;