Merge remote-tracking branch 'origin/integration' into integration
This commit is contained in:
commit
d272f835d7
14
pdf.js
14
pdf.js
@ -6057,13 +6057,13 @@ var CanvasGraphics = (function canvasGraphics() {
|
|||||||
|
|
||||||
var tmpCanvas = new this.ScratchCanvas(w, h);
|
var tmpCanvas = new this.ScratchCanvas(w, h);
|
||||||
var tmpCtx = tmpCanvas.getContext('2d');
|
var tmpCtx = tmpCanvas.getContext('2d');
|
||||||
if (imageObj.imageMask) {
|
|
||||||
var fillColor = this.current.fillColor;
|
var fillColor = this.current.fillColor;
|
||||||
tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
|
tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
|
||||||
fillColor.type === 'Pattern') ?
|
fillColor.type === 'Pattern') ?
|
||||||
fillColor.getPattern(tmpCtx) : fillColor;
|
fillColor.getPattern(tmpCtx) : fillColor;
|
||||||
tmpCtx.fillRect(0, 0, w, h);
|
tmpCtx.fillRect(0, 0, w, h);
|
||||||
}
|
|
||||||
var imgData = tmpCtx.getImageData(0, 0, w, h);
|
var imgData = tmpCtx.getImageData(0, 0, w, h);
|
||||||
var pixels = imgData.data;
|
var pixels = imgData.data;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user