Change HTJ2K compressor name to HTJ2K256

palemieux · palemieux · commit 98a748bb9082 · 2025-08-21T14:02:05.000-07:00
diff --git a/src/lib/OpenEXR/ImfCRgbaFile.h b/src/lib/OpenEXR/ImfCRgbaFile.h
@@ -80,7 +80,7 @@ typedef struct ImfRgba ImfRgba;
 #define IMF_B44A_COMPRESSION 7
 #define IMF_DWAA_COMPRESSION 8
 #define IMF_DWAB_COMPRESSION 9
-#define IMF_HTJ2K_COMPRESSION 10
+#define IMF_HTJ2K256_COMPRESSION 10
 #define IMF_HTJ2K32_COMPRESSION 11
 #define IMF_NUM_COMPRESSION_METHODS 12
 
diff --git a/src/lib/OpenEXR/ImfCompression.cpp b/src/lib/OpenEXR/ImfCompression.cpp
@@ -177,7 +177,7 @@ static const CompressionDesc IdToDesc[] = {
         true,
         false),
     CompressionDesc (
-        "htj2k",
+        "htj2k256",
         "High-Throughput JPEG 2000 (OpenJPH, 256 lines)",
         256,
         true,
@@ -204,7 +204,7 @@ static const std::map<std::string, Compression> CompressionNameToId = {
     {"b44a", Compression::B44A_COMPRESSION},
     {"dwaa", Compression::DWAA_COMPRESSION},
     {"dwab", Compression::DWAB_COMPRESSION},
-    {"htj2k", Compression::HTJ2K_COMPRESSION},
+    {"htj2k256", Compression::HTJ2K256_COMPRESSION},
     {"htj2k32", Compression::HTJ2K32_COMPRESSION},
 };
 
diff --git a/src/lib/OpenEXR/ImfCompression.h b/src/lib/OpenEXR/ImfCompression.h
@@ -51,9 +51,9 @@ enum IMF_EXPORT_ENUM Compression
                           // wise and faster to decode full frames
                           // than DWAA_COMPRESSION.
 
-    HTJ2K_COMPRESSION = 10,   // High-Throughput JPEG2000 (HTJ2K), 256 scanlines
+    HTJ2K256_COMPRESSION = 10,   // High-Throughput JPEG2000 (HTJ2K), 256 scanlines
 
-    HTJ2K32_COMPRESSION = 11, // High-Throughput JPEG2000 (HTJ2K), 32 scanlines
+    HTJ2K32_COMPRESSION = 11,    // High-Throughput JPEG2000 (HTJ2K), 32 scanlines
 
     NUM_COMPRESSION_METHODS // number of different compression methods
 };
diff --git a/src/lib/OpenEXR/ImfCompressor.cpp b/src/lib/OpenEXR/ImfCompressor.cpp
@@ -336,7 +336,7 @@ newCompressor (Compression c, size_t maxScanLineSize, const Header& hdr)
                 DwaCompressor::STATIC_HUFFMAN);
             break;
 
-        case HTJ2K_COMPRESSION:
+        case HTJ2K256_COMPRESSION:
 
             return new HTCompressor (hdr, static_cast<int> (maxScanLineSize), 256);
 
@@ -425,7 +425,7 @@ newTileCompressor (
                 DwaCompressor::STATIC_HUFFMAN);
             break;
 
