[image] Use separate EStorageDataType to specify not set value

alicevision · Oct 20, 2022 · b313aba · b313aba
1 parent e5b63c7
commit b313aba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/src/aliceVision/image/io.cpp b/src/aliceVision/image/io.cpp
@@ -155,7 +155,8 @@ std::string EStorageDataType_informations()
     return EStorageDataType_enumToString(EStorageDataType::Float) + ", " +
         EStorageDataType_enumToString(EStorageDataType::Half) + ", " +
         EStorageDataType_enumToString(EStorageDataType::HalfFinite) + ", " +
-        EStorageDataType_enumToString(EStorageDataType::Auto);
+        EStorageDataType_enumToString(EStorageDataType::Auto) + ", " +
+        EStorageDataType_enumToString(EStorageDataType::Undefined);
 }
 
 EStorageDataType EStorageDataType_stringToEnum(const std::string& dataType)
@@ -167,6 +168,7 @@ EStorageDataType EStorageDataType_stringToEnum(const std::string& dataType)
     if (type == "half") return EStorageDataType::Half;
     if (type == "halffinite") return EStorageDataType::HalfFinite;
     if (type == "auto") return EStorageDataType::Auto;
+    if (type == "undefined") return EStorageDataType::Undefined;
 
     throw std::out_of_range("Invalid EStorageDataType: " + dataType);
 }
@@ -179,6 +181,7 @@ std::string EStorageDataType_enumToString(const EStorageDataType dataType)
     case EStorageDataType::Half:   return "half";
     case EStorageDataType::HalfFinite:  return "halfFinite";
     case EStorageDataType::Auto:   return "auto";
+    case EStorageDataType::Undefined: return "undefined";
     }
     throw std::out_of_range("Invalid EStorageDataType enum");
 }
@@ -586,7 +589,7 @@ void writeImage(const std::string& path,
     // Storage data type may be saved as attributes to formats that support it and then come back
     // as metadata to this function. Therefore we store the storage data type to attributes if it
     // is set and load it from attributes if it isn't set.
-    if (options.isStorageDataTypeSet())
+    if (options.getStorageDataType() != EStorageDataType::Undefined)
     {
         imageSpec.attribute("AliceVision:storageDataType",
                             EStorageDataType_enumToString(options.getStorageDataType()));

diff --git a/src/aliceVision/image/io.hpp b/src/aliceVision/image/io.hpp
@@ -96,7 +96,8 @@ enum class EStorageDataType
     Float, //< Use full floating point precision to store
     Half, //< Use half (values our of range could become inf or nan)
     HalfFinite, //< Use half, but ensures out-of-range pixels are clamps to keep finite pixel values
-    Auto //< Use half if all pixels can be stored in half without clamp, else use full float
+    Auto, //< Use half if all pixels can be stored in half without clamp, else use full float
+    Undefined //< Storage data type is not defined and should be inferred from other sources
 };
 
 std::string EStorageDataType_informations();
@@ -183,7 +184,6 @@ class ImageWriteOptions
     EImageColorSpace getFromColorSpace() const { return _fromColorSpace; }
     EImageColorSpace getToColorSpace() const { return _toColorSpace; }
     EStorageDataType getStorageDataType() const { return _storageDataType; }
-    bool isStorageDataTypeSet() const { return _storageDataTypeSet; }
 
     ImageWriteOptions& fromColorSpace(EImageColorSpace colorSpace)
     {
@@ -200,15 +200,13 @@ class ImageWriteOptions
     ImageWriteOptions& storageDataType(EStorageDataType storageDataType)
     {
         _storageDataType = storageDataType;
-        _storageDataTypeSet = true;
         return *this;
     }
 
 private:
     EImageColorSpace _fromColorSpace{EImageColorSpace::LINEAR};
     EImageColorSpace _toColorSpace{EImageColorSpace::AUTO};
-    EStorageDataType _storageDataType{EStorageDataType::HalfFinite};
-    bool _storageDataTypeSet = false;
+    EStorageDataType _storageDataType{EStorageDataType::Undefined};
 };
 
 /**