Fix several issues with glyph id mappings (issue 8668, bug 1383504) #8681
Conversation
| if (!file || file.isEmpty) { | ||
| if (file) { | ||
| // Some bad PDF generators will include empty font files, | ||
| // attempting to recover by assuming that no file exists. | ||
| warn('Font file is empty in "' + name + '" (' + this.loadedName + ')'); | ||
| } | ||
|
|
There was a problem hiding this comment.
All of this is extracted into fallbackToSystemFont().
|
/botio test |
From: Bot.io (Windows)ReceivedCommand cmd_test from @brendandahl received. Current queue size: 0 Live output at: http://54.215.176.217:8877/4c55af5b31169a2/output.txt |
From: Bot.io (Linux m4)ReceivedCommand cmd_test from @brendandahl received. Current queue size: 0 Live output at: http://54.67.70.0:8877/0e684409aca5854/output.txt |
From: Bot.io (Linux m4)FailedFull output at http://54.67.70.0:8877/0e684409aca5854/output.txt Total script time: 16.49 mins
Image differences available at: http://54.67.70.0:8877/0e684409aca5854/reftest-analyzer.html#web=eq.log |
From: Bot.io (Windows)FailedFull output at http://54.215.176.217:8877/4c55af5b31169a2/output.txt Total script time: 29.41 mins
Image differences available at: http://54.215.176.217:8877/4c55af5b31169a2/reftest-analyzer.html#web=eq.log |
|
It looks fine on the Windows bot, but strangely enough on Linux ligatures ("fi", "fl") are moved vertically in the |
|
Besides fixing issue #8668, this patch also fixes bug 1383504. |
The initial issue with mozilla#8255 was I added a missing glyphs check to adjustMapping, but this caused us to skip re-mapping a glyph if the fontCharCode was a missingGlyph which in turn caused us to overwrite a valid glyph id with an invalid one. While fixing this, I also added a warning if the private use area is full since this also accidentally happened when I made a different mistake. This brought to light a number of issues where we map missing glyphs to notdef, but often the notdef is actually defined and then ends up being drawn. Now the glyphs don't get mapped in toFontChar and so they are not drawn by the canvas. Fixing the above brought up another issue though in bug1050040.pdf. In this PDF, the font fails to load by the browser and before we were still drawing the glyphs because it looked like the font had them, but with the fixes above the glyphs showed up as missing so we didn't attempt draw them. To fix this, I now throw an error when the loca table is in really bad shape and we fall back to trying to use a system font. We now also use this fall back if there are any format errors during converting fonts.
|
For some reason linux doesn't seem to like it when we don't have cmap entries for all the type1 fonts. |
From: Bot.io (Linux m4)ReceivedCommand cmd_test from @brendandahl received. Current queue size: 0 Live output at: http://54.67.70.0:8877/3a057663f4726ba/output.txt |
From: Bot.io (Windows)ReceivedCommand cmd_test from @brendandahl received. Current queue size: 0 Live output at: http://54.215.176.217:8877/9f21a2c3013b0e7/output.txt |
From: Bot.io (Linux m4)FailedFull output at http://54.67.70.0:8877/3a057663f4726ba/output.txt Total script time: 16.58 mins
Image differences available at: http://54.67.70.0:8877/3a057663f4726ba/reftest-analyzer.html#web=eq.log |
From: Bot.io (Windows)FailedFull output at http://54.215.176.217:8877/9f21a2c3013b0e7/output.txt Total script time: 29.29 mins
Image differences available at: http://54.215.176.217:8877/9f21a2c3013b0e7/reftest-analyzer.html#web=eq.log |
|
Hmm....well now the following fixes don't work, but the original regression, issue8187, is at least fixed. firefox-issue1049-page2 |
Do you want to try and fix the above files in this PR, or would a follow-up PR be better? |
|
@Snuffleupagus let's land as is and I'll do follow ups to re-fix the above |
|
/botio test |
From: Bot.io (Linux m4)ReceivedCommand cmd_test from @Snuffleupagus received. Current queue size: 0 Live output at: http://54.67.70.0:8877/16d8b300554d7b6/output.txt |
From: Bot.io (Windows)ReceivedCommand cmd_test from @Snuffleupagus received. Current queue size: 0 Live output at: http://54.215.176.217:8877/3f96e1c97b4210c/output.txt |
From: Bot.io (Linux m4)FailedFull output at http://54.67.70.0:8877/16d8b300554d7b6/output.txt Total script time: 16.60 mins
Image differences available at: http://54.67.70.0:8877/16d8b300554d7b6/reftest-analyzer.html#web=eq.log |
From: Bot.io (Windows)FailedFull output at http://54.215.176.217:8877/3f96e1c97b4210c/output.txt Total script time: 29.15 mins
Image differences available at: http://54.215.176.217:8877/3f96e1c97b4210c/reftest-analyzer.html#web=eq.log |
|
/botio makeref |
From: Bot.io (Linux m4)ReceivedCommand cmd_makeref from @Snuffleupagus received. Current queue size: 0 Live output at: http://54.67.70.0:8877/58bf553abb70a90/output.txt |
From: Bot.io (Windows)ReceivedCommand cmd_makeref from @Snuffleupagus received. Current queue size: 0 Live output at: http://54.215.176.217:8877/e6000df21057d8f/output.txt |
Snuffleupagus
changed the title
From: Bot.io (Linux m4)SuccessFull output at http://54.67.70.0:8877/58bf553abb70a90/output.txt Total script time: 15.54 mins
|
From: Bot.io (Windows)SuccessFull output at http://54.215.176.217:8877/e6000df21057d8f/output.txt Total script time: 27.43 mins
|
Fix several issues with glyph id mappings (issue 8668, bug 1383504)
The initial issue with #8255 was I added a missing glyphs
check to adjustMapping, but this caused us to skip re-mapping
a glyph if the fontCharCode was a missingGlyph which in turn
caused us to overwrite a valid glyph id with an invalid one. While
fixing this, I also added a warning if the private use area is full since
this also accidentally happened when I made a different mistake.
This brought to light a number of issues where we map
missing glyphs to notdef, but often the notdef is actually defined
and then ends up being drawn. Now the glyphs don't get
mapped in toFontChar and so they are not drawn by the canvas.
Fixing the above brought up another issue though in bug1050040.pdf.
In this PDF, the font fails to load by the browser and before we were still
drawing the glyphs because it looked like the font had them, but with the fixes
above the glyphs showed up as missing so we didn't attempt draw them. To
fix this, I now throw an error when the loca table is in really bad shape and
we fall back to trying to use a system font. We now also use this fall back if
there are any format errors during converting fonts.
I expect this to fix:
firefox-issue1049-page2
firefox-issue1049-page3
firefox-issue8187-page1
firefox-bug1354114-page30
Fixes #8668.
Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1383504.