Conflicts

Author: atishdhu

src/core/jpeg_stream.js

@@ -94,6 +94,7 @@ class JpegStream extends DecodeStream {
       }
     }
     const jpegImage = new JpegImage(jpegOptions);
+    
     jpegImage.parse(bytes);
     const data = jpegImage.getData({
       width: this.drawWidth,

src/core/jpg.js

@@ -789,6 +789,8 @@ class JpegImage {
         component.blocksPerLine = blocksPerLine;
         component.blocksPerColumn = blocksPerColumn;
       }
+      frame.mcusPerLine = mcusPerLine;
+      frame.mcusPerColumn = mcusPerColumn;
     }
 
     let offset = 0;

src/display/canvas.js

@@ -1059,6 +1059,8 @@ class CanvasGraphics {
     // Vertical or horizontal scaling shall not be more than 2 to not lose the
     // pixels during drawImage operation, painting on the temporary canvas(es)
     // that are twice smaller in size.
+    const width = img.width;
+    const height = img.height;
     let widthScale = Math.max(
       Math.hypot(inverseTransform[0], inverseTransform[1]),
       1
@@ -1513,6 +1515,7 @@ class CanvasGraphics {
           ctx.fillRect(0, 0, width, height);
           ctx.globalCompositeOperation = "source-over";
         }
+        
         maskCanvas = canvas.canvas;
         maskX = maskY = 0;
       } else if (backdrop.some(c => c !== 0)) {