From 46375c9489bbf7ef6166c33a03ab5903e51283eb Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Fri, 27 Feb 2015 12:37:22 +0000
Subject: [PATCH] PDF.js version 1.0.1160

---
 bower.json            |  2 +-
 build/pdf.combined.js | 11 +++++++++--
 build/pdf.js          |  4 ++--
 build/pdf.worker.js   | 11 +++++++++--
 package.json          |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/bower.json b/bower.json
index 86d25cc7f..5baf995ce 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.1158",
+  "version": "1.0.1160",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 6831145bf..24dd9cda3 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.0.1158';
-PDFJS.build = 'a0a9434';
+PDFJS.version = '1.0.1160';
+PDFJS.build = '2e14cc7';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -41457,6 +41457,13 @@ var JpegImage = (function jpegImage() {
               successiveApproximation >> 4, successiveApproximation & 15);
             offset += processed;
             break;
+
+          case 0xFFFF: // Fill bytes
+            if (data[offset] !== 0xFF) { // Avoid skipping a valid marker.
+              offset--;
+            }
+            break;
+
           default:
             if (data[offset - 3] === 0xFF &&
                 data[offset - 2] >= 0xC0 && data[offset - 2] <= 0xFE) {
diff --git a/build/pdf.js b/build/pdf.js
index 74640d666..7ddd627d8 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.0.1158';
-PDFJS.build = 'a0a9434';
+PDFJS.version = '1.0.1160';
+PDFJS.build = '2e14cc7';
 
 (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 af2e2b963..593f7c0e7 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.0.1158';
-PDFJS.build = 'a0a9434';
+PDFJS.version = '1.0.1160';
+PDFJS.build = '2e14cc7';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -35146,6 +35146,13 @@ var JpegImage = (function jpegImage() {
               successiveApproximation >> 4, successiveApproximation & 15);
             offset += processed;
             break;
+
+          case 0xFFFF: // Fill bytes
+            if (data[offset] !== 0xFF) { // Avoid skipping a valid marker.
+              offset--;
+            }
+            break;
+
           default:
             if (data[offset - 3] === 0xFF &&
                 data[offset - 2] >= 0xC0 && data[offset - 2] <= 0xFE) {
diff --git a/package.json b/package.json
index aa072cdee..19156675d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.1158",
+  "version": "1.0.1160",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",