[GRASS-SVN] r38612 - in grass/trunk: display/d.colors
display/d.nviz display/d.what.rast doc/raster/r.example
general/g.region gui/wxpython/nviz imagery/i.atcorr
imagery/i.class imagery/i.cluster
imagery/i.evapo.time_integration imagery/i.gensig
imagery/i.gensigset imagery/i.group imagery/i.smap include
lib/gis lib/gpde lib/manage lib/ogsf lib/raster
lib/rst/interp_float raster/r.buffer raster/r.category
raster/r.coin raster/r.colors raster/r.compress raster/r.cost
raster/r.cross raster/r.distance raster/r.fill.dir
raster/r.flow raster/r.horizon raster/r.in.gdal raster/r.info
raster/r.kappa raster/r.le/r.le.patch raster/r.le/r.le.pixel
raster/r.los raster/r.mapcalc raster/r.null raster/r.out.gdal
raster/r.proj raster/r.reclass raster/r.report raster/r.ros
raster/r.spread raster/r.spreadpath raster/r.sun
raster/r.support raster/r.surf.contour raster/r.terraflow
raster/r.topmodel raster/r.watershed/shed raster/simwe/simlib
raster3d/r3.cross.rast raster3d/r3.out.vtk
raster3d/r3.to.rast swig/perl/R_slope_aspect/r_slope_aspect
vector/lidar/v.surf.bspline vector/v.vol.rst visualization/nviz2/cmd
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Aug 4 02:44:27 EDT 2009
Author: martinl
Date: 2009-08-04 02:44:24 -0400 (Tue, 04 Aug 2009)
New Revision: 38612
Modified:
grass/trunk/display/d.colors/main.c
grass/trunk/display/d.nviz/main.c
grass/trunk/display/d.what.rast/opencell.c
grass/trunk/doc/raster/r.example/main.c
grass/trunk/general/g.region/main.c
grass/trunk/gui/wxpython/nviz/load.cpp
grass/trunk/imagery/i.atcorr/main.cpp
grass/trunk/imagery/i.class/main.c
grass/trunk/imagery/i.cluster/open_files.c
grass/trunk/imagery/i.evapo.time_integration/main.c
grass/trunk/imagery/i.gensig/labels.c
grass/trunk/imagery/i.gensig/openfiles.c
grass/trunk/imagery/i.gensig/parse.c
grass/trunk/imagery/i.gensigset/labels.c
grass/trunk/imagery/i.gensigset/openfiles.c
grass/trunk/imagery/i.gensigset/parse.c
grass/trunk/imagery/i.group/main.c
grass/trunk/imagery/i.smap/opencell.c
grass/trunk/include/gisdefs.h
grass/trunk/lib/gis/find_cell.c
grass/trunk/lib/gis/legal_name.c
grass/trunk/lib/gpde/N_arrays_io.c
grass/trunk/lib/manage/do_remove.c
grass/trunk/lib/manage/do_rename.c
grass/trunk/lib/ogsf/GS2.c
grass/trunk/lib/ogsf/Gp3.c
grass/trunk/lib/ogsf/Gs3.c
grass/trunk/lib/ogsf/gsd_legend.c
grass/trunk/lib/raster/auto_mask.c
grass/trunk/lib/raster/color_read.c
grass/trunk/lib/raster/gdal.c
grass/trunk/lib/raster/get_cellhd.c
grass/trunk/lib/raster/mask_info.c
grass/trunk/lib/raster/opencell.c
grass/trunk/lib/raster/rasterlib.dox
grass/trunk/lib/rst/interp_float/input2d.c
grass/trunk/raster/r.buffer/main.c
grass/trunk/raster/r.category/main.c
grass/trunk/raster/r.coin/main.c
grass/trunk/raster/r.colors/main.c
grass/trunk/raster/r.compress/main.c
grass/trunk/raster/r.cost/main.c
grass/trunk/raster/r.cross/main.c
grass/trunk/raster/r.distance/distance.c
grass/trunk/raster/r.distance/parse.c
grass/trunk/raster/r.fill.dir/main.c
grass/trunk/raster/r.flow/io.c
grass/trunk/raster/r.horizon/main.c
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.info/main.c
grass/trunk/raster/r.kappa/main.c
grass/trunk/raster/r.kappa/mask.c
grass/trunk/raster/r.kappa/stats.c
grass/trunk/raster/r.le/r.le.patch/driver.c
grass/trunk/raster/r.le/r.le.pixel/driver.c
grass/trunk/raster/r.los/main.c
grass/trunk/raster/r.mapcalc/map.c
grass/trunk/raster/r.null/main.c
grass/trunk/raster/r.out.gdal/main.c
grass/trunk/raster/r.proj/main.c
grass/trunk/raster/r.reclass/main.c
grass/trunk/raster/r.report/maskinfo.c
grass/trunk/raster/r.report/parse.c
grass/trunk/raster/r.ros/main.c
grass/trunk/raster/r.spread/main.c
grass/trunk/raster/r.spreadpath/main.c
grass/trunk/raster/r.sun/main.c
grass/trunk/raster/r.support/main.c
grass/trunk/raster/r.surf.contour/main.c
grass/trunk/raster/r.terraflow/grass2str.h
grass/trunk/raster/r.terraflow/main.cc
grass/trunk/raster/r.topmodel/check_ready.c
grass/trunk/raster/r.watershed/shed/read.c
grass/trunk/raster/r.watershed/shed/valid.c
grass/trunk/raster/simwe/simlib/input.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.out.vtk/main.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
grass/trunk/vector/lidar/v.surf.bspline/main.c
grass/trunk/vector/v.vol.rst/main.c
grass/trunk/vector/v.vol.rst/user1.c
grass/trunk/visualization/nviz2/cmd/surface.c
Log:
gislib: G_find_cell renamed to G_find_raster
Modified: grass/trunk/display/d.colors/main.c
===================================================================
--- grass/trunk/display/d.colors/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/display/d.colors/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -60,7 +60,7 @@
/* Make sure map is available */
if (map->answer == NULL)
exit(0);
- mapset = G_find_cell2(map->answer, "");
+ mapset = G_find_raster2(map->answer, "");
if (mapset == NULL) {
char msg[256];
Modified: grass/trunk/display/d.nviz/main.c
===================================================================
--- grass/trunk/display/d.nviz/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/display/d.nviz/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -176,7 +176,7 @@
name = parm.opt1->answer;
/* Open Raster File */
- if (NULL == (mapset = G_find_cell2(name, "")))
+ if (NULL == (mapset = G_find_raster2(name, "")))
G_fatal_error(_("Raster map <%s> not found"), name);
if (0 > (fd = Rast_open_old(name, mapset)))
G_fatal_error(_("Unable to open raster map <%s>"), name);
Modified: grass/trunk/display/d.what.rast/opencell.c
===================================================================
--- grass/trunk/display/d.what.rast/opencell.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/display/d.what.rast/opencell.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -8,7 +8,7 @@
int fd;
strcpy(name, fullname);
- m = G_find_cell2(name, "");
+ m = G_find_raster2(name, "");
if (m == NULL) {
G_warning(_("Raster map <%s> not found"), name);
return -1;
Modified: grass/trunk/doc/raster/r.example/main.c
===================================================================
--- grass/trunk/doc/raster/r.example/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/doc/raster/r.example/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -100,7 +100,7 @@
/* returns NULL if the map was not found in any mapset,
* mapset name otherwise */
- mapset = (char *) G_find_cell2(name, "");
+ mapset = (char *) G_find_raster2(name, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), name);
Modified: grass/trunk/general/g.region/main.c
===================================================================
--- grass/trunk/general/g.region/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/general/g.region/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -450,7 +450,7 @@
char rast_name[GNAME_MAX];
strcpy(rast_name, *rast_ptr);
- mapset = G_find_cell2(rast_name, "");
+ mapset = G_find_raster2(rast_name, "");
if (!mapset)
G_fatal_error(_("Raster map <%s> not found"), rast_name);
if (Rast_get_cellhd(rast_name, mapset, &temp_window) < 0)
@@ -776,7 +776,7 @@
/* zoom= */
if ((name = parm.zoom->answer)) {
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (!mapset)
G_fatal_error(_("Raster map <%s> not found"), name);
zoom(&window, name, mapset);
@@ -784,7 +784,7 @@
/* align= */
if ((name = parm.align->answer)) {
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (!mapset)
G_fatal_error(_("Raster map <%s> not found"), name);
if (Rast_get_cellhd(name, mapset, &temp_window) < 0)
Modified: grass/trunk/gui/wxpython/nviz/load.cpp
===================================================================
--- grass/trunk/gui/wxpython/nviz/load.cpp 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/gui/wxpython/nviz/load.cpp 2009-08-04 06:44:24 UTC (rev 38612)
@@ -34,7 +34,7 @@
const char *mapset;
int id;
- mapset = G_find_cell2 (name, "");
+ mapset = G_find_raster2 (name, "");
if (mapset == NULL) {
G_warning(_("Raster map <%s> not found"),
name);
@@ -47,7 +47,7 @@
data);
if (color_name) { /* check for color map */
- mapset = G_find_cell2 (color_name, "");
+ mapset = G_find_raster2 (color_name, "");
if (mapset == NULL) {
G_warning(_("Raster map <%s> not found"),
color_name);
Modified: grass/trunk/imagery/i.atcorr/main.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/main.cpp 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.atcorr/main.cpp 2009-08-04 06:44:24 UTC (rev 38612)
@@ -588,7 +588,7 @@
exit (EXIT_FAILURE);
/* open input raster */
- if ( (iimg_mapset = G_find_cell2 ( opts.iimg->answer, "") ) == NULL )
+ if ( (iimg_mapset = G_find_raster2 ( opts.iimg->answer, "") ) == NULL )
G_fatal_error ( _("Raster map <%s> not found"), opts.iimg->answer);
if((iimg_fd = Rast_open_old(opts.iimg->answer, iimg_mapset)) < 0)
G_fatal_error (_("Unable to open raster map <%s>"),
@@ -597,7 +597,7 @@
adjust_region(opts.iimg->answer, iimg_mapset);
if(opts.ialt->answer) {
- if ( (ialt_mapset = G_find_cell2 ( opts.ialt->answer, "") ) == NULL )
+ if ( (ialt_mapset = G_find_raster2 ( opts.ialt->answer, "") ) == NULL )
G_fatal_error ( _("Raster map <%s> not found"), opts.ialt->answer);
if((ialt_fd = Rast_open_old(opts.ialt->answer, ialt_mapset)) < 0)
G_fatal_error (_("Unable to open raster map <%s>"),
@@ -605,7 +605,7 @@
}
if(opts.ivis->answer) {
- if ( (iviz_mapset = G_find_cell2 ( opts.ivis->answer, "") ) == NULL )
+ if ( (iviz_mapset = G_find_raster2 ( opts.ivis->answer, "") ) == NULL )
G_fatal_error ( _("Raster map <%s> not found"), opts.ivis->answer);
if((ivis_fd = Rast_open_old(opts.ivis->answer, iviz_mapset)) < 0)
G_fatal_error (_("Unable to open raster map <%s>"),
Modified: grass/trunk/imagery/i.class/main.c
===================================================================
--- grass/trunk/imagery/i.class/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.class/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -160,7 +160,7 @@
/* put out a title */
display_title(VIEW_MAP1);
- mapset = G_find_cell(bg_map->answer, "");
+ mapset = G_find_raster(bg_map->answer, "");
if (Rast_get_cellhd(bg_map->answer, mapset, &cellhd) != 0)
G_fatal_error(_("Raster map <%s> not found"), bg_map->answer);
@@ -246,7 +246,7 @@
any = 0;
for (n = 0; n < Refer.nfiles; n++) {
- if (G_find_cell(Refer.file[n].name, Refer.file[n].mapset) == NULL) {
+ if (G_find_raster(Refer.file[n].name, Refer.file[n].mapset) == NULL) {
if (!any)
G_warning(_("** The following raster maps in subgroup "
"[%s] do not exist:"), img_subgroup);
Modified: grass/trunk/imagery/i.cluster/open_files.c
===================================================================
--- grass/trunk/imagery/i.cluster/open_files.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.cluster/open_files.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -29,7 +29,7 @@
for (n = 0; n < ref.nfiles; n++) {
name = ref.file[n].name;
mapset = ref.file[n].mapset;
- if (G_find_cell(name, mapset) == NULL) {
+ if (G_find_raster(name, mapset) == NULL) {
missing = 1;
G_warning(_("Raster map <%s> do not exists in subgroup <%s>"),
G_fully_qualified_name(name, mapset), subgroup);
Modified: grass/trunk/imagery/i.evapo.time_integration/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.evapo.time_integration/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -158,7 +158,7 @@
MAXFILES);
name = *ptr;
/* find map in mapset */
- mapset = (char *) G_find_cell2(name, "");
+ mapset = (char *) G_find_raster2(name, "");
if (mapset == NULL) {
G_fatal_error(_("Raster map <%s> not found"), name);
ok = 0;
@@ -191,7 +191,7 @@
MAXFILES);
name1 = *ptr1;
/* find map in mapset */
- mapset = (char *) G_find_cell2(name1, "");
+ mapset = (char *) G_find_raster2(name1, "");
if (mapset == NULL) {
G_fatal_error(_("Raster map <%s> not found"), name1);
ok = 0;
@@ -230,7 +230,7 @@
MAXFILES);
name2 = *ptr2;
/* find map in mapset */
- mapset = (char *) G_find_cell2(name2, "");
+ mapset = (char *) G_find_raster2(name2, "");
if (mapset == NULL) {
G_fatal_error(_("Raster map <%s> not found"), name2);
ok = 0;
Modified: grass/trunk/imagery/i.gensig/labels.c
===================================================================
--- grass/trunk/imagery/i.gensig/labels.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.gensig/labels.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -9,7 +9,7 @@
const char *map;
map = parms->training_map;
- mapset = G_find_cell2(map, "");
+ mapset = G_find_raster2(map, "");
if (Rast_read_cats(map, mapset, &files->training_labels) < 0)
Rast_init_cats("", &files->training_labels);
}
Modified: grass/trunk/imagery/i.gensig/openfiles.c
===================================================================
--- grass/trunk/imagery/i.gensig/openfiles.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.gensig/openfiles.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -29,7 +29,7 @@
files->band_cell = (DCELL **) G_calloc(Ref.nfiles, sizeof(DCELL *));
/* open training map for reading */
- mapset = G_find_cell2(parms->training_map, "");
+ mapset = G_find_raster2(parms->training_map, "");
files->train_fd = Rast_open_old(parms->training_map, mapset);
if (files->train_fd < 0)
G_fatal_error(_("Unable to open training map <%s>"),
Modified: grass/trunk/imagery/i.gensig/parse.c
===================================================================
--- grass/trunk/imagery/i.gensig/parse.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.gensig/parse.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -32,7 +32,7 @@
parms->sigfile = sigfile->answer;
/* check all the inputs */
- if (G_find_cell(parms->training_map, "") == NULL)
+ if (G_find_raster(parms->training_map, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), parms->training_map);
if (!I_find_group(parms->group))
Modified: grass/trunk/imagery/i.gensigset/labels.c
===================================================================
--- grass/trunk/imagery/i.gensigset/labels.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.gensigset/labels.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -10,7 +10,7 @@
const char *map;
map = parms->training_map;
- mapset = G_find_cell2(map, "");
+ mapset = G_find_raster2(map, "");
if (Rast_read_cats(map, mapset, &files->training_labels) < 0)
Rast_init_cats("", &files->training_labels);
}
Modified: grass/trunk/imagery/i.gensigset/openfiles.c
===================================================================
--- grass/trunk/imagery/i.gensigset/openfiles.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.gensigset/openfiles.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -29,7 +29,7 @@
files->band_cell = (DCELL **) G_calloc(Ref.nfiles, sizeof(DCELL *));
/* open training map for reading */
- mapset = G_find_cell2(parms->training_map, "");
+ mapset = G_find_raster2(parms->training_map, "");
files->train_fd = Rast_open_old(parms->training_map, mapset);
if (files->train_fd < 0)
G_fatal_error(_("Unable to open training map <%s>"),
Modified: grass/trunk/imagery/i.gensigset/parse.c
===================================================================
--- grass/trunk/imagery/i.gensigset/parse.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.gensigset/parse.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -38,7 +38,7 @@
parms->sigfile = sigfile->answer;
/* check all the inputs */
- if (G_find_cell(parms->training_map, "") == NULL) {
+ if (G_find_raster(parms->training_map, "") == NULL) {
G_fatal_error(_("Raster map <%s> not found"), parms->training_map);
}
if (!I_find_group(parms->group)) {
Modified: grass/trunk/imagery/i.group/main.c
===================================================================
--- grass/trunk/imagery/i.group/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.group/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -201,7 +201,7 @@
for (m = 0; m < k; m++) {
skip = 0;
- if ((mapset = G_find_cell(rasters[m], "")) == NULL)
+ if ((mapset = G_find_raster(rasters[m], "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), rasters[m]);
G_message(_("Adding raster map <%s> to group"),
@@ -240,7 +240,7 @@
for (m = 0; m < k; m++) {
skip = 0;
- if ((mapset = G_find_cell(rasters[m], "")) == NULL)
+ if ((mapset = G_find_raster(rasters[m], "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"),
G_fully_qualified_name(rasters[m], mapset));
Modified: grass/trunk/imagery/i.smap/opencell.c
===================================================================
--- grass/trunk/imagery/i.smap/opencell.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/imagery/i.smap/opencell.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -9,7 +9,7 @@
int fd;
if (mapset == NULL)
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
fd = Rast_open_old(name, mapset);
if (fd >= 0)
return fd;
Modified: grass/trunk/include/gisdefs.h
===================================================================
--- grass/trunk/include/gisdefs.h 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/include/gisdefs.h 2009-08-04 06:44:24 UTC (rev 38612)
@@ -212,8 +212,8 @@
const char *);
/* find_cell.c */
-const char *G_find_cell(char *, const char *);
-const char *G_find_cell2(const char *, const char *);
+const char *G_find_raster(char *, const char *);
+const char *G_find_raster2(const char *, const char *);
/* find_file.c */
const char *G_find_file(const char *, char *, const char *);
Modified: grass/trunk/lib/gis/find_cell.c
===================================================================
--- grass/trunk/lib/gis/find_cell.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/gis/find_cell.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -27,14 +27,14 @@
* returned. If not found, the NULL pointer is returned.
*
* Note: If the user specifies a fully qualified raster map which
- * exists, then G_find_cell() modifies <i>name</i> by removing
+ * exists, then G_find_raster() modifies <i>name</i> by removing
* the "@<i>mapset</i>".
*
* For example, to find a raster map anywhere in the database:
\code
char name[GNAME_MAX];
char *mapset;
- if ((mapset = G_find_cell(name,"")) == NULL)
+ if ((mapset = G_find_raster(name,"")) == NULL)
// not found
\endcode
*
@@ -42,7 +42,7 @@
*
\code
char name[GNAME_MAX];
- if (G_find_cell(name, G_mapset()) == NULL)
+ if (G_find_raster(name, G_mapset()) == NULL)
// not found
\endcode
*
@@ -52,7 +52,7 @@
* \return mapset where raster map was found
* \return NULL if not found
*/
-const char *G_find_cell(char *name, const char *mapset)
+const char *G_find_raster(char *name, const char *mapset)
{
return G_find_file("cell", name, mapset);
}
@@ -60,7 +60,7 @@
/*!
* \brief Find a raster map (look but don't touch)
*
- * The same as G_find_cell() but doesn't remove the "@<i>mapset</i>"
+ * The same as G_find_raster() but doesn't remove the "@<i>mapset</i>"
* qualification from <i>name</i>, if present.
*
* Returns NULL if the map wasn't found, or the mapset the raster was
@@ -72,7 +72,7 @@
* \return mapset where raster map was found
* \return NULL if not found
*/
-const char *G_find_cell2(const char *name, const char *mapset)
+const char *G_find_raster2(const char *name, const char *mapset)
{
return G_find_file2("cell", name, mapset);
}
Modified: grass/trunk/lib/gis/legal_name.c
===================================================================
--- grass/trunk/lib/gis/legal_name.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/gis/legal_name.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -84,7 +84,7 @@
}
}
- mapset = G_find_cell2(input, "");
+ mapset = G_find_raster2(input, "");
if (mapset == NULL) {
if (error == GR_FATAL_EXIT) {
Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/gpde/N_arrays_io.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -53,7 +53,7 @@
struct Cell_head region;
N_array_2d *data = array;
- if (NULL == G_find_cell2(name, ""))
+ if (NULL == G_find_raster2(name, ""))
G_fatal_error(_("Raster map <%s> not found"), name);
/* Get the active region */
@@ -64,7 +64,7 @@
cols = region.cols;
/*open the raster map */
- map = Rast_open_old(name, G_find_cell2(name, ""));
+ map = Rast_open_old(name, G_find_raster2(name, ""));
if (map < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
Modified: grass/trunk/lib/manage/do_remove.c
===================================================================
--- grass/trunk/lib/manage/do_remove.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/manage/do_remove.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -49,7 +49,7 @@
}
else {
if (G_strcasecmp(list[n].alias, "rast") == 0) {
- if ((mapset = G_find_cell2(old, "")) == NULL)
+ if ((mapset = G_find_raster2(old, "")) == NULL)
G_warning(_("Raster map <%s> not found"), old);
}
Modified: grass/trunk/lib/manage/do_rename.c
===================================================================
--- grass/trunk/lib/manage/do_rename.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/manage/do_rename.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -49,7 +49,7 @@
}
else {
if (G_strcasecmp(list[n].alias, "rast") == 0) {
- if ((mapset = G_find_cell2(old, "")) == NULL)
+ if ((mapset = G_find_raster2(old, "")) == NULL)
G_warning(_("Raster map <%s> not found"), old);
}
Modified: grass/trunk/lib/ogsf/GS2.c
===================================================================
--- grass/trunk/lib/ogsf/GS2.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/ogsf/GS2.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -1623,7 +1623,7 @@
begin = hdata = 1;
/* Get MAPSET to ensure names are fully qualified */
- mapset = G_find_cell2(filename, "");
+ mapset = G_find_raster2(filename, "");
if (mapset == NULL) {
/* Check for valid filename */
G_warning("Raster map <%s> not found", filename);
Modified: grass/trunk/lib/ogsf/Gp3.c
===================================================================
--- grass/trunk/lib/ogsf/Gp3.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/ogsf/Gp3.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -50,7 +50,7 @@
/* TODO: handle error messages */
if (grassname) {
- col_map = G_find_cell2(grassname, "");
+ col_map = G_find_raster2(grassname, "");
if (!col_map) {
G_warning(_("Raster map <%s> not found"), grassname);
return 0;
Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/ogsf/Gs3.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -122,7 +122,7 @@
G_debug(3, "Gs_loadmap_as_float(): name=%s", map_name);
- map_set = G_find_cell2(map_name, "");
+ map_set = G_find_raster2(map_name, "");
if (!map_set) {
G_warning(_("Raster map <%s> not found"), map_name);
return 0;
@@ -197,7 +197,7 @@
G_debug(3, "Gs_loadmap_as_int");
- map_set = G_find_cell2(map_name, "");
+ map_set = G_find_raster2(map_name, "");
if (!map_set) {
G_warning(_("Raster map <%s> not found"), map_name);
return 0;
@@ -282,7 +282,7 @@
first = 0;
}
- mapset = G_find_cell2(filename, "");
+ mapset = G_find_raster2(filename, "");
if (!mapset) {
G_warning(_("Raster map <%s> not found"), filename);
return -1;
@@ -355,7 +355,7 @@
max_short -= 1;
- map_set = G_find_cell2(map_name, "");
+ map_set = G_find_raster2(map_name, "");
if (!map_set) {
G_warning(_("Raster map <%s> not found"), map_name);
return -1;
@@ -471,7 +471,7 @@
max_char -= 1;
- map_set = G_find_cell2(map_name, "");
+ map_set = G_find_raster2(map_name, "");
if (!map_set) {
G_warning(_("Raster map <%s> not found"), map_name);
return -1;
@@ -568,7 +568,7 @@
G_debug(3, "Gs_loadmap_as_bitmap");
- map_set = G_find_cell2(map_name, "");
+ map_set = G_find_raster2(map_name, "");
if (!map_set) {
G_warning(_("Raster map <%s> not found"), map_name);
return -1;
@@ -635,7 +635,7 @@
G_debug(3, "building color table");
- mapset = G_find_cell2(filename, "");
+ mapset = G_find_raster2(filename, "");
if (!mapset) {
G_warning(_("Raster map <%s> not found"), filename);
return 0;
@@ -692,7 +692,7 @@
unsigned char *r, *g, *b, *set;
int *cur, i, j;
- mapset = G_find_cell2(filename, "");
+ mapset = G_find_raster2(filename, "");
if (!mapset) {
G_warning(_("Raster map <%s> not found"), filename);
return;
@@ -762,7 +762,7 @@
int i, j, *icur;
FCELL *fcur;
- mapset = G_find_cell2(filename, "");
+ mapset = G_find_raster2(filename, "");
if (!mapset) {
G_warning(_("Raster map <%s> not found"), filename);
return;
@@ -832,7 +832,7 @@
RASTER_MAP_TYPE map_type;
int fd;
- if ((mapset = G_find_cell2(filename, "")) == NULL) {
+ if ((mapset = G_find_raster2(filename, "")) == NULL) {
G_warning(_("Raster map <%s> not found"), filename);
return 0;
}
Modified: grass/trunk/lib/ogsf/gsd_legend.c
===================================================================
--- grass/trunk/lib/ogsf/gsd_legend.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/ogsf/gsd_legend.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -234,7 +234,7 @@
if (flags[2])
do_invert = 1;
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (mapset == NULL) {
G_warning(_("Raster map <%s> not found"), name);
return (-1);
Modified: grass/trunk/lib/raster/auto_mask.c
===================================================================
--- grass/trunk/lib/raster/auto_mask.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/raster/auto_mask.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -49,7 +49,7 @@
/* if(R__.mask_fd > 0) G_free (R__.mask_buf); */
/* look for the existence of the MASK file */
- R__.auto_mask = (G_find_cell("MASK", G_mapset()) != 0);
+ R__.auto_mask = (G_find_raster("MASK", G_mapset()) != 0);
if (R__.auto_mask <= 0)
return 0;
Modified: grass/trunk/lib/raster/color_read.c
===================================================================
--- grass/trunk/lib/raster/color_read.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/raster/color_read.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -70,7 +70,7 @@
Rast_init_colors(colors);
strcpy(xname, name);
- mapset = G_find_cell(xname, mapset);
+ mapset = G_find_raster(xname, mapset);
name = xname;
if (fp)
Modified: grass/trunk/lib/raster/gdal.c
===================================================================
--- grass/trunk/lib/raster/gdal.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/raster/gdal.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -193,7 +193,7 @@
DCELL null_val;
int hflip, vflip;
- if (!G_find_cell2(name, mapset))
+ if (!G_find_raster2(name, mapset))
return NULL;
map_type = Rast_map_type(name, mapset);
Modified: grass/trunk/lib/raster/get_cellhd.c
===================================================================
--- grass/trunk/lib/raster/get_cellhd.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/raster/get_cellhd.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -73,7 +73,7 @@
sprintf(tail, _(" It is a reclass of raster map <%s@%s> "),
real_name, real_mapset);
tail = buf + strlen(buf);
- if (!G_find_cell(real_name, real_mapset))
+ if (!G_find_raster(real_name, real_mapset))
sprintf(tail, _("which is missing."));
else
sprintf(tail, _("whose header file can't be opened."));
Modified: grass/trunk/lib/raster/mask_info.c
===================================================================
--- grass/trunk/lib/raster/mask_info.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/raster/mask_info.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -60,7 +60,7 @@
strcpy(name, "MASK");
strcpy(mapset, G_mapset());
- if (!G_find_cell(name, mapset))
+ if (!G_find_raster(name, mapset))
return -1;
if (Rast_is_reclass(name, mapset, rname, rmapset) > 0) {
Modified: grass/trunk/lib/raster/opencell.c
===================================================================
--- grass/trunk/lib/raster/opencell.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/raster/opencell.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -175,7 +175,7 @@
name = xname;
mapset = xmapset;
- if (!G_find_cell2(name, mapset)) {
+ if (!G_find_raster2(name, mapset)) {
G_warning(_("Unable to find <%s@%s>"), name, mapset);
return -1;
}
@@ -191,7 +191,7 @@
case 1:
r_name = reclass.name;
r_mapset = reclass.mapset;
- if (G_find_cell2(r_name, r_mapset) == NULL) {
+ if (G_find_raster2(r_name, r_mapset) == NULL) {
G_warning(_("Unable to open raster map <%s@%s> since it is a reclass "
"of raster map <%s@%s> which does not exist"), name,
mapset, r_name, r_mapset);
@@ -758,7 +758,7 @@
char path[GPATH_MAX];
const char *xmapset;
- xmapset = G_find_cell2(name, mapset);
+ xmapset = G_find_raster2(name, mapset);
if (!xmapset) {
G_warning(_("Unable to find <%s@%s>"), name, mapset);
return -1;
@@ -790,7 +790,7 @@
char path[GPATH_MAX];
const char *xmapset;
- xmapset = G_find_cell2(name, mapset);
+ xmapset = G_find_raster2(name, mapset);
if (!xmapset) {
if (mapset && *mapset)
G_warning(_("Raster map <%s> not found in mapset <%s>"), name,
@@ -847,7 +847,7 @@
RASTER_MAP_TYPE map_type;
const char *xmapset;
- xmapset = G_find_cell2(name, mapset);
+ xmapset = G_find_raster2(name, mapset);
if (!xmapset) {
G_warning(_("Unable to find <%s@%s>"), name, mapset);
return -1;
Modified: grass/trunk/lib/raster/rasterlib.dox
===================================================================
--- grass/trunk/lib/raster/rasterlib.dox 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/raster/rasterlib.dox 2009-08-04 06:44:24 UTC (rev 38612)
@@ -38,12 +38,12 @@
The following routines search the database for raster map files:
- - G_find_cell()
+ - G_find_raster()
Looks for the raster file in the database. If found, the mapset where
the raster file lives is returned. If not found, the NULL pointer is
returned. If the user specifies a fully qualified raster map name which
-exists, then G_find_cell() modifies <i>name</i> by removing
+exists, then G_find_raster() modifies <i>name</i> by removing
the "@<I>mapset</I>".
For example, to find a raster map in all mapsets listed the mapset search
@@ -53,7 +53,7 @@
char name[GNAME_MAX];
char *mapset;
-if ((mapset = G_find_cell(name,"")) == NULL)
+if ((mapset = G_find_raster(name,"")) == NULL)
/* not found */
\endcode
@@ -62,7 +62,7 @@
\code
char name[GNAME_MAX];
-if (G_find_cell(name, G_mapset()) == NULL)
+if (G_find_raster(name, G_mapset()) == NULL)
/* not found */
\endcode
@@ -91,7 +91,7 @@
<b>Note:</b> It is not an error for raster map to already exist. New
raster maps are actually created as temporary files and moved into
the cell or fcell directory when closed. This allows an existing raster map
-to be read at the same time that it is being rewritten. G_find_cell()
+to be read at the same time that it is being rewritten. G_find_raster()
could be used to see if raster map already exists.
<b>Warning:</b> However, there is a subtle trap. The temporary file,
Modified: grass/trunk/lib/rst/interp_float/input2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/input2d.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/lib/rst/interp_float/input2d.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -44,7 +44,7 @@
bitmask = BM_create(params->nsizc, params->nsizr);
if (params->maskmap != NULL) {
- mapsetm = G_find_cell2(params->maskmap, "");
+ mapsetm = G_find_raster2(params->maskmap, "");
if (!mapsetm)
G_fatal_error(_("Mask raster map <%s> not found"),
params->maskmap);
Modified: grass/trunk/raster/r.buffer/main.c
===================================================================
--- grass/trunk/raster/r.buffer/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.buffer/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -107,7 +107,7 @@
ZEROFLAG = 0; /* default: use NULL for non-data cells */
ZEROFLAG = (flag2->answer);
- mapset = G_find_cell2(input, "");
+ mapset = G_find_raster2(input, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), input);
Modified: grass/trunk/raster/r.category/main.c
===================================================================
--- grass/trunk/raster/r.category/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.category/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -121,7 +121,7 @@
fs = parm.fs->answer[0];
}
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), name);
@@ -142,7 +142,7 @@
int fd;
const char *cmapset;
- cmapset = G_find_cell2(parm.raster->answer, "");
+ cmapset = G_find_raster2(parm.raster->answer, "");
if (cmapset == NULL)
G_fatal_error(_("Raster map <%s> not found"),
parm.raster->answer);
Modified: grass/trunk/raster/r.coin/main.c
===================================================================
--- grass/trunk/raster/r.coin/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.coin/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -122,9 +122,9 @@
map1name = parm.map1->answer;
map2name = parm.map2->answer;
- if (!G_find_cell2(map1name, ""))
+ if (!G_find_raster2(map1name, ""))
G_fatal_error(_("Raster map <%s> not found"), map1name);
- if (!G_find_cell2(map2name, ""))
+ if (!G_find_raster2(map2name, ""))
G_fatal_error(_("Raster map <%s> not found"), map2name);
make_coin();
Modified: grass/trunk/raster/r.colors/main.c
===================================================================
--- grass/trunk/raster/r.colors/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.colors/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -262,7 +262,7 @@
if (is_from_stdin)
rules = NULL;
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), name);
@@ -337,7 +337,7 @@
}
else {
/* use color from another map (cmap) */
- cmapset = G_find_cell2(cmap, "");
+ cmapset = G_find_raster2(cmap, "");
if (cmapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), cmap);
Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.compress/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -99,7 +99,7 @@
RASTER_MAP_TYPE map_type;
char rname[GNAME_MAX], rmapset[GMAPSET_MAX];
- if (G_find_cell(name, G_mapset()) == NULL) {
+ if (G_find_raster(name, G_mapset()) == NULL) {
G_warning(_("[%s] not found"), name);
return 1;
}
Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.cost/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -332,7 +332,7 @@
/* Check if cost layer exists in data base */
strcpy(cost_layer, opt2->answer);
- cost_mapset = G_find_cell2(cost_layer, "");
+ cost_mapset = G_find_raster2(cost_layer, "");
if (cost_mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), cost_layer);
@@ -340,7 +340,7 @@
if (dir == 1) {
strcpy(move_dir_layer, opt11->answer);
search_mapset = "";
- move_dir_mapset = G_find_cell2(move_dir_layer, search_mapset);
+ move_dir_mapset = G_find_raster2(move_dir_layer, search_mapset);
}
/* Find number of rows and columns in window */
Modified: grass/trunk/raster/r.cross/main.c
===================================================================
--- grass/trunk/raster/r.cross/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.cross/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -104,7 +104,7 @@
for (nfiles = 0; (name = parm.input->answers[nfiles]); nfiles++) {
if (nfiles >= NFILES)
G_fatal_error(_("More than %d files not allowed"), NFILES);
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (!mapset)
G_fatal_error(_("Raster map <%s> not found"), name);
names[nfiles] = name;
@@ -157,7 +157,7 @@
qsort(reclass, result + 1, sizeof(RECLASS), cmp);
table = (CELL *) G_calloc(result + 1, sizeof(CELL));
for (i = 0; i < nfiles; i++) {
- mapset = G_find_cell2(names[i], "");
+ mapset = G_find_raster2(names[i], "");
Rast_read_cats(names[i], mapset, &labels[i]);
}
Modified: grass/trunk/raster/r.distance/distance.c
===================================================================
--- grass/trunk/raster/r.distance/distance.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.distance/distance.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -88,12 +88,12 @@
void *cell1, *cell2;
/* NOTE: no need to controll, if the map exists. it should be checked in edge.c */
- mapset = G_find_cell2(name1, "");
+ mapset = G_find_raster2(name1, "");
maptype1 = Rast_map_type(name1, mapset);
mapd1 = Rast_open_old(name1, mapset);
inrast1 = Rast_allocate_buf(maptype1);
- mapset = G_find_cell2(name2, "");
+ mapset = G_find_raster2(name2, "");
maptype2 = Rast_map_type(name2, mapset);
mapd2 = Rast_open_old(name2, mapset);
inrast2 = Rast_allocate_buf(maptype2);
Modified: grass/trunk/raster/r.distance/parse.c
===================================================================
--- grass/trunk/raster/r.distance/parse.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.distance/parse.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -59,14 +59,14 @@
exit(EXIT_FAILURE);
name = parms->map1.name = maps->answers[0];
- mapset = parms->map1.mapset = G_find_cell2(name, "");
+ mapset = parms->map1.mapset = G_find_raster2(name, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), name);
parms->map1.fullname = G_fully_qualified_name(name, mapset);
name = parms->map2.name = maps->answers[1];
- mapset = parms->map2.mapset = G_find_cell2(name, "");
+ mapset = parms->map2.mapset = G_find_raster2(name, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), name);
Modified: grass/trunk/raster/r.fill.dir/main.c
===================================================================
--- grass/trunk/raster/r.fill.dir/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.fill.dir/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -169,7 +169,7 @@
G_warning("Direction map is D8 resolution, i.e. 45 degrees.");
/* get the name of the elevation map layer for filling */
- map_mapset = G_find_cell(map_name, "");
+ map_mapset = G_find_raster(map_name, "");
if (!map_mapset)
G_fatal_error(_("Raster map <%s> not found"), map_name);
Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.flow/io.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -58,7 +58,7 @@
static int open_existing_cell_file(char *fname, struct Cell_head *chd)
{
- const char *mapset = G_find_cell(fname, "");
+ const char *mapset = G_find_raster(fname, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), fname);
Modified: grass/trunk/raster/r.horizon/main.c
===================================================================
--- grass/trunk/raster/r.horizon/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.horizon/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -550,7 +550,7 @@
}
/*read Z raster */
- if ((mapset = G_find_cell2(elevin, "")) == NULL)
+ if ((mapset = G_find_raster2(elevin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), elevin);
fd1 = Rast_open_old(elevin, mapset);
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.in.gdal/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -212,7 +212,7 @@
G_fatal_error(_("Name for output raster map not specified"));
if (!parm.outloc->answer) { /* Check if the map exists */
- if (G_find_cell2(output, G_mapset())) {
+ if (G_find_raster2(output, G_mapset())) {
if (overwrite)
G_warning(_("Raster map <%s> already exists and will be overwritten"),
output);
Modified: grass/trunk/raster/r.info/main.c
===================================================================
--- grass/trunk/raster/r.info/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.info/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -116,7 +116,7 @@
exit(EXIT_FAILURE);
name = G_store(opt1->answer);
- if ((mapset = G_find_cell2(name, "")) == NULL)
+ if ((mapset = G_find_raster2(name, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), name);
head_ok = Rast_get_cellhd(name, "", &cellhd) >= 0;
Modified: grass/trunk/raster/r.kappa/main.c
===================================================================
--- grass/trunk/raster/r.kappa/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.kappa/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -139,7 +139,7 @@
int n;
strcpy(name, s);
- if ((mapset = G_find_cell2(name, "")) == NULL)
+ if ((mapset = G_find_raster2(name, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), s);
n = nlayers++;
Modified: grass/trunk/raster/r.kappa/mask.c
===================================================================
--- grass/trunk/raster/r.kappa/mask.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.kappa/mask.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -18,7 +18,7 @@
int first, next;
results = NULL;
- if (G_find_cell("MASK", G_mapset()) == NULL)
+ if (G_find_raster("MASK", G_mapset()) == NULL)
return "none";
if (Rast_get_reclass("MASK", G_mapset(), &reclass) <= 0) {
sprintf(text, "MASK in %s", G_mapset());
Modified: grass/trunk/raster/r.kappa/stats.c
===================================================================
--- grass/trunk/raster/r.kappa/stats.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.kappa/stats.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -25,12 +25,12 @@
char **tokens;
strcpy(mname, maps[0]);
- mmapset = G_find_cell2(mname, "");
+ mmapset = G_find_raster2(mname, "");
if (mmapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), maps[0]);
strcpy(rname, maps[1]);
- rmapset = G_find_cell2(rname, "");
+ rmapset = G_find_raster2(rname, "");
if (rmapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), maps[1]);
Modified: grass/trunk/raster/r.le/r.le.patch/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/driver.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.le/r.le.patch/driver.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -547,49 +547,49 @@
maps. All maps currently are double,
rather than floating point or int */
if (choice->att[1]) {
- if (G_find_cell("a1", G_mapset()) != NULL) {
+ if (G_find_raster("a1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a1,a1bak");
system(cmdbuf);
}
a1 = Rast_open_new("a1", DCELL_TYPE);
}
if (choice->att[2]) {
- if (G_find_cell("a2", G_mapset()) != NULL) {
+ if (G_find_raster("a2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a2,a2bak");
system(cmdbuf);
}
a2 = Rast_open_new("a2", DCELL_TYPE);
}
if (choice->att[3]) {
- if (G_find_cell("a3", G_mapset()) != NULL) {
+ if (G_find_raster("a3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a3,a3bak");
system(cmdbuf);
}
a3 = Rast_open_new("a3", DCELL_TYPE);
}
if (choice->att[4]) {
- if (G_find_cell("a4", G_mapset()) != NULL) {
+ if (G_find_raster("a4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a4,a4bak");
system(cmdbuf);
}
a4 = Rast_open_new("a4", DCELL_TYPE);
}
if (choice->att[5]) {
- if (G_find_cell("a5", G_mapset()) != NULL) {
+ if (G_find_raster("a5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a5,a5bak");
system(cmdbuf);
}
a5 = Rast_open_new("a5", DCELL_TYPE);
}
if (choice->att[6]) {
- if (G_find_cell("a6", G_mapset()) != NULL) {
+ if (G_find_raster("a6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a6,a6bak");
system(cmdbuf);
}
a6 = Rast_open_new("a6", DCELL_TYPE);
}
if (choice->att[7]) {
- if (G_find_cell("a7", G_mapset()) != NULL) {
+ if (G_find_raster("a7", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a7,a7bak");
system(cmdbuf);
}
@@ -597,7 +597,7 @@
}
if (choice->att[8]) {
- if (G_find_cell("a8", G_mapset()) != NULL) {
+ if (G_find_raster("a8", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a8,a8bak");
system(cmdbuf);
}
@@ -605,42 +605,42 @@
}
if (choice->size[1]) {
- if (G_find_cell("s1", G_mapset()) != NULL) {
+ if (G_find_raster("s1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s1,s1bak");
system(cmdbuf);
}
s1 = Rast_open_new("s1", DCELL_TYPE);
}
if (choice->size[2]) {
- if (G_find_cell("s2", G_mapset()) != NULL) {
+ if (G_find_raster("s2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s2,s2bak");
system(cmdbuf);
}
s2 = Rast_open_new("s2", DCELL_TYPE);
}
if (choice->size[3]) {
- if (G_find_cell("s3", G_mapset()) != NULL) {
+ if (G_find_raster("s3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s3,s3bak");
system(cmdbuf);
}
s3 = Rast_open_new("s3", DCELL_TYPE);
}
if (choice->size[4]) {
- if (G_find_cell("s4", G_mapset()) != NULL) {
+ if (G_find_raster("s4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s4,s4bak");
system(cmdbuf);
}
s4 = Rast_open_new("s4", DCELL_TYPE);
}
if (choice->size[5]) {
- if (G_find_cell("s5", G_mapset()) != NULL) {
+ if (G_find_raster("s5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s5,s5bak");
system(cmdbuf);
}
s5 = Rast_open_new("s5", DCELL_TYPE);
}
if (choice->size[6]) {
- if (G_find_cell("s6", G_mapset()) != NULL) {
+ if (G_find_raster("s6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s6,s6bak");
system(cmdbuf);
}
@@ -648,7 +648,7 @@
}
if (choice->size[7]) {
- if (G_find_cell("s7", G_mapset()) != NULL) {
+ if (G_find_raster("s7", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s7,s7bak");
system(cmdbuf);
}
@@ -656,7 +656,7 @@
}
if (choice->size[8]) {
- if (G_find_cell("s8", G_mapset()) != NULL) {
+ if (G_find_raster("s8", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s8,s8bak");
system(cmdbuf);
}
@@ -664,70 +664,70 @@
}
if (choice->core[1]) {
- if (G_find_cell("c1", G_mapset()) != NULL) {
+ if (G_find_raster("c1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c1,c1bak");
system(cmdbuf);
}
c1 = Rast_open_new("c1", DCELL_TYPE);
}
if (choice->core[2]) {
- if (G_find_cell("c2", G_mapset()) != NULL) {
+ if (G_find_raster("c2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c2,c2bak");
system(cmdbuf);
}
c2 = Rast_open_new("c2", DCELL_TYPE);
}
if (choice->core[3]) {
- if (G_find_cell("c3", G_mapset()) != NULL) {
+ if (G_find_raster("c3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c3,c3bak");
system(cmdbuf);
}
c3 = Rast_open_new("c3", DCELL_TYPE);
}
if (choice->core[4]) {
- if (G_find_cell("c4", G_mapset()) != NULL) {
+ if (G_find_raster("c4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c4,c4bak");
system(cmdbuf);
}
c4 = Rast_open_new("c4", DCELL_TYPE);
}
if (choice->core[5]) {
- if (G_find_cell("c5", G_mapset()) != NULL) {
+ if (G_find_raster("c5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c5,c5bak");
system(cmdbuf);
}
c5 = Rast_open_new("c5", DCELL_TYPE);
}
if (choice->core[6]) {
- if (G_find_cell("c6", G_mapset()) != NULL) {
+ if (G_find_raster("c6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c6,c6bak");
system(cmdbuf);
}
c6 = Rast_open_new("c6", DCELL_TYPE);
}
if (choice->core[7]) {
- if (G_find_cell("c7", G_mapset()) != NULL) {
+ if (G_find_raster("c7", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c7,c7bak");
system(cmdbuf);
}
c7 = Rast_open_new("c7", DCELL_TYPE);
}
if (choice->core[8]) {
- if (G_find_cell("c8", G_mapset()) != NULL) {
+ if (G_find_raster("c8", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c8,c8bak");
system(cmdbuf);
}
c8 = Rast_open_new("c8", DCELL_TYPE);
}
if (choice->core[9]) {
- if (G_find_cell("c9", G_mapset()) != NULL) {
+ if (G_find_raster("c9", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c9,c9bak");
system(cmdbuf);
}
c9 = Rast_open_new("c9", DCELL_TYPE);
}
if (choice->core[10]) {
- if (G_find_cell("c10", G_mapset()) != NULL) {
+ if (G_find_raster("c10", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c10,c10bak");
system(cmdbuf);
}
@@ -735,42 +735,42 @@
}
if (choice->shape[1]) {
- if (G_find_cell("h1", G_mapset()) != NULL) {
+ if (G_find_raster("h1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h1,h1bak");
system(cmdbuf);
}
h1 = Rast_open_new("h1", DCELL_TYPE);
}
if (choice->shape[2]) {
- if (G_find_cell("h2", G_mapset()) != NULL) {
+ if (G_find_raster("h2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h2,h2bak");
system(cmdbuf);
}
h2 = Rast_open_new("h2", DCELL_TYPE);
}
if (choice->shape[3]) {
- if (G_find_cell("h3", G_mapset()) != NULL) {
+ if (G_find_raster("h3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h3,h3bak");
system(cmdbuf);
}
h3 = Rast_open_new("h3", DCELL_TYPE);
}
if (choice->shape[4]) {
- if (G_find_cell("h4", G_mapset()) != NULL) {
+ if (G_find_raster("h4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h4,h4bak");
system(cmdbuf);
}
h4 = Rast_open_new("h4", DCELL_TYPE);
}
if (choice->shape[5]) {
- if (G_find_cell("h5", G_mapset()) != NULL) {
+ if (G_find_raster("h5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h5,h5bak");
system(cmdbuf);
}
h5 = Rast_open_new("h5", DCELL_TYPE);
}
if (choice->shape[6]) {
- if (G_find_cell("h6", G_mapset()) != NULL) {
+ if (G_find_raster("h6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h6,h6bak");
system(cmdbuf);
}
@@ -778,7 +778,7 @@
}
if (choice->boundary[1]) {
- if (G_find_cell("n1", G_mapset()) != NULL) {
+ if (G_find_raster("n1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n1,n1bak");
system(cmdbuf);
}
@@ -786,7 +786,7 @@
}
if (choice->boundary[2]) {
- if (G_find_cell("n2", G_mapset()) != NULL) {
+ if (G_find_raster("n2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n2,n2bak");
system(cmdbuf);
}
@@ -794,7 +794,7 @@
}
if (choice->boundary[3]) {
- if (G_find_cell("n3", G_mapset()) != NULL) {
+ if (G_find_raster("n3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n3,n3bak");
system(cmdbuf);
}
@@ -802,7 +802,7 @@
}
if (choice->boundary[4]) {
- if (G_find_cell("n4", G_mapset()) != NULL) {
+ if (G_find_raster("n4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n4,n4bak");
system(cmdbuf);
}
@@ -810,42 +810,42 @@
}
if (choice->perim[1]) {
- if (G_find_cell("p1", G_mapset()) != NULL) {
+ if (G_find_raster("p1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p1,p1bak");
system(cmdbuf);
}
p1 = Rast_open_new("p1", DCELL_TYPE);
}
if (choice->perim[2]) {
- if (G_find_cell("p2", G_mapset()) != NULL) {
+ if (G_find_raster("p2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p2,p2bak");
system(cmdbuf);
}
p2 = Rast_open_new("p2", DCELL_TYPE);
}
if (choice->perim[3]) {
- if (G_find_cell("p3", G_mapset()) != NULL) {
+ if (G_find_raster("p3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p3,p3bak");
system(cmdbuf);
}
p3 = Rast_open_new("p3", DCELL_TYPE);
}
if (choice->perim[4]) {
- if (G_find_cell("p4", G_mapset()) != NULL) {
+ if (G_find_raster("p4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p4,p4bak");
system(cmdbuf);
}
p4 = Rast_open_new("p4", DCELL_TYPE);
}
if (choice->perim[5]) {
- if (G_find_cell("p5", G_mapset()) != NULL) {
+ if (G_find_raster("p5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p5,p5bak");
system(cmdbuf);
}
p5 = Rast_open_new("p5", DCELL_TYPE);
}
if (choice->perim[6]) {
- if (G_find_cell("p6", G_mapset()) != NULL) {
+ if (G_find_raster("p6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p6,p6bak");
system(cmdbuf);
}
Modified: grass/trunk/raster/r.le/r.le.pixel/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -194,28 +194,28 @@
maps */
if (choice->att[1]) {
- if (G_find_cell("b1", G_mapset()) != NULL) {
+ if (G_find_raster("b1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b1,b1bak");
system(cmdbuf);
}
b1 = Rast_open_new("b1", DCELL_TYPE);
}
if (choice->att[2]) {
- if (G_find_cell("b2", G_mapset()) != NULL) {
+ if (G_find_raster("b2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b2,b2bak");
system(cmdbuf);
}
b2 = Rast_open_new("b2", DCELL_TYPE);
}
if (choice->att[3]) {
- if (G_find_cell("b3", G_mapset()) != NULL) {
+ if (G_find_raster("b3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b3,b3bak");
system(cmdbuf);
}
b3 = Rast_open_new("b3", DCELL_TYPE);
}
if (choice->att[4]) {
- if (G_find_cell("b4", G_mapset()) != NULL) {
+ if (G_find_raster("b4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b4,b4bak");
system(cmdbuf);
}
@@ -223,28 +223,28 @@
}
if (choice->div[1]) {
- if (G_find_cell("d1", G_mapset()) != NULL) {
+ if (G_find_raster("d1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d1,d1bak");
system(cmdbuf);
}
d1 = Rast_open_new("d1", DCELL_TYPE);
}
if (choice->div[2]) {
- if (G_find_cell("d2", G_mapset()) != NULL) {
+ if (G_find_raster("d2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d2,d2bak");
system(cmdbuf);
}
d2 = Rast_open_new("d2", DCELL_TYPE);
}
if (choice->div[3]) {
- if (G_find_cell("d3", G_mapset()) != NULL) {
+ if (G_find_raster("d3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d3,d3bak");
system(cmdbuf);
}
d3 = Rast_open_new("d3", DCELL_TYPE);
}
if (choice->div[4]) {
- if (G_find_cell("d4", G_mapset()) != NULL) {
+ if (G_find_raster("d4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d4,d4bak");
system(cmdbuf);
}
@@ -252,35 +252,35 @@
}
if (choice->te2[1]) {
- if (G_find_cell("t1", G_mapset()) != NULL) {
+ if (G_find_raster("t1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t1,t1bak");
system(cmdbuf);
}
t1 = Rast_open_new("t1", DCELL_TYPE);
}
if (choice->te2[2]) {
- if (G_find_cell("t2", G_mapset()) != NULL) {
+ if (G_find_raster("t2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t2,t2bak");
system(cmdbuf);
}
t2 = Rast_open_new("t2", DCELL_TYPE);
}
if (choice->te2[3]) {
- if (G_find_cell("t3", G_mapset()) != NULL) {
+ if (G_find_raster("t3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t3,t3bak");
system(cmdbuf);
}
t3 = Rast_open_new("t3", DCELL_TYPE);
}
if (choice->te2[4]) {
- if (G_find_cell("t4", G_mapset()) != NULL) {
+ if (G_find_raster("t4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t4,t4bak");
system(cmdbuf);
}
t4 = Rast_open_new("t4", DCELL_TYPE);
}
if (choice->te2[5]) {
- if (G_find_cell("t5", G_mapset()) != NULL) {
+ if (G_find_raster("t5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t5,t5bak");
system(cmdbuf);
}
@@ -288,28 +288,28 @@
}
if (choice->jux[1]) {
- if (G_find_cell("j1", G_mapset()) != NULL) {
+ if (G_find_raster("j1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=j1,j1bak");
system(cmdbuf);
}
j1 = Rast_open_new("j1", DCELL_TYPE);
}
if (choice->jux[2]) {
- if (G_find_cell("j2", G_mapset()) != NULL) {
+ if (G_find_raster("j2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=j2,j2bak");
system(cmdbuf);
}
j2 = Rast_open_new("j2", DCELL_TYPE);
}
if (choice->edg[1]) {
- if (G_find_cell("e1", G_mapset()) != NULL) {
+ if (G_find_raster("e1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=e1,e1bak");
system(cmdbuf);
}
e1 = Rast_open_new("e1", DCELL_TYPE);
}
if (choice->edg[2]) {
- if (G_find_cell("e2", G_mapset()) != NULL) {
+ if (G_find_raster("e2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=e2,e2bak");
system(cmdbuf);
}
Modified: grass/trunk/raster/r.los/main.c
===================================================================
--- grass/trunk/raster/r.los/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.los/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -166,7 +166,7 @@
G_fatal_error(_("Specified observer coordinate is outside current region bounds."));
search_mapset = "";
- old_mapset = G_find_cell2(elev_layer, search_mapset);
+ old_mapset = G_find_raster2(elev_layer, search_mapset);
/* check if elevation layer present in database */
if (old_mapset == NULL)
@@ -174,7 +174,7 @@
/* if pattern layer used, check if present in database */
if (patt_flag == TRUE) {
- patt_mapset = G_find_cell(patt_layer, search_mapset);
+ patt_mapset = G_find_raster(patt_layer, search_mapset);
if (patt_mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), patt_layer);
}
Modified: grass/trunk/raster/r.mapcalc/map.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.mapcalc/map.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -467,7 +467,7 @@
switch (mod) {
case 'M':
tmpname = G_store((char *)name);
- mapset = G_find_cell2(tmpname, "");
+ mapset = G_find_raster2(tmpname, "");
result = mapset ? Rast_map_type(tmpname, mapset) : -1;
G_free(tmpname);
return result;
@@ -504,7 +504,7 @@
if (col > max_col)
max_col = col;
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (!mapset)
G_fatal_error(_("Raster map <%s> not found"), name);
@@ -653,7 +653,7 @@
int check_output_map(const char *name)
{
- return !!G_find_cell2(name, G_mapset());
+ return !!G_find_raster2(name, G_mapset());
}
int open_output_map(const char *name, int res_type)
Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.null/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -110,7 +110,7 @@
remove = flags.r->answer;
name = parms.map->answer;
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), name);
Modified: grass/trunk/raster/r.out.gdal/main.c
===================================================================
--- grass/trunk/raster/r.out.gdal/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.out.gdal/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -232,7 +232,7 @@
G_fatal_error(_("Required parameter <%s> not set"), input->key);
/* Try to open input GRASS raster.. */
- mapset = G_find_cell2(input->answer, "");
+ mapset = G_find_raster2(input->answer, "");
if (mapset != NULL) {
/* Add input to "group". "Group" whith 1 raster (band) will exist only in memory. */
Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.proj/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -216,7 +216,7 @@
mapname = outmap->answer ? outmap->answer : inmap->answer;
if (mapname && !list->answer && !overwrite &&
- G_find_cell(mapname, G_mapset()))
+ G_find_raster(mapname, G_mapset()))
G_fatal_error(_("option <%s>: <%s> exists."), "output", mapname);
setname = imapset->answer ? imapset->answer : G_store(G_mapset());
@@ -261,7 +261,7 @@
if (!inmap->answer)
G_fatal_error(_("Required parameter <%s> not set"), inmap->key);
- if (!G_find_cell(inmap->answer, setname))
+ if (!G_find_raster(inmap->answer, setname))
G_fatal_error(_("Raster map <%s> in location <%s> in mapset <%s> not found"),
inmap->answer, inlocation->answer, setname);
Modified: grass/trunk/raster/r.reclass/main.c
===================================================================
--- grass/trunk/raster/r.reclass/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.reclass/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -75,7 +75,7 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- old_mapset = G_find_cell2(parm.input->answer, "");
+ old_mapset = G_find_raster2(parm.input->answer, "");
if (old_mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), parm.input->answer);
Modified: grass/trunk/raster/r.report/maskinfo.c
===================================================================
--- grass/trunk/raster/r.report/maskinfo.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.report/maskinfo.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -15,7 +15,7 @@
int first;
results = NULL;
- if (G_find_cell("MASK", G_mapset()) == NULL)
+ if (G_find_raster("MASK", G_mapset()) == NULL)
return "none";
if (Rast_get_reclass("MASK", G_mapset(), &reclass) <= 0) {
sprintf(text, "MASK in %s", G_mapset());
Modified: grass/trunk/raster/r.report/parse.c
===================================================================
--- grass/trunk/raster/r.report/parse.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.report/parse.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -238,7 +238,7 @@
int n;
strcpy(name, s);
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), s);
Modified: grass/trunk/raster/r.ros/main.c
===================================================================
--- grass/trunk/raster/r.ros/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.ros/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -287,7 +287,7 @@
spotting = flag_s->answer;
/* Check if input layers exists in data base */
- if (G_find_cell2(parm.model->answer, "") == NULL)
+ if (G_find_raster2(parm.model->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), parm.model->answer);
if (!
@@ -298,22 +298,22 @@
}
if (parm.mois_1h->answer) {
- if (G_find_cell2(parm.mois_1h->answer, "") == NULL)
+ if (G_find_raster2(parm.mois_1h->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"),
parm.mois_1h->answer);
}
if (parm.mois_10h->answer) {
- if (G_find_cell2(parm.mois_10h->answer, "") == NULL)
+ if (G_find_raster2(parm.mois_10h->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"),
parm.mois_10h->answer);
}
if (parm.mois_100h->answer) {
- if (G_find_cell2(parm.mois_100h->answer, "") == NULL)
+ if (G_find_raster2(parm.mois_100h->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"),
parm.mois_100h->answer);
}
- if (G_find_cell2(parm.mois_live->answer, "") == NULL)
+ if (G_find_raster2(parm.mois_live->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), parm.mois_live->answer);
if (parm.vel->answer && !(parm.dir->answer)) {
@@ -327,11 +327,11 @@
parm.dir->answer);
}
if (parm.vel->answer) {
- if (G_find_cell2(parm.vel->answer, "") == NULL)
+ if (G_find_raster2(parm.vel->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), parm.vel->answer);
}
if (parm.dir->answer) {
- if (G_find_cell2(parm.dir->answer, "") == NULL)
+ if (G_find_raster2(parm.dir->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), parm.dir->answer);
}
@@ -346,11 +346,11 @@
parm.aspect->answer);
}
if (parm.slope->answer) {
- if (G_find_cell2(parm.slope->answer, "") == NULL)
+ if (G_find_raster2(parm.slope->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), parm.slope->answer);
}
if (parm.aspect->answer) {
- if (G_find_cell2(parm.aspect->answer, "") == NULL)
+ if (G_find_raster2(parm.aspect->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"),
parm.aspect->answer);
}
@@ -361,7 +361,7 @@
"if considering spotting"));
}
else {
- if (G_find_cell2(parm.elev->answer, "") == NULL)
+ if (G_find_raster2(parm.elev->answer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"),
parm.elev->answer);
}
@@ -374,22 +374,22 @@
/*check if the output layer names EXIST */
if (G_check_overwrite(argc, argv) == 0) {
- if (G_find_cell2(name_base, G_mapset()))
+ 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_cell2(name_max, 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_cell2(name_maxdir, 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) {
sprintf(name_spotdist, "%s.spotdist", parm.output->answer);
- if (G_find_cell2(name_spotdist, G_mapset()))
+ if (G_find_raster2(name_spotdist, G_mapset()))
G_fatal_error(_("Raster map <%s> already exists in mapset <%s>"),
name_spotdist, G_mapset());
}
@@ -424,7 +424,7 @@
fuel_fd =
Rast_open_old(parm.model->answer,
- G_find_cell2(parm.model->answer, ""));
+ G_find_raster2(parm.model->answer, ""));
if (fuel_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.model->answer);
@@ -432,7 +432,7 @@
if (parm.mois_1h->answer) {
mois_1h_fd =
Rast_open_old(parm.mois_1h->answer,
- G_find_cell2(parm.mois_1h->answer, ""));
+ G_find_raster2(parm.mois_1h->answer, ""));
if (mois_1h_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.mois_1h->answer);
@@ -440,7 +440,7 @@
if (parm.mois_10h->answer) {
mois_10h_fd =
Rast_open_old(parm.mois_10h->answer,
- G_find_cell2(parm.mois_10h->answer, ""));
+ G_find_raster2(parm.mois_10h->answer, ""));
if (mois_10h_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.mois_10h->answer);
@@ -448,7 +448,7 @@
if (parm.mois_100h->answer) {
mois_100h_fd =
Rast_open_old(parm.mois_100h->answer,
- G_find_cell2(parm.mois_100h->answer, ""));
+ G_find_raster2(parm.mois_100h->answer, ""));
if (mois_100h_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.mois_100h->answer);
@@ -456,7 +456,7 @@
mois_live_fd =
Rast_open_old(parm.mois_live->answer,
- G_find_cell2(parm.mois_live->answer, ""));
+ G_find_raster2(parm.mois_live->answer, ""));
if (mois_live_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.mois_live->answer);
@@ -464,7 +464,7 @@
if (parm.vel->answer) {
vel_fd =
Rast_open_old(parm.vel->answer,
- G_find_cell2(parm.vel->answer, ""));
+ G_find_raster2(parm.vel->answer, ""));
if (vel_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.vel->answer);
@@ -472,7 +472,7 @@
if (parm.dir->answer) {
dir_fd =
Rast_open_old(parm.dir->answer,
- G_find_cell2(parm.dir->answer, ""));
+ G_find_raster2(parm.dir->answer, ""));
if (dir_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.dir->answer);
@@ -481,7 +481,7 @@
if (parm.slope->answer) {
slope_fd =
Rast_open_old(parm.slope->answer,
- G_find_cell2(parm.slope->answer, ""));
+ G_find_raster2(parm.slope->answer, ""));
if (slope_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.slope->answer);
@@ -489,7 +489,7 @@
if (parm.aspect->answer) {
aspect_fd =
Rast_open_old(parm.aspect->answer,
- G_find_cell2(parm.aspect->answer, ""));
+ G_find_raster2(parm.aspect->answer, ""));
if (aspect_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.aspect->answer);
@@ -498,7 +498,7 @@
if (spotting) {
elev_fd =
Rast_open_old(parm.elev->answer,
- G_find_cell2(parm.elev->answer, ""));
+ G_find_raster2(parm.elev->answer, ""));
if (elev_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.elev->answer);
Modified: grass/trunk/raster/r.spread/main.c
===================================================================
--- grass/trunk/raster/r.spread/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.spread/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -350,55 +350,55 @@
/* Check if input layers exists in data base */
- if (G_find_cell2(max_layer, "") == NULL)
+ if (G_find_raster2(max_layer, "") == NULL)
G_fatal_error("Raster map <%s> not found", max_layer);
- if (G_find_cell2(dir_layer, "") == NULL)
+ if (G_find_raster2(dir_layer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), dir_layer);
- if (G_find_cell2(base_layer, "") == NULL)
+ if (G_find_raster2(base_layer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), base_layer);
- if (G_find_cell2(start_layer, "") == NULL)
+ if (G_find_raster2(start_layer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), start_layer);
if (spotting) {
- if (G_find_cell2(spotdist_layer, "") == NULL)
+ if (G_find_raster2(spotdist_layer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), spotdist_layer);
- if (G_find_cell2(velocity_layer, "") == NULL)
+ if (G_find_raster2(velocity_layer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), velocity_layer);
- if (G_find_cell2(mois_layer, "") == NULL)
+ if (G_find_raster2(mois_layer, "") == NULL)
G_fatal_error(_("Raster map <%s> not found"), mois_layer);
}
/* Open input cell layers for reading */
- max_fd = Rast_open_old(max_layer, G_find_cell2(max_layer, ""));
+ max_fd = Rast_open_old(max_layer, G_find_raster2(max_layer, ""));
if (max_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), max_layer);
- dir_fd = Rast_open_old(dir_layer, G_find_cell2(dir_layer, ""));
+ dir_fd = Rast_open_old(dir_layer, G_find_raster2(dir_layer, ""));
if (dir_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), dir_layer);
- base_fd = Rast_open_old(base_layer, G_find_cell2(base_layer, ""));
+ base_fd = Rast_open_old(base_layer, G_find_raster2(base_layer, ""));
if (base_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), base_layer);
if (spotting) {
spotdist_fd =
- Rast_open_old(spotdist_layer, G_find_cell2(spotdist_layer, ""));
+ Rast_open_old(spotdist_layer, G_find_raster2(spotdist_layer, ""));
if (spotdist_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), spotdist_layer);
velocity_fd =
- Rast_open_old(velocity_layer, G_find_cell2(velocity_layer, ""));
+ Rast_open_old(velocity_layer, G_find_raster2(velocity_layer, ""));
if (velocity_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), velocity_layer);
- mois_fd = Rast_open_old(mois_layer, G_find_cell2(mois_layer, ""));
+ mois_fd = Rast_open_old(mois_layer, G_find_raster2(mois_layer, ""));
if (mois_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), mois_layer);
}
@@ -467,7 +467,7 @@
* Create an array of starting points (min_heap) ordered by costs.
*/
- start_fd = Rast_open_old(start_layer, G_find_cell2(start_layer, ""));
+ start_fd = Rast_open_old(start_layer, G_find_raster2(start_layer, ""));
if (start_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), start_layer);
Modified: grass/trunk/raster/r.spreadpath/main.c
===================================================================
--- grass/trunk/raster/r.spreadpath/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.spreadpath/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -146,8 +146,8 @@
strcpy(backrow_layer, opt2->answer);
strcpy(backcol_layer, opt1->answer);
- backrow_mapset = G_find_cell(backrow_layer, search_mapset);
- backcol_mapset = G_find_cell(backcol_layer, search_mapset);
+ backrow_mapset = G_find_raster(backrow_layer, search_mapset);
+ backcol_mapset = G_find_raster(backcol_layer, search_mapset);
if (backrow_mapset == NULL)
G_fatal_error("%s - not found", backrow_layer);
@@ -159,7 +159,7 @@
strcpy(path_layer, opt4->answer);
- path_mapset = G_find_cell(path_layer, search_mapset);
+ path_mapset = G_find_raster(path_layer, search_mapset);
/* find number of rows and cols in window */
nrows = G_window_rows();
Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.sun/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -809,7 +809,7 @@
}
- if ((mapset = G_find_cell2(elevin, "")) == NULL)
+ if ((mapset = G_find_raster2(elevin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), elevin);
@@ -824,7 +824,7 @@
s[l] = (float *)G_malloc(sizeof(float) * (n));
}
}
- if ((mapset = G_find_cell2(slopein, "")) == NULL)
+ if ((mapset = G_find_raster2(slopein, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), slopein);
fd3 = Rast_open_old(slopein, mapset);
@@ -841,7 +841,7 @@
}
}
- if ((mapset = G_find_cell2(aspin, "")) == NULL)
+ if ((mapset = G_find_raster2(aspin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), aspin);
fd2 = Rast_open_old(aspin, mapset);
@@ -855,7 +855,7 @@
li[l] = (float *)G_malloc(sizeof(float) * (n));
}
- if ((mapset = G_find_cell2(linkein, "")) == NULL)
+ if ((mapset = G_find_raster2(linkein, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), linkein);
fd4 = Rast_open_old(linkein, mapset);
}
@@ -867,7 +867,7 @@
for (l = 0; l < numRows; l++)
a[l] = (float *)G_malloc(sizeof(float) * (n));
}
- if ((mapset = G_find_cell2(albedo, "")) == NULL)
+ if ((mapset = G_find_raster2(albedo, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), albedo);
fd5 = Rast_open_old(albedo, mapset);
}
@@ -879,7 +879,7 @@
for (l = 0; l < numRows; l++)
la[l] = (float *)G_malloc(sizeof(float) * (n));
}
- if ((mapset = G_find_cell2(latin, "")) == NULL)
+ if ((mapset = G_find_raster2(latin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), latin);
fd6 = Rast_open_old(latin, mapset);
}
@@ -890,7 +890,7 @@
for (l = 0; l < numRows; l++)
longitArray[l] = (float *)G_malloc(sizeof(float) * (n));
- if ((mapset = G_find_cell2(longin, "")) == NULL)
+ if ((mapset = G_find_raster2(longin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), longin);
fd7 = Rast_open_old(longin, mapset);
}
@@ -902,7 +902,7 @@
for (l = 0; l < numRows; l++)
cbhr[l] = (float *)G_malloc(sizeof(float) * (n));
}
- if ((mapset = G_find_cell2(coefbh, "")) == NULL)
+ if ((mapset = G_find_raster2(coefbh, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), coefbh);
fr1 = Rast_open_old(coefbh, mapset);
}
@@ -914,7 +914,7 @@
for (l = 0; l < numRows; l++)
cdhr[l] = (float *)G_malloc(sizeof(float) * (n));
}
- if ((mapset = G_find_cell2(coefdh, "")) == NULL)
+ if ((mapset = G_find_raster2(coefdh, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), coefdh);
fr2 = Rast_open_old(coefdh, mapset);
}
@@ -934,7 +934,7 @@
*
* horizonbuf[0]=Rast_allocate_f_buf();
* sprintf(shad_filename, "%s_%02d", horizon, arrayNumInt);
- * if((mapset=G_find_cell2(shad_filename,""))==NULL)
+ * if((mapset=G_find_raster2(shad_filename,""))==NULL)
* G_message("Horizon file no. %d not found\n", arrayNumInt);
*
* fd_shad[0] = Rast_open_old(shad_filename,mapset);
@@ -947,7 +947,7 @@
for (i = 0; i < arrayNumInt; i++) {
horizonbuf[i] = Rast_allocate_f_buf();
sprintf(shad_filename, formatString, horizon, i);
- if ((mapset = G_find_cell2(shad_filename, "")) == NULL)
+ if ((mapset = G_find_raster2(shad_filename, "")) == NULL)
G_fatal_error(_("Horizon file no. %d <%s> not found"), i,
shad_filename);
fd_shad[i] = Rast_open_old(shad_filename, mapset);
Modified: grass/trunk/raster/r.support/main.c
===================================================================
--- grass/trunk/raster/r.support/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.support/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -144,7 +144,7 @@
/* Make sure raster exists and set mapset */
infile = raster->answer;
- mapset = G_find_cell2(infile, G_mapset()); /* current mapset only for editing */
+ mapset = G_find_raster2(infile, G_mapset()); /* current mapset only for editing */
if (!mapset || strcmp(mapset, G_mapset()) != 0)
G_fatal_error(_("Raster map <%s> not found in current mapset"), infile);
Modified: grass/trunk/raster/r.surf.contour/main.c
===================================================================
--- grass/trunk/raster/r.surf.contour/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.surf.contour/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -83,7 +83,7 @@
con_name = opt1->answer;
alt_name = opt2->answer;
- con_mapset = G_find_cell2(con_name, "");
+ con_mapset = G_find_raster2(con_name, "");
if (!con_mapset)
G_fatal_error("Contour raster map [%s] not found", con_name);
Modified: grass/trunk/raster/r.terraflow/grass2str.h
===================================================================
--- grass/trunk/raster/r.terraflow/grass2str.h 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.terraflow/grass2str.h 2009-08-04 06:44:24 UTC (rev 38612)
@@ -55,7 +55,7 @@
}
const char *mapset;
- mapset = G_find_cell (cellname, "");
+ mapset = G_find_raster (cellname, "");
if (mapset == NULL)
G_fatal_error (_("Raster map <%s> not found"), cellname);
Modified: grass/trunk/raster/r.terraflow/main.cc
===================================================================
--- grass/trunk/raster/r.terraflow/main.cc 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.terraflow/main.cc 2009-08-04 06:44:24 UTC (rev 38612)
@@ -187,7 +187,7 @@
void check_header(char* cellname) {
const char *mapset;
- mapset = G_find_cell(cellname, "");
+ mapset = G_find_raster(cellname, "");
if (mapset == NULL) {
G_fatal_error(_("Raster map <%s> not found"), cellname);
}
@@ -336,7 +336,7 @@
const char *mapset;
struct Range r;
- mapset = G_find_cell(cellname, "");
+ mapset = G_find_raster(cellname, "");
if (mapset == NULL) {
G_fatal_error (_("Raster map <%s> not found"), cellname);
}
@@ -376,7 +376,7 @@
const char *mapset;
struct Range r;
- mapset = G_find_cell(cellname, "");
+ mapset = G_find_raster(cellname, "");
if (mapset == NULL) {
G_fatal_error (_("Raster map <%s> not found"), cellname);
}
Modified: grass/trunk/raster/r.topmodel/check_ready.c
===================================================================
--- grass/trunk/raster/r.topmodel/check_ready.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.topmodel/check_ready.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -246,17 +246,17 @@
retval = 0;
if (!flg.input) {
- if (map.elev && !G_find_cell(map.elev, mapset)) {
+ if (map.elev && !G_find_raster(map.elev, mapset)) {
G_warning("%s - not exists", map.elev);
retval = 1;
}
- if (map.basin && !G_find_cell(map.basin, mapset)) {
+ if (map.basin && !G_find_raster(map.basin, mapset)) {
G_warning("%s - not exists", map.basin);
retval = 1;
}
- if (map.fill && G_find_cell(map.fill, mapset)) {
+ if (map.fill && G_find_raster(map.fill, mapset)) {
if (flg.overwr) {
flg.overwrlist |= FILL;
}
@@ -266,7 +266,7 @@
}
}
- if (map.dir && G_find_cell(map.dir, mapset)) {
+ if (map.dir && G_find_raster(map.dir, mapset)) {
if (flg.overwr) {
flg.overwrlist |= DIR;
}
@@ -276,7 +276,7 @@
}
}
- if (map.belev && G_find_cell(map.belev, mapset)) {
+ if (map.belev && G_find_raster(map.belev, mapset)) {
if (flg.overwr) {
flg.overwrlist |= BELEV;
}
@@ -286,7 +286,7 @@
}
}
- if (map.topidx && G_find_cell(map.topidx, mapset)) {
+ if (map.topidx && G_find_raster(map.topidx, mapset)) {
if (flg.overwr) {
flg.overwrlist |= TOPIDX;
}
@@ -309,12 +309,12 @@
}
else {
if (map.belev) {
- if (!G_find_cell(map.belev, mapset)) {
+ if (!G_find_raster(map.belev, mapset)) {
G_warning("%s - not exists", map.belev);
retval = 1;
}
else {
- if (map.topidx && G_find_cell(map.topidx, mapset)) {
+ if (map.topidx && G_find_raster(map.topidx, mapset)) {
if (flg.overwr) {
flg.overwrlist |= TOPIDX;
}
@@ -338,7 +338,7 @@
}
}
else if (map.topidx) {
- if (!G_find_cell(map.topidx, mapset)) {
+ if (!G_find_raster(map.topidx, mapset)) {
G_warning("%s - not exists", map.topidx);
retval = 1;
}
Modified: grass/trunk/raster/r.watershed/shed/read.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/read.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.watershed/shed/read.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -18,7 +18,7 @@
ncols = G_window_cols();
buf = Rast_allocate_c_buf();
bas_buf = Rast_allocate_c_buf();
- mapset = G_find_cell(haf_name, "");
+ mapset = G_find_raster(haf_name, "");
if (!mapset) {
G_fatal_error(_("unable to open basin/half basin map"));
}
Modified: grass/trunk/raster/r.watershed/shed/valid.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/valid.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/r.watershed/shed/valid.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -19,7 +19,7 @@
nrows = G_window_rows ();
ncols = G_window_cols ();
*/
- if (NULL == (mapset = G_find_cell(accum_name, ""))) {
+ if (NULL == (mapset = G_find_raster(accum_name, ""))) {
free_output(output);
G_fatal_error(_("accum file missing in valid_basins()"));
}
Modified: grass/trunk/raster/simwe/simlib/input.c
===================================================================
--- grass/trunk/raster/simwe/simlib/input.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster/simwe/simlib/input.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -174,18 +174,18 @@
/* Check if data available in mapsets
* if found, then open the files */
- if ((mapset = G_find_cell(elevin, "")) == NULL)
+ if ((mapset = G_find_raster(elevin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), elevin);
fd1 = Rast_open_old(elevin, mapset);
/* TO REPLACE BY INTERNAL PROCESSING of dx, dy from Elevin */
- if ((mapset = G_find_cell(dxin, "")) == NULL)
+ if ((mapset = G_find_raster(dxin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), dxin);
fd2 = Rast_open_old(dxin, mapset);
- if ((mapset = G_find_cell(dyin, "")) == NULL)
+ if ((mapset = G_find_raster(dyin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), dyin);
fd3 = Rast_open_old(dyin, mapset);
@@ -194,7 +194,7 @@
/* Rendered Mannings n input map optional to run! */
/* Careful! (Yann, 20080212) */
if (manin != NULL) {
- if ((mapset = G_find_cell(manin, "")) == NULL)
+ if ((mapset = G_find_raster(manin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), manin);
fd5 = Rast_open_old(manin, mapset);
}
@@ -202,47 +202,47 @@
/* Rendered Rainfall input map optional to run! */
/* Careful! (Yann, 20080212) */
if (rain != NULL) {
- if ((mapset = G_find_cell(rain, "")) == NULL)
+ if ((mapset = G_find_raster(rain, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), rain);
fd4 = Rast_open_old(rain, mapset);
}
if (infil != NULL) {
- if ((mapset = G_find_cell(infil, "")) == NULL)
+ if ((mapset = G_find_raster(infil, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), infil);
fd4a = Rast_open_old(infil, mapset);
}
if (traps != NULL) {
- if ((mapset = G_find_cell(traps, "")) == NULL)
+ if ((mapset = G_find_raster(traps, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), traps);
fd4b = Rast_open_old(traps, mapset);
}
if (detin != NULL) {
- if ((mapset = G_find_cell(detin, "")) == NULL)
+ if ((mapset = G_find_raster(detin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), detin);
fd9 = Rast_open_old(detin, mapset);
}
if (tranin != NULL) {
- if ((mapset = G_find_cell(tranin, "")) == NULL)
+ if ((mapset = G_find_raster(tranin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), tranin);
fd10 = Rast_open_old(tranin, mapset);
}
if (tauin != NULL) {
- if ((mapset = G_find_cell(tauin, "")) == NULL)
+ if ((mapset = G_find_raster(tauin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), tauin);
fd11 = Rast_open_old(tauin, mapset);
}
if (wdepth != NULL) {
- if ((mapset = G_find_cell(wdepth, "")) == NULL)
+ if ((mapset = G_find_raster(wdepth, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), wdepth);
fd12 = Rast_open_old(wdepth, mapset);
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -340,7 +340,7 @@
/**********************/
- if (G_find_cell2(param.output->answer, ""))
+ if (G_find_raster2(param.output->answer, ""))
G_message(_("Output map already exists. Will be overwritten!"));
if (output_type == FCELL_TYPE) {
Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster3d/r3.out.vtk/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -125,7 +125,7 @@
mapset = NULL;
name = NULL;
name = param.top->answer;
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (mapset == NULL) {
G3d_fatalError(_("Top cell map <%s> not found"),
param.top->answer);
@@ -134,7 +134,7 @@
mapset = NULL;
name = NULL;
name = param.bottom->answer;
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
if (mapset == NULL) {
G3d_fatalError(_("Bottom cell map <%s> not found"),
param.bottom->answer);
@@ -467,7 +467,7 @@
mapset = NULL;
name = NULL;
name = param.top->answer;
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
in->top = open_input_map(name, mapset);
in->topMapType = Rast_get_map_type(in->top);
@@ -475,7 +475,7 @@
mapset = NULL;
name = NULL;
name = param.bottom->answer;
- mapset = G_find_cell2(name, "");
+ mapset = G_find_raster2(name, "");
in->bottom = open_input_map(name, mapset);
in->bottomMapType = Rast_get_map_type(in->bottom);
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -308,7 +308,7 @@
G_asprintf(&RasterFileName, "%s_%05d", param.output->answer, i + 1);
G_message(_("Raster map %i Filename: %s"), i + 1, RasterFileName);
- if (G_find_cell2(RasterFileName, ""))
+ if (G_find_raster2(RasterFileName, ""))
G_message(_("Raster map %d Filename: %s already exists. Will be overwritten!"),
i + 1, RasterFileName);
Modified: grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
===================================================================
--- grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -387,7 +387,7 @@
}
/* check elevation file existence */
- mapset = G_find_cell2(elev_name, "");
+ mapset = G_find_raster2(elev_name, "");
if (!mapset)
G_fatal_error(_("Raster map <%s> not found"), elev_name);
Modified: grass/trunk/vector/lidar/v.surf.bspline/main.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/vector/lidar/v.surf.bspline/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -288,7 +288,7 @@
if (!vector && map) {
grid = TRUE;
/*
- if (G_find_cell (out_map_opt->answer, G_mapset()) != NULL)
+ if (G_find_raster (out_map_opt->answer, G_mapset()) != NULL)
G_fatal_error (_("Raster <%s> already exist."), out_map_opt->answer);
*/
Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/vector/v.vol.rst/main.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -640,7 +640,7 @@
if (ii > 0) {
if ((cellinp != NULL) && (cellout != NULL)) {
mapset = NULL;
- mapset = G_find_cell2(cellinp, "");
+ mapset = G_find_raster2(cellinp, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), cellinp);
fdcell = Rast_open_old(cellinp, mapset);
Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/vector/v.vol.rst/user1.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -358,7 +358,7 @@
/** create a bitmap mask from given raster map **/
if (maskmap != NULL) {
- mapsetm = G_find_cell2(maskmap, "");
+ mapsetm = G_find_raster2(maskmap, "");
if (!mapsetm) {
sprintf(buf, "mask raster map [%s] not found\n", maskmap);
clean_fatal_error(buf);
Modified: grass/trunk/visualization/nviz2/cmd/surface.c
===================================================================
--- grass/trunk/visualization/nviz2/cmd/surface.c 2009-08-03 21:09:14 UTC (rev 38611)
+++ grass/trunk/visualization/nviz2/cmd/surface.c 2009-08-04 06:44:24 UTC (rev 38612)
@@ -51,7 +51,7 @@
for (i = 0; i < nelevs; i++) {
/* check maps */
if (i < nelev_map && strcmp(params->elev_map->answers[i], "")) {
- mapset = G_find_cell2(params->elev_map->answers[i], "");
+ mapset = G_find_raster2(params->elev_map->answers[i], "");
if (mapset == NULL) {
G_fatal_error(_("Raster map <%s> not found"),
params->elev_map->answers[i]);
@@ -101,7 +101,7 @@
/* color */
/* check for color map */
if (i < ncolor_map && strcmp(params->color_map->answers[i], "")) {
- mapset = G_find_cell2(params->color_map->answers[i], "");
+ mapset = G_find_raster2(params->color_map->answers[i], "");
if (mapset == NULL) {
G_fatal_error(_("Raster map <%s> not found"),
params->color_map->answers[i]);
More information about the grass-commit
mailing list