From f7891c7ec00405a8d57b1caab5874cbe6c85a1cc Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Tue, 3 Sep 2024 22:15:36 +0200 Subject: [PATCH] LibGfx/Font: Remove unused Typeface::glyph_advance() --- Userland/Libraries/LibGfx/Font/OpenType/Typeface.cpp | 12 ------------ Userland/Libraries/LibGfx/Font/OpenType/Typeface.h | 1 - Userland/Libraries/LibGfx/Font/Typeface.h | 1 - 3 files changed, 14 deletions(-) diff --git a/Userland/Libraries/LibGfx/Font/OpenType/Typeface.cpp b/Userland/Libraries/LibGfx/Font/OpenType/Typeface.cpp index 314ed1d9210..03dadeb3b05 100644 --- a/Userland/Libraries/LibGfx/Font/OpenType/Typeface.cpp +++ b/Userland/Libraries/LibGfx/Font/OpenType/Typeface.cpp @@ -357,18 +357,6 @@ Gfx::ScaledFontMetrics Typeface::metrics([[maybe_unused]] float x_scale, float y }; } -float Typeface::glyph_advance(u32 glyph_id, float x_scale, float, float, float) const -{ - if (!m_hmtx.has_value()) - return 0; - - if (glyph_id >= glyph_count()) - glyph_id = 0; - - auto horizontal_metrics = m_hmtx->get_glyph_horizontal_metrics(glyph_id); - return static_cast(horizontal_metrics.advance_width) * x_scale; -} - Gfx::ScaledGlyphMetrics Typeface::glyph_metrics(u32 glyph_id, float x_scale, float y_scale, float, float) const { if (!m_loca.has_value() || !m_glyf.has_value() || !m_hmtx.has_value()) { diff --git a/Userland/Libraries/LibGfx/Font/OpenType/Typeface.h b/Userland/Libraries/LibGfx/Font/OpenType/Typeface.h index 3e8ab13131e..9ba0d9bd197 100644 --- a/Userland/Libraries/LibGfx/Font/OpenType/Typeface.h +++ b/Userland/Libraries/LibGfx/Font/OpenType/Typeface.h @@ -56,7 +56,6 @@ public: virtual Gfx::ScaledFontMetrics metrics(float x_scale, float y_scale) const override; virtual Gfx::ScaledGlyphMetrics glyph_metrics(u32 glyph_id, float x_scale, float y_scale, float point_width, float point_height) const override; - virtual float glyph_advance(u32 glyph_id, float x_scale, float y_scale, float point_width, float point_height) const override; virtual u32 glyph_count() const override; virtual u16 units_per_em() const override; virtual u32 glyph_id_for_code_point(u32 code_point) const override; diff --git a/Userland/Libraries/LibGfx/Font/Typeface.h b/Userland/Libraries/LibGfx/Font/Typeface.h index ebe7cd046b3..6034db68dd5 100644 --- a/Userland/Libraries/LibGfx/Font/Typeface.h +++ b/Userland/Libraries/LibGfx/Font/Typeface.h @@ -48,7 +48,6 @@ public: virtual ~Typeface(); virtual ScaledFontMetrics metrics(float x_scale, float y_scale) const = 0; virtual ScaledGlyphMetrics glyph_metrics(u32 glyph_id, float x_scale, float y_scale, float point_width, float point_height) const = 0; - virtual float glyph_advance(u32 glyph_id, float x_scale, float y_scale, float point_width, float point_height) const = 0; virtual u32 glyph_count() const = 0; virtual u16 units_per_em() const = 0;