[GRASS-SVN] r32940 - in grass/branches/develbranch_6: include raster/r.what.color

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-08-20 16:53:40 -0400 (Wed, 20 Aug 2008)
New Revision: 32940

Modified:
   grass/branches/develbranch_6/include/gisdefs.h
   grass/branches/develbranch_6/raster/r.what.color/main.c
Log:
glynn: Remove redundant G_raster_map_type2() (merge from trunk, r32715)

Modified: grass/branches/develbranch_6/include/gisdefs.h
===================================================================
--- grass/branches/develbranch_6/include/gisdefs.h	2008-08-20 20:50:58 UTC (rev 32939)
+++ grass/branches/develbranch_6/include/gisdefs.h	2008-08-20 20:53:40 UTC (rev 32940)
@@ -899,7 +899,6 @@
 int G_set_fp_type(RASTER_MAP_TYPE);
 int G_raster_map_is_fp(const char *, const char *);
 RASTER_MAP_TYPE G_raster_map_type(const char *, const char *);
-RASTER_MAP_TYPE G_raster_map_type2(const char *, const char *);
 RASTER_MAP_TYPE G__check_fp_type(const char *, const char *);
 RASTER_MAP_TYPE G_get_raster_map_type(int);
 int G_open_raster_new(const char *, RASTER_MAP_TYPE);

Modified: grass/branches/develbranch_6/raster/r.what.color/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.what.color/main.c	2008-08-20 20:50:58 UTC (rev 32939)
+++ grass/branches/develbranch_6/raster/r.what.color/main.c	2008-08-20 20:53:40 UTC (rev 32940)
@@ -126,7 +126,7 @@
     if (!mapset)
 	G_fatal_error("Raster map <%s> not found", name);
 
-    type = G_raster_map_type2(name, mapset);
+    type = G_raster_map_type(name, mapset);
     if (type < 0)
 	G_fatal_error("Unable to determine type of input map %s", name);