[GRASS-SVN] r63834 - in grass/trunk: include/defs lib/gis lib/raster lib/vector/Vlib

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-12-29 10:45:36 -0800 (Mon, 29 Dec 2014)
New Revision: 63834

Modified:
   grass/trunk/include/defs/gis.h
   grass/trunk/lib/gis/proj2.c
   grass/trunk/lib/gis/proj3.c
   grass/trunk/lib/raster/open.c
   grass/trunk/lib/vector/Vlib/header.c
Log:
-int G__projection_units(int);
-const char *G__projection_name(int);
+int G_projection_units(int);
+const char *G_projection_name(int);

libgis: G__projection_units() -> G_projection_units()
        G__projection_name() -> G_projection_name()


Modified: grass/trunk/include/defs/gis.h
===================================================================
--- grass/trunk/include/defs/gis.h	2014-12-29 18:17:37 UTC (rev 63833)
+++ grass/trunk/include/defs/gis.h	2014-12-29 18:45:36 UTC (rev 63834)
@@ -575,8 +575,8 @@
 int G_projection(void);
 
 /* proj2.c */
-int G__projection_units(int);
-const char *G__projection_name(int);
+int G_projection_units(int);
+const char *G_projection_name(int);
 
 /* proj3.c */
 const char *G_database_unit_name(int);

Modified: grass/trunk/lib/gis/proj2.c
===================================================================
--- grass/trunk/lib/gis/proj2.c	2014-12-29 18:17:37 UTC (rev 63833)
+++ grass/trunk/lib/gis/proj2.c	2014-12-29 18:45:36 UTC (rev 63834)
@@ -29,7 +29,7 @@
   \return units code (see gis.h)
   \return U_UNDEFINED if not defined
 */
-int G__projection_units(int n)
+int G_projection_units(int n)
 {
     switch (n) {
     case PROJECTION_XY:
@@ -52,7 +52,7 @@
   \return projection name
   \return NULL on error
 */
-const char *G__projection_name(int n)
+const char *G_projection_name(int n)
 {
     switch (n) {
     case PROJECTION_XY:

Modified: grass/trunk/lib/gis/proj3.c
===================================================================
--- grass/trunk/lib/gis/proj3.c	2014-12-29 18:17:37 UTC (rev 63833)
+++ grass/trunk/lib/gis/proj3.c	2014-12-29 18:45:36 UTC (rev 63834)
@@ -52,7 +52,7 @@
     int units;
     const char *name;
     
-    units = G__projection_units(G_projection());
+    units = G_projection_units(G_projection());
     
     if (units == U_UNDEFINED) {
 	name = lookup_units(plural ? "units" : "unit");
@@ -102,7 +102,7 @@
     case PROJECTION_XY:
     case PROJECTION_UTM:
     case PROJECTION_LL:
-	return G__projection_name(n);
+	return G_projection_name(n);
     }
 
     name = lookup_proj("name");

Modified: grass/trunk/lib/raster/open.c
===================================================================
--- grass/trunk/lib/raster/open.c	2014-12-29 18:17:37 UTC (rev 63833)
+++ grass/trunk/lib/raster/open.c	2014-12-29 18:45:36 UTC (rev 63834)
@@ -219,8 +219,8 @@
 	G_fatal_error(_("Raster map <%s> is in different projection than current region. "
 			"Found <%s>, should be <%s>."),
 		      G_fully_qualified_name(name, mapset),
-		      G__projection_name(cellhd.proj),
-		      G__projection_name(R__.rd_window.proj));
+		      G_projection_name(cellhd.proj),
+		      G_projection_name(R__.rd_window.proj));
 
     if (cellhd.zone != R__.rd_window.zone)
 	G_fatal_error(_("Raster map <%s> is in different zone (%d) than current region (%d)"),

Modified: grass/trunk/lib/vector/Vlib/header.c
===================================================================
--- grass/trunk/lib/vector/Vlib/header.c	2014-12-29 18:17:37 UTC (rev 63833)
+++ grass/trunk/lib/vector/Vlib/header.c	2014-12-29 18:45:36 UTC (rev 63834)
@@ -539,7 +539,7 @@
     case PROJECTION_XY:
     case PROJECTION_UTM:
     case PROJECTION_LL:
-	return G__projection_name(n);
+	return G_projection_name(n);
     case PROJECTION_OTHER:
 	/* this won't protect against differing "other" projections, so
 	   better to just include P_OTHER in the above list so we return the