diff options
| author | Ryan T. Hamilton <astrobokonon@gmail.com> | 2020-10-08 12:43:52 -0700 |
|---|---|---|
| committer | Ryan T. Hamilton <astrobokonon@gmail.com> | 2020-10-08 12:43:52 -0700 |
| commit | 99f27bea614a0493ab4655d0631f981d807d0e74 (patch) | |
| tree | 050495cdbece51f3ba845c6871aa9e02fdbf291a /shared-module/sharpdisplay/SharpMemoryFramebuffer.c | |
| parent | 2a4a244245e3e03bfb89dcc49e56e83b71291bb2 (diff) | |
| parent | 763e14f815423207984586c276c8787eefe19b68 (diff) | |
Merge branch 'main' of https://github.com/adafruit/circuitpython into esp32s2-morenet
Diffstat (limited to 'shared-module/sharpdisplay/SharpMemoryFramebuffer.c')
| -rw-r--r-- | shared-module/sharpdisplay/SharpMemoryFramebuffer.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/shared-module/sharpdisplay/SharpMemoryFramebuffer.c b/shared-module/sharpdisplay/SharpMemoryFramebuffer.c index 71e00d7f0..c23446828 100644 --- a/shared-module/sharpdisplay/SharpMemoryFramebuffer.c +++ b/shared-module/sharpdisplay/SharpMemoryFramebuffer.c @@ -90,10 +90,6 @@ bool common_hal_sharpdisplay_framebuffer_get_pixels_in_byte_share_row(sharpdispl } void common_hal_sharpdisplay_framebuffer_reset(sharpdisplay_framebuffer_obj_t *self) { - if (!allocation_from_ptr(self->bufinfo.buf)) { - self->bufinfo.buf = NULL; - } - if (self->bus != &self->inline_bus #if BOARD_SPI && self->bus != common_hal_board_get_spi() @@ -105,7 +101,9 @@ void common_hal_sharpdisplay_framebuffer_reset(sharpdisplay_framebuffer_obj_t *s } void common_hal_sharpdisplay_framebuffer_reconstruct(sharpdisplay_framebuffer_obj_t *self) { - + if (!allocation_from_ptr(self->bufinfo.buf)) { + self->bufinfo.buf = NULL; + } } void common_hal_sharpdisplay_framebuffer_get_bufinfo(sharpdisplay_framebuffer_obj_t *self, mp_buffer_info_t *bufinfo) { |