From af6dce47a48070264970a99b52c7ae3862e49e36 Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Fri, 6 Nov 2015 13:28:36 +0000
Subject: [PATCH] PDF.js version 1.2.70 - See
 mozilla/pdf.js@9e66625092921ba70c506eac2b5ee3bb454291e1

---
 bower.json            | 2 +-
 build/pdf.combined.js | 4 ++--
 build/pdf.js          | 4 ++--
 build/pdf.worker.js   | 4 ++--
 package.json          | 2 +-
 web/pdf_viewer.js     | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/bower.json b/bower.json
index a7a172cea..e5a3544dd 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.2.68",
+  "version": "1.2.70",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 0c15e9a26..60b97cf4b 100644
--- a/build/pdf.combined.js
+++ b/build/pdf.combined.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.2.68';
-PDFJS.build = '8079bdd';
+PDFJS.version = '1.2.70';
+PDFJS.build = '9e66625';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.js b/build/pdf.js
index b21eb56c5..babbb2e03 100644
--- a/build/pdf.js
+++ b/build/pdf.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.2.68';
-PDFJS.build = '8079bdd';
+PDFJS.version = '1.2.70';
+PDFJS.build = '9e66625';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.worker.js b/build/pdf.worker.js
index 48f6ec990..8444eceac 100644
--- a/build/pdf.worker.js
+++ b/build/pdf.worker.js
@@ -22,8 +22,8 @@ if (typeof PDFJS === 'undefined') {
   (typeof window !== 'undefined' ? window : this).PDFJS = {};
 }
 
-PDFJS.version = '1.2.68';
-PDFJS.build = '8079bdd';
+PDFJS.version = '1.2.70';
+PDFJS.build = '9e66625';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/package.json b/package.json
index 585db650f..0825c8311 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.2.68",
+  "version": "1.2.70",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",
diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index f41e3fb38..eeebd41ad 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -1270,8 +1270,8 @@ var PDFPageView = (function PDFPageViewClosure() {
       if (this.textLayerFactory) {
         textLayerDiv = document.createElement('div');
         textLayerDiv.className = 'textLayer';
-        textLayerDiv.style.width = canvas.style.width;
-        textLayerDiv.style.height = canvas.style.height;
+        textLayerDiv.style.width = canvasWrapper.style.width;
+        textLayerDiv.style.height = canvasWrapper.style.height;
         if (this.annotationLayer && this.annotationLayer.div) {
           // annotationLayer needs to stay on top
           div.insertBefore(textLayerDiv, this.annotationLayer.div);