beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-30 00:31:14 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibTTF: Convert code to east-const style

Browse source
This commit is contained in:
Andreas Kling 2021-07-19 20:43:42 +02:00
parent 84efed502a
commit 8070bbd442
Notes: sideshowbarker 2024-07-18 08:43:34 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/8070bbd442f
7 changed files with 50 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Userland/Libraries/LibTTF/Cmap.cpp
View file

@ -9,9 +9,9 @@
namespace TTF {
extern u16 be_u16(const u8* ptr);
extern u32 be_u32(const u8* ptr);
extern i16 be_i16(const u8* ptr);
extern u16 be_u16(u8 const*);
extern u32 be_u32(u8 const*);
extern i16 be_i16(u8 const*);
Cmap::Subtable::Platform Cmap::Subtable::platform_id() const
{
@ -143,7 +143,7 @@ u32 Cmap::glyph_id_for_code_point(u32 code_point) const
return subtable.glyph_id_for_code_point(code_point);
}
Optional<Cmap> Cmap::from_slice(const ReadonlyBytes& slice)
Optional<Cmap> Cmap::from_slice(ReadonlyBytes const& slice)
{
if (slice.size() < (size_t)Sizes::TableHeader) {
return {};

6
Userland/Libraries/LibTTF/Cmap.h
View file

@ -37,7 +37,7 @@ public:
UnicodeFullRepertoire = 10,
};
Subtable(const ReadonlyBytes& slice, u16 platform_id, u16 encoding_id)
Subtable(ReadonlyBytes const& slice, u16 platform_id, u16 encoding_id)
: m_slice(slice)
, m_raw_platform_id(platform_id)
, m_encoding_id(encoding_id)
@ -81,7 +81,7 @@ public:
u16 m_encoding_id { 0 };
};
static Optional<Cmap> from_slice(const ReadonlyBytes&);
static Optional<Cmap> from_slice(ReadonlyBytes const&);
u32 num_subtables() const;
Optional<Subtable> subtable(u32 index) const;
void set_active_index(u32 index) { m_active_index = index; }
@ -99,7 +99,7 @@ private:
EncodingRecord = 8,
};
Cmap(const ReadonlyBytes& slice)
Cmap(ReadonlyBytes const& slice)
: m_slice(slice)
{
}

36
Userland/Libraries/LibTTF/Font.cpp
View file

