[GRASS-SVN] r34204 - grass/branches/develbranch_6/raster/r.coin

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-11-09 11:35:14 -0500 (Sun, 09 Nov 2008)
New Revision: 34204

Modified:
   grass/branches/develbranch_6/raster/r.coin/coin.h
   grass/branches/develbranch_6/raster/r.coin/inter.c
   grass/branches/develbranch_6/raster/r.coin/main.c
Log:
fixed backport

Modified: grass/branches/develbranch_6/raster/r.coin/coin.h
===================================================================
--- grass/branches/develbranch_6/raster/r.coin/coin.h	2008-11-09 16:29:52 UTC (rev 34203)
+++ grass/branches/develbranch_6/raster/r.coin/coin.h	2008-11-09 16:35:14 UTC (rev 34204)
@@ -42,6 +42,7 @@
 extern const char *statname;
 extern FILE *dumpfile;
 
+extern const char *mapset1, *mapset2;
 extern const char *map1name, *map2name;
 extern int ncat1, ncat2;
 

Modified: grass/branches/develbranch_6/raster/r.coin/inter.c
===================================================================
--- grass/branches/develbranch_6/raster/r.coin/inter.c	2008-11-09 16:29:52 UTC (rev 34203)
+++ grass/branches/develbranch_6/raster/r.coin/inter.c	2008-11-09 16:35:14 UTC (rev 34204)
@@ -21,7 +21,6 @@
 #include <grass/spawn.h>
 #include <grass/glocale.h>
 
-
 int interactive_version(void)
 {
     int cols;

Modified: grass/branches/develbranch_6/raster/r.coin/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.coin/main.c	2008-11-09 16:29:52 UTC (rev 34203)
+++ grass/branches/develbranch_6/raster/r.coin/main.c	2008-11-09 16:35:14 UTC (rev 34204)
@@ -37,6 +37,7 @@
 const char *statname;
 FILE *dumpfile;
 
+const char *mapset1, *mapset2;
 const char *map1name, *map2name;
 int ncat1, ncat2;
 
@@ -121,9 +122,10 @@
     map1name = parm.map1->answer;
     map2name = parm.map2->answer;
 
-    if (!G_find_cell2(map1name, ""))
+    mapset1 = G_find_cell2(map1name, "");
+    if (!mapset1)
 	G_fatal_error(_("Raster map <%s> not found"), map1name);
-    if (!G_find_cell2(map2name, ""))
+    mapset2 = G_find_cell2(map2name, "");
 	G_fatal_error(_("Raster map <%s> not found"), map2name);
 
     make_coin();