Merge pull request #2681 from vyv03354/bug767455_basefont
Take BaseFont entry from CIDFont dict instead of Type 0 Font dict
This commit is contained in:
commit
43e954f11d
@ -1205,7 +1205,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|||||||
var lastChar = dict.get('LastChar') || maxCharIndex;
|
var lastChar = dict.get('LastChar') || maxCharIndex;
|
||||||
|
|
||||||
var fontName = descriptor.get('FontName');
|
var fontName = descriptor.get('FontName');
|
||||||
var baseFont = baseDict.get('BaseFont');
|
var baseFont = dict.get('BaseFont');
|
||||||
// Some bad pdf's have a string as the font name.
|
// Some bad pdf's have a string as the font name.
|
||||||
if (isString(fontName)) {
|
if (isString(fontName)) {
|
||||||
fontName = new Name(fontName);
|
fontName = new Name(fontName);
|
||||||
@ -1215,13 +1215,6 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var fontNameStr = fontName && fontName.name;
|
var fontNameStr = fontName && fontName.name;
|
||||||
// 9.7.6.1
|
|
||||||
if (type.name == 'CIDFontType0') {
|
|
||||||
var cidEncoding = baseDict.get('Encoding');
|
|
||||||
if (isName(cidEncoding)) {
|
|
||||||
fontNameStr = fontNameStr + '-' + cidEncoding.name;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
var baseFontStr = baseFont && baseFont.name;
|
var baseFontStr = baseFont && baseFont.name;
|
||||||
if (fontNameStr !== baseFontStr) {
|
if (fontNameStr !== baseFontStr) {
|
||||||
warn('The FontDescriptor\'s FontName is "' + fontNameStr +
|
warn('The FontDescriptor\'s FontName is "' + fontNameStr +
|
||||||
|
Loading…
Reference in New Issue
Block a user