From 1bce3db8d4897bbe426034f6728314bb16d394da Mon Sep 17 00:00:00 2001
From: Pdf Bot <pdfjsbot@gmail.com>
Date: Thu, 12 Nov 2015 23:14:35 +0000
Subject: [PATCH] PDF.js version 1.2.107 - See
 mozilla/pdf.js@9e335a61fd5caaeb88f6e7e5a3c3bfea642b65f9

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

diff --git a/bower.json b/bower.json
index 18a28515a..f56c39b8c 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.2.105",
+  "version": "1.2.107",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"
diff --git a/build/pdf.combined.js b/build/pdf.combined.js
index 621a27c09..fdaafbfdd 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.105';
-PDFJS.build = '9455095';
+PDFJS.version = '1.2.107';
+PDFJS.build = '9e335a6';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -33782,7 +33782,12 @@ var PDFImage = (function PDFImageClosure() {
       this.smask = new PDFImage(xref, res, smask, false);
     } else if (mask) {
       if (isStream(mask)) {
-        this.mask = new PDFImage(xref, res, mask, false, null, null, true);
+        var maskDict = mask.dict, imageMask = maskDict.get('ImageMask', 'IM');
+        if (!imageMask) {
+          warn('Ignoring /Mask in image without /ImageMask.');
+        } else {
+          this.mask = new PDFImage(xref, res, mask, false, null, null, true);
+        }
       } else {
         // Color key mask (just an array).
         this.mask = mask;
diff --git a/build/pdf.js b/build/pdf.js
index 3afbe43f5..93d371297 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.105';
-PDFJS.build = '9455095';
+PDFJS.version = '1.2.107';
+PDFJS.build = '9e335a6';
 
 (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 943d36373..62c95fdf1 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.105';
-PDFJS.build = '9455095';
+PDFJS.version = '1.2.107';
+PDFJS.build = '9e335a6';
 
 (function pdfjsWrapper() {
   // Use strict in our context only - users might not want it
@@ -27201,7 +27201,12 @@ var PDFImage = (function PDFImageClosure() {
       this.smask = new PDFImage(xref, res, smask, false);
     } else if (mask) {
       if (isStream(mask)) {
-        this.mask = new PDFImage(xref, res, mask, false, null, null, true);
+        var maskDict = mask.dict, imageMask = maskDict.get('ImageMask', 'IM');
+        if (!imageMask) {
+          warn('Ignoring /Mask in image without /ImageMask.');
+        } else {
+          this.mask = new PDFImage(xref, res, mask, false, null, null, true);
+        }
       } else {
         // Color key mask (just an array).
         this.mask = mask;
diff --git a/package.json b/package.json
index 3b7b8ec79..b8303482c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.2.105",
+  "version": "1.2.107",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [
     "Mozilla",