-        case HTJ2K_COMPRESSION:
+        case HTJ2K256_COMPRESSION:
         case HTJ2K32_COMPRESSION:
 
             return new HTCompressor (
diff --git a/src/wrappers/python/Imath.py b/src/wrappers/python/Imath.py
@@ -94,11 +94,11 @@ class Compression(Enumerated):
     B44A_COMPRESSION = 7
     DWAA_COMPRESSION = 8
     DWAB_COMPRESSION = 9
-    HTJ2K_COMPRESSION = 10
+    HTJ2K256_COMPRESSION = 10
     HTJ2K32_COMPRESSION = 11
     names = [
         "NO_COMPRESSION", "RLE_COMPRESSION", "ZIPS_COMPRESSION", "ZIP_COMPRESSION", "PIZ_COMPRESSION", "PXR24_COMPRESSION",
-        "B44_COMPRESSION", "B44A_COMPRESSION", "DWAA_COMPRESSION", "DWAB_COMPRESSION", "HTJ2K_COMPRESSION", "HTJ2K32_COMPRESSION"
+        "B44_COMPRESSION", "B44A_COMPRESSION", "DWAA_COMPRESSION", "DWAB_COMPRESSION", "HTJ2K256_COMPRESSION", "HTJ2K32_COMPRESSION"
     ]
 
 class PixelType(Enumerated):
diff --git a/src/wrappers/python/PyOpenEXR.cpp b/src/wrappers/python/PyOpenEXR.cpp
@@ -2360,7 +2360,7 @@ PYBIND11_MODULE(OpenEXR, m)
         .value("B44A_COMPRESSION", B44A_COMPRESSION)
         .value("DWAA_COMPRESSION", DWAA_COMPRESSION)
         .value("DWAB_COMPRESSION", DWAB_COMPRESSION)
-        .value("HTJ2K_COMPRESSION", HTJ2K_COMPRESSION)
+        .value("HTJ2K256_COMPRESSION", HTJ2K256_COMPRESSION)
         .value("HTJ2K32_COMPRESSION", HTJ2K32_COMPRESSION)
         .value("NUM_COMPRESSION_METHODS", NUM_COMPRESSION_METHODS)
         .export_values();
@@ -2714,7 +2714,7 @@ PYBIND11_MODULE(OpenEXR, m)
                  B44A_COMPRESSION
                  DWAA_COMPRESSION
                  DWAB_COMPRESSION
-                 HTJ2K_COMPRESSION
+                 HTJ2K256_COMPRESSION
                  HTJ2K32_COMPRESSION
              )pbdoc")
         .def_readwrite("header", &PyPart::header,
diff --git a/website/OpenEXRFileLayout.rst b/website/OpenEXRFileLayout.rst
@@ -696,7 +696,7 @@ per block depends on how the pixel data are compressed:
      - 32
    * - ``DWAB_COMPRESSION``
      - 256
-   * - ``HTJ2K_COMPRESSION``
+   * - ``HTJ2K256_COMPRESSION``
      - 256
    * - ``HTJ2K32_COMPRESSION``
      - 32
@@ -936,7 +936,7 @@ The OpenEXR library predefines the following attribute types:
 |                    | * ``B44A_COMPRESSION`` = 7                                      |
 |                    | * ``DWAA_COMPRESSION`` = 8                                      |
 |                    | * ``DWAB_COMPRESSION`` = 9                                      |
-|                    | * ``HTJ2K_COMPRESSION`` = 10                                    |
+|                    | * ``HTJ2K256_COMPRESSION`` = 10                                    |
 |                    | * ``HTJ2K32_COMPRESSION`` = 11                                  |
 |                    |                                                                 |
 +--------------------+-----------------------------------------------------------------+
diff --git a/website/StandardAttributes.rst b/website/StandardAttributes.rst
@@ -151,7 +151,7 @@ Basic Attributes
            <li> <tt> B44A_COMPRESSION </tt> - lossy 4-by-4 pixel block compression, flat fields are compressed more </li>
            <li> <tt> DWAA_COMPRESSION </tt> - lossy DCT based compression, in blocks of 32 scanlines. More efficient for partial buffer access. </li>
            <li> <tt> DWAB_COMPRESSION </tt> - lossy DCT based compression, in blocks of 256 scanlines. More efficient space wise and faster to decode full frames than <tt>DWAA_COMPRESSION</tt>. </li>
-           <li> <tt> HTJ2K_COMPRESSION </tt> - JPEG 2000 lossless coding, in blocks of 256 scanlines and using the High-Throughput (HT) blocker. Offers both speed and high-coding efficiency. </li>
+           <li> <tt> HTJ2K256_COMPRESSION </tt> - JPEG 2000 lossless coding, in blocks of 256 scanlines and using the High-Throughput (HT) blocker. Offers both speed and high-coding efficiency. </li>
            <li> <tt> HTJ2K32_COMPRESSION </tt> - JPEG 2000 lossless coding, in blocks of 32 scanlines and using the High-Throughput (HT) blocker. Offers both speed and high-coding efficiency. </li>
          </ul>
        </p>
diff --git a/website/python.rst b/website/python.rst
@@ -228,7 +228,7 @@ The OpenEXR module has enumerated types for certain attributes:
            <li> <tt> OpenEXR.B44A_COMPRESSION </tt>
            <li> <tt> OpenEXR.DWAA_COMPRESSION </tt>
            <li> <tt> OpenEXR.DWAB_COMPRESSION </tt> 
-           <li> <tt> OpenEXR.HTJ2K_COMPRESSION </tt> 
+           <li> <tt> OpenEXR.HTJ2K256_COMPRESSION </tt> 
            <li> <tt> OpenEXR.HTJ2K32_COMPRESSION </tt> 
            <li> <tt> OpenEXR.NUM_COMPRESSION_METHODS </tt> 
          </ul>
