Merge pull request mozilla#5743 from Snuffleupagus/pr-5703-followup

Only skip the |!isSymbolicFont| check for TrueType (3, 1) cmap tables if no previous cmap table was found (PR 5703 followup)
speedplane · Feb 24, 2015 · 6ee87b7 · 6ee87b7
2 parents 050f8b4 + d872100
commit 6ee87b7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/src/core/fonts.js b/src/core/fonts.js
@@ -3184,7 +3184,8 @@ var Font = (function FontClosure() {
             useTable = true;
             // Continue the loop since there still may be a higher priority
             // table.
-          } else if (platformId === 3 && encodingId === 1) {
+          } else if (platformId === 3 && encodingId === 1 &&
+                     (!isSymbolicFont || !potentialTable)) {
             useTable = true;
             if (!isSymbolicFont) {
               canBreak = true;

diff --git a/test/pdfs/.gitignore b/test/pdfs/.gitignore
@@ -29,6 +29,7 @@
 !scan-bad.pdf
 !bug847420.pdf
 !bug860632.pdf
+!bug894572.pdf
 !pdfjsbad1586.pdf
 !freeculture.pdf
 !pdfkit_compressed.pdf

diff --git a/test/pdfs/bug894572.pdf b/test/pdfs/bug894572.pdf
diff --git a/test/test_manifest.json b/test/test_manifest.json
@@ -1106,6 +1106,13 @@
       "lastPage": 1,
       "type": "eq"
     },
+    {  "id": "bug894572",
+       "file": "pdfs/bug894572.pdf",
+       "md5": "e54a6b0451939f685ed37e3d46e16158",
+       "rounds": 1,
+       "link": false,
+       "type": "eq"
+    },
     {  "id": "issue1466",
       "file": "pdfs/issue1466.pdf",
       "md5": "8a8877432e5bb10cfd50d60488d947bb",