Merge with upstream

diff --cc fonts.js
index aae775dc3b568b3dec163b642eecc4538a655473,eeefa02f8d696961be0c487b3778f02dcc260ad4..105df5ec607b49821c09884eb1cd86e96b651e71
mode 100755,100644..100644
--- 1/fonts.js
--- 2/fonts.js
+++ b/fonts.js

diff --cc utils/fonts_utils.js
index e17eefa45f939cb2b101e6ec44374aaf980a27ee,a51469c539c284471643d287c5499deb08b10de4..ff5e686b584ad0b91035cf452149d3c87eeddcde
--- 1/utils/fonts_utils.js
--- 2/utils/fonts_utils.js
+++ b/utils/fonts_utils.js
@@@ -82,11 -69,11 +82,11 @@@ function readCharstringEncoding(aString
      } else if (value <= 31) {
        token = CFFEncodingMap[value];
      } else if (value < 247) {
-       token = parseInt(value) - 139;
+       token = parseInt(value, 10) - 139;
      } else if (value < 251) {
 -      token = ((value - 247) * 256) + aString[i++] + 108;
 +      token = (value - 247) * 256 + aString[i++] + 108;
      } else if (value < 255) {
 -      token = -((value - 251) * 256) - aString[i++] - 108;
 +      token = -(value - 251) * 256 - aString[i++] - 108;
      } else {// value == 255
        token = aString[i++] << 24 | aString[i++] << 16 |
                aString[i++] << 8 | aString[i];
@@@ -157,11 -144,11 +157,11 @@@ function readFontDictData(aString, aMap
      } else if (value <= 31) {
        token = aMap[value];
      } else if (value <= 246) {
-       token = parseInt(value) - 139;
+       token = parseInt(value, 10) - 139;
      } else if (value <= 250) {
 -      token = ((value - 247) * 256) + aString[i++] + 108;
 +      token = (value - 247) * 256 + aString[i++] + 108;
      } else if (value <= 254) {
 -      token = -((value - 251) * 256) - aString[i++] - 108;
 +      token = -(value - 251) * 256 - aString[i++] - 108;
      } else if (value == 255) {
        error('255 is not a valid DICT command');
      }