summaryrefslogtreecommitdiff
path: root/extmod/modframebuf.c
diff options
context:
space:
mode:
authorCorran Webster <cwebster@unital.dev>2024-11-14 10:15:10 +0000
committerDamien George <damien@micropython.org>2024-11-28 22:56:44 +1100
commite70048cf5934bf3db65ec7a1b6490635716282f5 (patch)
tree64cd862fb6c94c129b603c995ac2e4be9e502f93 /extmod/modframebuf.c
parent154d1419659795aa6785778e4ddd6f23f09f2861 (diff)
extmod/modframebuf: Fix 0 radius bug in FrameBuffer.ellipse.
This fixes a bug in FrameBuffer.ellipse where it goes into an infinite loop if both radii are 0. This fixes the bug with a simple pre-check to see if both radii are 0, and in that case sets a single pixel at the center. This is consistent with the behaviour of the method when called with just one of the radii set to 0, where it will draw a horizontal or vertical line of 1 pixel width. The pixel is set with setpixel_checked so it should handle out-of-bounds drawing correctly. This fix also includes three new tests: one for the default behaviour, one for drawing out-of-bounds, and one for when the sector mask is 0. Fixes issue #16053. Signed-off-by: Corran Webster <cwebster@unital.dev>
Diffstat (limited to 'extmod/modframebuf.c')
-rw-r--r--extmod/modframebuf.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/extmod/modframebuf.c b/extmod/modframebuf.c
index cd0f50d10..b718a66cc 100644
--- a/extmod/modframebuf.c
+++ b/extmod/modframebuf.c
@@ -536,6 +536,10 @@ static mp_obj_t framebuf_ellipse(size_t n_args, const mp_obj_t *args_in) {
} else {
mask |= ELLIPSE_MASK_ALL;
}
+ if (args[2] == 0 && args[3] == 0) {
+ setpixel_checked(self, args[0], args[1], args[4], mask & ELLIPSE_MASK_ALL);
+ return mp_const_none;
+ }
mp_int_t two_asquare = 2 * args[2] * args[2];
mp_int_t two_bsquare = 2 * args[3] * args[3];
mp_int_t x = args[2];