Merge remote-tracking branch 'upstream/master' into CIDFont

pdf.js

@@ -4194,9 +4194,13 @@ var CanvasGraphics = (function() {
       this.setStrokeRGBColor.apply(this, color);
     },
     setStrokeColorN: function(/*...*/) {
-      // TODO real impl
+      var cs = this.getStrokeColorSpace();
-      TODO('check for special color spaces');
+
+      if (cs.name == 'Pattern') {
+        this.ctx.strokeStyle = this.getPattern(cs, arguments);
+      } else {
         this.setStrokeColor.apply(this, arguments);
+      }
     },
     setFillColor: function(/*...*/) {
       var cs = this.getFillColorSpace();
@@ -4207,28 +4211,25 @@ var CanvasGraphics = (function() {
       var cs = this.getFillColorSpace();
 
       if (cs.name == 'Pattern') {
-        var length = arguments.length;
+        this.ctx.fillStyle = this.getPattern(cs, arguments);
+      } else {
+        this.setFillColor.apply(this, arguments);
+      }
+    },
+    getPattern: function(cs, args) {
+      var length = args.length;
       var base = cs.base;
       if (base) {
         var baseComps = base.numComps;
 
-          if (baseComps != length - 1)
-            error("invalid base color for pattern colorspace");
-
         var color = [];
         for (var i = 0; i < baseComps; ++i)
-            color.push(arguments[i]);
+          color.push(args[i]);
 
         color = base.getRgb(color);
       }
-        var patternName = arguments[length - 1];
+
-        this.setFillPattern(patternName, base, color);
+      var patternName = args[length - 1];
-      } else {
-        // TODO real impl
-        this.setFillColor.apply(this, arguments);
-      }
-    },
-    setFillPattern: function(patternName, baseCS, color) {
       if (!IsName(patternName))
         error("Bad args to getPattern");
 
@@ -4240,36 +4241,26 @@ var CanvasGraphics = (function() {
       var pattern = xref.fetchIfRef(patternRes.get(patternName.name));
       var dict = IsStream(pattern) ? pattern.dict : pattern;
 
-      var types = [null, this.setTilingPattern, this.setShadingPattern];
+      var types = [null, this.getTilingPattern, this.getShadingPattern];
 
       var typeNum = dict.get("PatternType");
       var patternFn = types[typeNum];
       if (!patternFn)
         error("Unhandled pattern type");
-      patternFn.call(this, pattern, dict, baseCS, color);
+      return patternFn.call(this, pattern, dict, color);
     },
-    setShadingPattern: function(pattern, dict) {
+    getShadingPattern: function(pattern, dict) {
       var matrix = dict.get("Matrix");
       
-      var inv = [0,0,0,0,0,0];
+      this.save();
-      var det = 1 / (matrix[0] * matrix[3] - matrix[1] * matrix[2]);
-      inv[0] = matrix[3] * det;
-      inv[1] = -matrix[1] * det;
-      inv[2] = -matrix[2] * det;
-      inv[3] = matrix[0] * det;
-      inv[4] = det * (matrix[2] * matrix[5] - matrix[3] * matrix[4]);
-      inv[5] = det * (matrix[1] * matrix[4] - matrix[0] * matrix[5]);
-
       this.transform.apply(this, matrix);
       var shading = this.getShading(pattern.get("Shading"));
-      this.ctx.fillStyle = shading;
+      this.restore();
 
-      // HACK to get the gradient to show at the right location. If
+      TODO('store transform so it can be applied before every fill');
-      // removed, the gradient will show at the pre-transform coordinates.
+      return shading;
-      this.ctx.fillRect(0,0,0,0);
-      this.transform.apply(this, inv);
     },
-    setTilingPattern: function(pattern, dict, baseCS, color) {
+    getTilingPattern: function(pattern, dict, color) {
       function multiply(m, tm) {
         var a = m[0] * tm[0] + m[1] * tm[2];
         var b = m[0] * tm[1] + m[1] * tm[3];
@@ -4303,8 +4294,10 @@ var CanvasGraphics = (function() {
       var height = botRight[1] - topLeft[1];
 
       // TODO: hack to avoid OOM, remove then pattern code is fixed
-      if (Math.abs(width) > 8192 || Math.abs(height) > 8192)
+      if (Math.abs(width) > 8192 || Math.abs(height) > 8192) {
-        return false;
+        this.restore();
+        return 'hotpink';
+      }
 
       var tmpCanvas = new this.ScratchCanvas(width, height);
 
@@ -4316,13 +4309,13 @@ var CanvasGraphics = (function() {
       var paintType = dict.get('PaintType');
       switch (paintType) {
       case PAINT_TYPE_COLORED:
-        // should go to default for color space
+        tmpCtx.fillStyle = savedCtx.fillStyle;
-        tmpCtx.fillStyle = this.makeCssRgb(1, 1, 1);
+        tmpCtx.strokeStyle = savedCtx.strokeStyle;
-        tmpCtx.strokeStyle = this.makeCssRgb(0, 0, 0);
         break;
       case PAINT_TYPE_UNCOLORED:
-        tmpCtx.fillStyle = this.makeCssRgb.apply(this, baseCS.getRgb(color));
+        color = this.makeCssRgb.apply(this, color);
-        tmpCtx.strokeStyle = this.makeCssRgb.apply(this, baseCS.getRgb(color));
+        tmpCtx.fillStyle = color;
+        tmpCtx.strokeStyle = color;
         break;
       default:
         error('Unsupported paint type');
@@ -4356,9 +4349,7 @@ var CanvasGraphics = (function() {
       this.ctx = savedCtx;
       this.restore();
 
-      TODO('Inverse pattern is painted');
+      return this.ctx.createPattern(tmpCanvas, 'repeat');
-      pattern = this.ctx.createPattern(tmpCanvas, 'repeat');
-      this.ctx.fillStyle = pattern;
     },
     setStrokeGray: function(gray) {
       this.setStrokeRGBColor(gray, gray, gray);
@@ -4428,6 +4419,8 @@ var CanvasGraphics = (function() {
       this.restore();
     },
     getShading: function(shading) {
+      this.save();
+      
       shading = this.xref.fetchIfRef(shading);
       var dict = IsStream(shading) ? shading.dict : shading;
 
@@ -4453,6 +4446,8 @@ var CanvasGraphics = (function() {
       var typeNum = dict.get('ShadingType');
       var shadingFn = types[typeNum];
       
+      this.restore();
+
       // Most likely we will not implement other types of shading
       // unless the browser supports them
       if (!shadingFn) {
@@ -4544,7 +4539,6 @@ var CanvasGraphics = (function() {
         gradient.addColorStop((i - t0) / diff, 
             this.makeCssRgb.apply(this, rgbColor));
       }
-
       return gradient;
     },
 
@@ -5417,9 +5411,28 @@ var PDFFunction = (function() {
       }
       return array;
     },
-    constructInterpolated: function() {
+    constructInterpolated: function(str, dict) {
-      TODO('unhandled type of function');
+      var c0 = dict.get('C0') || [0];
-      this.func = function () { return [ 255, 105, 180 ]; }
+      var c1 = dict.get('C1') || [1];
+      var n = dict.get('N');
+      
+      if (!IsArray(c0) || !IsArray(c1))
+        error('Illegal dictionary for interpolated function');
+
+      var length = c0.length;
+      var diff = [];
+      for (var i = 0; i < length; ++i)
+        diff.push(c1[i] - c0[i]);
+
+      this.func = function (args) {
+        var x = args[0];
+
+        var out = [];
+        for (var j = 0; j < length; ++j)
+          out.push(c0[j] + (x^n * diff[i]));
+
+        return out;
+      }
     },
     constructStiched: function() {
       TODO('unhandled type of function');