Conflicts

Author: atishdhu

Diff for: src/core/jpeg_stream.js

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

Diff for: src/core/jpg.js

@@ -828,7 +828,7 @@ class JpegImage {
         case 0xffee: // APP14
         case 0xffef: // APP15
         case 0xfffe: // COM (Comment)
-          offset = newOffset;
+          const appData = readDataBlock();
 
           if (fileMarker === 0xffe0) {
             // 'JFIF\x00'

Diff for: src/display/canvas.js

@@ -3250,4 +3250,4 @@ for (const op in OPS) {
   }
 }
 
-export { CanvasGraphics };
+export { CanvasGraphics };

Diff for: test/pdfs/.gitignore

@@ -679,4 +679,3 @@
 !issue18036.pdf
 !issue18894.pdf
 !bug1922766.pdf
-!issue18956.pdf

Diff for: test/pdfs/issue18956.pdf

@@ -10742,4 +10742,4 @@
     "rounds": 1,
     "type": "eq"
   }
-]
+]

Diff for: test/test_manifest.json

@@ -2236,7 +2236,7 @@ if (typeof PDFJSDev === "undefined" || PDFJSDev.test("GENERIC")) {
       // start accepting URLs from foreign origin -- CORS headers on the remote
       // server must be properly configured.
       if (fileOrigin !== viewerOrigin) {
-        // throw new Error("file origin does not match viewer's");
+        throw new Error("file origin does not match viewer's");
       }
     } catch (ex) {
       PDFViewerApplication._documentError("pdfjs-loading-error", {