Skip to content

Commit 3f66a0b

Browse files
authored
Merge pull request #7611 from gamblor21/colorconverter-mem-fix
ColorConverter output colorspace non-initialization fix
2 parents c7f485d + e78875a commit 3f66a0b

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

shared-bindings/displayio/ColorConverter.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ STATIC mp_obj_t displayio_colorconverter_obj_convert(mp_obj_t self_in, mp_obj_t
7373
displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
7474

7575
mp_int_t color = mp_arg_validate_type_int(color_obj, MP_QSTR_color);
76-
_displayio_colorspace_t colorspace;
77-
colorspace.depth = 16;
7876
uint32_t output_color;
79-
common_hal_displayio_colorconverter_convert(self, &colorspace, color, &output_color);
77+
common_hal_displayio_colorconverter_convert(self, &self->output_colorspace, color, &output_color);
8078
return MP_OBJ_NEW_SMALL_INT(output_color);
8179
}
8280
MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_convert_obj, displayio_colorconverter_obj_convert);

shared-module/displayio/ColorConverter.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ void common_hal_displayio_colorconverter_construct(displayio_colorconverter_t *s
4545
self->dither = dither;
4646
self->transparent_color = NO_TRANSPARENT_COLOR;
4747
self->input_colorspace = input_colorspace;
48+
self->output_colorspace.depth = 16;
4849
}
4950

5051
uint16_t displayio_colorconverter_compute_rgb565(uint32_t color_rgb888) {

shared-module/displayio/ColorConverter.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ typedef struct displayio_colorconverter {
3737
mp_obj_base_t base;
3838
bool dither;
3939
uint8_t input_colorspace;
40+
_displayio_colorspace_t output_colorspace;
4041
uint32_t transparent_color;
4142
} displayio_colorconverter_t;
4243

0 commit comments

Comments
 (0)