diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot index 03e15c6db2..96d1a210f4 100644 --- a/locale/circuitpython.pot +++ b/locale/circuitpython.pot @@ -2566,6 +2566,10 @@ msgstr "" msgid "axis too long" msgstr "" +#: shared-bindings/bitmaptools/__init__.c +msgid "background value out of range of target" +msgstr "" + #: py/builtinevex.c msgid "bad compile mode" msgstr "" @@ -3917,6 +3921,7 @@ msgstr "" #: ports/esp32s2/boards/gravitech_cucumber_rs/mpconfigboard.h #: ports/esp32s2/boards/lilygo_ttgo_t8_s2_st7789/mpconfigboard.h #: ports/esp32s2/boards/microdev_micro_s2/mpconfigboard.h +#: ports/esp32s2/boards/morpheans_morphesp-240/mpconfigboard.h #: ports/esp32s2/boards/muselab_nanoesp32_s2_wroom/mpconfigboard.h #: ports/esp32s2/boards/muselab_nanoesp32_s2_wrover/mpconfigboard.h #: ports/esp32s2/boards/targett_module_clip_wroom/mpconfigboard.h @@ -4358,6 +4363,10 @@ msgstr "" msgid "value must fit in %d byte(s)" msgstr "" +#: shared-bindings/bitmaptools/__init__.c +msgid "value out of range of target" +msgstr "" + #: shared-bindings/displayio/Bitmap.c msgid "value_count must be > 0" msgstr "" diff --git a/shared-module/bitmaptools/__init__.c b/shared-module/bitmaptools/__init__.c index ae00c68b46..43bb53a500 100644 --- a/shared-module/bitmaptools/__init__.c +++ b/shared-module/bitmaptools/__init__.c @@ -263,9 +263,9 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination, // first point is the one user passed in mp_obj_t point[] = { mp_obj_new_int(x), mp_obj_new_int(y) }; mp_obj_list_append( - fill_area, - mp_obj_new_tuple(2, point) - ); + fill_area, + mp_obj_new_tuple(2, point) + ); mp_obj_t *fill_points; size_t list_length = 0; @@ -278,7 +278,7 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination, mp_obj_t *tuple_items; // while there are still points to check - while (list_length > 0){ + while (list_length > 0) { mp_obj_list_get(fill_area, &list_length, &fill_points); current_point = mp_obj_list_pop(fill_area, 0); mp_obj_tuple_get(current_point, &tuple_len, &tuple_items); @@ -288,7 +288,7 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination, mp_obj_get_int(tuple_items[1])); // if the current point is not background color ignore it - if(current_point_color_value != background_value){ + if (current_point_color_value != background_value) { mp_obj_list_get(fill_area, &list_length, &fill_points); continue; } @@ -303,28 +303,32 @@ void common_hal_bitmaptools_boundary_fill(displayio_bitmap_t *destination, // add all 4 surrounding points to the list to check mp_obj_t above_point[] = { tuple_items[0], - MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[1])-1)}; + MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[1]) - 1) + }; mp_obj_list_append( fill_area, mp_obj_new_tuple(2, above_point)); mp_obj_t left_point[] = { - MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[0])-1), - tuple_items[1]}; + MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[0]) - 1), + tuple_items[1] + }; mp_obj_list_append( fill_area, mp_obj_new_tuple(2, left_point)); mp_obj_t right_point[] = { - MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[0])+1), - tuple_items[1]}; + MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[0]) + 1), + tuple_items[1] + }; mp_obj_list_append( fill_area, mp_obj_new_tuple(2, right_point)); mp_obj_t below_point[] = { tuple_items[0], - MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[1])+1)}; + MP_OBJ_NEW_SMALL_INT(mp_obj_int_get_checked(tuple_items[1]) + 1) + }; mp_obj_list_append( fill_area, mp_obj_new_tuple(2, below_point));