Minor modifications. auto_ptr replaced by unique_ptr, add some inline…

… function.

src/openMVG/cameras/Camera_Common.hpp

@@ -22,12 +22,12 @@ enum EINTRINSIC
 };
 
 // Return if the camera type is a valid enum
-static bool isValid(EINTRINSIC eintrinsic)
+static inline bool isValid(EINTRINSIC eintrinsic)
 {
   return eintrinsic > PINHOLE_CAMERA_START && eintrinsic < PINHOLE_CAMERA_END;
 }
 
-static bool isPinhole(EINTRINSIC eintrinsic)
+static inline bool isPinhole(EINTRINSIC eintrinsic)
 {
   return eintrinsic > PINHOLE_CAMERA_START && eintrinsic < PINHOLE_CAMERA_END;
 }

src/openMVG/features/akaze/msurf_descriptor.hpp

@@ -55,7 +55,6 @@ namespace features {
     Real cx = - static_cast<Real>( 0.5 ) , cy = static_cast<Real>( 0.5 ) ;
 
     // Set the descriptor size and the sample and pattern sizes
-    const int dsize = 64;
     const int sample_step = 5;
     const int pattern_size = 12;
 

src/openMVG/image/image_converter.hpp

@@ -92,18 +92,18 @@ void rgb2Float( const ImageIn& imaIn,
 // Float to RGB ( unsigned char or int )
 //--------------------------------------------------------------------------
 
-
-static void convertFloatToInt(
-        const RGBfColor& valIn,
-        RGBColor& valOut,
-        float factor = 255.f)
+static inline
+void convertFloatToInt
+(
+  const RGBfColor& valIn,
+  RGBColor& valOut,
+  float factor = 255.f
+)
 {
   for( int channel = 0; channel < 3; ++channel )
     valOut(channel) = (int)(valIn(channel) * factor);
 }
 
-
-//template<typename ImageOut>
 static void rgbFloat2rgbInt(
         const Image< RGBfColor >& imaIn,
         Image< RGBColor > *imaOut,

src/openMVG/matching/indMatch.hpp

@@ -60,7 +60,7 @@ struct IndMatch
   IndexT _i, _j;  // Left, right index
 };
 
-static std::ostream& operator<<(std::ostream & out, const IndMatch & obj) {
+static inline std::ostream& operator<<(std::ostream & out, const IndMatch & obj) {
   return out << obj._i << " " << obj._j;
 }
 

src/openMVG/sfm/sfm_landmark.hpp

@@ -47,8 +47,8 @@ typedef Hash_Map<IndexT, Observation> Observations;
 /// Define a landmark (a 3D point, with it's 2d observations)
 struct Landmark
 {
-  Observations obs;
   Vec3 X;
+  Observations obs;
 
   // Serialization
   template <class Archive>

src/openMVG/tracks/tracks.hpp

@@ -43,7 +43,8 @@ using namespace lemon;
 #include <functional>
 #include <vector>
 #include <set>
-#include <map>
+#include <map>
+#include <memory>
 
 namespace openMVG  {
 
@@ -96,8 +97,8 @@ struct TracksBuilder
 
   lemon::ListDigraph _graph; //Graph container to create the node
   MapNodeToIndex _map_nodeToIndex; //Node to index map
-  std::auto_ptr<IndexMap> _index;
-  std::auto_ptr<UnionFindObject> _tracksUF;
+  std::unique_ptr<IndexMap> _index;
+  std::unique_ptr<UnionFindObject> _tracksUF;
 
   const UnionFindObject & getUnionFindEnum() const {return *_tracksUF; }
   const MapNodeToIndex & getReverseMap() const {return _map_nodeToIndex;}
@@ -144,8 +145,8 @@ struct TracksBuilder
     _map_nodeToIndex.sort();
 
     // Add the element of myset to the UnionFind insert method.
-    _index = std::auto_ptr<IndexMap>( new IndexMap(_graph) );
-    _tracksUF = std::auto_ptr<UnionFindObject>( new UnionFindObject(*_index));
+    _index = std::unique_ptr<IndexMap>( new IndexMap(_graph) );
+    _tracksUF = std::unique_ptr<UnionFindObject>( new UnionFindObject(*_index));
     for (ListDigraph::NodeIt it(_graph); it != INVALID; ++it) {
       _tracksUF->insert(it);
     }

src/software/SfM/main_evalQuality.cpp

@@ -130,7 +130,9 @@ int main(int argc, char **argv)
   if (map_Cam_gt.size() != sfm_data.GetPoses().size())
   {
     std::cerr << std::endl
-      << "There is missing camera in the loaded scene." << std::endl;
+      << "There is missing camera in the loaded scene." << "\n"
+      << "#GT poses: " << map_Cam_gt.size() << "\n"
+      << "#Scene poses: " << sfm_data.GetPoses().size() << std::endl;
     return EXIT_FAILURE;
   }
 

src/software/colorHarmonize/main_ColHarmonize.cpp

@@ -5,15 +5,15 @@
 // 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/.
 
-#include <cstdlib>
-#include <memory>
-
 #include "software/colorHarmonize/colorHarmonizeEngineGlobal.hpp"
 
 #include "third_party/cmdLine/cmdLine.h"
 #include "third_party/stlplus3/filesystemSimplified/file_system.hpp"
 #include "openMVG/system/timer.hpp"
 
+#include <cstdlib>
+#include <memory>
+
 using namespace openMVG;
 
 int main( int argc, char **argv )
@@ -71,7 +71,7 @@ int main( int argc, char **argv )
   openMVG::system::Timer timer;
 
   sMatchesDir = stlplus::folder_part(sMatchesFile);
-  std::auto_ptr<ColorHarmonizationEngineGlobal> m_colorHarmonizeEngine(
+  std::unique_ptr<ColorHarmonizationEngineGlobal> m_colorHarmonizeEngine(
     new ColorHarmonizationEngineGlobal(sSfM_Data_Filename,
     sMatchesDir,
     sMatchesFile,