|
@@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
|
|
(typeof window !== 'undefined' ? window : this).PDFJS = {};
|
|
(typeof window !== 'undefined' ? window : this).PDFJS = {};
|
|
}
|
|
}
|
|
|
|
|
|
-PDFJS.version = '1.0.429';
|
|
|
|
-PDFJS.build = '10db93b';
|
|
|
|
|
|
+PDFJS.version = '1.0.431';
|
|
|
|
+PDFJS.build = '6d5a041';
|
|
|
|
|
|
(function pdfjsWrapper() {
|
|
(function pdfjsWrapper() {
|
|
// Use strict in our context only - users might not want it
|
|
// Use strict in our context only - users might not want it
|
|
@@ -3955,6 +3955,26 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
|
|
var x = current.x, y = current.y;
|
|
var x = current.x, y = current.y;
|
|
for (var i = 0, j = 0, ii = ops.length; i < ii; i++) {
|
|
for (var i = 0, j = 0, ii = ops.length; i < ii; i++) {
|
|
switch (ops[i] | 0) {
|
|
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:
|
|
case OPS.moveTo:
|
|
x = args[j++];
|
|
x = args[j++];
|
|
y = args[j++];
|
|
y = args[j++];
|
|
@@ -3995,16 +4015,6 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
|
|
closePath: function CanvasGraphics_closePath() {
|
|
closePath: function CanvasGraphics_closePath() {
|
|
this.ctx.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) {
|
|
stroke: function CanvasGraphics_stroke(consumePath) {
|
|
consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
|
|
consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
|
|
var ctx = this.ctx;
|
|
var ctx = this.ctx;
|
|
@@ -4488,7 +4498,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
|
|
ury) {
|
|
ury) {
|
|
// TODO According to the spec we're also suppose to ignore any operators
|
|
// TODO According to the spec we're also suppose to ignore any operators
|
|
// that set color or include images while processing this type3 font.
|
|
// 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.clip();
|
|
this.endPath();
|
|
this.endPath();
|
|
},
|
|
},
|
|
@@ -4581,7 +4591,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
|
|
if (isArray(bbox) && 4 === bbox.length) {
|
|
if (isArray(bbox) && 4 === bbox.length) {
|
|
var width = bbox[2] - bbox[0];
|
|
var width = bbox[2] - bbox[0];
|
|
var height = bbox[3] - bbox[1];
|
|
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.clip();
|
|
this.endPath();
|
|
this.endPath();
|
|
}
|
|
}
|
|
@@ -4733,7 +4743,7 @@ var CanvasGraphics = (function CanvasGraphicsClosure() {
|
|
if (isArray(rect) && 4 === rect.length) {
|
|
if (isArray(rect) && 4 === rect.length) {
|
|
var width = rect[2] - rect[0];
|
|
var width = rect[2] - rect[0];
|
|
var height = rect[3] - rect[1];
|
|
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.clip();
|
|
this.endPath();
|
|
this.endPath();
|
|
}
|
|
}
|
|
@@ -5869,7 +5879,7 @@ var TilingPattern = (function TilingPatternClosure() {
|
|
if (bbox && isArray(bbox) && 4 == bbox.length) {
|
|
if (bbox && isArray(bbox) && 4 == bbox.length) {
|
|
var bboxWidth = x1 - x0;
|
|
var bboxWidth = x1 - x0;
|
|
var bboxHeight = y1 - y0;
|
|
var bboxHeight = y1 - y0;
|
|
- graphics.rectangle(x0, y0, bboxWidth, bboxHeight);
|
|
|
|
|
|
+ graphics.ctx.rect(x0, y0, bboxWidth, bboxHeight);
|
|
graphics.clip();
|
|
graphics.clip();
|
|
graphics.endPath();
|
|
graphics.endPath();
|
|
}
|
|
}
|
|
@@ -22251,6 +22261,9 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|
case OPS.closePath:
|
|
case OPS.closePath:
|
|
self.buildPath(operatorList, fn, args);
|
|
self.buildPath(operatorList, fn, args);
|
|
continue;
|
|
continue;
|
|
|
|
+ case OPS.rectangle:
|
|
|
|
+ self.buildPath(operatorList, fn, args);
|
|
|
|
+ continue;
|
|
}
|
|
}
|
|
operatorList.addOp(fn, args);
|
|
operatorList.addOp(fn, args);
|
|
}
|
|
}
|