[GRASS-SVN] r64541 - grass/trunk/raster/r.ros

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Feb 10 17:46:45 PST 2015


Author: annakrat
Date: 2015-02-10 17:46:45 -0800 (Tue, 10 Feb 2015)
New Revision: 64541

Modified:
   grass/trunk/raster/r.ros/main.c
Log:
r.ros: remove unnecessary checks which caused crash when using spotting

Modified: grass/trunk/raster/r.ros/main.c
===================================================================
--- grass/trunk/raster/r.ros/main.c	2015-02-10 22:24:08 UTC (rev 64540)
+++ grass/trunk/raster/r.ros/main.c	2015-02-11 01:46:45 UTC (rev 64541)
@@ -449,27 +449,9 @@
     name_max = parm.max->answer;
     name_maxdir = parm.maxdir->answer;
 
-    /*check if the output layer names EXIST */
-    if (G_check_overwrite(argc, argv) == 0) {
-	if (G_find_raster2(name_base, G_mapset()))
-	    G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
-			  name_base, G_mapset());
-	
-	if (G_find_raster2(name_max, G_mapset()))
-	    G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
-			  name_max, G_mapset());
-	
-	if (G_find_raster2(name_maxdir, G_mapset()))
-	    G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
-			  name_maxdir, G_mapset());
-	
-	/*assign a name to output SPOTTING distance layer */
-	if (spotting) {
-	    name_spotdist = parm.spotdist->answer;
-	    if (G_find_raster2(name_spotdist, G_mapset()))
-		G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
-			      name_spotdist, G_mapset());
-	}
+    /*assign a name to output SPOTTING distance layer */
+    if (spotting) {
+        name_spotdist = parm.spotdist->answer;
     }
 
     /*  Get database window parameters  */



More information about the grass-commit mailing list