Miscellaneous updates, mostly aesthetic

[grits] / src / gis-util.h

diff --git a/src/gis-util.h b/src/gis-util.h
index c7e1f69c497a4881a4696d040f980e79a84f713e..234bb16b84f091dd4a365774adb88aa5a3fdc242 100644 (file)
--- a/src/gis-util.h
+++ b/src/gis-util.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009 Andy Spencer <spenceal@rose-hulman.edu>
+ * Copyright (C) 2009-2010 Andy Spencer <andy753421@gmail.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,8 +18,10 @@
 #ifndef __GIS_UTIL_H__
 #define __GIS_UTIL_H__
 
+#include <glib.h>
+
 #define EARTH_R (6371000)
-#define EARTH_C (2*M_PI*EARTH_R)
+#define EARTH_C (2*G_PI*EARTH_R)
 #define NORTH  90
 #define SOUTH -90
 #define EAST  180
@@ -65,15 +67,13 @@
  * xyz2lle:    0.0,   0.0,  10.0 ->    0.0,   0.0,   0.0
  */
 
-#define azim2lon(azim) ((azim)*180/M_PI)
-#define lon2azim(lon)  ((lon)*M_PI/180)
-#define incl2lat(incl) (90-(incl)*180/M_PI)
-#define lat2incl(lat)  ((90-(lat))*M_PI/180)
+#define incl2lat(incl) (90-(incl)*180/G_PI)
+#define lat2incl(lat)  ((90-(lat))*G_PI/180)
 #define rad2elev(rad)  ((rad)-EARTH_R)
 #define elev2rad(elev) ((elev)+EARTH_R)
 
-#define deg2rad(deg) (((deg)*M_PI)/180.0)
-#define rad2deg(rad) (((rad)*180.0)/M_PI)
+#define deg2rad(deg) (((deg)*G_PI)/180.0)
+#define rad2deg(rad) (((rad)*180.0)/G_PI)
 
 #define FOV_DIST   2000.0
 #define MPPX(dist) (4*dist/FOV_DIST)