Merge pull request #7050 from brendandahl/issue4402

For CIDFontType2 use CID as glyph ID when missing CID to GID map.

src/core/fonts.js

@@ -2286,7 +2286,7 @@ var Font = (function FontClosure() {
           assert(cid <= 0xffff, 'Max size of CID is 65,535');
           var glyphId = -1;
           if (isCidToGidMapEmpty) {
-            glyphId = charCode;
+            glyphId = cid;
           } else if (cidToGidMap[cid] !== undefined) {
             glyphId = cidToGidMap[cid];
           }

test/pdfs/.gitignore

@@ -68,6 +68,7 @@
 !devicen.pdf
 !cmykjpeg.pdf
 !issue840.pdf
+!issue4402_reduced.pdf
 !issue845r.pdf
 !issue3405r.pdf
 !issue3438.pdf

test/test_manifest.json

@@ -911,6 +911,13 @@
        "rounds": 1,
        "type": "eq"
     },
+    {  "id": "issue4402_reduced",
+       "file": "pdfs/issue4402_reduced.pdf",
+       "md5": "6cc7e61a581889eec3ed7402d87161c4",
+       "link": false,
+       "rounds": 1,
+       "type": "eq"
+    },
     {  "id": "protectip",
        "file": "pdfs/protectip.pdf",
        "md5": "676e7a7b8f96d04825361832b1838a93",