[all] continue updating code to replace principal point with offset

alicevision · Aug 12, 2021 · f346c9d · f346c9d
1 parent 68c5f0c
commit f346c9d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/aliceVision/sfm/pipeline/sequential/ReconstructionEngine_sequentialSfM.cpp b/src/aliceVision/sfm/pipeline/sequential/ReconstructionEngine_sequentialSfM.cpp
@@ -1143,7 +1143,7 @@ bool ReconstructionEngine_sequentialSfM::makeInitialPair3D(const Pair& currentPa
     {
       std::set<IndexT> newReconstructedViews = {static_cast<IndexT>(I), static_cast<IndexT>(J)};
       const bool isInitialPair = true;
-      const bool success = true;// bundleAdjustment(newReconstructedViews, isInitialPair);
+      const bool success = bundleAdjustment(newReconstructedViews, isInitialPair);
 
       if(!success)
       {

diff --git a/src/aliceVision/sfmDataIO/viewIO.cpp b/src/aliceVision/sfmDataIO/viewIO.cpp
@@ -140,8 +140,8 @@ std::shared_ptr<camera::IntrinsicBase> getViewIntrinsic(
 
   camera::EINTRINSIC intrinsicType = defaultIntrinsicType;
 
-  double ppx = view.getWidth() / 2.0;
-  double ppy = view.getHeight() / 2.0;
+  double ppx = defaultPPx;
+  double ppy = defaultPPy;
 
   bool isResized = false;
 
@@ -165,11 +165,6 @@ std::shared_ptr<camera::IntrinsicBase> getViewIntrinsic(
       isResized = true;
     }
   }
-  else if(defaultPPx > 0.0 && defaultPPy > 0.0) // use default principal point
-  {
-    ppx = defaultPPx;
-    ppy = defaultPPy;
-  }
 
 
   // handle case where focal length (mm) is unset or false

diff --git a/src/software/pipeline/main_cameraInit.cpp b/src/software/pipeline/main_cameraInit.cpp
@@ -350,8 +350,8 @@ int aliceVision_main(int argc, char **argv)
   }
 
   // read K matrix if valid
-  double defaultPPx = -1.0;
-  double defaultPPy = -1.0;
+  double defaultPPx = 0.0;
+  double defaultPPy = 0.0;
 
   if(!defaultIntrinsicKMatrix.empty() && !checkIntrinsicStringValidity(defaultIntrinsicKMatrix, defaultFocalLengthPixel, defaultPPx, defaultPPy))
   {