Combine re element into constructPath

This commit is contained in:
pramodhkp 2014-06-24 01:37:31 +05:30
parent 456d219f2a
commit 8407d28c9e
4 changed files with 39 additions and 39 deletions

View file

@ -977,6 +977,26 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
var x = current.x, y = current.y;
for (var i = 0, j = 0, ii = ops.length; i < ii; i++) {
switch (ops[i] | 0) {
case OPS.rectangle:
x = args[j++];
y = args[j++];
var width = args[j++];
var height = args[j++];
if (width === 0) {
width = this.getSinglePixelWidth();
}
if (height === 0) {
height = this.getSinglePixelWidth();
}
var xw = x + width;
var yh = y + height;
this.ctx.moveTo(x, y);
this.ctx.lineTo(xw, y);
this.ctx.lineTo(xw, yh);
this.ctx.lineTo(x, yh);
this.ctx.lineTo(x, y);
this.ctx.closePath();
break;
case OPS.moveTo:
x = args[j++];
y = args[j++];
@ -1017,16 +1037,6 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
closePath: function CanvasGraphics_closePath() {
this.ctx.closePath();
},
rectangle: function CanvasGraphics_rectangle(x, y, width, height) {
if (width === 0) {
width = this.getSinglePixelWidth();
}
if (height === 0) {
height = this.getSinglePixelWidth();
}
this.ctx.rect(x, y, width, height);
},
stroke: function CanvasGraphics_stroke(consumePath) {
consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
var ctx = this.ctx;
@ -1510,7 +1520,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
ury) {
// TODO According to the spec we're also suppose to ignore any operators
// that set color or include images while processing this type3 font.
this.rectangle(llx, lly, urx - llx, ury - lly);
this.ctx.rect(llx, lly, urx - llx, ury - lly);
this.clip();
this.endPath();
},
@ -1603,7 +1613,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
if (isArray(bbox) && 4 === bbox.length) {
var width = bbox[2] - bbox[0];
var height = bbox[3] - bbox[1];
this.rectangle(bbox[0], bbox[1], width, height);
this.ctx.rect(bbox[0], bbox[1], width, height);
this.clip();
this.endPath();
}
@ -1755,7 +1765,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
if (isArray(rect) && 4 === rect.length) {
var width = rect[2] - rect[0];
var height = rect[3] - rect[1];
this.rectangle(rect[0], rect[1], width, height);
this.ctx.rect(rect[0], rect[1], width, height);
this.clip();
this.endPath();
}