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

Make worker code work with latest font code changes

Browse Source
This commit is contained in:
Julian Viereck 2011-06-29 14:26:38 +02:00
parent 16e1eadf93
commit 31e9bea5c9
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pdf.js
View File

@ -3807,23 +3807,21 @@ var CanvasGraphics = (function() {
if (fontDescriptor && fontDescriptor.num) {
var fontDescriptor = this.xref.fetchIfRef(fontDescriptor);
fontName = fontDescriptor.get("FontName").name.replace("+", "_");
Fonts.setActive(fontName, size);
}
if (!fontName) {
// TODO: fontDescriptor is not available, fallback to default font
this.current.fontSize = size;
this.ctx.font = this.current.fontSize + 'px sans-serif';
Fonts.setActive("sans-serif", this.current.fontSize);
return;
fontName = "sans-serif";
}
this.current.fontName = fontName;
this.current.fontSize = size;
this.ctx.font = this.current.fontSize + 'px "' + fontName + '"';
if (this.ctx.$setFont) {
this.ctx.$setFont(fontName);
this.ctx.$setFont(fontName, size);
} else {
this.ctx.font = size + 'px "' + fontName + '"';
Fonts.setActive(fontName, size);
}
},
setTextRenderingMode: function(mode) {

7
worker/client.js
View File

@ -250,9 +250,10 @@ function WorkerPDFDoc(canvas) {
}
this.strokeStyle = pattern;
},
"$setFont": function(name) {
Fonts.active = name;
"$setFont": function(name, size) {
this.font = size + 'px "' + name + '"';
Fonts.setActive(name, size);
}
}