Changed M_PI to G_PI.

git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@197 f5e0f49d-192f-0410-a22d-a8d8700d0965

diff --git a/glabels2/src/print.c b/glabels2/src/print.c
index fb7f36ee7f96104c54b4661dfdbb3e811ee8561b..e6fcd1099f3659b090a7b76424a695ae1bf8d476 100644 (file)
--- a/glabels2/src/print.c
+++ b/glabels2/src/print.c
@@ -1098,8 +1098,8 @@ create_ellipse_path (GnomePrintContext *pc,
        gnome_print_newpath (pc);
        gnome_print_moveto (pc, x0 + rx, y0);
        for (i_theta = 2; i_theta <= 360; i_theta += 2) {
-               x = x0 + rx * cos (i_theta * M_PI / 180.0);
-               y = y0 + ry * sin (i_theta * M_PI / 180.0);
+               x = x0 + rx * cos (i_theta * G_PI / 180.0);
+               y = y0 + ry * sin (i_theta * G_PI / 180.0);
                gnome_print_lineto (pc, x, y);
        }
        gnome_print_closepath (pc);
@@ -1124,23 +1124,23 @@ create_rounded_rectangle_path (GnomePrintContext *pc,
 
        gnome_print_moveto (pc, x0 + r, y0);
        for (i_theta = 5; i_theta <= 90; i_theta += 5) {
-               x = x0 + r - r * sin (i_theta * M_PI / 180.0);
-               y = y0 + r - r * cos (i_theta * M_PI / 180.0);
+               x = x0 + r - r * sin (i_theta * G_PI / 180.0);
+               y = y0 + r - r * cos (i_theta * G_PI / 180.0);
                gnome_print_lineto (pc, x, y);
        }
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
-               x = x0 + r - r * cos (i_theta * M_PI / 180.0);
-               y = y0 + (h - r) + r * sin (i_theta * M_PI / 180.0);
+               x = x0 + r - r * cos (i_theta * G_PI / 180.0);
+               y = y0 + (h - r) + r * sin (i_theta * G_PI / 180.0);
                gnome_print_lineto (pc, x, y);
        }
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
-               x = x0 + (w - r) + r * sin (i_theta * M_PI / 180.0);
-               y = y0 + (h - r) + r * cos (i_theta * M_PI / 180.0);
+               x = x0 + (w - r) + r * sin (i_theta * G_PI / 180.0);
+               y = y0 + (h - r) + r * cos (i_theta * G_PI / 180.0);
                gnome_print_lineto (pc, x, y);
        }
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
-               x = x0 + (w - r) + r * cos (i_theta * M_PI / 180.0);
-               y = y0 + r - r * sin (i_theta * M_PI / 180.0);
+               x = x0 + (w - r) + r * cos (i_theta * G_PI / 180.0);
+               y = y0 + r - r * sin (i_theta * G_PI / 180.0);
                gnome_print_lineto (pc, x, y);
        }
        gnome_print_lineto (pc, x0 + r, y0);

diff --git a/glabels2/src/view.c b/glabels2/src/view.c
index 205f42311b823437422e7b60184f0679c99e818f..be0e5ad215ae6a00746a3719f522c1bfa86e2bd2 100644 (file)
--- a/glabels2/src/view.c
+++ b/glabels2/src/view.c
@@ -683,27 +683,27 @@ draw_bg_fg_rounded_rect (glView *view)
        i_coords = 0;
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
                points->coords[i_coords++] =
-                   r - r * sin (i_theta * M_PI / 180.0);
+                   r - r * sin (i_theta * G_PI / 180.0);
                points->coords[i_coords++] =
-                   r - r * cos (i_theta * M_PI / 180.0);
+                   r - r * cos (i_theta * G_PI / 180.0);
        }
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
                points->coords[i_coords++] =
-                   r - r * cos (i_theta * M_PI / 180.0);
+                   r - r * cos (i_theta * G_PI / 180.0);
                points->coords[i_coords++] =
