Automate compression method detection

BUILD.bazel

@@ -275,6 +275,7 @@ cc_library(
         "src/lib/OpenEXR/ImfChromaticities.cpp",
         "src/lib/OpenEXR/ImfChromaticitiesAttribute.cpp",
         "src/lib/OpenEXR/ImfCompositeDeepScanLine.cpp",
+        "src/lib/OpenEXR/ImfCompression.cpp",
         "src/lib/OpenEXR/ImfCompressionAttribute.cpp",
         "src/lib/OpenEXR/ImfCompressor.cpp",
         "src/lib/OpenEXR/ImfConvert.cpp",

src/bin/exrenvmap/main.cpp

@@ -40,6 +40,9 @@ usageMessage (ostream& stream, const char* program_name, bool verbose = false)
 
     if (verbose)
     {
+        std::string compressionNames;
+        getCompressionNamesString("/", compressionNames);
+
         stream << "\n"
             "Convert an OpenEXR latitude-longitude environment map\n"
             "into a cube-face environment map or vice versa.\n"
@@ -119,7 +122,7 @@ usageMessage (ostream& stream, const char* program_name, bool verbose = false)
             "  -u            sets level size rounding to ROUND_UP\n"
             "\n"
             "  -z x          sets the data compression method to x\n"
-            "                (none/rle/zip/piz/pxr24/b44/b44a/dwaa/dwab,\n"
+            "                (" << compressionNames.c_str() << ",\n"
             "                default is zip)\n"
             "\n"
             "  -v            verbose mode\n"
@@ -137,44 +140,8 @@ Compression
 getCompression (const string& str)
 {
     Compression c;
-
-    if (str == "no" || str == "none" || str == "NO" || str == "NONE")
-    {
-        c = NO_COMPRESSION;
-    }
-    else if (str == "rle" || str == "RLE")
-    {
-        c = RLE_COMPRESSION;
-    }
-    else if (str == "zip" || str == "ZIP")
-    {
-        c = ZIP_COMPRESSION;
-    }
-    else if (str == "piz" || str == "PIZ")
-    {
-        c = PIZ_COMPRESSION;
-    }
-    else if (str == "pxr24" || str == "PXR24")
-    {
-        c = PXR24_COMPRESSION;
-    }
-    else if (str == "b44" || str == "B44")
-    {
-        c = B44_COMPRESSION;
-    }
-    else if (str == "b44a" || str == "B44A")
-    {
-        c = B44A_COMPRESSION;
-    }
-    else if (str == "dwaa" || str == "DWAA")
-    {
-        c = DWAA_COMPRESSION;
-    }
-    else if (str == "dwab" || str == "DWAB")
-    {
-        c = DWAB_COMPRESSION;
-    }
-    else
+    getCompressionIdFromName (str, c);
+    if (c == Compression::NUM_COMPRESSION_METHODS)
     {
         std::stringstream e;
         e << "Unknown compression method \"" << str << "\"";

src/bin/exrheader/main.cpp

@@ -43,30 +43,9 @@ using namespace std;
 void
 printCompression (Compression c)
 {
-    switch (c)
-    {
-        case NO_COMPRESSION: cout << "none"; break;
-
-        case RLE_COMPRESSION: cout << "run-length encoding"; break;
-
-        case ZIPS_COMPRESSION: cout << "zip, individual scanlines"; break;
-
-        case ZIP_COMPRESSION: cout << "zip, multi-scanline blocks"; break;
-
-        case PIZ_COMPRESSION: cout << "piz"; break;
-
-        case PXR24_COMPRESSION: cout << "pxr24"; break;
-
-        case B44_COMPRESSION: cout << "b44"; break;
-
-        case B44A_COMPRESSION: cout << "b44a"; break;
-
-        case DWAA_COMPRESSION: cout << "dwa, small scanline blocks"; break;
-
-        case DWAB_COMPRESSION: cout << "dwa, medium scanline blocks"; break;
-
-        default: cout << int (c); break;
-    }
+    std::string desc;
+    getCompressionDescriptionFromId(c, desc);
+    cout << desc.c_str();
 }
 
 void

src/bin/exrmaketiled/main.cpp

@@ -37,6 +37,9 @@ usageMessage (ostream& stream, const char* program_name, bool verbose = false)
 
     if (verbose)
     {
+        std::string compressionNames;
+        getCompressionNamesString("/", compressionNames);
+
         stream << "\n"
             "Read an OpenEXR image from infile, produce a tiled\n"
             "version of the image, and save the result in outfile.\n"
@@ -71,7 +74,7 @@ usageMessage (ostream& stream, const char* program_name, bool verbose = false)
             "  -u            sets level size rounding to ROUND_UP\n"
             "\n"
             "  -z x          sets the data compression method to x\n"
-            "                (none/rle/zip/piz/pxr24/b44/b44a/dwaa/dwab,\n"
+            "                (" << compressionNames.c_str() << ",\n"
             "                default is zip)\n"
             "\n"
             "  -v            verbose mode\n"
@@ -93,44 +96,8 @@ Compression
 getCompression (const string& str)
 {
     Compression c;
-
-    if (str == "no" || str == "none" || str == "NO" || str == "NONE")
-    {
-        c = NO_COMPRESSION;
-    }
-    else if (str == "rle" || str == "RLE")
-    {
-        c = RLE_COMPRESSION;
-    }
-    else if (str == "zip" || str == "ZIP")
-    {
-        c = ZIP_COMPRESSION;
-    }
-    else if (str == "piz" || str == "PIZ")
-    {
-        c = PIZ_COMPRESSION;
-    }
-    else if (str == "pxr24" || str == "PXR24")
-    {
-        c = PXR24_COMPRESSION;
-    }
-    else if (str == "b44" || str == "B44")
-    {
-        c = B44_COMPRESSION;
-    }
-    else if (str == "b44a" || str == "B44A")
-    {
-        c = B44A_COMPRESSION;
-    }
-    else if (str == "dwaa" || str == "DWAA")
-    {
-        c = DWAA_COMPRESSION;
-    }
-    else if (str == "dwab" || str == "DWAB")
-    {
-        c = DWAB_COMPRESSION;
-    }
-    else
+    getCompressionIdFromName (str, c);
+    if (c == Compression::NUM_COMPRESSION_METHODS)
     {
         std::stringstream e;
         e << "Unknown compression method \"" << str << "\"";

src/bin/exrmultiview/main.cpp

@@ -35,6 +35,10 @@ usageMessage (ostream& stream, const char* program_name, bool verbose = false)
     stream << "Usage: " << program_name << " [options] viewname1 infile1 viewname2 infile2 ... outfile" << endl;
 
     if (verbose)
+    {
+        std::string compressionNames;
+        getCompressionNamesString("/", compressionNames);
+
         stream << "\n"
             "Combine two or more single-view OpenEXR image files into\n"
             "a single multi-view image file.  On the command line,\n"
@@ -51,7 +55,7 @@ usageMessage (ostream& stream, const char* program_name, bool verbose = false)
             "Options:\n"
             "\n"
             "  -z x          sets the data compression method to x\n"
-            "                (none/rle/zip/piz/pxr24/b44/b44a/dwaa/dwab,\n"
+            "                ("  << compressionNames.c_str() << ",\n"
             "                default is piz)\n"
             "\n"
             "  -v            verbose mode\n"
@@ -62,50 +66,15 @@ usageMessage (ostream& stream, const char* program_name, bool verbose = false)
             "\n"
             "Report bugs via https://github.com/AcademySoftwareFoundation/openexr/issues or email [email protected]\n"
             "";
+    }
 }
 
 Compression
 getCompression (const string& str)
 {
     Compression c;
-
-    if (str == "no" || str == "none" || str == "NO" || str == "NONE")
-    {
-        c = NO_COMPRESSION;
-    }
-    else if (str == "rle" || str == "RLE")
-    {
-        c = RLE_COMPRESSION;
-    }
-    else if (str == "zip" || str == "ZIP")
-    {
-        c = ZIP_COMPRESSION;
-    }
-    else if (str == "piz" || str == "PIZ")
-    {
-        c = PIZ_COMPRESSION;
-    }
-    else if (str == "pxr24" || str == "PXR24")
-    {
-        c = PXR24_COMPRESSION;
-    }
-    else if (str == "b44" || str == "B44")
-    {
-        c = B44_COMPRESSION;
-    }
-    else if (str == "b44a" || str == "B44A")
-    {
-        c = B44A_COMPRESSION;
-    }
-    else if (str == "dwaa" || str == "DWAA")
-    {
-        c = DWAA_COMPRESSION;
-    }
-    else if (str == "dwab" || str == "DWAB")
-    {
-        c = DWAB_COMPRESSION;
-    }
-    else
+    getCompressionIdFromName (str, c);
+    if (c == Compression::NUM_COMPRESSION_METHODS)
     {
         std::stringstream e;
         e << "Unknown compression method \"" << str << "\"";

src/lib/OpenEXR/CMakeLists.txt

@@ -8,6 +8,7 @@ openexr_define_library(OpenEXR
     ImfAutoArray.h
     ImfB44Compressor.h
     ImfCheckedArithmetic.h
+    ImfCompression.h
     ImfCompressor.h
     ImfDwaCompressor.h
     ImfDwaCompressorSimd.h
@@ -42,6 +43,7 @@ openexr_define_library(OpenEXR
     ImfCompositeDeepScanLine.cpp
     ImfCompressionAttribute.cpp
     ImfCompressor.cpp
+    ImfCompression.cpp
     ImfConvert.cpp
     ImfCRgbaFile.cpp
     ImfDeepCompositing.cpp

src/lib/OpenEXR/ImfB44Compressor.h

@@ -29,10 +29,10 @@ class B44Compressor : public Compressor
 
     virtual ~B44Compressor ();
 
-    B44Compressor (const B44Compressor& other) = delete;
+    B44Compressor (const B44Compressor& other)            = delete;
     B44Compressor& operator= (const B44Compressor& other) = delete;
     B44Compressor (B44Compressor&& other)                 = delete;
-    B44Compressor& operator= (B44Compressor&& other) = delete;
+    B44Compressor& operator= (B44Compressor&& other)      = delete;
 
     virtual int numScanLines () const;
 

src/lib/OpenEXR/ImfCRgbaFile.h

@@ -80,6 +80,7 @@ typedef struct ImfRgba ImfRgba;
 #define IMF_B44A_COMPRESSION 7
 #define IMF_DWAA_COMPRESSION 8
 #define IMF_DWAB_COMPRESSION 9
+#define IMF_NUM_COMPRESSION_METHODS 10
 
 /*
 ** Channels; values must be the same as in Imf::RgbaChannels.