From: notmasteryet <async.processingjs@yahoo.com>
Date: Wed, 4 Jan 2012 00:42:13 +0000 (-0600)
Subject: Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textlayout-ui
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=edb0ae4eb830b311da84d1a110ff1c99aa0ebfd2;p=pdf.js.git

Merge branch 'master' of git://github.com/mozilla/pdf.js.git into textlayout-ui

Conflicts:
	src/canvas.js
---

edb0ae4eb830b311da84d1a110ff1c99aa0ebfd2
diff --cc src/canvas.js
index a1c4fb4,4797bab..3fd55b4
--- a/src/canvas.js
+++ b/src/canvas.js
@@@ -255,9 -255,10 +255,11 @@@ var CanvasGraphics = (function CanvasGr
        }
        // Scale so that canvas units are the same as PDF user space units
        this.ctx.scale(cw / mediaBox.width, ch / mediaBox.height);
+       // Move the media left-top corner to the (0,0) canvas position
+       this.ctx.translate(-mediaBox.x, -mediaBox.y);
 -      this.textDivs = [];
 -      this.textLayerQueue = [];
 +
 +      if (this.textLayer)
 +        this.textLayer.beginLayout();
      },
  
      executeIRQueue: function canvasGraphicsExecuteIRQueue(codeIR,