-                   (h - r) + r * sin (i_theta * M_PI / 180.0);
+                   (h - r) + r * sin (i_theta * G_PI / 180.0);
        }
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
                points->coords[i_coords++] =
-                   (w - r) + r * sin (i_theta * M_PI / 180.0);
+                   (w - r) + r * sin (i_theta * G_PI / 180.0);
                points->coords[i_coords++] =
-                   (h - r) + r * cos (i_theta * M_PI / 180.0);
+                   (h - r) + r * cos (i_theta * G_PI / 180.0);
        }
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
                points->coords[i_coords++] =
-                   (w - r) + r * cos (i_theta * M_PI / 180.0);
+                   (w - r) + r * cos (i_theta * G_PI / 180.0);
                points->coords[i_coords++] =
-                   r - r * sin (i_theta * M_PI / 180.0);
+                   r - r * sin (i_theta * G_PI / 180.0);
        }
 
        /* Background */
@@ -1059,27 +1059,27 @@ draw_markup_margin_rounded_rect (glView                 *view,
        i_coords = 0;
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
                points->coords[i_coords++] =
-                       m + r - r * sin (i_theta * M_PI / 180.0);
+                       m + r - r * sin (i_theta * G_PI / 180.0);
                points->coords[i_coords++] =
-                       m + r - r * cos (i_theta * M_PI / 180.0);
+                       m + r - r * cos (i_theta * G_PI / 180.0);
        }
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
                points->coords[i_coords++] =
-                       m + r - r * cos (i_theta * M_PI / 180.0);
+                       m + r - r * cos (i_theta * G_PI / 180.0);
                points->coords[i_coords++] =
-                       m + (h - r) + r * sin (i_theta * M_PI / 180.0);
+                       m + (h - r) + r * sin (i_theta * G_PI / 180.0);
        }
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
                points->coords[i_coords++] =
-                       m + (w - r) + r * sin (i_theta * M_PI / 180.0);
+                       m + (w - r) + r * sin (i_theta * G_PI / 180.0);
                points->coords[i_coords++] =
-                       m + (h - r) + r * cos (i_theta * M_PI / 180.0);
+                       m + (h - r) + r * cos (i_theta * G_PI / 180.0);
        }
        for (i_theta = 0; i_theta <= 90; i_theta += 5) {
                points->coords[i_coords++] =
-                       m + (w - r) + r * cos (i_theta * M_PI / 180.0);
+                       m + (w - r) + r * cos (i_theta * G_PI / 180.0);
                points->coords[i_coords++] =
-                       m + r - r * sin (i_theta * M_PI / 180.0);
+                       m + r - r * sin (i_theta * G_PI / 180.0);
        }
        item = gnome_canvas_item_new (view->markup_group,
                                      gnome_canvas_polygon_get_type (),

diff --git a/glabels2/src/wdgt-vector.c b/glabels2/src/wdgt-vector.c
index b67919d200ec2141150e067d77a5dac3c898d896..34ec89d986dafeafc6afa518cc4d61c95c1906a3 100644 (file)
--- a/glabels2/src/wdgt-vector.c
+++ b/glabels2/src/wdgt-vector.c
@@ -30,14 +30,10 @@
 
 #include <math.h>
 
-#ifndef M_PI
-#define M_PI           3.14159265358979323846  /* pi */
-#endif
-
 #define LENGTH(x,y) sqrt( (x)*(x) + (y)*(y) )
-#define ANGLE(x,y)  ( (180.0/M_PI)*atan2( -(y), (x) ) )
-#define COMP_X(l,a) ( (l) * cos( (M_PI/180.0)*(a) ) )
-#define COMP_Y(l,a) ( -(l) * sin( (M_PI/180.0)*(a) ) )
+#define ANGLE(x,y)  ( (180.0/G_PI)*atan2( -(y), (x) ) )
+#define COMP_X(l,a) ( (l) * cos( (G_PI/180.0)*(a) ) )
+#define COMP_Y(l,a) ( -(l) * sin( (G_PI/180.0)*(a) ) )
 
 /*===========================================*/
 /* Private types                             */