Browse Source

Merge pull request #448 from kkujala/master

Use radix in parseInt function calls.
notmasteryet 14 years ago
parent
commit
f8866b37a4
  1. 12
      fonts.js

12
fonts.js

@ -1661,7 +1661,7 @@ var Type1Parser = function() {
i += length; i += length;
token = ''; token = '';
} else if (isSeparator(c)) { } else if (isSeparator(c)) {
length = parseInt(token); length = parseInt(token, 10);
token = ''; token = '';
} else { } else {
token += c; token += c;
@ -1672,16 +1672,16 @@ var Type1Parser = function() {
break; break;
case '/Subrs': case '/Subrs':
++i; ++i;
var num = parseInt(getToken()); var num = parseInt(getToken(), 10);
getToken(); // read in 'array' getToken(); // read in 'array'
for (var j = 0; j < num; ++j) { for (var j = 0; j < num; ++j) {
var t = getToken(); // read in 'dup' var t = getToken(); // read in 'dup'
if (t == 'ND' || t == '|-' || t == 'noaccess') if (t == 'ND' || t == '|-' || t == 'noaccess')
break; break;
var index = parseInt(getToken()); var index = parseInt(getToken(), 10);
if (index > j) if (index > j)
j = index; j = index;
var length = parseInt(getToken()); var length = parseInt(getToken(), 10);
getToken(); // read in 'RD' getToken(); // read in 'RD'
var data = eexec.slice(i + 1, i + 1 + length); var data = eexec.slice(i + 1, i + 1 + length);
var lenIV = program.properties.private['lenIV']; var lenIV = program.properties.private['lenIV'];
@ -1767,13 +1767,13 @@ var Type1Parser = function() {
properties.textMatrix = matrix; properties.textMatrix = matrix;
break; break;
case '/Encoding': case '/Encoding':
var size = parseInt(getToken()); var size = parseInt(getToken(), 10);
getToken(); // read in 'array' getToken(); // read in 'array'
for (var j = 0; j < size; j++) { for (var j = 0; j < size; j++) {
var token = getToken(); var token = getToken();
if (token == 'dup') { if (token == 'dup') {
var index = parseInt(getToken()); var index = parseInt(getToken(), 10);
var glyph = getToken(); var glyph = getToken();
if ('undefined' == typeof(properties.differences[index])) { if ('undefined' == typeof(properties.differences[index])) {

Loading…
Cancel
Save