Browse Source

Merge pull request #7600 from Snuffleupagus/issue-7598

Check that Type1C fonts does not actually contain OpenType font files (issue 7598)
Tim van der Meij 9 years ago committed by GitHub
parent
commit
b112f9f9f4
  1. 7
      src/core/fonts.js
  2. 1
      test/pdfs/.gitignore
  3. BIN
      test/pdfs/issue7598.pdf
  4. 7
      test/test_manifest.json

7
src/core/fonts.js

@ -689,13 +689,18 @@ var Font = (function FontClosure() { @@ -689,13 +689,18 @@ var Font = (function FontClosure() {
}
// Some fonts might use wrong font types for Type1C or CIDFontType0C
if (subtype === 'Type1C' && (type !== 'Type1' && type !== 'MMType1')) {
if (subtype === 'Type1C') {
if (type !== 'Type1' && type !== 'MMType1') {
// Some TrueType fonts by mistake claim Type1C
if (isTrueTypeFile(file)) {
subtype = 'TrueType';
} else {
type = 'Type1';
}
} else if (isOpenTypeFile(file)) {
// Sometimes the type/subtype can be a complete lie (see issue7598.pdf).
type = subtype = 'OpenType';
}
}
if (subtype === 'CIDFontType0C' && type !== 'CIDFontType0') {
type = 'CIDFontType0';

1
test/pdfs/.gitignore vendored

@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
!issue7439.pdf
!issue7446.pdf
!issue7492.pdf
!issue7598.pdf
!filled-background.pdf
!ArabicCIDTrueType.pdf
!ThuluthFeatures.pdf

BIN
test/pdfs/issue7598.pdf

Binary file not shown.

7
test/test_manifest.json

@ -1803,6 +1803,13 @@ @@ -1803,6 +1803,13 @@
"link": false,
"type": "eq"
},
{ "id": "issue7598",
"file": "pdfs/issue7598.pdf",
"md5": "c5bc5a779bfcb4b234f853231b56cf60",
"rounds": 1,
"link": false,
"type": "eq"
},
{ "id": "issue7439",
"file": "pdfs/issue7439.pdf",
"md5": "56682657990a894c66db26560d3039d7",

Loading…
Cancel
Save