[GRASS-SVN] r61368 - in grass/branches/releasebranch_7_0: . raster/r.reclass

[svn_grass at osgeo.org]

Author: neteler
Date: 2014-07-23 04:45:37 -0700 (Wed, 23 Jul 2014)
New Revision: 61368

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/raster/r.reclass/reclass.c
Log:
r.reclass: Delete fp raster maps only (trunk, r61165)


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:59505,59646,60219,60278,60610,60807,60835,60936-60937,61159-61160,61275,61288,61290,61292,61294,61301
   + /grass/trunk:59505,59646,60219,60278,60610,60807,60835,60936-60937,61159-61160,61165,61275,61288,61290,61292,61294,61301

Modified: grass/branches/releasebranch_7_0/raster/r.reclass/reclass.c
===================================================================
--- grass/branches/releasebranch_7_0/raster/r.reclass/reclass.c	2014-07-23 11:44:03 UTC (rev 61367)
+++ grass/branches/releasebranch_7_0/raster/r.reclass/reclass.c	2014-07-23 11:45:37 UTC (rev 61368)
@@ -227,15 +227,12 @@
 	_reclass(rules, cats, &new);
     }
 
-    if (G_find_file2("cell", new_name, G_mapset())) {
-	G_suppress_warnings(1);
-
+    if (G_find_file2("cell", new_name, G_mapset()) &&
+	Rast_map_type(new_name, G_mapset()) != CELL_TYPE) {
 	M_read_list(FALSE, NULL);
         if (M_do_remove(M_get_element("rast"), new_name) == 1)
 	    G_fatal_error(_("Cannot overwrite existing raster map <%s>"),
 			  new_name);
-
-	G_suppress_warnings(0);
     }
 
     if (Rast_put_reclass(new_name, &new) < 0)