system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-04 15:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibGfx: Remove bit casting in OpenType CBDT table after construction

Browse source
This commit is contained in:
Sam Atkins 2023-11-02 12:49:26 +00:00 committed by Andreas Kling
parent 4e944e676b
commit 21f2f09df4
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Userland/Libraries/LibGfx/Font/OpenType/Tables.cpp
View file

@ -506,7 +506,8 @@ ErrorOr<CBDT> CBDT::from_slice(ReadonlyBytes slice)
{
if (slice.size() < sizeof(CbdtHeader))
return Error::from_string_literal("CBDT table too small");
return CBDT { slice };
auto const& header = *bit_cast<CbdtHeader*>(slice.data());
return CBDT { slice, header };
}
ErrorOr<GPOS> GPOS::from_slice(ReadonlyBytes slice)

6
Userland/Libraries/LibGfx/Font/OpenType/Tables.h
View file

@ -586,15 +586,17 @@ public:
static ErrorOr<CBDT> from_slice(ReadonlyBytes);
ReadonlyBytes bytes() const { return m_slice; }
CbdtHeader const& header() const { return *bit_cast<CbdtHeader const*>(m_slice.data()); }
CbdtHeader const& header() const { return m_header; }
private:
explicit CBDT(ReadonlyBytes slice)
explicit CBDT(ReadonlyBytes slice, CbdtHeader const& header)
: m_slice(slice)
, m_header(header)
{
}
ReadonlyBytes m_slice;
CbdtHeader const& m_header;
};
// https://learn.microsoft.com/en-us/typography/opentype/spec/chapter2#feature-list-table