Changeset 135 for libcaca/trunk/libee/conic.cTweet

Timestamp:

Nov 10, 2003, 7:29:04 PM (19 years ago)

Author:

Sam Hocevar

Message:

• libee/sprite.c: + Added sanity checks in ee_sprite_* functions.
• libee/conic.c: + Use ellipsepoints() in ee_draw_circle().

File:

• libcaca/trunk/libee/conic.c (modified) (3 diffs)

libcaca/trunk/libee/conic.c

@@ -27 +27 @@
 #include "ee.h"
 
+static void ellipsepoints(int, int, int, int, char);
+
 void ee_draw_circle(int x, int y, int r, char c)
 {
@@ -34 +36 @@
     for(test = 0, dx = 0, dy = r ; dx <= dy ; dx++)
     {
-        ee_putcharTO(x + dx, y + dy / 2, c);
-        ee_putcharTO(x - dx, y + dy / 2, c);
-        ee_putcharTO(x + dx, y - dy / 2, c);
-        ee_putcharTO(x - dx, y - dy / 2, c);
-
-        ee_putcharTO(x + dy, y + dx / 2, c);
-        ee_putcharTO(x - dy, y + dx / 2, c);
-        ee_putcharTO(x + dy, y - dx / 2, c);
-        ee_putcharTO(x - dy, y - dx / 2, c);
+        ellipsepoints(x, y, dx, dy, c);
+        ellipsepoints(x, y, dy, dx, c);
 
         test += test > 0 ? dx - dy-- : dx;
     }
-}
-
-static void ellipsepoints(int xo, int yo, int x, int y, char c)
-{
-    ee_putcharTO(xo + x, yo + y, c);
-    ee_putcharTO(xo - x, yo + y, c);
-    ee_putcharTO(xo + x, yo - y, c);
-    ee_putcharTO(xo - x, yo - y, c);
 }
 
@@ -98 +85 @@
 }
 
+static void ellipsepoints(int xo, int yo, int x, int y, char c)
+{
+    ee_putcharTO(xo + x, yo + y, c);
+    ee_putcharTO(xo - x, yo + y, c);
+    ee_putcharTO(xo + x, yo - y, c);
+    ee_putcharTO(xo - x, yo - y, c);
+}
+