djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7467 from matemaciek/main

Browse Source 
Allow lines with ends out of bitmap in `bitmaptools_obj_draw_line`
This commit is contained in:
Dan Halbert 2023-01-19 21:11:17 -05:00 committed by GitHub
commit 7dd76fc7e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shared-bindings/bitmaptools/__init__.c
View File

@ -514,13 +514,6 @@ STATIC mp_obj_t bitmaptools_obj_draw_line(size_t n_args, const mp_obj_t *pos_arg
int16_t x2 = args[ARG_x2].u_int; int16_t x2 = args[ARG_x2].u_int;
int16_t y2 = args[ARG_y2].u_int; int16_t y2 = args[ARG_y2].u_int;
// verify points are within the bitmap boundary (inclusive)
if ((x1 < 0) || (x2 < 0) || (y1 < 0) || (y2 < 0) ||
(x1 >= destination->width) || (x2 >= destination->width) ||
(y1 >= destination->height) || (y2 >= destination->height)) {
mp_raise_ValueError(translate("out of range of target"));
}
common_hal_bitmaptools_draw_line(destination, x1, y1, x2, y2, value); common_hal_bitmaptools_draw_line(destination, x1, y1, x2, y2, value);
return mp_const_none; return mp_const_none;

4
shared-module/bitmaptools/__init__.c
View File

@ -423,6 +423,8 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
y0 = y1; y0 = y1;
y1 = temp; y1 = temp;
} }
y0 = MAX(0, y0); // only draw inside bitmap
y1 = MIN(y1, destination->height - 1);
for (y = y0; y < (y1 + 1); y++) { // write a horizontal line for (y = y0; y < (y1 + 1); y++) { // write a horizontal line
displayio_bitmap_write_pixel(destination, x0, y, value); displayio_bitmap_write_pixel(destination, x0, y, value);
} }
@ -432,6 +434,8 @@ void common_hal_bitmaptools_draw_line(displayio_bitmap_t *destination,
x0 = x1; x0 = x1;
x1 = temp; x1 = temp;
} }
x0 = MAX(0, x0); // only draw inside bitmap
x1 = MIN(x1, destination->width - 1);
for (x = x0; x < (x1 + 1); x++) { // write a horizontal line for (x = x0; x < (x1 + 1); x++) { // write a horizontal line
displayio_bitmap_write_pixel(destination, x, y0, value); displayio_bitmap_write_pixel(destination, x, y0, value);
} }

5
shared-module/displayio/Bitmap.c
View File

@ -131,6 +131,11 @@ void displayio_bitmap_write_pixel(displayio_bitmap_t *self, int16_t x, int16_t y
// Writes the color index value into a pixel position // Writes the color index value into a pixel position
// Must update the dirty area separately // Must update the dirty area separately
// Don't write if out of area
if (0 > x || x >= self->width || 0 > y || y >= self->height) {
return;
}
// Update one pixel of data // Update one pixel of data
int32_t row_start = y * self->stride; int32_t row_start = y * self->stride;
uint32_t bytes_per_value = self->bits_per_value / 8; uint32_t bytes_per_value = self->bits_per_value / 8;