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

LibPDF: Rename subroutines to local_subroutines in CFF code

Browse source
This commit is contained in:
Nico Weber 2023-10-17 09:37:35 -04:00 • committed by Andreas Kling
parent 9a0b559932
commit 3be5719987
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -125,7 +125,7 @@ PDFErrorOr<NonnullRefPtr<CFF>> CFF::create(ReadonlyBytes const& cff_bytes, RefPt
int charset_offset = 0; int charset_offset = 0;
int encoding_offset = 0; int encoding_offset = 0;
auto charstrings_offset = 0; auto charstrings_offset = 0;
Vector<ByteBuffer> subroutines; Vector<ByteBuffer> local_subroutines;
float defaultWidthX = 0; float defaultWidthX = 0;
float nominalWidthX = 0; float nominalWidthX = 0;
TRY(parse_index(reader, [&](ReadonlyBytes const& element_data) { TRY(parse_index(reader, [&](ReadonlyBytes const& element_data) {
@ -190,7 +190,7 @@ PDFErrorOr<NonnullRefPtr<CFF>> CFF::create(ReadonlyBytes const& cff_bytes, RefPt
Reader subrs_reader { cff_bytes.slice(private_dict_offset + subrs_offset) }; Reader subrs_reader { cff_bytes.slice(private_dict_offset + subrs_offset) };
dbgln("Parsing Subrs INDEX"); dbgln("Parsing Subrs INDEX");
TRY(parse_index(subrs_reader, [&](ReadonlyBytes const& subroutine_bytes) -> PDFErrorOr<void> { TRY(parse_index(subrs_reader, [&](ReadonlyBytes const& subroutine_bytes) -> PDFErrorOr<void> {
return TRY(subroutines.try_append(TRY(ByteBuffer::copy(subroutine_bytes)))); return TRY(local_subroutines.try_append(TRY(ByteBuffer::copy(subroutine_bytes))));
})); }));
break; break;
} }
@ -220,7 +220,7 @@ PDFErrorOr<NonnullRefPtr<CFF>> CFF::create(ReadonlyBytes const& cff_bytes, RefPt
// "Global subrs are stored in an INDEX structure which follows the String INDEX." // "Global subrs are stored in an INDEX structure which follows the String INDEX."
// Create glyphs (now that we have the subroutines) and associate missing information to store them and their encoding // Create glyphs (now that we have the subroutines) and associate missing information to store them and their encoding
auto glyphs = TRY(parse_charstrings(Reader(cff_bytes.slice(charstrings_offset)), subroutines)); auto glyphs = TRY(parse_charstrings(Reader(cff_bytes.slice(charstrings_offset)), local_subroutines));
// CFF spec, "Table 16 Encoding ID" // CFF spec, "Table 16 Encoding ID"
// FIXME: Only read this if the built-in encoding is actually needed? (ie. `if (!encoding)`) // FIXME: Only read this if the built-in encoding is actually needed? (ie. `if (!encoding)`)