[GRASS-SVN] r63835 - in grass/trunk: display/d.geodesic display/d.rhumbline general/g.setproj

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-29 10:47:26 -0800 (Mon, 29 Dec 2014)
New Revision: 63835

Modified:
   grass/trunk/display/d.geodesic/main.c
   grass/trunk/display/d.rhumbline/main.c
   grass/trunk/general/g.setproj/main.c
Log:
update r63834


Modified: grass/trunk/display/d.geodesic/main.c
===================================================================
--- grass/trunk/display/d.geodesic/main.c	2014-12-29 18:45:36 UTC (rev 63834)
+++ grass/trunk/display/d.geodesic/main.c	2014-12-29 18:47:26 UTC (rev 63835)
@@ -76,7 +76,7 @@
 
     if (G_projection() != PROJECTION_LL)
 	G_fatal_error(_("Location is not %s"),
-		      G__projection_name(PROJECTION_LL));
+		      G_projection_name(PROJECTION_LL));
 
     /* get conversion factor and unit name */
     unit_id = G_units(parm.units->answer);

Modified: grass/trunk/display/d.rhumbline/main.c
===================================================================
--- grass/trunk/display/d.rhumbline/main.c	2014-12-29 18:45:36 UTC (rev 63834)
+++ grass/trunk/display/d.rhumbline/main.c	2014-12-29 18:47:26 UTC (rev 63835)
@@ -73,7 +73,7 @@
 
     if (G_projection() != PROJECTION_LL)
 	G_fatal_error(_("Location is not %s"),
-		      G__projection_name(PROJECTION_LL));
+		      G_projection_name(PROJECTION_LL));
 
 #ifdef CAN_DO_DISTANCES
     /* get conversion factor and unit name */

Modified: grass/trunk/general/g.setproj/main.c
===================================================================
--- grass/trunk/general/g.setproj/main.c	2014-12-29 18:45:36 UTC (rev 63834)
+++ grass/trunk/general/g.setproj/main.c	2014-12-29 18:47:26 UTC (rev 63835)
@@ -161,19 +161,19 @@
 	}
     case PROJECTION_UTM:
 	if (!exist) {
-	    sprintf(proj_name, "%s", G__projection_name(PROJECTION_UTM));
+	    sprintf(proj_name, "%s", G_projection_name(PROJECTION_UTM));
 	    sprintf(proj_out, "utm");
 	    break;
 	}
     case PROJECTION_SP:
 	if (!exist) {
-	    sprintf(proj_name, "%s", G__projection_name(PROJECTION_SP));
+	    sprintf(proj_name, "%s", G_projection_name(PROJECTION_SP));
 	    sprintf(proj_out, "stp");
 	    break;
 	}
     case PROJECTION_LL:
 	if (!exist) {
-	    sprintf(proj_name, "%s", G__projection_name(PROJECTION_LL));
+	    sprintf(proj_name, "%s", G_projection_name(PROJECTION_LL));
 	    sprintf(proj_out, "ll");
 	    break;
 	}