From b873c1f4da297c4d4b1bd743d6d28a975fe75c65 Mon Sep 17 00:00:00 2001
From: Julian Viereck <julian.viereck@gmail.com>
Date: Fri, 21 Oct 2011 09:42:44 +0200
Subject: [PATCH] Fix imageObj.imageMask bug from merge

---
 pdf.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pdf.js b/pdf.js
index b1d61078a..d1574ac31 100644
--- a/pdf.js
+++ b/pdf.js
@@ -6057,13 +6057,13 @@ var CanvasGraphics = (function canvasGraphics() {
 
       var tmpCanvas = new this.ScratchCanvas(w, h);
       var tmpCtx = tmpCanvas.getContext('2d');
-      if (imageObj.imageMask) {
-        var fillColor = this.current.fillColor;
-        tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
-                            fillColor.type === 'Pattern') ?
-                            fillColor.getPattern(tmpCtx) : fillColor;
-        tmpCtx.fillRect(0, 0, w, h);
-      }
+
+      var fillColor = this.current.fillColor;
+      tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
+                          fillColor.type === 'Pattern') ?
+                          fillColor.getPattern(tmpCtx) : fillColor;
+      tmpCtx.fillRect(0, 0, w, h);
+
       var imgData = tmpCtx.getImageData(0, 0, w, h);
       var pixels = imgData.data;