fix: uncaught exceptions, still need to reject promise

AndyOGo · AndyOGo · commit 5faa5f636616 · 2020-05-06T19:58:52.000+02:00
diff --git a/js/load-image-orientation.js b/js/load-image-orientation.js
@@ -87,8 +87,12 @@ Exif orientation values to correctly display the letter F:
       $.orientation = img.width === 2 && img.height === 3
       if ($.orientation) {
         var canvas = $.createCanvas(1, 1, true)
-        var ctx = canvas.getContext('2d')
-        ctx.drawImage(img, 1, 1, 1, 1, 0, 0, 1, 1)
+        try {
+          var ctx = canvas.getContext('2d')
+          ctx.drawImage(img, 1, 1, 1, 1, 0, 0, 1, 1)
+        } catch (error) {
+          // @todo: reject promise
+        }
         // Check if the source image coordinates (sX, sY, sWidth, sHeight) are
         // correctly applied to the auto-orientated image, which should result
         // in a white opaque pixel (e.g. in Safari).
diff --git a/js/load-image-scale.js b/js/load-image-scale.js
@@ -96,25 +96,29 @@
     destHeight,
     options
   ) {
-    var ctx = canvas.getContext('2d')
-    if (options.imageSmoothingEnabled === false) {
-      ctx.msImageSmoothingEnabled = false
-      ctx.imageSmoothingEnabled = false
-    } else if (options.imageSmoothingQuality) {
-      ctx.imageSmoothingQuality = options.imageSmoothingQuality
+    try {
+      var ctx = canvas.getContext('2d')
+      if (options.imageSmoothingEnabled === false) {
+        ctx.msImageSmoothingEnabled = false
+        ctx.imageSmoothingEnabled = false
+      } else if (options.imageSmoothingQuality) {
+        ctx.imageSmoothingQuality = options.imageSmoothingQuality
+      }
+      ctx.drawImage(
+        img,
+        sourceX,
+        sourceY,
+        sourceWidth,
+        sourceHeight,
+        0,
+        0,
+        destWidth,
+        destHeight
+      )
+      return ctx
+    } catch (error) {
+      // @todo: reject promise upon error
     }
-    ctx.drawImage(
-      img,
-      sourceX,
-      sourceY,
-      sourceWidth,
-      sourceHeight,
-      0,
-      0,
-      destWidth,
-      destHeight
-    )
-    return ctx
   }
 
   // Determines if the target image should be a canvas element:
