From 29c6b1456e8bb46fbee0e8ea962553cb9f1230a3 Mon Sep 17 00:00:00 2001 From: N-R-K Date: Wed, 27 Apr 2022 01:25:11 +0000 Subject: code-style: reduce some unnecessary if-elses (#261) also change the condition inside img_frame_animate() to check for positive value rather than comparing against 0. --- image.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'image.c') diff --git a/image.c b/image.c index ba5b1fe..2904887 100644 --- a/image.c +++ b/image.c @@ -898,23 +898,15 @@ bool img_frame_navigate(img_t *img, int d) return false; d += img->multi.sel; - if (d < 0) - d = 0; - else if (d >= img->multi.cnt) - d = img->multi.cnt - 1; + d = MAX(0, MIN(d, img->multi.cnt - 1)); return img_frame_goto(img, d); } bool img_frame_animate(img_t *img) { - if (img->multi.cnt == 0) - return false; - - if (img->multi.sel + 1 >= img->multi.cnt) - img_frame_goto(img, 0); + if (img->multi.cnt > 0) + return img_frame_goto(img, (img->multi.sel + 1) % img->multi.cnt); else - img_frame_goto(img, img->multi.sel + 1); - img->dirty = true; - return true; + return false; } -- cgit v1.2.3-70-g09d2