Merge pull request #691 from kkujala/dev

Fix strict javascript warning in CanvasGraphics.
2011-10-20 15:10:22 -07:00 · 2011-10-20 15:10:22 -07:00 · 2aa9b16b51
commit 2aa9b16b51
parent 5a699720bc 7da3c68c48
1 changed files with 3 additions and 2 deletions
--- a/pdf.js
+++ b/pdf.js
@ -5649,7 +5649,8 @@ var CanvasGraphics = (function canvasGraphics() {
      var tmpCtx = tmpCanvas.getContext('2d');
      if (imageObj.imageMask) {
        var fillColor = this.current.fillColor;
-        tmpCtx.fillStyle = (fillColor && fillColor.type === 'Pattern') ?
+        tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
+                            fillColor.type === 'Pattern') ?
                            fillColor.getPattern(tmpCtx) : fillColor;
        tmpCtx.fillRect(0, 0, w, h);
      }