diff options
| author | Scott Shawcroft <scott@adafruit.com> | 2020-07-21 11:22:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 11:22:47 -0700 |
| commit | a3a601d0c62d56f2c491cb2e7c6b48805157af62 (patch) | |
| tree | b7f31165cf0a540537332ea6ebc1d7151f71c843 | |
| parent | 7f27fcd63af7253f4c0fc11f51d0635c1644c325 (diff) | |
| parent | e977b427aa6783858ecccd4a69e17d08f039122c (diff) | |
Merge pull request #3177 from WarriorOfWire/issue_3170
vectorio: fix VectorShape non-transposed pixel placement
| -rw-r--r-- | shared-module/vectorio/VectorShape.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shared-module/vectorio/VectorShape.c b/shared-module/vectorio/VectorShape.c index bfe8a7b25..81f46b3fa 100644 --- a/shared-module/vectorio/VectorShape.c +++ b/shared-module/vectorio/VectorShape.c @@ -223,8 +223,8 @@ bool vectorio_vector_shape_fill_area(vectorio_vector_shape_t *self, const _displ pixel_to_get_x = (input_pixel.y - self->absolute_transform->dy * self->x - self->absolute_transform->y) / self->absolute_transform->dy; pixel_to_get_y = (input_pixel.x - self->absolute_transform->dx * self->y - self->absolute_transform->x) / self->absolute_transform->dx; } else { - pixel_to_get_x = (input_pixel.x - self->absolute_transform->dx * self->x) / self->absolute_transform->dx; - pixel_to_get_y = (input_pixel.y - self->absolute_transform->dy * self->y) / self->absolute_transform->dy; + pixel_to_get_x = (input_pixel.x - self->absolute_transform->dx * self->x - self->absolute_transform->x) / self->absolute_transform->dx; + pixel_to_get_y = (input_pixel.y - self->absolute_transform->dy * self->y - self->absolute_transform->y) / self->absolute_transform->dy; } VECTORIO_SHAPE_PIXEL_DEBUG(" get_pixel %p (%3d, %3d) -> ( %3d, %3d )", self->ishape.shape, input_pixel.x, input_pixel.y, pixel_to_get_x, pixel_to_get_y); #ifdef VECTORIO_PERF |