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

Fix setting the font from graphics state. Fix

Browse Source 
setting other graphical state params.
This commit is contained in:
= 2011-10-20 11:47:13 -07:00
parent d4a810e2b3
commit 211cf22886
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pdf.js
View File

@ -4794,7 +4794,7 @@ var PartialEvaluator = (function partialEvaluator() {
} }
} }
} else if (cmd == 'Tf') { // eagerly collect all fonts } else if (cmd == 'Tf') { // eagerly collect all fonts
args[0].name = handleSetFont(args[0].name); args[0] = handleSetFont(args[0].name);
} else if (cmd == 'EI') { } else if (cmd == 'EI') {
buildPaintImageXObject(args[0], true); buildPaintImageXObject(args[0], true);
} }
@ -4849,8 +4849,6 @@ var PartialEvaluator = (function partialEvaluator() {
case 'Font': case 'Font':
gsStateObj.push([ gsStateObj.push([
'Font', 'Font',
// isRef(value[0]) === true -> pass in as ref and not as
// font name.
handleSetFont(null, value[0]), handleSetFont(null, value[0]),
value[1] value[1]
]); ]);
@ -5518,25 +5516,25 @@ var CanvasGraphics = (function canvasGraphics() {
this.setLineWidth(value); this.setLineWidth(value);
break; break;
case 'LC': case 'LC':
self.setLineCap(value); this.setLineCap(value);
break; break;
case 'LJ': case 'LJ':
self.setLineJoin(value); this.setLineJoin(value);
break; break;
case 'ML': case 'ML':
self.setMiterLimit(value); this.setMiterLimit(value);
break; break;
case 'D': case 'D':
self.setDash(value[0], value[1]); this.setDash(value[0], value[1]);
break; break;
case 'RI': case 'RI':
self.setRenderingIntent(value); this.setRenderingIntent(value);
break; break;
case 'FL': case 'FL':
self.setFlatness(value); this.setFlatness(value);
break; break;
case 'Font': case 'Font':
self.setFont(state[1], state[2]); this.setFont(state[1], state[2]);
break; break;
} }
} }
@ -5700,9 +5698,8 @@ var CanvasGraphics = (function canvasGraphics() {
setLeading: function canvasGraphicsSetLeading(leading) { setLeading: function canvasGraphicsSetLeading(leading) {
this.current.leading = -leading; this.current.leading = -leading;
}, },
setFont: function canvasGraphicsSetFont(fontRef, size) { setFont: function canvasGraphicsSetFont(fontRefName, size) {
// Lookup the fontObj using fontRef only. // Lookup the fontObj using fontRefName only.
var fontRefName = fontRef.name;
var fontObj = this.objs.get(fontRefName).fontObj; var fontObj = this.objs.get(fontRefName).fontObj;
if (!fontObj) { if (!fontObj) {