Merge pull request mozilla#2313 from yurydelendik/issue-1905

yurydelendik · yurydelendik · commit 1f084053e660 · 2012-10-29T12:09:11.000-07:00
Fixes incomplete restore in paintFormXObject
diff --git a/src/canvas.js b/src/canvas.js
@@ -187,6 +187,7 @@ var CanvasExtraState = (function CanvasExtraStateClosure() {
     this.fillAlpha = 1;
     this.strokeAlpha = 1;
     this.lineWidth = 1;
+    this.paintFormXObjectDepth = 0;
 
     this.old = old;
   }
@@ -1109,6 +1110,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
     paintFormXObjectBegin: function CanvasGraphics_paintFormXObjectBegin(matrix,
                                                                         bbox) {
       this.save();
+      this.current.paintFormXObjectDepth++;
 
       if (matrix && isArray(matrix) && 6 == matrix.length)
         this.transform.apply(this, matrix);
@@ -1123,7 +1125,12 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
     },
 
     paintFormXObjectEnd: function CanvasGraphics_paintFormXObjectEnd() {
-      this.restore();
+      var depth = this.current.paintFormXObjectDepth;
+      do {
+        this.restore();
+        // some pdf don't close all restores inside object
+        // closing those for them
+      } while (this.current.paintFormXObjectDepth >= depth);
     },
 
     paintJpegXObject: function CanvasGraphics_paintJpegXObject(objId, w, h) {
diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -24,6 +24,7 @@
 !pdfkit_compressed.pdf
 !TAMReview.pdf
 !issue918.pdf
+!issue1905.pdf
 !issue1249.pdf
 !smaskdim.pdf
 !type4psfunc.pdf
diff --git a/test/pdfs/issue1905.pdf b/test/pdfs/issue1905.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -367,6 +367,12 @@
        "pageLimit": 3,
        "type": "eq"
     },
+    {  "id": "issue1905",
+       "file": "pdfs/issue1905.pdf",
+       "md5": "b1bbd72ca6522ae1502aa26320f81994",
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "issue918",
        "file": "pdfs/issue918.pdf",
        "md5": "d582cc0f2592ae82936589ced2a47e55",
