Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Bugfix] qp_ellipse overflow #19005

Merged
merged 8 commits into from
Oct 7, 2023
Merged

[Bugfix] qp_ellipse overflow #19005

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a4a9148
Improve algorithm for drawing ellipses
elpekenin Nov 8, 2022
6e1d521
Lint
elpekenin May 7, 2023
0db9813
Merge branch 'develop' into ellipse
elpekenin Aug 17, 2023
ce51f63
Re-implementation with parametric equation (yet untested)
elpekenin Sep 25, 2023
66fedd8
Lint + fix equation in comment
elpekenin Sep 25, 2023
6daffd8
Update copyright + use return value
elpekenin Sep 25, 2023
60f3ecf
Oops
elpekenin Sep 25, 2023
6e5e5cf
It was just an overflow after all, fix it
elpekenin Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions quantum/painter/qp_draw_ellipse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ bool qp_ellipse(painter_device_t device, uint16_t x, uint16_t y, uint16_t sizex,
return false;
}

int16_t aa = ((int16_t)sizex) * ((int16_t)sizex);
int16_t bb = ((int16_t)sizey) * ((int16_t)sizey);
int16_t fa = 4 * ((int16_t)aa);
int16_t fb = 4 * ((int16_t)bb);
int32_t aa = ((int32_t)sizex) * ((int32_t)sizex);
int32_t bb = ((int32_t)sizey) * ((int32_t)sizey);
int32_t fa = 4 * aa;
int32_t fb = 4 * bb;

int16_t dx = 0;
int16_t dy = ((int16_t)sizey);
Expand All @@ -83,7 +83,7 @@ bool qp_ellipse(painter_device_t device, uint16_t x, uint16_t y, uint16_t sizex,
}

bool ret = true;
for (int16_t delta = (2 * bb) + (aa * (1 - (2 * sizey))); bb * dx <= aa * dy; dx++) {
for (int32_t delta = (2 * bb) + (aa * (1 - (2 * sizey))); bb * dx <= aa * dy; dx++) {
if (!qp_ellipse_helper_impl(device, x, y, dx, dy, filled)) {
ret = false;
break;
Expand All @@ -98,7 +98,7 @@ bool qp_ellipse(painter_device_t device, uint16_t x, uint16_t y, uint16_t sizex,
dx = sizex;
dy = 0;

for (int16_t delta = (2 * aa) + (bb * (1 - (2 * sizex))); aa * dy <= bb * dx; dy++) {
for (int32_t delta = (2 * aa) + (bb * (1 - (2 * sizex))); aa * dy <= bb * dx; dy++) {
if (!qp_ellipse_helper_impl(device, x, y, dx, dy, filled)) {
ret = false;
break;
Expand Down