displayio: ColorConverter handle if opaque color is black

Author: jensechu

shared-bindings/displayio/ColorConverter.c

@@ -117,28 +117,23 @@ STATIC mp_obj_t displayio_colorconverter_make_transparent(mp_obj_t self_in, mp_o
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
 
     mp_int_t transparent_color;
-    if (!mp_obj_get_int_maybe(transparent_color_obj, &transparent_color)) {
+    if (!mp_obj_get_int(&transparent_color)) {
         mp_raise_ValueError(translate("transparent_color should be an int"));
     }
     common_hal_displayio_colorconverter_make_transparent(self, transparent_color);
     return mp_const_none;
 }
 MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_make_transparent_obj, displayio_colorconverter_make_transparent);
 
-//|     def make_opaque(self, pixel: int) -> None:
+//|     def make_opaque(self) -> None:
 //|         """Sets a pixel to opaque."""
 //|
-STATIC mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in, mp_obj_t transparent_color_obj) {
+STATIC mp_obj_t displayio_colorconverter_make_opaque(mp_obj_t self_in) {
     displayio_colorconverter_t *self = MP_OBJ_TO_PTR(self_in);
-
-    mp_int_t transparent_color;
-    if (!mp_obj_get_int_maybe(transparent_color_obj, &transparent_color)) {
-        mp_raise_ValueError(translate("transparent_color should be an int"));
-    }
-    common_hal_displayio_colorconverter_make_opaque(self, transparent_color);
+    common_hal_displayio_colorconverter_make_opaque(self);
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_2(displayio_colorconverter_make_opaque_obj, displayio_colorconverter_make_opaque);
+MP_DEFINE_CONST_FUN_OBJ_1(displayio_colorconverter_make_opaque_obj, displayio_colorconverter_make_opaque);
 
 STATIC const mp_rom_map_elem_t displayio_colorconverter_locals_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_convert), MP_ROM_PTR(&displayio_colorconverter_convert_obj) },

shared-bindings/displayio/ColorConverter.h

@@ -40,6 +40,6 @@ void common_hal_displayio_colorconverter_set_dither(displayio_colorconverter_t*
 bool common_hal_displayio_colorconverter_get_dither(displayio_colorconverter_t* self);
 
 void common_hal_displayio_colorconverter_make_transparent(displayio_colorconverter_t* self, uint32_t transparent_color);
-void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t* self, uint32_t transparent_color);
+void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t* self);
 
 #endif // MICROPY_INCLUDED_SHARED_BINDINGS_DISPLAYIO_COLORCONVERTER_H

shared-module/displayio/ColorConverter.c

@@ -130,16 +130,13 @@ bool common_hal_displayio_colorconverter_get_dither(displayio_colorconverter_t*
 }
 
 void common_hal_displayio_colorconverter_make_transparent(displayio_colorconverter_t* self, uint32_t transparent_color) {
-    if (self->transparent_color) {
-        mp_raise_RuntimeError(translate("transparent_color value is already set"));
+    if (self->transparent_color >= 0x1000000) {
+        mp_raise_RuntimeError(translate("Only one color can be transparent at a time"));
     }
     self->transparent_color = transparent_color;
 }
 
-void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t* self, uint32_t transparent_color) {
-    if (self->transparent_color != transparent_color) {
-        mp_raise_RuntimeError(translate("transparent_color value is not transparent"));
-    }
+void common_hal_displayio_colorconverter_make_opaque(displayio_colorconverter_t* self) {
     // 0x1000000 will never equal a valid color
     self->transparent_color = 0x1000000;
 }