mirror of
https://github.com/RGBCube/serenity
synced 2025-07-24 18:27:42 +00:00
11bee7a075
Type 1 fonts usually have a m_font_program and no m_font -- they only have m_font if we're using a replacement font for the fonts that were built-in to PDFs before Acrobat 4.0 (and must still work to show existing files). However, SimpleFont::get_glyph_width() used to always return a float, which in Type1Font was only implemented if m_font was set. Per spec, we're supposed to just use /MissingWidth for fonts that are missing an entry in the descriptor's /Width array. However, for built-in fonts, no explicit /Width array is needed (PDF 1.7 spec, Appendix H.3, 5.5.1). So if we just always use /MissingWidth, then PDFs that use a built-in font draw all their text on top of each other (e.g. 000333.pdf from stillhq.com-pdfdb). So change get_glyph_width() to return Optional<float>, return it only in Type1Font if m_font is set, and use MissingWidth if it isn't set. That way, replacement fonts still return a width, and real fonts that are supposed to have /Width and use /MissingWidth for missing entries do what they're supposed to too, instead of crashing. From 20 (6%) to 16 (5%) crashes on the 300 first PDFs, and from 39 (7.8%) to 31 (6.2%) on the 500-random PDFs test. |
||
|---|---|---|
| .. | ||
| CFF.cpp | ||
| CFF.h | ||
| PDFFont.cpp | ||
| PDFFont.h | ||
| PS1FontProgram.cpp | ||
| PS1FontProgram.h | ||
| SimpleFont.cpp | ||
| SimpleFont.h | ||
| TrueTypeFont.cpp | ||
| TrueTypeFont.h | ||
| Type0Font.cpp | ||
| Type0Font.h | ||
| Type1Font.cpp | ||
| Type1Font.h | ||
| Type1FontProgram.cpp | ||
| Type1FontProgram.h | ||