RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:07:36 +00:00
Code Issues Activity Actions

LibPDF: Rename charset to charset_names in CFF parser

Browse source 
No behavior change.
This commit is contained in:
Nico Weber 2024-02-05 21:38:14 -05:00 • committed by Andreas Kling
parent 42f29b9670
commit 9750261921
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Libraries/LibPDF/Fonts/CFF.cpp
View file

@ -249,26 +249,26 @@ PDFErrorOr<NonnullRefPtr<CFF>> CFF::create(ReadonlyBytes const& cff_bytes, RefPt
} }
// CFF spec, "Table 22 Charset ID" // CFF spec, "Table 22 Charset ID"
Vector<DeprecatedFlyString> charset; Vector<DeprecatedFlyString> charset_names;
switch (charset_offset) { switch (charset_offset) {
case 0: case 0:
dbgln_if(CFF_DEBUG, "CFF predefined charset ISOAdobe"); dbgln_if(CFF_DEBUG, "CFF predefined charset ISOAdobe");
// CFF spec, "Appendix C Predefined Charsets, ISOAdobe" // CFF spec, "Appendix C Predefined Charsets, ISOAdobe"
for (SID sid = 1; sid <= 228; sid++) for (SID sid = 1; sid <= 228; sid++)
TRY(charset.try_append(resolve_sid(sid, strings))); TRY(charset_names.try_append(resolve_sid(sid, strings)));
break; break;
case 1: case 1:
dbgln_if(CFF_DEBUG, "CFF predefined charset Expert"); dbgln_if(CFF_DEBUG, "CFF predefined charset Expert");
for (SID sid : s_predefined_charset_expert) for (SID sid : s_predefined_charset_expert)
TRY(charset.try_append(resolve_sid(sid, strings))); TRY(charset_names.try_append(resolve_sid(sid, strings)));
break; break;
case 2: case 2:
dbgln_if(CFF_DEBUG, "CFF predefined charset Expert Subset"); dbgln_if(CFF_DEBUG, "CFF predefined charset Expert Subset");
for (SID sid : s_predefined_charset_expert_subset) for (SID sid : s_predefined_charset_expert_subset)
TRY(charset.try_append(resolve_sid(sid, strings))); TRY(charset_names.try_append(resolve_sid(sid, strings)));
break; break;
default: default:
charset = TRY(parse_charset(Reader { cff_bytes.slice(charset_offset) }, glyphs.size(), strings)); charset_names = TRY(parse_charset(Reader { cff_bytes.slice(charset_offset) }, glyphs.size(), strings));
break; break;
} }
@ -285,7 +285,7 @@ PDFErrorOr<NonnullRefPtr<CFF>> CFF::create(ReadonlyBytes const& cff_bytes, RefPt
TRY(cff->add_glyph(0, move(glyphs[0]))); TRY(cff->add_glyph(0, move(glyphs[0])));
continue; continue;
} }
auto const& name = charset[i - 1]; auto const& name = charset_names[i - 1];
TRY(cff->add_glyph(name, move(glyphs[i]))); TRY(cff->add_glyph(name, move(glyphs[i])));
} }
cff->consolidate_glyphs(); cff->consolidate_glyphs();
@ -302,10 +302,10 @@ PDFErrorOr<NonnullRefPtr<CFF>> CFF::create(ReadonlyBytes const& cff_bytes, RefPt
encoding->set(0, ".notdef"); encoding->set(0, ".notdef");
continue; continue;
} }
if (i >= encoding_codes.size() || i >= charset.size()) if (i >= encoding_codes.size() || i >= charset_names.size())
break; break;
auto code = encoding_codes[i - 1]; auto code = encoding_codes[i - 1];
auto char_name = charset[i - 1]; auto char_name = charset_names[i - 1];
encoding->set(code, char_name); encoding->set(code, char_name);
} }
for (auto const& entry : encoding_supplemental) for (auto const& entry : encoding_supplemental)