@ -20,38 +20,38 @@
namespace TTF {
u16 be_u16(const u8* ptr);
u32 be_u32(const u8* ptr);
i16 be_i16(const u8* ptr);
float be_fword(const u8* ptr);
u32 tag_from_str(const char* str);
u16 be_u16(u8 const*);
u32 be_u32(u8 const*);
i16 be_i16(u8 const*);
float be_fword(u8 const*);
u32 tag_from_str(char const*);
u16 be_u16(const u8* ptr)
u16 be_u16(u8 const* ptr)
{
return (((u16)ptr[0]) << 8) | ((u16)ptr[1]);
}
u32 be_u32(const u8* ptr)
u32 be_u32(u8 const* ptr)
{
return (((u32)ptr[0]) << 24) | (((u32)ptr[1]) << 16) | (((u32)ptr[2]) << 8) | ((u32)ptr[3]);
}
i16 be_i16(const u8* ptr)
i16 be_i16(u8 const* ptr)
{
return (((i16)ptr[0]) << 8) | ((i16)ptr[1]);
}
float be_fword(const u8* ptr)
float be_fword(u8 const* ptr)
{
return (float)be_i16(ptr) / (float)(1 << 14);
}
u32 tag_from_str(const char* str)
u32 tag_from_str(char const* str)
{
return be_u32((const u8*)str);
return be_u32((u8 const*)str);
}
Optional<Head> Head::from_slice(const ReadonlyBytes& slice)
Optional<Head> Head::from_slice(ReadonlyBytes const& slice)
{
if (slice.size() < (size_t)Sizes::Table) {
return {};
@ -102,7 +102,7 @@ IndexToLocFormat Head::index_to_loc_format() const
}
}
Optional<Hhea> Hhea::from_slice(const ReadonlyBytes& slice)
Optional<Hhea> Hhea::from_slice(ReadonlyBytes const& slice)
{
if (slice.size() < (size_t)Sizes::Table) {
return {};
@ -135,7 +135,7 @@ u16 Hhea::number_of_h_metrics() const
return be_u16(m_slice.offset_pointer((u32)Offsets::NumberOfHMetrics));
}
Optional<Maxp> Maxp::from_slice(const ReadonlyBytes& slice)
Optional<Maxp> Maxp::from_slice(ReadonlyBytes const& slice)
{
if (slice.size() < (size_t)Sizes::TableV0p5) {
return {};
@ -148,7 +148,7 @@ u16 Maxp::num_glyphs() const
return be_u16(m_slice.offset_pointer((u32)Offsets::NumGlyphs));
}
Optional<Hmtx> Hmtx::from_slice(const ReadonlyBytes& slice, u32 num_glyphs, u32 number_of_h_metrics)
Optional<Hmtx> Hmtx::from_slice(ReadonlyBytes const& slice, u32 num_glyphs, u32 number_of_h_metrics)
{
if (slice.size() < number_of_h_metrics * (u32)Sizes::LongHorMetric + (num_glyphs - number_of_h_metrics) * (u32)Sizes::LeftSideBearing) {
return {};
@ -156,7 +156,7 @@ Optional<Hmtx> Hmtx::from_slice(const ReadonlyBytes& slice, u32 num_glyphs, u32
return Hmtx(slice, num_glyphs, number_of_h_metrics);
}
Optional<Name> Name::from_slice(const ReadonlyBytes& slice)
Optional<Name> Name::from_slice(ReadonlyBytes const& slice)
{
return Name(slice);
}
@ -192,10 +192,10 @@ String Name::string_for_id(NameId id) const
if (platform == (u16)Platform::Windows) {
static auto& decoder = *TextCodec::decoder_for("utf-16be");
return decoder.to_utf8(StringView { (const char*)m_slice.offset_pointer(string_offset + offset), length });
return decoder.to_utf8(StringView { (char const*)m_slice.offset_pointer(string_offset + offset), length });
}
return String((const char*)m_slice.offset_pointer(string_offset + offset), length);
return String((char const*)m_slice.offset_pointer(string_offset + offset), length);
}
GlyphHorizontalMetrics Hmtx::get_glyph_horizontal_metrics(u32 glyph_id) const

6
Userland/Libraries/LibTTF/Font.h
View file

@ -132,9 +132,9 @@ public:
virtual u8 glyph_fixed_width() const override;
virtual u8 baseline() const override { return m_point_height; } // FIXME: Read from font
virtual u8 mean_line() const override { return m_point_height; } // FIXME: Read from font
virtual int width(const StringView&) const override;
virtual int width(const Utf8View&) const override;
virtual int width(const Utf32View&) const override;
virtual int width(StringView const&) const override;
virtual int width(Utf8View const&) const override;
virtual int width(Utf32View const&) const override;
virtual String name() const override { return String::formatted("{} {}", family(), variant()); }
virtual bool is_fixed_width() const override { return m_font->is_fixed_width(); }
virtual u8 glyph_spacing() const override { return m_x_scale; } // FIXME: Read from font

14
Userland/Libraries/LibTTF/Glyf.cpp
View file

@ -10,10 +10,10 @@
namespace TTF {
extern u16 be_u16(const u8* ptr);
extern u32 be_u32(const u8* ptr);
extern i16 be_i16(const u8* ptr);
extern float be_fword(const u8* ptr);
extern u16 be_u16(u8 const* ptr);
extern u32 be_u32(u8 const* ptr);
extern i16 be_i16(u8 const* ptr);
extern float be_fword(u8 const* ptr);
enum class SimpleGlyfFlags {
// From spec.
@ -56,7 +56,7 @@ public:
Gfx::FloatPoint point;
};
PointIterator(const ReadonlyBytes& slice, u16 num_points, u32 flags_offset, u32 x_offset, u32 y_offset, Gfx::AffineTransform affine)
PointIterator(ReadonlyBytes const& slice, u16 num_points, u32 flags_offset, u32 x_offset, u32 y_offset, Gfx::AffineTransform affine)
: m_slice(slice)
, m_points_remaining(num_points)
, m_flags_offset(flags_offset)
@ -319,7 +319,7 @@ void Rasterizer::draw_line(Gfx::FloatPoint p0, Gfx::FloatPoint p1)
}
}
Optional<Loca> Loca::from_slice(const ReadonlyBytes& slice, u32 num_glyphs, IndexToLocFormat index_to_loc_format)
Optional<Loca> Loca::from_slice(ReadonlyBytes const& slice, u32 num_glyphs, IndexToLocFormat index_to_loc_format)
{
switch (index_to_loc_format) {
case IndexToLocFormat::Offset16:
@ -349,7 +349,7 @@ u32 Loca::get_glyph_offset(u32 glyph_id) const
}
}
static void get_ttglyph_offsets(const ReadonlyBytes& slice, u32 num_points, u32 flags_offset, u32* x_offset, u32* y_offset)
static void get_ttglyph_offsets(ReadonlyBytes const& slice, u32 num_points, u32 flags_offset, u32* x_offset, u32* y_offset)
{
u32 flags_size = 0;
u32 x_size = 0;

10
Userland/Libraries/LibTTF/Glyf.h
View file

@ -30,11 +30,11 @@ private:
class Loca {
public:
static Optional<Loca> from_slice(const ReadonlyBytes&, u32 num_glyphs, IndexToLocFormat);
static Optional<Loca> from_slice(ReadonlyBytes const&, u32 num_glyphs, IndexToLocFormat);
u32 get_glyph_offset(u32 glyph_id) const;
private:
Loca(const ReadonlyBytes& slice, u32 num_glyphs, IndexToLocFormat index_to_loc_format)
Loca(ReadonlyBytes const& slice, u32 num_glyphs, IndexToLocFormat index_to_loc_format)
: m_slice(slice)
, m_num_glyphs(num_glyphs)
, m_index_to_loc_format(index_to_loc_format)
@ -50,7 +50,7 @@ class Glyf {
public:
class Glyph {
public:
Glyph(const ReadonlyBytes& slice, i16 xmin, i16 ymin, i16 xmax, i16 ymax, i16 num_contours = -1)
Glyph(ReadonlyBytes const& slice, i16 xmin, i16 ymin, i16 xmax, i16 ymax, i16 num_contours = -1)
: m_xmin(xmin)
, m_ymin(ymin)
, m_xmax(xmax)
@ -89,7 +89,7 @@ public:
Gfx::AffineTransform affine;
};
ComponentIterator(const ReadonlyBytes& slice)
ComponentIterator(ReadonlyBytes const& slice)
: m_slice(slice)
{
}
@ -133,7 +133,7 @@ public:
ReadonlyBytes m_slice;
};
Glyf(const ReadonlyBytes& slice)
Glyf(ReadonlyBytes const& slice)
: m_slice(slice)
{
}

20
Userland/Libraries/LibTTF/Tables.h
View file

@ -17,7 +17,7 @@ enum class IndexToLocFormat {
class Head {
public:
static Optional<Head> from_slice(const ReadonlyBytes&);
static Optional<Head> from_slice(ReadonlyBytes const&);
u16 units_per_em() const;
i16 xmin() const;
i16 ymin() const;
@ -40,7 +40,7 @@ private:
Table = 54,
};
Head(const ReadonlyBytes& slice)
Head(ReadonlyBytes const& slice)
: m_slice(slice)
{
}
@ -50,7 +50,7 @@ private:
class Hhea {
public:
static Optional<Hhea> from_slice(const ReadonlyBytes&);
static Optional<Hhea> from_slice(ReadonlyBytes const&);
i16 ascender() const;
i16 descender() const;
i16 line_gap() const;
@ -69,7 +69,7 @@ private:
Table = 36,
};
Hhea(const ReadonlyBytes& slice)
Hhea(ReadonlyBytes const& slice)
: m_slice(slice)
{
}
@ -79,7 +79,7 @@ private:
class Maxp {
public:
static Optional<Maxp> from_slice(const ReadonlyBytes&);
static Optional<Maxp> from_slice(ReadonlyBytes const&);
u16 num_glyphs() const;
private:
@ -90,7 +90,7 @@ private:
TableV0p5 = 6,
};
Maxp(const ReadonlyBytes& slice)
Maxp(ReadonlyBytes const& slice)
: m_slice(slice)
{
}
@ -105,7 +105,7 @@ struct GlyphHorizontalMetrics {
class Hmtx {
public:
static Optional<Hmtx> from_slice(const ReadonlyBytes&, u32 num_glyphs, u32 number_of_h_metrics);
static Optional<Hmtx> from_slice(ReadonlyBytes const&, u32 num_glyphs, u32 number_of_h_metrics);
GlyphHorizontalMetrics get_glyph_horizontal_metrics(u32 glyph_id) const;
private:
@ -114,7 +114,7 @@ private:
LeftSideBearing = 2
};
Hmtx(const ReadonlyBytes& slice, u32 num_glyphs, u32 number_of_h_metrics)
Hmtx(ReadonlyBytes const& slice, u32 num_glyphs, u32 number_of_h_metrics)
: m_slice(slice)
, m_num_glyphs(num_glyphs)
, m_number_of_h_metrics(number_of_h_metrics)
@ -139,7 +139,7 @@ public:
enum class WindowsLanguage {
EnglishUnitedStates = 0x0409,
};
static Optional<Name> from_slice(const ReadonlyBytes&);
static Optional<Name> from_slice(ReadonlyBytes const&);
String family_name() const { return string_for_id(NameId::FamilyName); }
String subfamily_name() const { return string_for_id(NameId::SubfamilyName); }
@ -163,7 +163,7 @@ private:
TypographicSubfamilyName = 17,
};
Name(const ReadonlyBytes& slice)
Name(ReadonlyBytes const& slice)
: m_slice(slice)
{
}