Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1085 from notmasteryet/issue-1008

Browse Source 
Replaces makeCssRgb.apply with direct call
This commit is contained in:
Brendan Dahl 2012-01-16 16:37:27 -08:00
commit 39284d4209
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/canvas.js
View File

@ -832,8 +832,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
}, },
setStrokeColor: function canvasGraphicsSetStrokeColor(/*...*/) { setStrokeColor: function canvasGraphicsSetStrokeColor(/*...*/) {
var cs = this.current.strokeColorSpace; var cs = this.current.strokeColorSpace;
var color = cs.getRgb(arguments); var rgbColor = cs.getRgb(arguments);
var color = Util.makeCssRgb.apply(null, cs.getRgb(arguments)); var color = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
this.ctx.strokeStyle = color; this.ctx.strokeStyle = color;
this.current.strokeColor = color; this.current.strokeColor = color;
}, },
@ -870,7 +870,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
}, },
setFillColor: function canvasGraphicsSetFillColor(/*...*/) { setFillColor: function canvasGraphicsSetFillColor(/*...*/) {
var cs = this.current.fillColorSpace; var cs = this.current.fillColorSpace;
var color = Util.makeCssRgb.apply(null, cs.getRgb(arguments)); var rgbColor = cs.getRgb(arguments);
var color = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
this.ctx.fillStyle = color; this.ctx.fillStyle = color;
this.current.fillColor = color; this.current.fillColor = color;
}, },

12
src/pattern.js
View File

@ -94,9 +94,9 @@ Shadings.RadialAxial = (function RadialAxialClosure() {
var colorStops = []; var colorStops = [];
for (var i = t0; i <= t1; i += step) { for (var i = t0; i <= t1; i += step) {
var color = fn([i]); var rgbColor = cs.getRgb(fn([i]));
var rgbColor = Util.makeCssRgb.apply(this, cs.getRgb(color)); var cssColor = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
colorStops.push([(i - t0) / diff, rgbColor]); colorStops.push([(i - t0) / diff, cssColor]);
} }
this.colorStops = colorStops; this.colorStops = colorStops;
@ -234,9 +234,9 @@ var TilingPattern = (function TilingPatternClosure() {
tmpCtx.strokeStyle = ctx.strokeStyle; tmpCtx.strokeStyle = ctx.strokeStyle;
break; break;
case PaintType.UNCOLORED: case PaintType.UNCOLORED:
color = Util.makeCssRgb.apply(this, color); var cssColor = Util.makeCssRgb(this, color[0], color[1], color[2]);
tmpCtx.fillStyle = color; tmpCtx.fillStyle = cssColor;
tmpCtx.strokeStyle = color; tmpCtx.strokeStyle = cssColor;
break; break;
default: default:
error('Unsupported paint type: ' + paintType); error('Unsupported paint type: ' + paintType);