Merge pull request #17956 from calixteman/jpx_exceptions

[JPX] Throw an exception with the error messages returned by openjpeg
mozilla · Apr 16, 2024 · 7290faf · 7290faf
2 parents 921fae5 + ebcae30
commit 7290faf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/external/openjpeg/openjpeg.js b/external/openjpeg/openjpeg.js
diff --git a/src/core/jpx.js b/src/core/jpx.js
@@ -28,8 +28,8 @@ class JpxImage {
   static decode(data, ignoreColorSpace = false) {
     this.#module ||= OpenJPEG();
     const imageData = this.#module.decode(data, ignoreColorSpace);
-    if (!imageData) {
-      throw new JpxError("JPX decode failed");
+    if (typeof imageData === "string") {
+      throw new JpxError(imageData);
     }
     return imageData;
   }