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

Add another warning for malformed stack. Fix/add variable names.

Browse Source
This commit is contained in:
Brendan Dahl 2012-07-20 13:48:48 -07:00
parent 8fccd19948
commit 34eb537160
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/fonts.js
View File

@ -3433,7 +3433,8 @@ var Type1Parser = function type1Parser() {
warn('Malformed charstring stack: not enough values on stack.'); warn('Malformed charstring stack: not enough values on stack.');
continue; continue;
} }
if (stack[index] === 'div') { var token = stack[index];
if (token === 'div') {
var a = stack[index - 2]; var a = stack[index - 2];
var b = stack[index - 1]; var b = stack[index - 1];
if (!isInt(a) || !isInt(b)) { if (!isInt(a) || !isInt(b)) {
@ -3444,10 +3445,12 @@ var Type1Parser = function type1Parser() {
args.unshift({ arg: [a, b, 'div'], args.unshift({ arg: [a, b, 'div'],
value: a / b }); value: a / b });
index -= 3; index -= 3;
} else { } else if (isInt(token)) {
args.unshift({ arg: stack.slice(index, index + 1), args.unshift({ arg: stack.slice(index, index + 1),
value: stack[index] }); value: token });
index--; index--;
} else {
warn('Malformed charsting stack: found bad token ' + token + '.');
} }
} }
return args; return args;
@ -3504,12 +3507,14 @@ var Type1Parser = function type1Parser() {
} else { } else {
if (value == 13) { // hsbw if (value == 13) { // hsbw
var args = breakUpArgs(charstring, 2); var args = breakUpArgs(charstring, 2);
lsb = args[0]['value']; var arg0 = args[0];
width = args[1]['value']; var arg1 = args[1];
lsb = arg0.value;
width = arg1.value;
// To convert to type2 we have to move the width value to the first // To convert to type2 we have to move the width value to the first
// part of the charstring and then use hmoveto with lsb. // part of the charstring and then use hmoveto with lsb.
charstring = args[1]['arg']; charstring = arg1.arg;
charstring = charstring.concat(args[0]['arg']); charstring = charstring.concat(arg0.arg);
charstring.push('hmoveto'); charstring.push('hmoveto');
continue; continue;
} else if (value == 10) { // callsubr } else if (value == 10) { // callsubr