From 42e1d44be1a2ed2023169977f8296930685bc7fd Mon Sep 17 00:00:00 2001 From: pmoulon Date: Mon, 5 Oct 2015 09:29:54 +0200 Subject: [PATCH] Enhance BUILD installation documentation. Fix some alignement style. --- BUILD | 5 +++-- .../global/GlobalSfM_rotation_averaging.cpp | 15 +++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/BUILD b/BUILD index 3455574c0a..73417e0c36 100644 --- a/BUILD +++ b/BUILD @@ -130,8 +130,9 @@ OpenMVG can be used as a third party once it have been installed. Because it can use it's own ceres version, it's better to install it locally and not in system files. So please consider using the CMAKE_INSTALL_PREFIX cmake variable to specify a local installation directory. -Here the syntax to add the variable to the cmake command line: --DCMAKE_INSTALL_PREFIX:STRING="./openMVG_install" +Here the syntax to add the variable to the cmake command line (use absolute path): +-DCMAKE_INSTALL_PREFIX:STRING="YourInstallPath" +i.e: -DCMAKE_INSTALL_PREFIX:STRING="/home/user/Dev/github/openMVG_Build/openMVG_install" Perform "make" and "make install" diff --git a/src/openMVG/sfm/pipelines/global/GlobalSfM_rotation_averaging.cpp b/src/openMVG/sfm/pipelines/global/GlobalSfM_rotation_averaging.cpp index 2dbb880280..1648a15d49 100644 --- a/src/openMVG/sfm/pipelines/global/GlobalSfM_rotation_averaging.cpp +++ b/src/openMVG/sfm/pipelines/global/GlobalSfM_rotation_averaging.cpp @@ -53,12 +53,13 @@ bool GlobalSfM_Rotation_AveragingSolver::Run( return false; KeepOnlyReferencedElement(set_remainingIds, relativeRotations); } - break; + break; default: - std::cerr << "Unknown relative rotation inference method: " - << (int) eRelativeRotationInferenceMethod << std::endl; + std::cerr + << "Unknown relative rotation inference method: " + << (int) eRelativeRotationInferenceMethod << std::endl; } - + // Compute contiguous index (mapping between sparse index and contiguous index) // from ranging in [min(Id), max(Id)] to [0, nbCam] @@ -128,7 +129,9 @@ bool GlobalSfM_Rotation_AveragingSolver::Run( } break; default: - std::cerr << "Unknown rotation averaging method: " << (int) eRotationAveragingMethod << std::endl; + std::cerr + << "Unknown rotation averaging method: " + << (int) eRotationAveragingMethod << std::endl; } if (bSuccess) @@ -138,7 +141,7 @@ bool GlobalSfM_Rotation_AveragingSolver::Run( map_globalR[_reindexBackward[i]] = vec_globalR[i]; } } - else{ + else { std::cerr << "Global rotation solving failed." << std::endl; }