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

LibGfx: Address awesomekling's comments on API and codestyle

Browse source
This commit is contained in:
Srimanta Barua 2020-06-06 16:21:03 +05:30 • committed by Andreas Kling
parent 1931535218
commit 22fbe59126
2 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Libraries/LibGfx/TTFont.cpp
View file

@ -25,6 +25,7 @@
*/ */
#include "TTFont.h" #include "TTFont.h"
#include <AK/FixedArray.h>
#include <AK/LogStream.h> #include <AK/LogStream.h>
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
#include <AK/Utf32View.h> #include <AK/Utf32View.h>
@ -240,8 +241,8 @@ class Rasterizer {
public: public:
Rasterizer(Size size) Rasterizer(Size size)
: m_size(size) : m_size(size)
, m_data(m_size.width() * m_size.height())
{ {
m_data = OwnPtr(new float[m_size.width() * m_size.height()]);
for (int i = 0; i < m_size.width() * m_size.height(); i++) { for (int i = 0; i < m_size.width() * m_size.height(); i++) {
m_data[i] = 0.0; m_data[i] = 0.0;
} }
@ -344,7 +345,7 @@ private:
} }
Size m_size; Size m_size;
OwnPtr<float> m_data; FixedArray<float> m_data;
}; };
Font::GlyphHorizontalMetrics Font::Hmtx::get_glyph_horizontal_metrics(u32 glyph_id) const Font::GlyphHorizontalMetrics Font::Hmtx::get_glyph_horizontal_metrics(u32 glyph_id) const
@ -358,15 +359,14 @@ Font::GlyphHorizontalMetrics Font::Hmtx::get_glyph_horizontal_metrics(u32 glyph_
.advance_width = advance_width, .advance_width = advance_width,
.left_side_bearing = left_side_bearing, .left_side_bearing = left_side_bearing,
}; };
} else {
auto offset = m_number_of_h_metrics * (u32) Sizes::LongHorMetric + (glyph_id - m_number_of_h_metrics) * (u32) Sizes::LeftSideBearing;
u16 advance_width = be_u16(m_slice.offset_pointer((m_number_of_h_metrics - 1) * (u32) Sizes::LongHorMetric));
i16 left_side_bearing = be_i16(m_slice.offset_pointer(offset));
return GlyphHorizontalMetrics {
.advance_width = advance_width,
.left_side_bearing = left_side_bearing,
};
} }
auto offset = m_number_of_h_metrics * (u32) Sizes::LongHorMetric + (glyph_id - m_number_of_h_metrics) * (u32) Sizes::LeftSideBearing;
u16 advance_width = be_u16(m_slice.offset_pointer((m_number_of_h_metrics - 1) * (u32) Sizes::LongHorMetric));
i16 left_side_bearing = be_i16(m_slice.offset_pointer(offset));
return GlyphHorizontalMetrics {
.advance_width = advance_width,
.left_side_bearing = left_side_bearing,
};
} }
Font::Cmap::Subtable::Platform Font::Cmap::Subtable::platform_id() const Font::Cmap::Subtable::Platform Font::Cmap::Subtable::platform_id() const
@ -447,11 +447,10 @@ u32 Font::Cmap::Subtable::glyph_id_for_codepoint_table_4(u32 codepoint) const
u32 range = be_u16(m_slice.offset_pointer((u32) Table4Offsets::RangeConstBase + segcount_x2 * 3 + offset)); u32 range = be_u16(m_slice.offset_pointer((u32) Table4Offsets::RangeConstBase + segcount_x2 * 3 + offset));
if (range == 0) { if (range == 0) {
return (codepoint + delta) & 0xffff; return (codepoint + delta) & 0xffff;
} else {
u32 glyph_offset = (u32) Table4Offsets::GlyphOffsetConstBase + segcount_x2 * 3 + offset + range + (codepoint - start_codepoint) * 2;
ASSERT(glyph_offset + 2 <= m_slice.size());
return (be_u16(m_slice.offset_pointer(glyph_offset)) + delta) & 0xffff;
} }
u32 glyph_offset = (u32) Table4Offsets::GlyphOffsetConstBase + segcount_x2 * 3 + offset + range + (codepoint - start_codepoint) * 2;
ASSERT(glyph_offset + 2 <= m_slice.size());
return (be_u16(m_slice.offset_pointer(glyph_offset)) + delta) & 0xffff;
} }
return 0; return 0;
} }
@ -674,9 +673,8 @@ Font::Glyf::Glyph Font::Glyf::glyph(u32 offset) const
auto slice = ByteBuffer::wrap(m_slice.offset_pointer(offset + (u32) Sizes::GlyphHeader), m_slice.size() - offset - (u32) Sizes::GlyphHeader); auto slice = ByteBuffer::wrap(m_slice.offset_pointer(offset + (u32) Sizes::GlyphHeader), m_slice.size() - offset - (u32) Sizes::GlyphHeader);
if (num_contours < 0) { if (num_contours < 0) {
return Glyph::composite(slice); return Glyph::composite(slice);
} else {
return Glyph::simple(slice, num_contours, xmin, ymin, xmax, ymax);
} }
return Glyph::simple(slice, num_contours, xmin, ymin, xmax, ymax);
} }
RefPtr<Font> Font::load_from_file(const StringView& path, unsigned index) RefPtr<Font> Font::load_from_file(const StringView& path, unsigned index)
@ -705,15 +703,16 @@ RefPtr<Font> Font::load_from_file(const StringView& path, unsigned index)
} }
u32 offset = be_u32(buffer.offset_pointer((u32) Sizes::TTCHeaderV1 + sizeof(u32) * index)); u32 offset = be_u32(buffer.offset_pointer((u32) Sizes::TTCHeaderV1 + sizeof(u32) * index));
return adopt(*new Font(move(buffer), offset)); return adopt(*new Font(move(buffer), offset));
} else if (tag == tag_from_str("OTTO")) { }
if (tag == tag_from_str("OTTO")) {
dbg() << "CFF fonts not supported yet"; dbg() << "CFF fonts not supported yet";
return nullptr; return nullptr;
} else if (tag != 0x00010000) { }
if (tag != 0x00010000) {
dbg() << "Not a valid font"; dbg() << "Not a valid font";
return nullptr; return nullptr;
} else {
return adopt(*new Font(move(buffer), 0));
} }
return adopt(*new Font(move(buffer), 0));
} }
// FIXME: "loca" and "glyf" are not available for CFF fonts. // FIXME: "loca" and "glyf" are not available for CFF fonts.

11
Libraries/LibGfx/TTFont.h
View file

@ -28,7 +28,6 @@
#include <AK/ByteBuffer.h> #include <AK/ByteBuffer.h>
#include <AK/Noncopyable.h> #include <AK/Noncopyable.h>
#include <AK/OwnPtr.h>
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <AK/StringView.h> #include <AK/StringView.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
@ -336,19 +335,17 @@ private:
{ {
if (m_type == Type::Simple) { if (m_type == Type::Simple) {
return m_meta.simple.ymax; return m_meta.simple.ymax;
} else {
// FIXME: Support composite outlines.
TODO();
} }
// FIXME: Support composite outlines.
TODO();
} }
int descender() const int descender() const
{ {
if (m_type == Type::Simple) { if (m_type == Type::Simple) {
return m_meta.simple.ymin; return m_meta.simple.ymin;
} else {
// FIXME: Support composite outlines.
TODO();
} }
// FIXME: Support composite outlines.
TODO();
} }
private: private: