Adjust the heuristics used to detect OpenType font file with CFF data (bug 1186827, bug 1182130, issue 6264)

*This is a tentative patch.*

Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1186827.
Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1182130.
Fixes 6264.
This commit is contained in:
Jonas Jenwald 2015-07-25 12:26:36 +02:00
parent 61f9052233
commit 0a024b5051
5 changed files with 17 additions and 1 deletions

View File

@ -4053,7 +4053,7 @@ var Font = (function FontClosure() {
var isTrueType = !tables['CFF '];
if (!isTrueType) {
// OpenType font
if (header.version === 'OTTO' ||
if ((header.version === 'OTTO' && properties.type !== 'CIDFontType2') ||
!tables.head || !tables.hhea || !tables.maxp || !tables.post) {
// no major tables: throwing everything at CFFFont
cffFile = new Stream(tables['CFF '].data);

View File

@ -132,6 +132,8 @@
!issue4800.pdf
!issue4801.pdf
!issue5334.pdf
!bug1186827.pdf
!issue215.pdf
!issue5540.pdf
!issue5549.pdf
!issue5475.pdf

BIN
test/pdfs/bug1186827.pdf Normal file

Binary file not shown.

BIN
test/pdfs/issue215.pdf Normal file

Binary file not shown.

View File

@ -435,6 +435,20 @@
"link": false,
"type": "eq"
},
{ "id": "bug1186827",
"file": "pdfs/bug1186827.pdf",
"md5": "6c5526ae1a9d66cb517153001afc196e",
"rounds": 1,
"link": false,
"type": "eq"
},
{ "id": "issue215",
"file": "pdfs/issue215.pdf",
"md5": "31f3dc60ecf008987d970edfd2b1df61",
"rounds": 1,
"link": false,
"type": "eq"
},
{ "id": "bug850854",
"file": "pdfs/bug850854.pdf",
"md5": "346a034a80120d123b9fefc42bcb11da",