Merge pull request #6814 from Snuffleupagus/beginAnnotations-baseTran…

…sform Ensure that the `baseTransform` is applied when rendering annotations
mozilla · Dec 28, 2015 · edf8ccc · edf8ccc
2 parents f17d672 + 2f2ea61
commit edf8ccc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/src/display/canvas.js b/src/display/canvas.js
@@ -1839,6 +1839,10 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
     beginAnnotations: function CanvasGraphics_beginAnnotations() {
       this.save();
       this.current = new CanvasExtraState();
+
+      if (this.baseTransform) {
+        this.ctx.setTransform.apply(this.ctx, this.baseTransform);
+      }
     },
 
     endAnnotations: function CanvasGraphics_endAnnotations() {

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -11,6 +11,7 @@
 !issue2391-2.pdf
 !issue4665.pdf
 !issue5801.pdf
+!issue5946.pdf
 !issue5972.pdf
 !issue5874.pdf
 !filled-background.pdf

diff --git a/test/pdfs/issue5946.pdf b/test/pdfs/issue5946.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -637,6 +637,13 @@
        "link": false,
        "type": "eq"
     },
+    {  "id": "issue5946",
+       "file": "pdfs/issue5946.pdf",
+       "md5": "1217a3c8e2ee4ceb96d85a2f27e437b4",
+       "rounds": 1,
+       "link": false,
+       "type": "eq"
+    },
     {  "id": "issue5954",
        "file": "pdfs/issue5954.pdf",
        "md5": "4f60ec0d9bbeec845b681242b8982361",