thor/esphome-dev
1
0
Fork 0
mirror of https://github.com/Threnklyn/esphome-dev.git synced 2026-05-23 14:18:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert storing Font glyphs in manually-allocated memory (#4516)

Browse Source 
This partially reverts commit 62459a8ae1.
This commit is contained in:
Oxan van Leeuwen
2023-03-09 01:14:34 +01:00
committed by Jesse Hills
parent a4f21db272
commit 7c91b4474a
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/display/display_buffer.h
+2 -4
View File
@@ -526,12 +526,10 @@ class Font {
inline int get_baseline() { return this->baseline_; }
inline int get_height() { return this->height_; }
Glyph *&get_glyphs() { return this->glyphs_; }
const u_int16_t &get_glyphs_size() const { return this->glyphs_size_; }
const std::vector<Glyph, ExternalRAMAllocator<Glyph>> &get_glyphs() const { return glyphs_; }
protected:
Glyph *glyphs_{nullptr};
u_int16_t glyphs_size_;
std::vector<Glyph, ExternalRAMAllocator<Glyph>> glyphs_;
int baseline_;
int height_;
};