From aee62a75b8321234060b9f7a0432a407c7cf2d19 Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Wed, 11 Mar 2015 12:47:13 +0000
Subject: [PATCH] PDF.js version 1.0.1196

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

diff --git a/bower.json b/bower.json
index ab96cde0d..2f08d050c 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.1194",
+  "version": "1.0.1196",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 06b3a4ff6..4ac7fdf0a 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.1194';
-PDFJS.build = 'c17ff30';
+PDFJS.version = '1.0.1196';
+PDFJS.build = '70608be';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -41333,9 +41333,9 @@ var JpegImage = (function jpegImage() {
             if (fileMarker === 0xFFEE) {
               if (appData[0] === 0x41 && appData[1] === 0x64 &&
                   appData[2] === 0x6F && appData[3] === 0x62 &&
-                  appData[4] === 0x65 && appData[5] === 0) { // 'Adobe\x00'
+                  appData[4] === 0x65) { // 'Adobe'
                 adobe = {
-                  version: appData[6],
+                  version: (appData[5] << 8) | appData[6],
                   flags0: (appData[7] << 8) | appData[8],
                   flags1: (appData[9] << 8) | appData[10],
                   transformCode: appData[11]
diff --git a/build/pdf.js b/build/pdf.js
index ff8e13761..181b9b747 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.1194';
-PDFJS.build = 'c17ff30';
+PDFJS.version = '1.0.1196';
+PDFJS.build = '70608be';
 
 (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 61886e9c7..0d275d4aa 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.1194';
-PDFJS.build = 'c17ff30';
+PDFJS.version = '1.0.1196';
+PDFJS.build = '70608be';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -35011,9 +35011,9 @@ var JpegImage = (function jpegImage() {
             if (fileMarker === 0xFFEE) {
               if (appData[0] === 0x41 && appData[1] === 0x64 &&
                   appData[2] === 0x6F && appData[3] === 0x62 &&
-                  appData[4] === 0x65 && appData[5] === 0) { // 'Adobe\x00'
+                  appData[4] === 0x65) { // 'Adobe'
                 adobe = {
-                  version: appData[6],
+                  version: (appData[5] << 8) | appData[6],
                   flags0: (appData[7] << 8) | appData[8],
                   flags1: (appData[9] << 8) | appData[10],
                   transformCode: appData[11]
diff --git a/package.json b/package.json
index 2348bba30..a9269f456 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.0.1194",
+  "version": "1.0.1196",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",