Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert storing Font glyphs in manually-allocated memory #4516

Merged
merged 1 commit into from
Mar 9, 2023

Conversation

oxan
Copy link
Member

@oxan oxan commented Mar 5, 2023

Instead of replacing the std::vector with manually allocated memory, use ExternalRAMAllocator as an allocator for the std::vector.

This also reverts the graceful handling of allocation failure for the glyphs, but that didn't work correctly anyway: if glyph allocation failed and DisplayBuffer::print() was called, a null pointer (this->glyphs_[0]) was dereferenced in Font::match_next_glyph. While not ideal, I'd rather have abort() be called on the allocation failure, as that at least makes clear what's going wrong.

This partially reverts commit 62459a8 (PR #4485).

What does this implement/fix?

Types of changes

  • Bugfix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Other

Related issue or feature (if applicable): fixes

Pull request in esphome-docs with documentation (if applicable): esphome/esphome-docs#

Test Environment

  • ESP32
  • ESP32 IDF
  • ESP8266
  • RP2040

Example entry for config.yaml:

# Example config.yaml

Checklist:

  • The code change is tested and works locally.
  • Tests have been added to verify that the new code works (under tests/ folder).

If user exposed functionality or configuration variables are added/changed:

@jesserockz jesserockz added this to the 2023.3.0b2 milestone Mar 9, 2023
@jesserockz jesserockz added this pull request to the merge queue Mar 9, 2023
Merged via the queue into esphome:dev with commit 801fbf4 Mar 9, 2023
jesserockz pushed a commit that referenced this pull request Mar 9, 2023
@jesserockz jesserockz mentioned this pull request Mar 9, 2023
@oxan oxan deleted the misc/revert-manual-memory-management branch March 9, 2023 07:50
@github-actions github-actions bot locked and limited conversation to collaborators Mar 11, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants