Merge pull request #2877 from vyv03354/tilector
Pass commonObjs to TilingPattern constructor
This commit is contained in:
commit
4024354bd0
@ -1153,7 +1153,8 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
|
|||||||
|
|
||||||
color = base.getRgb(args, 0);
|
color = base.getRgb(args, 0);
|
||||||
}
|
}
|
||||||
var pattern = new TilingPattern(IR, color, this.ctx, this.objs);
|
var pattern = new TilingPattern(IR, color, this.ctx, this.objs,
|
||||||
|
this.commonObjs);
|
||||||
} else if (IR[0] == 'RadialAxial' || IR[0] == 'Dummy') {
|
} else if (IR[0] == 'RadialAxial' || IR[0] == 'Dummy') {
|
||||||
var pattern = Pattern.shadingFromIR(IR);
|
var pattern = Pattern.shadingFromIR(IR);
|
||||||
} else {
|
} else {
|
||||||
|
@ -270,7 +270,7 @@ var TilingPattern = (function TilingPatternClosure() {
|
|||||||
};
|
};
|
||||||
var MAX_PATTERN_SIZE = 4096;
|
var MAX_PATTERN_SIZE = 4096;
|
||||||
|
|
||||||
function TilingPattern(IR, color, ctx, objs) {
|
function TilingPattern(IR, color, ctx, objs, commonObjs) {
|
||||||
var operatorList = IR[2];
|
var operatorList = IR[2];
|
||||||
this.matrix = IR[3] || [1, 0, 0, 1, 0, 0];
|
this.matrix = IR[3] || [1, 0, 0, 1, 0, 0];
|
||||||
var bbox = IR[4];
|
var bbox = IR[4];
|
||||||
@ -314,7 +314,7 @@ var TilingPattern = (function TilingPatternClosure() {
|
|||||||
|
|
||||||
// set the new canvas element context as the graphics context
|
// set the new canvas element context as the graphics context
|
||||||
var tmpCtx = tmpCanvas.getContext('2d');
|
var tmpCtx = tmpCanvas.getContext('2d');
|
||||||
var graphics = new CanvasGraphics(tmpCtx, null, objs);
|
var graphics = new CanvasGraphics(tmpCtx, commonObjs, objs);
|
||||||
|
|
||||||
this.setFillAndStrokeStyleToContext(tmpCtx, paintType, color);
|
this.setFillAndStrokeStyleToContext(tmpCtx, paintType, color);
|
||||||
|
|
||||||
|
1
test/pdfs/ichiji.pdf.link
Normal file
1
test/pdfs/ichiji.pdf.link
Normal file
@ -0,0 +1 @@
|
|||||||
|
http://www.eiken.or.jp/eiken/apply/private/flow/pdf/ichiji.pdf
|
@ -612,6 +612,13 @@
|
|||||||
"link": true,
|
"link": true,
|
||||||
"type": "eq"
|
"type": "eq"
|
||||||
},
|
},
|
||||||
|
{ "id": "ichiji",
|
||||||
|
"file": "pdfs/ichiji.pdf",
|
||||||
|
"md5": "66b645802d33513cd598886e017392b8",
|
||||||
|
"rounds": 1,
|
||||||
|
"link": true,
|
||||||
|
"type": "eq"
|
||||||
|
},
|
||||||
{ "id": "issue1350",
|
{ "id": "issue1350",
|
||||||
"file": "pdfs/issue1350.pdf",
|
"file": "pdfs/issue1350.pdf",
|
||||||
"md5": "92f72a04a4d9d05b2dd433b51f32ab1f",
|
"md5": "92f72a04a4d9d05b2dd433b51f32ab1f",
|
||||||
|
Loading…
Reference in New Issue
Block a user