[sfmData] fallback if there is no iso information

alicevision · Sep 7, 2020 · 7f64ff5 · 7f64ff5
1 parent 8030277
commit 7f64ff5
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/aliceVision/sfmData/View.cpp b/src/aliceVision/sfmData/View.cpp
@@ -21,18 +21,26 @@ float View::getCameraExposureSetting(const float referenceISO, const float refer
 {
     const float shutter = getMetadataShutter();
     const float fnumber = getMetadataFNumber();
-    const float iso = getMetadataISO();
-
-    if(shutter < 0 || fnumber < 0)
+    if(shutter <= 0.0f || fnumber <= 0.0f)
         return -1.f;
 
+    float iso = getMetadataISO();
     float lReferenceIso = referenceISO;
-    if (lReferenceIso < 0.0f) {
-        lReferenceIso = iso;
+    if (lReferenceIso <= 0.0f || iso <= 0.0f)
+    {
+        if(lReferenceIso <= 0.0f && iso <= 0.0f)
+        {
+            lReferenceIso = iso = 100;
+        }
+        else if(lReferenceIso <= 0.0f)
+            lReferenceIso = iso;
+        else
+            iso = lReferenceIso;
     }
 
     float lReferenceFNumber = referenceFNumber;
-    if (lReferenceFNumber < 0.0f) {
+    if (lReferenceFNumber <= 0.0f)
+    {
         lReferenceFNumber = fnumber;
     }