Home-IoT/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2024-12-22 05:24:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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 GitHub
parent ba1416cc0e
commit 801fbf44c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
esphome/components/display/display_buffer.cpp
View file

@ -256,7 +256,7 @@ void DisplayBuffer::print(int x, int y, Font *font, Color color, TextAlign align
if (glyph_n < 0) { if (glyph_n < 0) {
// Unknown char, skip // Unknown char, skip
ESP_LOGW(TAG, "Encountered character without representation in font: '%c'", text[i]); ESP_LOGW(TAG, "Encountered character without representation in font: '%c'", text[i]);
if (font->get_glyphs_size() > 0) { if (!font->get_glyphs().empty()) {
uint8_t glyph_width = font->get_glyphs()[0].glyph_data_->width; uint8_t glyph_width = font->get_glyphs()[0].glyph_data_->width;
for (int glyph_x = 0; glyph_x < glyph_width; glyph_x++) { for (int glyph_x = 0; glyph_x < glyph_width; glyph_x++) {
for (int glyph_y = 0; glyph_y < height; glyph_y++) for (int glyph_y = 0; glyph_y < height; glyph_y++)
@ -557,7 +557,7 @@ void Glyph::scan_area(int *x1, int *y1, int *width, int *height) const {
} }
int Font::match_next_glyph(const char *str, int *match_length) { int Font::match_next_glyph(const char *str, int *match_length) {
int lo = 0; int lo = 0;
int hi = this->glyphs_size_ - 1; int hi = this->glyphs_.size() - 1;
while (lo != hi) { while (lo != hi) {
int mid = (lo + hi + 1) / 2; int mid = (lo + hi + 1) / 2;
if (this->glyphs_[mid].compare_to(str)) { if (this->glyphs_[mid].compare_to(str)) {
@ -583,7 +583,7 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
int glyph_n = this->match_next_glyph(str + i, &match_length); int glyph_n = this->match_next_glyph(str + i, &match_length);
if (glyph_n < 0) { if (glyph_n < 0) {
// Unknown char, skip // Unknown char, skip
if (this->glyphs_size_ > 0) if (!this->get_glyphs().empty())
x += this->get_glyphs()[0].glyph_data_->width; x += this->get_glyphs()[0].glyph_data_->width;
i++; i++;
continue; continue;
@ -604,16 +604,9 @@ void Font::measure(const char *str, int *width, int *x_offset, int *baseline, in
*width = x - min_x; *width = x - min_x;
} }
Font::Font(const GlyphData *data, int data_nr, int baseline, int height) : baseline_(baseline), height_(height) { Font::Font(const GlyphData *data, int data_nr, int baseline, int height) : baseline_(baseline), height_(height) {
ExternalRAMAllocator<Glyph> allocator(ExternalRAMAllocator<Glyph>::ALLOW_FAILURE); glyphs_.reserve(data_nr);
this->glyphs_ = allocator.allocate(data_nr); for (int i = 0; i < data_nr; ++i)
if (this->glyphs_ == nullptr) { glyphs_.emplace_back(&data[i]);
ESP_LOGE(TAG, "Could not allocate buffer for Glyphs!");
return;
}
for (int i = 0; i < data_nr; ++i) {
this->glyphs_[i] = Glyph(data + i);
}
this->glyphs_size_ = data_nr;
} }
bool Image::get_pixel(int x, int y) const { bool Image::get_pixel(int x, int y) const {

6
esphome/components/display/display_buffer.h
View file

@ -526,12 +526,10 @@ class Font {
inline int get_baseline() { return this->baseline_; } inline int get_baseline() { return this->baseline_; }
inline int get_height() { return this->height_; } inline int get_height() { return this->height_; }
Glyph *&get_glyphs() { return this->glyphs_; } const std::vector<Glyph, ExternalRAMAllocator<Glyph>> &get_glyphs() const { return glyphs_; }
const u_int16_t &get_glyphs_size() const { return this->glyphs_size_; }
protected: protected:
Glyph *glyphs_{nullptr}; std::vector<Glyph, ExternalRAMAllocator<Glyph>> glyphs_;
u_int16_t glyphs_size_;
int baseline_; int baseline_;
int height_; int height_;
}; };