Merge pull request #2103 from SFN-eu/dev/fix-misc-memory-issues

Miscellaneous memory correctness improvements

Author: servantftransperfect

src/aliceVision/camera/IntrinsicBase.hpp

@@ -471,17 +471,18 @@ class IntrinsicBase
     void setState(EEstimatorParameterState state) { _state = state; }
 
   protected:
+    std::string _serialNumber;
+    double _sensorWidth = 36.0;
+    double _sensorHeight = 24.0;
+    unsigned int _w = 0;
+    unsigned int _h = 0;
+
     /// initialization mode
     EInitMode _initializationMode = EInitMode::NONE;
+
     /// intrinsic lock
     bool _locked = false;
     EEstimatorParameterState _state = EEstimatorParameterState::REFINED;
-
-    unsigned int _w = 0;
-    unsigned int _h = 0;
-    double _sensorWidth = 36.0;
-    double _sensorHeight = 24.0;
-    std::string _serialNumber;
 };
 
 /**

src/aliceVision/camera/IntrinsicScaleOffset.hpp

@@ -158,12 +158,12 @@ class IntrinsicScaleOffset : public IntrinsicBase
     void setInitialFocalLength(double initialFocalLengthMM, double pixelAspectRatio, bool useCompatibility = false);
 
   protected:
-    Vec2 _scale{1.0, 1.0};
-    Vec2 _offset{0.0, 0.0};
-    Vec2 _initialScale{-1.0, -1.0};
     bool _ratioLocked{true};
     bool _offsetLocked{false};
     bool _scaleLocked{false};
+    Vec2 _scale{1.0, 1.0};
+    Vec2 _offset{0.0, 0.0};
+    Vec2 _initialScale{-1.0, -1.0};
 };
 
 }  // namespace camera

src/aliceVision/mvsUtils/MultiViewParams.cpp

@@ -656,6 +656,9 @@ std::vector<int> MultiViewParams::findTileNearestCams(int rc, int nbNearestCams,
             ids.push_back(SortedId(tcScorePair.first, tcScorePair.second));
     }
 
+    if(ids.empty())
+        return out;
+
     qsort(&ids[0], ids.size(), sizeof(SortedId), qsortCompareSortedIdDesc);
 
     // ensure the ideal number of target cameras is not superior to the actual number of cameras