From f346c9daec63f63b19ec0d08ded9a73202583a0a Mon Sep 17 00:00:00 2001 From: Fabien Servant Date: Wed, 2 Jun 2021 14:28:51 +0200 Subject: [PATCH] [all] continue updating code to replace principal point with offset --- .../sequential/ReconstructionEngine_sequentialSfM.cpp | 2 +- src/aliceVision/sfmDataIO/viewIO.cpp | 9 ++------- src/software/pipeline/main_cameraInit.cpp | 4 ++-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/aliceVision/sfm/pipeline/sequential/ReconstructionEngine_sequentialSfM.cpp b/src/aliceVision/sfm/pipeline/sequential/ReconstructionEngine_sequentialSfM.cpp index 920ac16839..c151c3c3d2 100644 --- 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 newReconstructedViews = {static_cast(I), static_cast(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 index 4a7e4b190a..cdb367cf7b 100644 --- a/src/aliceVision/sfmDataIO/viewIO.cpp +++ b/src/aliceVision/sfmDataIO/viewIO.cpp @@ -140,8 +140,8 @@ std::shared_ptr 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 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 index 656aa8345f..7495e5a8fd 100644 --- 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)) {