DngDecoder: detect JPEG XL chunks

Author: kmilos

src/librawspeed/decoders/DngDecoder.cpp

@@ -119,6 +119,9 @@ void DngDecoder::dropUnsuportedChunks(std::vector<const TiffIFD*>* data) {
     case 9: // VC-5 as used by GoPro
 #ifdef HAVE_JPEG
     case 0x884c: // lossy JPEG
+#endif
+#ifdef HAVE_JXL
+    case 0xcd42: // JPEG XL
 #endif
                  // no change, if supported, then is still supported.
       break;
@@ -140,6 +143,15 @@ void DngDecoder::dropUnsuportedChunks(std::vector<const TiffIFD*>* data) {
                                     "chunk, but the jpeg support was "
                                     "disabled at build!");
       [[clang::fallthrough]];
+#endif
+#ifndef HAVE_JXL
+    case 0xcd42: // JPEG XL
+#pragma message                                                                \
+    "JPEG XL is not present! JPEG XL compression will not be supported!"
+      writeLog(DEBUG_PRIO::WARNING, "DNG Decoder: found JPEG XL encoded "
+                                    "chunk, but the jpeg xl support was "
+                                    "disabled at build!");
+      [[clang::fallthrough]];
 #endif
     default:
       supported = false;
@@ -362,10 +374,11 @@ void DngDecoder::decodeData(const TiffIFD* raw, uint32_t sample_format) const {
   if (compression == 8 && sample_format != 3) {
     ThrowRDE("Only float format is supported for "
              "deflate-compressed data.");
-  } else if ((compression == 7 || compression == 0x884c) &&
+  } else if ((compression == 7 || compression == 0x884c ||
+              compression == 0xcd42) &&
              sample_format != 1) {
     ThrowRDE("Only 16 bit unsigned data supported for "
-             "JPEG-compressed data.");
+             "JPEG or JPEG XL compressed data.");
   }
 
   uint32_t predictor = ~0U;