diff --git a/shared-bindings/gifio/OnDiskGif.c b/shared-bindings/gifio/OnDiskGif.c index cfed55d0c8..be8794f24c 100644 --- a/shared-bindings/gifio/OnDiskGif.c +++ b/shared-bindings/gifio/OnDiskGif.c @@ -126,18 +126,18 @@ STATIC mp_obj_t gifio_ondiskgif_make_new(const mp_obj_type_t *type, size_t n_arg mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)]; mp_arg_parse_all_kw_array(n_args, n_kw, all_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args); - mp_obj_t arg = all_args[0]; - if (mp_obj_is_str(arg)) { - arg = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), arg, MP_ROM_QSTR(MP_QSTR_rb)); + mp_obj_t filename = all_args[0]; + if (mp_obj_is_str(filename)) { + filename = mp_call_function_2(MP_OBJ_FROM_PTR(&mp_builtin_open_obj), filename, MP_ROM_QSTR(MP_QSTR_rb)); } - if (!mp_obj_is_type(arg, &mp_type_fileio)) { + if (!mp_obj_is_type(filename, &mp_type_fileio)) { mp_raise_TypeError(translate("file must be a file opened in byte mode")); } gifio_ondiskgif_t *self = m_new_obj(gifio_ondiskgif_t); self->base.type = &gifio_ondiskgif_type; - common_hal_gifio_ondiskgif_construct(self, MP_OBJ_TO_PTR(arg), args[ARG_use_palette].u_bool); + common_hal_gifio_ondiskgif_construct(self, MP_OBJ_TO_PTR(filename), args[ARG_use_palette].u_bool); return MP_OBJ_FROM_PTR(self); } @@ -207,7 +207,7 @@ MP_PROPERTY_GETTER(gifio_ondiskgif_bitmap_obj, (mp_obj_t)&gifio_ondiskgif_get_bitmap_obj); //| palette: displayio.Palette -//| """The palette for the current frame.""" +//| """The palette for the current frame if it exists.""" STATIC mp_obj_t gifio_ondiskgif_obj_get_palette(mp_obj_t self_in) { gifio_ondiskgif_t *self = MP_OBJ_TO_PTR(self_in); diff --git a/shared-module/gifio/OnDiskGif.c b/shared-module/gifio/OnDiskGif.c index f6adfa0775..c1e6d1f2c2 100644 --- a/shared-module/gifio/OnDiskGif.c +++ b/shared-module/gifio/OnDiskGif.c @@ -68,9 +68,9 @@ static void GIFDraw(GIFDRAW *pDraw) { // The palette is either RGB565 or the original 24-bit RGB values // depending on the pixel type selected with gif.begin() - gifio_ondiskgif_displayio_objs_t *displayio_objs = (gifio_ondiskgif_displayio_objs_t *)pDraw->pUser; - displayio_bitmap_t *bitmap = displayio_objs->bitmap; - displayio_palette_t *palette = displayio_objs->palette; + gifio_ondiskgif_t *ondiskgif = (gifio_ondiskgif_t *)pDraw->pUser; + displayio_bitmap_t *bitmap = ondiskgif->bitmap; + displayio_palette_t *palette = ondiskgif->palette; // Update the palette if we have one in RGB888 if (palette != NULL) { @@ -174,20 +174,19 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_ int bpp = 16; if (use_palette == true) { - mp_printf(&mp_plat_print, "Using palette\n"); displayio_palette_t *palette = m_new_obj(displayio_palette_t); palette->base.type = &displayio_palette_type; common_hal_displayio_palette_construct(palette, 256, false); - self->displayio_objs.palette = palette; + self->palette = palette; bpp = 8; } else { - self->displayio_objs.palette = NULL; + self->palette = NULL; } displayio_bitmap_t *bitmap = m_new_obj(displayio_bitmap_t); bitmap->base.type = &displayio_bitmap_type; common_hal_displayio_bitmap_construct(bitmap, self->gif.iCanvasWidth, self->gif.iCanvasHeight, bpp); - self->displayio_objs.bitmap = bitmap; + self->bitmap = bitmap; GIFINFO info; GIF_getInfo(&self->gif, &info); @@ -199,13 +198,13 @@ void common_hal_gifio_ondiskgif_construct(gifio_ondiskgif_t *self, pyb_file_obj_ void common_hal_gifio_ondiskgif_deinit(gifio_ondiskgif_t *self) { self->file = NULL; - common_hal_displayio_bitmap_deinit(self->displayio_objs.bitmap); - self->displayio_objs.bitmap = NULL; - self->displayio_objs.palette = NULL; + common_hal_displayio_bitmap_deinit(self->bitmap); + self->bitmap = NULL; + self->palette = NULL; } bool common_hal_gifio_ondiskgif_deinited(gifio_ondiskgif_t *self) { - return self->displayio_objs.bitmap == NULL; + return self->bitmap == NULL; } uint16_t common_hal_gifio_ondiskgif_get_height(gifio_ondiskgif_t *self) { @@ -217,11 +216,14 @@ uint16_t common_hal_gifio_ondiskgif_get_width(gifio_ondiskgif_t *self) { } mp_obj_t common_hal_gifio_ondiskgif_get_bitmap(gifio_ondiskgif_t *self) { - return MP_OBJ_FROM_PTR(self->displayio_objs.bitmap); + return MP_OBJ_FROM_PTR(self->bitmap); } mp_obj_t common_hal_gifio_ondiskgif_get_palette(gifio_ondiskgif_t *self) { - return MP_OBJ_FROM_PTR(self->displayio_objs.palette); + if (self->palette == NULL) { + return mp_const_none; + } + return MP_OBJ_FROM_PTR(self->palette); } int32_t common_hal_gifio_ondiskgif_get_duration(gifio_ondiskgif_t *self) { @@ -243,17 +245,17 @@ int32_t common_hal_gifio_ondiskgif_get_max_delay(gifio_ondiskgif_t *self) { uint32_t common_hal_gifio_ondiskgif_next_frame(gifio_ondiskgif_t *self, bool setDirty) { int nextDelay = 0; int result = 0; - result = GIF_playFrame(&self->gif, &nextDelay, &self->displayio_objs); + result = GIF_playFrame(&self->gif, &nextDelay, self); if ((result >= 0) && (setDirty)) { displayio_area_t dirty_area = { .x1 = 0, .y1 = 0, - .x2 = self->displayio_objs.bitmap->width, - .y2 = self->displayio_objs.bitmap->height, + .x2 = self->bitmap->width, + .y2 = self->bitmap->height, }; - displayio_bitmap_set_dirty_area(self->displayio_objs.bitmap, &dirty_area); + displayio_bitmap_set_dirty_area(self->bitmap, &dirty_area); } return nextDelay; diff --git a/shared-module/gifio/OnDiskGif.h b/shared-module/gifio/OnDiskGif.h index 70479ac8d9..6138337391 100644 --- a/shared-module/gifio/OnDiskGif.h +++ b/shared-module/gifio/OnDiskGif.h @@ -38,16 +38,12 @@ #include "extmod/vfs_fat.h" -typedef struct { - displayio_bitmap_t *bitmap; - displayio_palette_t *palette; -} gifio_ondiskgif_displayio_objs_t; - typedef struct { mp_obj_base_t base; GIFIMAGE gif; pyb_file_obj_t *file; - gifio_ondiskgif_displayio_objs_t displayio_objs; + displayio_bitmap_t *bitmap; + displayio_palette_t *palette; int32_t duration; int32_t frame_count; int32_t min_delay;