From d047eebb013230a99644c0619de49fcda7ff3433 Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Thu, 9 Jul 2015 13:21:17 +0100
Subject: [PATCH] PDF.js version 1.1.268

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

diff --git a/bower.json b/bower.json
index 365fcbb50..6ec5c412e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.266",
+  "version": "1.1.268",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 0d6d73e22..8a4613528 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.1.266';
-PDFJS.build = 'eb2ad11';
+PDFJS.version = '1.1.268';
+PDFJS.build = 'ba38454';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/build/pdf.js b/build/pdf.js
index 5dda6f46f..7919211b6 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.1.266';
-PDFJS.build = 'eb2ad11';
+PDFJS.version = '1.1.268';
+PDFJS.build = 'ba38454';
 
 (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 5a5c667ab..26f3f00a5 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.1.266';
-PDFJS.build = 'eb2ad11';
+PDFJS.version = '1.1.268';
+PDFJS.build = 'ba38454';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
diff --git a/package.json b/package.json
index a94a8bc5e..a63153bca 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.1.266",
+  "version": "1.1.268",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",
diff --git a/web/pdf_viewer.js b/web/pdf_viewer.js
index 979dd2984..e8022e503 100644
--- a/web/pdf_viewer.js
+++ b/web/pdf_viewer.js
@@ -2005,6 +2005,18 @@ var PDFViewer = (function pdfViewer() {
     };
   }
 
+  function isSameScale(oldScale, newScale) {
+    if (newScale === oldScale) {
+      return true;
+    }
+    if (Math.abs(newScale - oldScale) < 1e-15) {
+      // Prevent unnecessary re-rendering of all pages when the scale
+      // changes only because of limited numerical precision.
+      return true;
+    }
+    return false;
+  }
+
   /**
    * @constructs PDFViewer
    * @param {PDFViewerOptions} options
@@ -2298,7 +2310,8 @@ var PDFViewer = (function pdfViewer() {
     _setScaleUpdatePages: function pdfViewer_setScaleUpdatePages(
         newScale, newValue, noScroll, preset) {
       this._currentScaleValue = newValue;
-      if (newScale === this._currentScale) {
+
+      if (isSameScale(this._currentScale, newScale)) {
         if (preset) {
           this._setScaleDispatchEvent(newScale, newValue, true);
         }