Remove HT compression and keep HT256

Author: palemieux

src/lib/OpenEXR/ImfCRgbaFile.h

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

src/lib/OpenEXR/ImfCompression.cpp

@@ -176,12 +176,6 @@ static const CompressionDesc IdToDesc[] = {
         256,
         true,
         false),
-    CompressionDesc (
-        "ht",
-        "High-Throughtput JPEG 2000 (OpenJPH, full frame)",
-        16000,
-        true,
-        false),
     CompressionDesc (
         "ht256",
         "High-Throughtput JPEG 2000 (OpenJPH, 256 lines)",
@@ -204,7 +198,6 @@ static const std::map<std::string, Compression> CompressionNameToId = {
     {"b44a", Compression::B44A_COMPRESSION},
     {"dwaa", Compression::DWAA_COMPRESSION},
     {"dwab", Compression::DWAB_COMPRESSION},
-    {"ht", Compression::HT_COMPRESSION},
     {"ht256", Compression::HT256_COMPRESSION},
 };
 

src/lib/OpenEXR/ImfCompression.h

@@ -51,9 +51,7 @@ enum IMF_EXPORT_ENUM Compression
                           // wise and faster to decode full frames
                           // than DWAA_COMPRESSION.
 
-    HT_COMPRESSION = 10,
-
-    HT256_COMPRESSION = 11,
+    HT256_COMPRESSION = 10,
 
     NUM_COMPRESSION_METHODS // number of different compression methods
 };

src/lib/OpenEXR/ImfCompressor.cpp

@@ -336,10 +336,6 @@ newCompressor (Compression c, size_t maxScanLineSize, const Header& hdr)
                 DwaCompressor::STATIC_HUFFMAN);
             break;
 
-        case HT_COMPRESSION:
-
-            return new HTCompressor (hdr, static_cast<int> (maxScanLineSize), 0);
-
         case HT256_COMPRESSION:
 
             return new HTCompressor (hdr, static_cast<int> (maxScanLineSize), 256);

src/lib/OpenEXRCore/compression.c

@@ -227,7 +227,6 @@ int exr_compression_lines_per_chunk (exr_compression_t comptype)
         case EXR_COMPRESSION_B44A:
         case EXR_COMPRESSION_DWAA: linePerChunk = 32; break;
         case EXR_COMPRESSION_DWAB: linePerChunk = 256; break;
-        case EXR_COMPRESSION_HT: linePerChunk = 16000; break;
         case EXR_COMPRESSION_HT256: linePerChunk = 256; break;
         case EXR_COMPRESSION_LAST_TYPE:
         default:
@@ -362,7 +361,6 @@ exr_compress_chunk (exr_encode_pipeline_t* encode)
         case EXR_COMPRESSION_B44A: rv = internal_exr_apply_b44a (encode); break;
         case EXR_COMPRESSION_DWAA: rv = internal_exr_apply_dwaa (encode); break;
         case EXR_COMPRESSION_DWAB: rv = internal_exr_apply_dwab (encode); break;
-        case EXR_COMPRESSION_HT:
         case EXR_COMPRESSION_HT256:
             rv = internal_exr_apply_ht (encode); break;
         case EXR_COMPRESSION_LAST_TYPE:
@@ -441,7 +439,6 @@ decompress_data (
             rv = internal_exr_undo_dwab (
                 decode, packbufptr, packsz, unpackbufptr, unpacksz);
             break;
-        case EXR_COMPRESSION_HT:
         case EXR_COMPRESSION_HT256:
             rv = internal_exr_undo_ht (
                 decode, packbufptr, packsz, unpackbufptr, unpacksz);

src/lib/OpenEXRCore/openexr_attr.h

@@ -45,8 +45,7 @@ typedef enum
     EXR_COMPRESSION_B44A  = 7,
     EXR_COMPRESSION_DWAA  = 8,
     EXR_COMPRESSION_DWAB  = 9,
-    EXR_COMPRESSION_HT        = 10,
-    EXR_COMPRESSION_HT256     = 11,
+    EXR_COMPRESSION_HT256     = 10,
     EXR_COMPRESSION_LAST_TYPE /**< Invalid value, provided for range checking. */
 } exr_compression_t;
 

src/test/OpenEXRTest/testCompressionApi.cpp

@@ -28,11 +28,11 @@ testCompressionApi (const string& tempDir)
         cout << "Testing compression API functions." << endl;
 
         // update this if you add a new compressor.
-        string codecList = "none/rle/zips/zip/piz/pxr24/b44/b44a/dwaa/dwab/ht/ht256";
+        string codecList = "none/rle/zips/zip/piz/pxr24/b44/b44a/dwaa/dwab/ht256";
 
         int numMethods = static_cast<int> (NUM_COMPRESSION_METHODS);
         // update this if you add a new compressor.
-        assert (numMethods == 12);
+        assert (numMethods == 11);
 
         for (int i = 0; i < numMethods; i++)
         {