Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Ensure that Type0, i.e. composite, OpenType fonts with CFF tables are *not* treated as CFF fonts if their glyph mapping is non-default (issue 9915)

Browse Source 
This particular code-path has been the source of *numerous* regressions to date, so hopefully this patch won't cause any more of those.

Fixes 9915.
This commit is contained in:
Jonas Jenwald 2018-07-27 16:33:30 +02:00
parent cfdb597e4a
commit 17eac2d48a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/fonts.js
View File

@ -35,6 +35,7 @@ import {
getUnicodeForGlyph, getUnicodeRangeFor, mapSpecialUnicodeValues getUnicodeForGlyph, getUnicodeRangeFor, mapSpecialUnicodeValues
} from './unicode'; } from './unicode';
import { FontRendererFactory } from './font_renderer'; import { FontRendererFactory } from './font_renderer';
import { IdentityCMap } from './cmap';
import { Stream } from './stream'; import { Stream } from './stream';
import { Type1Parser } from './type1_parser'; import { Type1Parser } from './type1_parser';
@ -2308,9 +2309,11 @@ var Font = (function FontClosure() {
var isTrueType = !tables['CFF ']; var isTrueType = !tables['CFF '];
if (!isTrueType) { if (!isTrueType) {
// OpenType font (skip composite fonts with non-default CID to GID map). const isComposite = properties.composite &&
if ((header.version === 'OTTO' && ((properties.cidToGidMap || []).length > 0 ||
!(properties.composite && properties.cidToGidMap)) || !(properties.cMap instanceof IdentityCMap));
// OpenType font (skip composite fonts with non-default glyph mapping).
if ((header.version === 'OTTO' && !isComposite) ||
!tables['head'] || !tables['hhea'] || !tables['maxp'] || !tables['head'] || !tables['hhea'] || !tables['maxp'] ||
!tables['post']) { !tables['post']) {
// No major tables: throwing everything at `CFFFont`. // No major tables: throwing everything at `CFFFont`.