exr: OpenEXR 3.4 supports two compression types for HTJ2K (#4871)

`htj2k32` or `htj2k256` compression options.

Signed-off-by: Todica Ionut <[email protected]>

Author: TodicaIonut

src/doc/builtinplugins.rst

@@ -1497,8 +1497,8 @@ The official OpenEXR site is http://www.openexr.com/.
    * - ``compression``
      - string
      - one of: ``"none"``, ``"rle"``, ``"zip"``, ``"zips"``, ``"piz"``,
-       ``"pxr24"``, ``"b44"``, ``"b44a"``, ``"dwaa"``, ``"dwab"`` or ``"htj2k"``.
-       (``"htj2k"`` is only supported with OpenEXR 3.4 or later.)
+       ``"pxr24"``, ``"b44"``, ``"b44a"``, ``"dwaa"``, ``"dwab"``, ``"htj2k256"`` or ``"htj2k32"``.
+       (``"htj2k256"`` and ``"htj2k32"`` are only supported with OpenEXR 3.4 or later.)
        If the writer receives a request for a compression type it does not
        recognize or is not supported by the version of OpenEXR on the
        system, it will use ``"zip"`` by default. For ``"dwaa"`` and

src/openexr.imageio/exrinput.cpp

@@ -436,8 +436,11 @@ OpenEXRInput::PartInfo::parse_header(OpenEXRInput* in,
         case Imf::B44A_COMPRESSION: comp = "b44a"; break;
         case Imf::DWAA_COMPRESSION: comp = "dwaa"; break;
         case Imf::DWAB_COMPRESSION: comp = "dwab"; break;
-#ifdef IMF_HTJ2K_COMPRESSION
-        case Imf::HTJ2K_COMPRESSION: comp = "htj2k"; break;
+#ifdef IMF_HTJ2K256_COMPRESSION
+        case EXR_COMPRESSION_HTJ2K256: comp = "htj2k256"; break;
+#endif
+#ifdef IMF_HTJ2K32_COMPRESSION
+        case EXR_COMPRESSION_HTJ2K32: comp = "htj2k32"; break;
 #endif
         default: break;
         }

src/openexr.imageio/exrinput_c.cpp

@@ -571,8 +571,11 @@ OpenEXRCoreInput::PartInfo::parse_header(OpenEXRCoreInput* in,
         case EXR_COMPRESSION_B44A: comp = "b44a"; break;
         case EXR_COMPRESSION_DWAA: comp = "dwaa"; break;
         case EXR_COMPRESSION_DWAB: comp = "dwab"; break;
-#ifdef IMF_HTJ2K_COMPRESSION
-        case EXR_COMPRESSION_HTJ2K: comp = "htj2k"; break;
+#ifdef IMF_HTJ2K256_COMPRESSION
+        case EXR_COMPRESSION_HTJ2K256: comp = "htj2k256"; break;
+#endif
+#ifdef IMF_HTJ2K32_COMPRESSION
+        case EXR_COMPRESSION_HTJ2K32: comp = "htj2k32"; break;
 #endif
         default: break;
         }

src/openexr.imageio/exroutput.cpp

@@ -961,9 +961,13 @@ OpenEXROutput::put_parameter(const std::string& name, TypeDesc type,
                 header.compression() = Imf::DWAA_COMPRESSION;
             else if (Strutil::iequals(str, "dwab"))
                 header.compression() = Imf::DWAB_COMPRESSION;
-#ifdef IMF_HTJ2K_COMPRESSION
-            else if (Strutil::iequals(str, "htj2k"))
-                header.compression() = Imf::HTJ2K_COMPRESSION;
+#ifdef IMF_HTJ2K256_COMPRESSION
+            else if (Strutil::iequals(str, "htj2k256"))
+                header.compression() = Imf::HTJ2K256_COMPRESSION;
+#endif
+#ifdef IMF_HTJ2K32_COMPRESSION
+            else if (Strutil::iequals(str, "htj2k32"))
+                header.compression() = Imf::HTJ2K32_COMPRESSION;
 #endif
         }
         return true;