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

Merge pull request #4484 from kmatch98/vector_fix

Browse Source 
Corrects vectorio.Rectangle size dimensions
This commit is contained in:
Scott Shawcroft 2021-03-25 10:56:47 -07:00 committed by GitHub
commit 0105b30a07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
shared-module/vectorio/Rectangle.c
View File

@ -12,7 +12,7 @@ void common_hal_vectorio_rectangle_construct(vectorio_rectangle_t *self, uint32_
uint32_t common_hal_vectorio_rectangle_get_pixel(void *obj, int16_t x, int16_t y) { uint32_t common_hal_vectorio_rectangle_get_pixel(void *obj, int16_t x, int16_t y) {
vectorio_rectangle_t *self = obj; vectorio_rectangle_t *self = obj;
if (x < 0 || x > self->width || y > self->height || y < 0) { if (x < 0 || x >= self->width || y >= self->height || y < 0) {
return 0; return 0;
} }
return 1; return 1;
@ -21,8 +21,8 @@ uint32_t common_hal_vectorio_rectangle_get_pixel(void *obj, int16_t x, int16_t y
void common_hal_vectorio_rectangle_get_area(void *rectangle, displayio_area_t *out_area) { void common_hal_vectorio_rectangle_get_area(void *rectangle, displayio_area_t *out_area) {
vectorio_rectangle_t *self = rectangle; vectorio_rectangle_t *self = rectangle;
out_area->x1 = -1; out_area->x1 = 0;
out_area->y1 = -1; out_area->y1 = 0;
out_area->x2 = self->width; out_area->x2 = self->width;
out_area->y2 = self->height; out_area->y2 = self->height;
} }