Code cleanup and C++11. openMVG#527

Oliver001 · Apr 22, 2016 · cddad06 · cddad06
1 parent 35c81ca
commit cddad06
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/src/openMVG/cameras/Camera_Pinhole.hpp b/src/openMVG/cameras/Camera_Pinhole.hpp
@@ -79,7 +79,7 @@ class Pinhole_Intrinsic : public IntrinsicBase
     * @brief Get the intrinsic matrix
     * @return 3x3 intrinsic matrix
     */
-    const Mat3& K() const 
+    const Mat3& K() const
     {
       return K_;
     }
@@ -177,7 +177,7 @@ class Pinhole_Intrinsic : public IntrinsicBase
     * @param value Error in image plane
     * @return error of passing from the image plane to the camera plane
     */
-    double imagePlane_toCameraPlaneError( double value ) const
+    double imagePlane_toCameraPlaneError( double value ) const override
     {
       return value / focal();
     }

diff --git a/src/openMVG/cameras/Camera_Pinhole_Brown.hpp b/src/openMVG/cameras/Camera_Pinhole_Brown.hpp
@@ -182,7 +182,7 @@ class Pinhole_Intrinsic_Brown_T2 : public Pinhole_Intrinsic
     * @param p Input distorted pixel
     * @return Point without distortion
     */
-    virtual Vec2 get_ud_pixel( const Vec2& p ) const override
+    Vec2 get_ud_pixel( const Vec2& p ) const override
     {
       return cam2ima( remove_disto( ima2cam( p ) ) );
     }
@@ -192,7 +192,7 @@ class Pinhole_Intrinsic_Brown_T2 : public Pinhole_Intrinsic
     * @param p Input pixel
     * @return Distorted pixel
     */
-    virtual Vec2 get_d_pixel( const Vec2& p ) const
+    Vec2 get_d_pixel( const Vec2& p ) const override
     {
       return cam2ima( add_disto( ima2cam( p ) ) );
     }

diff --git a/src/openMVG/features/regions.hpp b/src/openMVG/features/regions.hpp
@@ -25,7 +25,7 @@ class Regions
 {
 public:
 
-  virtual ~Regions() = default ; 
+  virtual ~Regions() = default ;
 
   //--
   // IO - one file for region features, one file for region descriptors
@@ -107,7 +107,7 @@ class Scalar_Regions : public Regions
   /// Read from files the regions and their corresponding descriptors.
   bool Load(
     const std::string& sfileNameFeats,
-    const std::string& sfileNameDescs) override 
+    const std::string& sfileNameDescs) override
   {
     return loadFeatsFromFile(sfileNameFeats, vec_feats_)
           & loadDescsFromBinFile(sfileNameDescs, vec_descs_);
@@ -116,23 +116,23 @@ class Scalar_Regions : public Regions
   /// Export in two separate files the regions and their corresponding descriptors.
   bool Save(
     const std::string& sfileNameFeats,
-    const std::string& sfileNameDescs) const override 
+    const std::string& sfileNameDescs) const override
   {
     return saveFeatsToFile(sfileNameFeats, vec_feats_)
           & saveDescsToBinFile(sfileNameDescs, vec_descs_);
   }
 
-  bool LoadFeatures(const std::string& sfileNameFeats) override 
+  bool LoadFeatures(const std::string& sfileNameFeats) override
   {
     return loadFeatsFromFile(sfileNameFeats, vec_feats_);
   }
 
-  PointFeatures GetRegionsPositions() const override 
+  PointFeatures GetRegionsPositions() const override
   {
     return PointFeatures(vec_feats_.begin(), vec_feats_.end());
   }
 
-  Vec2 GetRegionPosition(size_t i) const override 
+  Vec2 GetRegionPosition(size_t i) const override
   {
     return Vec2f(vec_feats_[i].coords()).cast<double>();
   }
@@ -157,7 +157,7 @@ class Scalar_Regions : public Regions
     ar(vec_descs_);
   }
 
-  Regions * EmptyClone() const override 
+  Regions * EmptyClone() const override
   {
     return new Scalar_Regions();
   }
@@ -175,7 +175,7 @@ class Scalar_Regions : public Regions
   }
 
   /// Add the Inth region to another Region container
-  void CopyRegion(size_t i, Regions * region_container) const
+  void CopyRegion(size_t i, Regions * region_container) const override
   {
     assert(i < vec_feats_.size() && i < vec_descs_.size());
     static_cast<Scalar_Regions<FeatT, T, L> *>(region_container)->vec_feats_.push_back(vec_feats_[i]);
@@ -291,7 +291,7 @@ class Binary_Regions : public Regions
   }
 
   /// Add the Inth region to another Region container
-  void CopyRegion(size_t i, Regions * region_container) const
+  void CopyRegion(size_t i, Regions * region_container) const override
   {
     assert(i < vec_feats_.size() && i < vec_descs_.size());
     static_cast<Binary_Regions<FeatT, L> *>(region_container)->vec_feats_.push_back(vec_feats_[i]);