diff options
| author | Kevin Matocha <kmatocha@icloud.com> | 2020-08-21 14:28:24 -0500 |
|---|---|---|
| committer | Kevin Matocha <kmatocha@icloud.com> | 2020-08-21 14:28:24 -0500 |
| commit | 7e529ed4c50c7697c649e09b999a2e9f8988b673 (patch) | |
| tree | 1b7cda5f791571054003b9ea91e84c1be881f8aa /shared-bindings | |
| parent | 6c199c5d6918b00752bd03696e17607b1489512c (diff) | |
| parent | b6008d0032a49e6b5c332576fa2f141d353b9fd3 (diff) | |
Merge with latest adafruit/main
Diffstat (limited to 'shared-bindings')
| -rw-r--r-- | shared-bindings/displayio/Bitmap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/shared-bindings/displayio/Bitmap.c b/shared-bindings/displayio/Bitmap.c index d732bc5f4..a31256f93 100644 --- a/shared-bindings/displayio/Bitmap.c +++ b/shared-bindings/displayio/Bitmap.c @@ -243,6 +243,7 @@ STATIC mp_obj_t displayio_bitmap_obj_blit(size_t n_args, const mp_obj_t *pos_arg (y2 < 0) || (y2 > source->height) ) { mp_raise_ValueError(translate("(x1,y1) or (x2,y2): out of range of source bitmap")); } + // Ensure x1 < x2 and y1 < y2 if (x1 > x2) { int16_t temp=x2; @@ -293,7 +294,11 @@ MP_DEFINE_CONST_FUN_OBJ_2(displayio_bitmap_fill_obj, displayio_bitmap_obj_fill); STATIC const mp_rom_map_elem_t displayio_bitmap_locals_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_height), MP_ROM_PTR(&displayio_bitmap_height_obj) }, { MP_ROM_QSTR(MP_QSTR_width), MP_ROM_PTR(&displayio_bitmap_width_obj) }, +<<<<<<< HEAD { MP_ROM_QSTR(MP_QSTR_blit), MP_ROM_PTR(&displayio_bitmap_blit_obj) }, +======= + { MP_ROM_QSTR(MP_QSTR_insert), MP_ROM_PTR(&displayio_bitmap_insert_obj) }, // Added insert function 8/7/2020 +>>>>>>> upstream/master { MP_ROM_QSTR(MP_QSTR_fill), MP_ROM_PTR(&displayio_bitmap_fill_obj) }, }; |