Clean up rectangle code (#135)

* Move variable declarations to top
* Remove unneeded semicolons
* Apply astyle styling

Author: tuupola

include/hagl/rectangle.h

@@ -3,7 +3,7 @@
 
 MIT License
 
-Copyright (c) 2018-2023 Mika Tuupola
+Copyright (c) 2018-2026 Mika Tuupola
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -72,8 +72,7 @@ hagl_draw_rectangle_xyxy(void const *surface, int16_t x0, int16_t y0, int16_t x1
  * @param color
  */
 static void inline
-hagl_draw_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, hagl_color_t color)
-{
+hagl_draw_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, hagl_color_t color) {
     hagl_draw_rectangle_xyxy(surface, x0, y0, x1, y1, color);
 }
 
@@ -90,8 +89,7 @@ hagl_draw_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int
  * @param color
  */
 static void inline
-hagl_draw_rectangle_xywh(void const *surface, int16_t x0, int16_t y0, uint16_t width, uint16_t height, hagl_color_t color)
-{
+hagl_draw_rectangle_xywh(void const *surface, int16_t x0, int16_t y0, uint16_t width, uint16_t height, hagl_color_t color) {
     hagl_draw_rectangle_xyxy(surface, x0, y0, x0 + width - 1, y0 + height - 1, color);
 };
 
@@ -123,8 +121,7 @@ hagl_fill_rectangle_xyxy(void const *surface, int16_t x0, int16_t y0, int16_t x1
  * @param color
  */
 static void inline
-hagl_fill_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, hagl_color_t color)
-{
+hagl_fill_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, hagl_color_t color) {
     hagl_fill_rectangle_xyxy(surface, x0, y0, x1, y1, color);
 }
 
@@ -141,8 +138,7 @@ hagl_fill_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int
  * @param color
  */
 static void inline
-hagl_fill_rectangle_xywh(void const *surface, int16_t x0, int16_t y0, uint16_t width, uint16_t height, hagl_color_t color)
-{
+hagl_fill_rectangle_xywh(void const *surface, int16_t x0, int16_t y0, uint16_t width, uint16_t height, hagl_color_t color) {
     hagl_fill_rectangle_xyxy(surface, x0, y0, x0 + width - 1, y0 + height - 1, color);
 };
 
@@ -176,8 +172,7 @@ hagl_draw_rounded_rectangle_xyxy(void const *surface, int16_t x0, int16_t y0, in
  * @param color
  */
 static void inline
-hagl_draw_rounded_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t r, hagl_color_t color)
-{
+hagl_draw_rounded_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t r, hagl_color_t color) {
     hagl_draw_rounded_rectangle_xyxy(surface, x0, y0, x1, y1, r, color);
 }
 
@@ -195,8 +190,7 @@ hagl_draw_rounded_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t
  * @param color
  */
 static void inline
-hagl_draw_rounded_rectangle_xywh(void const *surface, int16_t x0, int16_t y0, uint16_t width, uint16_t height, int16_t r, hagl_color_t color)
-{
+hagl_draw_rounded_rectangle_xywh(void const *surface, int16_t x0, int16_t y0, uint16_t width, uint16_t height, int16_t r, hagl_color_t color) {
     hagl_draw_rounded_rectangle_xyxy(surface, x0, y0, x0 + width - 1, y0 + height - 1, r, color);
 }
 
@@ -230,8 +224,7 @@ hagl_fill_rounded_rectangle_xyxy(void const *surface, int16_t x0, int16_t y0, in
  * @param color
  */
 static void inline
-hagl_fill_rounded_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t r, hagl_color_t color)
-{
+hagl_fill_rounded_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t r, hagl_color_t color) {
     hagl_fill_rounded_rectangle_xyxy(surface, x0, y0, x1, y1, r, color);
 }
 
@@ -249,8 +242,7 @@ hagl_fill_rounded_rectangle(void const *surface, int16_t x0, int16_t y0, int16_t
  * @param color
  */
 static void inline
-hagl_fill_rounded_rectangle_xywh(void const *surface, int16_t x0, int16_t y0, uint16_t width, uint16_t height, int16_t r, hagl_color_t color)
-{
+hagl_fill_rounded_rectangle_xywh(void const *surface, int16_t x0, int16_t y0, uint16_t width, uint16_t height, int16_t r, hagl_color_t color) {
     hagl_fill_rounded_rectangle_xyxy(surface, x0, y0, x0 + width - 1, y0 + height - 1, r, color);
 }
 
@@ -259,4 +251,4 @@ hagl_fill_rounded_rectangle_xywh(void const *surface, int16_t x0, int16_t y0, ui
 }
 #endif /* __cplusplus */
 
-#endif /* _HAGL_RECTANGLE_H */
+#endif /* _HAGL_RECTANGLE_H */

src/hagl_rectangle.c

@@ -2,7 +2,7 @@
 
 MIT License
 
-Copyright (c) 2018-2023 Mika Tuupola
+Copyright (c) 2018-2026 Mika Tuupola
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -44,9 +44,9 @@ SPDX-License-Identifier: MIT
 #define MAX(a,b) (((a)>(b))?(a):(b))
 
 void
-hagl_draw_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, hagl_color_t color)
-{
+hagl_draw_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, hagl_color_t color) {
     const hagl_surface_t *surface = _surface;
+    uint16_t width, height;
 
     /* Make sure x0 is smaller than x1. */
     if (x0 > x1) {
@@ -72,8 +72,8 @@ hagl_draw_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x
         return;
     }
 
-    uint16_t width = x1 - x0 + 1;
-    uint16_t height = y1 - y0 + 1;
+    width = x1 - x0 + 1;
+    height = y1 - y0 + 1;
 
     hagl_draw_hline(surface, x0, y0, width, color);
     hagl_draw_hline(surface, x0, y1, width, color);
@@ -82,9 +82,9 @@ hagl_draw_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x
 }
 
 void
-hagl_fill_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, hagl_color_t color)
-{
+hagl_fill_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, hagl_color_t color) {
     const hagl_surface_t *surface = _surface;
+    uint16_t width, height;
 
     /* Make sure x0 is smaller than x1. */
     if (x0 > x1) {
@@ -115,8 +115,8 @@ hagl_fill_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x
     x1 = MIN(x1, surface->clip.x1);
     y1 = MIN(y1, surface->clip.y1);
 
-    uint16_t width = x1 - x0 + 1;
-    uint16_t height = y1 - y0 + 1;
+    width = x1 - x0 + 1;
+    height = y1 - y0 + 1;
 
     for (uint16_t i = 0; i < height; i++) {
         if (surface->hline) {
@@ -129,8 +129,7 @@ hagl_fill_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x
 }
 
 void
-hagl_draw_rounded_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t r, hagl_color_t color)
-{
+hagl_draw_rounded_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t r, hagl_color_t color) {
     const hagl_surface_t *surface = _surface;
 
     uint16_t width, height;
@@ -200,11 +199,10 @@ hagl_draw_rounded_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, i
         hagl_put_pixel(surface, x0 + r - x, y1 - r + y, color);
         hagl_put_pixel(surface, x0 + r - y, y1 - r + x, color);
     }
-};
+}
 
 void
-hagl_fill_rounded_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t r, hagl_color_t color)
-{
+hagl_fill_rounded_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, int16_t x1, int16_t y1, int16_t r, hagl_color_t color) {
     const hagl_surface_t *surface = _surface;
 
     uint16_t width, height;
@@ -282,4 +280,4 @@ hagl_fill_rounded_rectangle_xyxy(void const *_surface, int16_t x0, int16_t y0, i
 
     /* Center */
     hagl_fill_rectangle_xyxy(surface, x0, y0 + r, x1, y1 - r, color);
-};
+}