Merge pull request mozilla#2245 from yurydelendik/issue-1912

brendandahl · brendandahl · commit c8cf4458c658 · 2012-10-16T09:24:21.000-07:00
Fixes reading CFF with two .notdef in charset
diff --git a/src/fonts.js b/src/fonts.js
@@ -5132,10 +5132,9 @@ var CFFFont = (function CFFFontClosure() {
           inverseEncoding[encoding[charcode]] = charcode | 0;
       else
         inverseEncoding = charsets;
-      for (var i = 0, ii = charsets.length; i < ii; i++) {
+      var i = charsets[0] == '.notdef' ? 1 : 0;
+      for (var ii = charsets.length; i < ii; i++) {
         var glyph = charsets[i];
-        if (glyph == '.notdef')
-          continue;
 
         var code = inverseEncoding[i];
         if (!code || isSpecialUnicode(code)) {
diff --git a/test/pdfs/issue1912.pdf.link b/test/pdfs/issue1912.pdf.link
@@ -0,0 +1 @@
+http://rua.ua.es/dspace/bitstream/10045/23475/1/OBETS_07_01_03.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -671,6 +671,13 @@
       "link": true,
       "type": "eq"
     },
+    {  "id": "issue1912",
+      "file": "pdfs/issue1912.pdf",
+      "md5": "15305b7c2cba971e7423de3f6ad38fef",
+      "rounds": 1,
+      "link": true,
+      "type": "eq"
+    },
     {  "id": "gradientfill",
       "file": "pdfs/gradientfill.pdf",
       "md5": "cbc1988e4803f647fa83467a85f0e231",

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+http://rua.ua.es/dspace/bitstream/10045/23475/1/OBETS_07_01_03.pdf`