Code cleanup openMVG#719

- compilation fix
jkerfs · Dec 31, 2016 · e54ff59 · e54ff59
1 parent 863f624
commit e54ff59
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/src/openMVG/matching/metric.hpp b/src/openMVG/matching/metric.hpp
@@ -11,6 +11,9 @@
 #include "openMVG/matching/metric_hamming.hpp"
 #include "openMVG/numeric/accumulator_trait.hpp"
 
+#ifdef OPENMVG_USE_SSE
+#include <xmmintrin.h>
+#endif
 
 #include <cstddef>
 #include <iostream>
@@ -76,8 +79,6 @@ struct L2_Vectorized
 
 namespace optim_ss2{
 
-#include <xmmintrin.h>
-
   /// Union to switch between SSE and float array
   union sseRegisterHelper
   {

diff --git a/src/openMVG/multiview/rotation_averaging_test.cpp b/src/openMVG/multiview/rotation_averaging_test.cpp
@@ -61,13 +61,13 @@ TEST ( rotation_averaging, RotationLeastSquare_3_Camera)
   using namespace std;
 
   //--
-  // Setup 3 camera that have a relative orientation of 120�
+  // Setup 3 camera that have a relative orientation of 120 degree
   // Set Z axis as UP Vector for the rotation
   // They are in the same plane and looking in O={0,0,0}
   //--
-  const Mat3 R01 = RotationAroundZ(2.*M_PI/3.0); //120�
-  const Mat3 R12 = RotationAroundZ(2.*M_PI/3.0); //120�
-  const Mat3 R20 = RotationAroundZ(2.*M_PI/3.0); //120�
+  const Mat3 R01 = RotationAroundZ(2.*M_PI/3.0); //120 degree
+  const Mat3 R12 = RotationAroundZ(2.*M_PI/3.0); //120 degree
+  const Mat3 R20 = RotationAroundZ(2.*M_PI/3.0); //120 degree
 
   std::vector<RelativeRotation > vec_relativeRotEstimate;
   vec_relativeRotEstimate.push_back( RelativeRotation(0,1, R01));
@@ -162,13 +162,13 @@ TEST ( rotation_averaging, RefineRotationsAvgL1IRLS_SimpleTriplet)
   using namespace std;
 
   //--
-  // Setup 3 camera that have a relative orientation of 120�
+  // Setup 3 camera that have a relative orientation of 120 degree
   // Set Z axis as UP Vector for the rotation
   // They are in the same plane and looking in O={0,0,0}
   //--
-  const Mat3 R01 = RotationAroundZ(2.*M_PI/3.0); //120�
-  const Mat3 R12 = RotationAroundZ(2.*M_PI/3.0); //120�
-  const Mat3 R20 = RotationAroundZ(2.*M_PI/3.0); //120�
+  const Mat3 R01 = RotationAroundZ(2.*M_PI/3.0); //120 degree
+  const Mat3 R12 = RotationAroundZ(2.*M_PI/3.0); //120 degree
+  const Mat3 R20 = RotationAroundZ(2.*M_PI/3.0); //120 degree
 
   // Setup the relative motions (relative rotations)
   RelativeRotations vec_relativeRotEstimate;

diff --git a/src/openMVG/sfm/sfm_view_priors.hpp b/src/openMVG/sfm/sfm_view_priors.hpp
@@ -4,8 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifndef OPENMVG_SFM_SFM_VIEW_PRIOS_HPP
-#define OPENMVG_SFM_SFM_VIEW_PRIOS_HPP
+#ifndef OPENMVG_SFM_SFM_VIEW_PRIORS_HPP
+#define OPENMVG_SFM_SFM_VIEW_PRIORS_HPP
 
 #include "openMVG/geometry/pose3.hpp"
 
@@ -195,4 +195,4 @@ struct ViewPriors : public View
 CEREAL_REGISTER_TYPE_WITH_NAME( openMVG::sfm::ViewPriors, "view_priors" );
 CEREAL_REGISTER_POLYMORPHIC_RELATION(openMVG::sfm::View, openMVG::sfm::ViewPriors);
 
-#endif // OPENMVG_SFM_SFM_VIEW_PRIOS_HPP
+#endif // OPENMVG_SFM_SFM_VIEW_PRIORS_HPP
diff --git a/src/openMVG/stl/dynamic_bitset.hpp b/src/openMVG/stl/dynamic_bitset.hpp
@@ -16,6 +16,7 @@
 #define OPENMVG_STL_DYNAMIC_BITSET_HPP
 
 #include <cassert>
+#include <cstddef>
 #include <limits>
 #include <vector>
 
@@ -111,4 +112,4 @@ namespace stl
   };
 } // namespace stl
 
-#endif // OPENMVG_STL_DYNAMIC_BITSET_HPP
+#endif // OPENMVG_STL_DYNAMIC_BITSET_HPP