[GRASS-SVN] r38120 - in grass/trunk: display/d.colors
display/d.colortable display/d.his display/d.histogram
display/d.legend display/d.nviz display/d.profile
display/d.rast display/d.rast.arrow display/d.rast.num
display/d.rgb display/d.what.rast doc/raster/r.example
general/g.region imagery/i.albedo imagery/i.atcorr
imagery/i.biomass imagery/i.cca imagery/i.class
imagery/i.cluster imagery/i.eb.eta imagery/i.eb.evapfr
imagery/i.eb.h_SEBAL01 imagery/i.eb.soilheatflux
imagery/i.emissivity imagery/i.evapo.time_integration
imagery/i.fft imagery/i.gensig imagery/i.gensigset
imagery/i.his.rgb imagery/i.ifft imagery/i.latlong
imagery/i.maxlik imagery/i.modis.qc imagery/i.pca
imagery/i.points imagery/i.rectify imagery/i.rgb.his
imagery/i.smap imagery/i.sunhours imagery/i.vi
imagery/i.vpoints imagery/i.zc include lib/gpde lib/ogsf
lib/raster lib/rst/interp_float ps/ps.map
raster/r.basins.fill raster/r.bitpattern raster/r.buffer
raster/r.carve raster/r.category raster/r.circle
raster/r.clump raster/r.colors raster/r.composite
raster/r.compress raster/r.contour raster/r.cost
raster/r.covar raster/r.cross raster/r.describe
raster/r.distance raster/r.drain raster/r.fill.dir
raster/r.flow raster/r.grow raster/r.grow.distance
raster/r.his raster/r.horizon raster/r.in.arc
raster/r.in.ascii raster/r.in.bin raster/r.in.gdal
raster/r.in.gridatb raster/r.in.mat raster/r.in.poly
raster/r.in.xyz raster/r.info raster/r.lake
raster/r.le/r.le.patch raster/r.le/r.le.pixel
raster/r.le/r.le.setup raster/r.le/r.le.setup/polytocell
raster/r.le/r.le.trace raster/r.li/r.li.daemon raster/r.los
raster/r.mapcalc raster/r.mfilter raster/r.neighbors
raster/r.null raster/r.out.arc raster/r.out.ascii
raster/r.out.bin raster/r.out.gdal raster/r.out.gridatb
raster/r.out.mat raster/r.out.mpeg raster/r.out.png
raster/r.out.pov raster/r.out.ppm raster/r.out.ppm3
raster/r.out.tiff raster/r.out.vrml raster/r.out.vtk
raster/r.param.scale raster/r.patch raster/r.profile
raster/r.proj raster/r.quant raster/r.quantile
raster/r.random raster/r.random.cells raster/r.random.surface
raster/r.reclass raster/r.recode raster/r.report
raster/r.resamp.interp raster/r.resamp.rst
raster/r.resamp.stats raster/r.resample raster/r.rescale
raster/r.rescale.eq raster/r.ros raster/r.series
raster/r.slope.aspect raster/r.spread raster/r.spreadpath
raster/r.statistics raster/r.statistics2 raster/r.statistics3
raster/r.stats raster/r.sun raster/r.sun2 raster/r.sunmask
raster/r.support raster/r.support.stats raster/r.surf.area
raster/r.surf.contour raster/r.surf.fractal
raster/r.surf.gauss raster/r.surf.idw raster/r.surf.idw2
raster/r.surf.random raster/r.terraflow raster/r.texture
raster/r.thin raster/r.to.rast3 raster/r.to.rast3elev
raster/r.to.vect raster/r.topidx raster/r.univar
raster/r.uslek raster/r.usler raster/r.volume raster/r.walk
raster/r.water.outlet raster/r.watershed/ram
raster/r.watershed/seg raster/r.watershed/shed raster/r.what
raster/r.what.color 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.drape vector/v.extrude
vector/v.kernel vector/v.neighbors vector/v.sample
vector/v.surf.idw vector/v.to.rast vector/v.vol.rst
vector/v.what.rast visualization/xganim
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jun 29 17:09:02 EDT 2009
Author: martinl
Date: 2009-06-29 17:09:01 -0400 (Mon, 29 Jun 2009)
New Revision: 38120
Modified:
grass/trunk/display/d.colors/main.c
grass/trunk/display/d.colortable/main.c
grass/trunk/display/d.his/main.c
grass/trunk/display/d.histogram/get_stats.c
grass/trunk/display/d.legend/main.c
grass/trunk/display/d.nviz/main.c
grass/trunk/display/d.profile/main.c
grass/trunk/display/d.rast.arrow/main.c
grass/trunk/display/d.rast.num/main.c
grass/trunk/display/d.rast/display.c
grass/trunk/display/d.rast/main.c
grass/trunk/display/d.rgb/main.c
grass/trunk/display/d.what.rast/opencell.c
grass/trunk/display/d.what.rast/what.c
grass/trunk/doc/raster/r.example/main.c
grass/trunk/general/g.region/zoom.c
grass/trunk/imagery/i.albedo/main.c
grass/trunk/imagery/i.atcorr/main.cpp
grass/trunk/imagery/i.biomass/main.c
grass/trunk/imagery/i.cca/main.c
grass/trunk/imagery/i.class/band_files.c
grass/trunk/imagery/i.class/draw_cell.c
grass/trunk/imagery/i.class/signature.c
grass/trunk/imagery/i.cluster/open_files.c
grass/trunk/imagery/i.eb.eta/main.c
grass/trunk/imagery/i.eb.evapfr/main.c
grass/trunk/imagery/i.eb.h_SEBAL01/main.c
grass/trunk/imagery/i.eb.soilheatflux/main.c
grass/trunk/imagery/i.emissivity/main.c
grass/trunk/imagery/i.evapo.time_integration/main.c
grass/trunk/imagery/i.fft/main.c
grass/trunk/imagery/i.gensig/openfiles.c
grass/trunk/imagery/i.gensigset/openfiles.c
grass/trunk/imagery/i.his.rgb/openfiles.c
grass/trunk/imagery/i.ifft/main.c
grass/trunk/imagery/i.latlong/main.c
grass/trunk/imagery/i.maxlik/open.c
grass/trunk/imagery/i.modis.qc/main.c
grass/trunk/imagery/i.pca/main.c
grass/trunk/imagery/i.pca/support.c
grass/trunk/imagery/i.points/drawcell.c
grass/trunk/imagery/i.rectify/rectify.c
grass/trunk/imagery/i.rectify/write.c
grass/trunk/imagery/i.rgb.his/openfiles.c
grass/trunk/imagery/i.smap/opencell.c
grass/trunk/imagery/i.sunhours/main.c
grass/trunk/imagery/i.vi/main.c
grass/trunk/imagery/i.vpoints/drawcell.c
grass/trunk/imagery/i.zc/main.c
grass/trunk/include/raster.h
grass/trunk/lib/gpde/N_arrays_io.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/cats.c
grass/trunk/lib/raster/color_read.c
grass/trunk/lib/raster/gdal.c
grass/trunk/lib/raster/get_row_colr.c
grass/trunk/lib/raster/opencell.c
grass/trunk/lib/raster/put_row.c
grass/trunk/lib/raster/quant_io.c
grass/trunk/lib/raster/quant_rw.c
grass/trunk/lib/raster/range.c
grass/trunk/lib/rst/interp_float/input2d.c
grass/trunk/lib/rst/interp_float/output2d.c
grass/trunk/lib/rst/interp_float/resout2d.c
grass/trunk/ps/ps.map/outl_io.c
grass/trunk/ps/ps.map/ps_raster.c
grass/trunk/ps/ps.map/r_cell.c
grass/trunk/ps/ps.map/r_colortable.c
grass/trunk/ps/ps.map/r_group.c
grass/trunk/ps/ps.map/r_rgb.c
grass/trunk/raster/r.basins.fill/main.c
grass/trunk/raster/r.basins.fill/read_map.c
grass/trunk/raster/r.bitpattern/main.c
grass/trunk/raster/r.buffer/read_map.c
grass/trunk/raster/r.buffer/write_map.c
grass/trunk/raster/r.carve/main.c
grass/trunk/raster/r.category/cats.c
grass/trunk/raster/r.category/main.c
grass/trunk/raster/r.circle/main.c
grass/trunk/raster/r.clump/main.c
grass/trunk/raster/r.colors/main.c
grass/trunk/raster/r.colors/stats.c
grass/trunk/raster/r.composite/main.c
grass/trunk/raster/r.compress/main.c
grass/trunk/raster/r.contour/main.c
grass/trunk/raster/r.cost/main.c
grass/trunk/raster/r.covar/main.c
grass/trunk/raster/r.cross/main.c
grass/trunk/raster/r.describe/describe.c
grass/trunk/raster/r.distance/distance.c
grass/trunk/raster/r.distance/edges.c
grass/trunk/raster/r.drain/main.c
grass/trunk/raster/r.fill.dir/main.c
grass/trunk/raster/r.flow/io.c
grass/trunk/raster/r.grow.distance/main.c
grass/trunk/raster/r.grow/main.c
grass/trunk/raster/r.his/main.c
grass/trunk/raster/r.horizon/main.c
grass/trunk/raster/r.in.arc/main.c
grass/trunk/raster/r.in.ascii/main.c
grass/trunk/raster/r.in.bin/main.c
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.in.gridatb/file_io.c
grass/trunk/raster/r.in.mat/main.c
grass/trunk/raster/r.in.poly/poly2rast.c
grass/trunk/raster/r.in.xyz/main.c
grass/trunk/raster/r.info/main.c
grass/trunk/raster/r.lake/main.c
grass/trunk/raster/r.le/r.le.patch/driver.c
grass/trunk/raster/r.le/r.le.patch/trace.c
grass/trunk/raster/r.le/r.le.pixel/cellclip.c
grass/trunk/raster/r.le/r.le.pixel/driver.c
grass/trunk/raster/r.le/r.le.pixel/texture.c
grass/trunk/raster/r.le/r.le.setup/mv_wind.c
grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c
grass/trunk/raster/r.le/r.le.setup/sample.c
grass/trunk/raster/r.le/r.le.trace/main.c
grass/trunk/raster/r.li/r.li.daemon/daemon.c
grass/trunk/raster/r.li/r.li.daemon/worker.c
grass/trunk/raster/r.los/main.c
grass/trunk/raster/r.mapcalc/map.c
grass/trunk/raster/r.mfilter/perform.c
grass/trunk/raster/r.neighbors/main.c
grass/trunk/raster/r.null/main.c
grass/trunk/raster/r.out.arc/main.c
grass/trunk/raster/r.out.ascii/main.c
grass/trunk/raster/r.out.bin/main.c
grass/trunk/raster/r.out.gdal/export_band.c
grass/trunk/raster/r.out.gdal/main.c
grass/trunk/raster/r.out.gridatb/file_io.c
grass/trunk/raster/r.out.mat/main.c
grass/trunk/raster/r.out.mpeg/main.c
grass/trunk/raster/r.out.png/main.c
grass/trunk/raster/r.out.pov/main.c
grass/trunk/raster/r.out.ppm/main.c
grass/trunk/raster/r.out.ppm3/main.c
grass/trunk/raster/r.out.tiff/main.c
grass/trunk/raster/r.out.vrml/main.c
grass/trunk/raster/r.out.vtk/main.c
grass/trunk/raster/r.param.scale/open_files.c
grass/trunk/raster/r.patch/main.c
grass/trunk/raster/r.profile/main.c
grass/trunk/raster/r.proj/main.c
grass/trunk/raster/r.quant/main.c
grass/trunk/raster/r.quantile/main.c
grass/trunk/raster/r.random.cells/indep.c
grass/trunk/raster/r.random.cells/init.c
grass/trunk/raster/r.random.surface/init.c
grass/trunk/raster/r.random.surface/main.c
grass/trunk/raster/r.random.surface/save.c
grass/trunk/raster/r.random/count.c
grass/trunk/raster/r.random/random.c
grass/trunk/raster/r.reclass/main.c
grass/trunk/raster/r.recode/read_rules.c
grass/trunk/raster/r.recode/recode.c
grass/trunk/raster/r.report/parse.c
grass/trunk/raster/r.resamp.interp/main.c
grass/trunk/raster/r.resamp.rst/main.c
grass/trunk/raster/r.resamp.stats/main.c
grass/trunk/raster/r.resample/main.c
grass/trunk/raster/r.rescale.eq/get_stats.c
grass/trunk/raster/r.rescale/get_range.c
grass/trunk/raster/r.ros/main.c
grass/trunk/raster/r.series/main.c
grass/trunk/raster/r.slope.aspect/main.c
grass/trunk/raster/r.slope.aspect/opennew.c
grass/trunk/raster/r.spread/main.c
grass/trunk/raster/r.spreadpath/main.c
grass/trunk/raster/r.statistics/main.c
grass/trunk/raster/r.statistics2/main.c
grass/trunk/raster/r.statistics3/main.c
grass/trunk/raster/r.stats/main.c
grass/trunk/raster/r.sun/main.c
grass/trunk/raster/r.sun2/main.c
grass/trunk/raster/r.sunmask/main.c
grass/trunk/raster/r.support.stats/check.c
grass/trunk/raster/r.support.stats/histo.c
grass/trunk/raster/r.support/check.c
grass/trunk/raster/r.support/histo.c
grass/trunk/raster/r.support/main.c
grass/trunk/raster/r.surf.area/main.c
grass/trunk/raster/r.surf.contour/main.c
grass/trunk/raster/r.surf.contour/read_cell.c
grass/trunk/raster/r.surf.fractal/write_rast.c
grass/trunk/raster/r.surf.gauss/gaussurf.c
grass/trunk/raster/r.surf.idw/main.c
grass/trunk/raster/r.surf.idw2/main.c
grass/trunk/raster/r.surf.idw2/read_cell.c
grass/trunk/raster/r.surf.random/randsurf.c
grass/trunk/raster/r.terraflow/grass2str.h
grass/trunk/raster/r.terraflow/main.cc
grass/trunk/raster/r.texture/main.c
grass/trunk/raster/r.thin/io.c
grass/trunk/raster/r.to.rast3/main.c
grass/trunk/raster/r.to.rast3elev/main.c
grass/trunk/raster/r.to.vect/main.c
grass/trunk/raster/r.topidx/file_io.c
grass/trunk/raster/r.univar/r.univar_main.c
grass/trunk/raster/r.uslek/main.c
grass/trunk/raster/r.usler/main.c
grass/trunk/raster/r.volume/main.c
grass/trunk/raster/r.walk/main.c
grass/trunk/raster/r.water.outlet/main.c
grass/trunk/raster/r.watershed/ram/close_maps.c
grass/trunk/raster/r.watershed/ram/close_maps2.c
grass/trunk/raster/r.watershed/ram/init_vars.c
grass/trunk/raster/r.watershed/seg/bseg_read.c
grass/trunk/raster/r.watershed/seg/bseg_write.c
grass/trunk/raster/r.watershed/seg/close_maps.c
grass/trunk/raster/r.watershed/seg/close_maps2.c
grass/trunk/raster/r.watershed/seg/cseg_read.c
grass/trunk/raster/r.watershed/seg/cseg_write.c
grass/trunk/raster/r.watershed/seg/dseg_read.c
grass/trunk/raster/r.watershed/seg/dseg_write.c
grass/trunk/raster/r.watershed/seg/init_vars.c
grass/trunk/raster/r.watershed/shed/read.c
grass/trunk/raster/r.watershed/shed/valid.c
grass/trunk/raster/r.what.color/main.c
grass/trunk/raster/r.what/main.c
grass/trunk/raster/simwe/simlib/input.c
grass/trunk/raster/simwe/simlib/output.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/opennew.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.drape/main.c
grass/trunk/vector/v.extrude/main.c
grass/trunk/vector/v.kernel/main.c
grass/trunk/vector/v.neighbors/main.c
grass/trunk/vector/v.sample/main.c
grass/trunk/vector/v.surf.idw/main.c
grass/trunk/vector/v.to.rast/support.c
grass/trunk/vector/v.to.rast/vect2rast.c
grass/trunk/vector/v.vol.rst/main.c
grass/trunk/vector/v.vol.rst/user1.c
grass/trunk/vector/v.what.rast/main.c
grass/trunk/visualization/xganim/main.cc
Log:
rasterlib: fns from opencell.c renamed, see
http://trac.osgeo.org/grass/wiki/Grass7/RasterLib
Modified: grass/trunk/display/d.colors/main.c
===================================================================
--- grass/trunk/display/d.colors/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.colors/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -68,7 +68,7 @@
G_fatal_error(msg);
}
- if (Rast_raster_map_is_fp(map->answer, mapset)) {
+ if (Rast_map_is_fp(map->answer, mapset)) {
sprintf(buff,
"Raster file [%s] is floating point! \nd.colors only works with integer maps",
map->answer);
Modified: grass/trunk/display/d.colortable/main.c
===================================================================
--- grass/trunk/display/d.colortable/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.colortable/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -97,7 +97,7 @@
exit(EXIT_FAILURE);
map_name = opt1->answer;
- fp = Rast_raster_map_is_fp(map_name, "");
+ fp = Rast_map_is_fp(map_name, "");
if (opt2->answer != NULL) {
new_colr = D_translate_color(opt2->answer);
Modified: grass/trunk/display/d.his/main.c
===================================================================
--- grass/trunk/display/d.his/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.his/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -121,7 +121,7 @@
name_h = opt_h->answer;
/* Make sure map is available */
- if ((hue_file = Rast_open_cell_old(name_h, "")) == -1)
+ if ((hue_file = Rast_open_old(name_h, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), name_h);
hue_r = G_malloc(window.cols);
@@ -143,7 +143,7 @@
int_used = 1;
/* Make sure map is available */
- if ((int_file = Rast_open_cell_old(name_i, "")) == -1)
+ if ((int_file = Rast_open_old(name_i, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), name_i);
int_r = G_malloc(window.cols);
@@ -162,7 +162,7 @@
sat_used = 1;
/* Make sure map is available */
- if ((sat_file = Rast_open_cell_old(name_s, "")) == -1)
+ if ((sat_file = Rast_open_old(name_s, "")) == -1)
G_fatal_error("Unable to open raster map <%s>", name_s);
sat_r = G_malloc(window.cols);
Modified: grass/trunk/display/d.histogram/get_stats.c
===================================================================
--- grass/trunk/display/d.histogram/get_stats.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.histogram/get_stats.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -51,7 +51,7 @@
/* write stats to a temp file */
tempfile = G_tempfile();
- is_fp = Rast_raster_map_is_fp(mapname, "");
+ is_fp = Rast_map_is_fp(mapname, "");
if (is_fp) {
if (cat_ranges) {
if (Rast_read_cats(mapname, "", &cats) < 0)
Modified: grass/trunk/display/d.legend/main.c
===================================================================
--- grass/trunk/display/d.legend/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.legend/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -247,7 +247,7 @@
if (Rast_read_colors(map_name, "", &colors) == -1)
G_fatal_error(_("Color file for <%s> not available"), map_name);
- fp = Rast_raster_map_is_fp(map_name, "");
+ fp = Rast_map_is_fp(map_name, "");
if (fp && !use_catlist) {
do_smooth = TRUE;
/* fprintf(stderr, "FP map found - switching gradient legend on\n"); */
Modified: grass/trunk/display/d.nviz/main.c
===================================================================
--- grass/trunk/display/d.nviz/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.nviz/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -178,7 +178,7 @@
/* Open Raster File */
if (NULL == (mapset = G_find_cell2(name, "")))
G_fatal_error(_("Raster map <%s> not found"), name);
- if (0 > (fd = Rast_open_cell_old(name, mapset)))
+ if (0 > (fd = Rast_open_old(name, mapset)))
G_fatal_error(_("Unable to open raster map <%s>"), name);
/* Set Image name */
@@ -199,7 +199,7 @@
G_fatal_error(_("Unable to open file <%s>"), outfile);
/* Get Raster Type */
- data_type = Rast_get_raster_map_type(fd);
+ data_type = Rast_get_map_type(fd);
/* Done with file */
/* Output initial startup stuff */
Modified: grass/trunk/display/d.profile/main.c
===================================================================
--- grass/trunk/display/d.profile/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.profile/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -60,7 +60,7 @@
static void get_map_range(void)
{
- if (Rast_raster_map_type(mapname, "") == CELL_TYPE) {
+ if (Rast_map_type(mapname, "") == CELL_TYPE) {
struct Range range;
CELL xmin, xmax;
@@ -212,7 +212,7 @@
mapname = map->answer;
- fd = Rast_open_cell_old(mapname, "");
+ fd = Rast_open_old(mapname, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), mapname);
Modified: grass/trunk/display/d.rast/display.c
===================================================================
--- grass/trunk/display/d.rast/display.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.rast/display.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -57,7 +57,7 @@
D_set_overlay_mode(overlay);
/* Make sure map is available */
- if ((cellfile = Rast_open_cell_old(name, "")) == -1)
+ if ((cellfile = Rast_open_old(name, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), name);
/* Allocate space for cell buffer */
Modified: grass/trunk/display/d.rast/main.c
===================================================================
--- grass/trunk/display/d.rast/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.rast/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -105,7 +105,7 @@
if (D_open_driver() != 0)
G_fatal_error(_("No graphics device selected"));
- fp = Rast_raster_map_is_fp(name, "");
+ fp = Rast_map_is_fp(name, "");
if (catlist->answer) {
if (fp)
G_warning(_("Ignoring catlist: map is floating point (please use 'val=')"));
Modified: grass/trunk/display/d.rast.arrow/main.c
===================================================================
--- grass/trunk/display/d.rast.arrow/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.rast.arrow/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -290,11 +290,11 @@
}
/* open the raster map */
- layer_fd = Rast_open_cell_old(layer_name, "");
+ layer_fd = Rast_open_old(layer_name, "");
if (layer_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), layer_name);
- raster_type = Rast_get_raster_map_type(layer_fd);
+ raster_type = Rast_get_map_type(layer_fd);
/* allocate the cell array */
raster_row = Rast_allocate_buf(raster_type);
@@ -302,11 +302,11 @@
if (opt7->answer) {
/* open the magnitude raster map */
- mag_fd = Rast_open_cell_old(mag_map, "");
+ mag_fd = Rast_open_old(mag_map, "");
if (mag_fd < 0)
G_fatal_error("Unable to open raster map <%s>", mag_map);
- mag_raster_type = Rast_get_raster_map_type(mag_fd);
+ mag_raster_type = Rast_get_map_type(mag_fd);
/* allocate the cell array */
mag_raster_row = Rast_allocate_buf(mag_raster_type);
Modified: grass/trunk/display/d.rast.num/main.c
===================================================================
--- grass/trunk/display/d.rast.num/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.rast.num/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -126,12 +126,12 @@
else
fixed_color = 1;
- layer_fd = Rast_open_cell_old(map_name, "");
+ layer_fd = Rast_open_old(map_name, "");
if (layer_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), map_name);
/* determine the inputmap type (CELL/FCELL/DCELL) */
- inmap_type = Rast_get_raster_map_type(layer_fd);
+ inmap_type = Rast_get_map_type(layer_fd);
map_type = DCELL_TYPE;
/* Read in the map window associated with window */
Modified: grass/trunk/display/d.rgb/main.c
===================================================================
--- grass/trunk/display/d.rgb/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.rgb/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -89,10 +89,10 @@
char *name = B[i].opt->answer;
/* Make sure map is available */
- if ((B[i].file = Rast_open_cell_old(name, "")) == -1)
+ if ((B[i].file = Rast_open_old(name, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), name);
- B[i].type = Rast_get_raster_map_type(B[i].file);
+ B[i].type = Rast_get_map_type(B[i].file);
/* Reading color lookup table */
if (Rast_read_colors(name, "", &B[i].colors) == -1)
Modified: grass/trunk/display/d.what.rast/opencell.c
===================================================================
--- grass/trunk/display/d.what.rast/opencell.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.what.rast/opencell.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -19,7 +19,7 @@
else
strcpy(mapset, m);
- fd = Rast_open_cell_old(name, mapset);
+ fd = Rast_open_old(name, mapset);
if (fd < 0)
G_warning(_("Unable to open raster map <%s>"), name);
Modified: grass/trunk/display/d.what.rast/what.c
===================================================================
--- grass/trunk/display/d.what.rast/what.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/display/d.what.rast/what.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -29,7 +29,7 @@
screen_y = ((int)D_get_d_north() + (int)D_get_d_south()) / 2;
for (i = 0; i < nrasts; i++)
- map_type[i] = Rast_get_raster_map_type(fd[i]);
+ map_type[i] = Rast_get_map_type(fd[i]);
do {
if (!terse)
Modified: grass/trunk/doc/raster/r.example/main.c
===================================================================
--- grass/trunk/doc/raster/r.example/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/doc/raster/r.example/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -113,10 +113,10 @@
G_fatal_error(_("Raster map <%s> not found"), name);
/* determine the inputmap type (CELL/FCELL/DCELL) */
- data_type = Rast_raster_map_type(name, mapset);
+ data_type = Rast_map_type(name, mapset);
- /* Rast_open_cell_old - returns file destriptor (>0) */
- if ((infd = Rast_open_cell_old(name, mapset)) < 0)
+ /* Rast_open_old - returns file destriptor (>0) */
+ if ((infd = Rast_open_old(name, mapset)) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
@@ -135,7 +135,7 @@
outrast = Rast_allocate_buf(data_type);
/* controlling, if we can write the raster */
- if ((outfd = Rast_open_raster_new(result, data_type)) < 0)
+ if ((outfd = Rast_open_new(result, data_type)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
/* for each row */
Modified: grass/trunk/general/g.region/zoom.c
===================================================================
--- grass/trunk/general/g.region/zoom.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/general/g.region/zoom.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -19,11 +19,11 @@
nrows = window->rows;
ncols = window->cols;
- fd = Rast_open_cell_old(name, mapset);
+ fd = Rast_open_old(name, mapset);
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s> in <%s>"),
name, mapset);
- map_type = Rast_get_raster_map_type(fd);
+ map_type = Rast_get_map_type(fd);
raster = Rast_allocate_buf(map_type);
/* find first non-null row */
Modified: grass/trunk/imagery/i.albedo/main.c
===================================================================
--- grass/trunk/imagery/i.albedo/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.albedo/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -150,13 +150,13 @@
G_fatal_error(_("Too many input maps. Only %d allowed."), MAXFILES);
name = *ptr;
- infd[nfiles] = Rast_open_cell_old(name, "");
+ infd[nfiles] = Rast_open_old(name, "");
if (infd[nfiles] < 0)
continue;
/* Allocate input buffer */
- in_data_type[nfiles] = Rast_raster_map_type(name, "");
- if ((infd[nfiles] = Rast_open_cell_old(name, "")) < 0)
+ in_data_type[nfiles] = Rast_map_type(name, "");
+ if ((infd[nfiles] = Rast_open_old(name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
if ((Rast_get_cellhd(name, "", &cellhd)) < 0)
@@ -175,7 +175,7 @@
outrast = Rast_allocate_buf(out_data_type);
/* Create New raster files */
- if ((outfd = Rast_open_raster_new(result, 1)) < 0)
+ if ((outfd = Rast_open_new(result, 1)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
/*START ALBEDO HISTOGRAM STRETCH */
Modified: grass/trunk/imagery/i.atcorr/main.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/main.cpp 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.atcorr/main.cpp 2009-06-29 21:09:01 UTC (rev 38120)
@@ -590,7 +590,7 @@
/* open input raster */
if ( (iimg_mapset = G_find_cell2 ( opts.iimg->answer, "") ) == NULL )
G_fatal_error ( _("Raster map <%s> not found"), opts.iimg->answer);
- if((iimg_fd = Rast_open_cell_old(opts.iimg->answer, iimg_mapset)) < 0)
+ if((iimg_fd = Rast_open_old(opts.iimg->answer, iimg_mapset)) < 0)
G_fatal_error (_("Unable to open raster map <%s>"),
G_fully_qualified_name(opts.iimg->answer, iimg_mapset));
@@ -599,7 +599,7 @@
if(opts.ialt->answer) {
if ( (ialt_mapset = G_find_cell2 ( opts.ialt->answer, "") ) == NULL )
G_fatal_error ( _("Raster map <%s> not found"), opts.ialt->answer);
- if((ialt_fd = Rast_open_cell_old(opts.ialt->answer, ialt_mapset)) < 0)
+ if((ialt_fd = Rast_open_old(opts.ialt->answer, ialt_mapset)) < 0)
G_fatal_error (_("Unable to open raster map <%s>"),
G_fully_qualified_name(opts.ialt->answer, ialt_mapset));
}
@@ -607,7 +607,7 @@
if(opts.ivis->answer) {
if ( (iviz_mapset = G_find_cell2 ( opts.ivis->answer, "") ) == NULL )
G_fatal_error ( _("Raster map <%s> not found"), opts.ivis->answer);
- if((ivis_fd = Rast_open_cell_old(opts.ivis->answer, iviz_mapset)) < 0)
+ if((ivis_fd = Rast_open_old(opts.ivis->answer, iviz_mapset)) < 0)
G_fatal_error (_("Unable to open raster map <%s>"),
G_fully_qualified_name(opts.ivis->answer, iviz_mapset));
}
@@ -615,13 +615,13 @@
/* open a floating point raster or not? */
if(opts.oflt->answer)
{
- if((oimg_fd = Rast_open_fp_cell_new(opts.oimg->answer)) < 0)
+ if((oimg_fd = Rast_open_fp_new(opts.oimg->answer)) < 0)
G_fatal_error (_("Unable to create raster map <%s>"),
opts.oimg->answer);
}
else
{
- if((oimg_fd = Rast_open_raster_new(opts.oimg->answer, CELL_TYPE)) < 0)
+ if((oimg_fd = Rast_open_new(opts.oimg->answer, CELL_TYPE)) < 0)
G_fatal_error (_("Unable to create raster map <%s>"),
opts.oimg->answer);
}
Modified: grass/trunk/imagery/i.biomass/main.c
===================================================================
--- grass/trunk/imagery/i.biomass/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.biomass/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -99,27 +99,27 @@
result1 = output1->answer;
/***************************************************/
- if ((infd_fpar = Rast_open_cell_old(fpar, "")) < 0)
+ if ((infd_fpar = Rast_open_old(fpar, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), fpar);
inrast_fpar = Rast_allocate_d_buf();
- if ((infd_luf = Rast_open_cell_old(luf, "")) < 0)
+ if ((infd_luf = Rast_open_old(luf, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), luf);
inrast_luf = Rast_allocate_d_buf();
- if ((infd_lat = Rast_open_cell_old(lat, "")) < 0)
+ if ((infd_lat = Rast_open_old(lat, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), lat);
inrast_lat = Rast_allocate_d_buf();
- if ((infd_doy = Rast_open_cell_old(doy, "")) < 0)
+ if ((infd_doy = Rast_open_old(doy, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), doy);
inrast_doy = Rast_allocate_d_buf();
- if ((infd_tsw = Rast_open_cell_old(tsw, "")) < 0)
+ if ((infd_tsw = Rast_open_old(tsw, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), tsw);
inrast_tsw = Rast_allocate_d_buf();
- if ((infd_wa = Rast_open_cell_old(wa, "")) < 0)
+ if ((infd_wa = Rast_open_old(wa, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), wa);
inrast_wa = Rast_allocate_d_buf();
@@ -128,7 +128,7 @@
outrast1 = Rast_allocate_d_buf();
/* Create New raster files */
- if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
+ if ((outfd1 = Rast_open_new(result1, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result1);
/* Process pixels */
Modified: grass/trunk/imagery/i.cca/main.c
===================================================================
--- grass/trunk/imagery/i.cca/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.cca/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -168,14 +168,14 @@
outbandmax[i] = (CELL) 0;
outbandmin[i] = (CELL) 0;
- if ((datafds[i] = Rast_open_cell_old(refs.file[i - 1].name,
+ if ((datafds[i] = Rast_open_old(refs.file[i - 1].name,
refs.file[i - 1].mapset)) < 0) {
G_fatal_error(_("Cannot open raster map <%s>"),
refs.file[i - 1].name);
}
sprintf(tempname, "%s.%d", out_opt->answer, i);
- if ((outfds[i] = Rast_open_cell_new(tempname)) < 0)
+ if ((outfds[i] = Rast_open_c_new(tempname)) < 0)
G_fatal_error(_("Cannot create raster map <%s>"), tempname);
}
Modified: grass/trunk/imagery/i.class/band_files.c
===================================================================
--- grass/trunk/imagery/i.class/band_files.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.class/band_files.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -18,7 +18,7 @@
Bandbuf[n] = Rast_allocate_c_buf();
name = Refer.file[n].name;
mapset = Refer.file[n].mapset;
- if ((Bandfd[n] = Rast_open_cell_old(name, mapset)) < 0)
+ if ((Bandfd[n] = Rast_open_old(name, mapset)) < 0)
G_fatal_error(_("Unable to open band files."));
}
Modified: grass/trunk/imagery/i.class/draw_cell.c
===================================================================
--- grass/trunk/imagery/i.class/draw_cell.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.class/draw_cell.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -38,7 +38,7 @@
return 1;
}
- fd = Rast_open_cell_old(view->cell.name, view->cell.mapset);
+ fd = Rast_open_old(view->cell.name, view->cell.mapset);
if (fd < 0) {
Rast_free_colors(&colr);
return 0;
Modified: grass/trunk/imagery/i.class/signature.c
===================================================================
--- grass/trunk/imagery/i.class/signature.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.class/signature.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -272,7 +272,7 @@
Rast_set_window(&VIEW_MAP1->cell.head);
open_band_files();
- if ((fd = Rast_open_cell_new(MASK)) < 0)
+ if ((fd = Rast_open_c_new(MASK)) < 0)
G_fatal_error(_("Unable to open the cell map MASK."));
if ((buffer = Rast_allocate_c_buf()) == NULL)
G_fatal_error(_("Unable to allocate the cell buffer in display_signature()."));
Modified: grass/trunk/imagery/i.cluster/open_files.c
===================================================================
--- grass/trunk/imagery/i.cluster/open_files.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.cluster/open_files.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -54,7 +54,7 @@
name = ref.file[n].name;
mapset = ref.file[n].mapset;
- if ((cellfd[n] = Rast_open_cell_old(name, mapset)) < 0)
+ if ((cellfd[n] = Rast_open_old(name, mapset)) < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
G_fully_qualified_name(name, mapset));
}
Modified: grass/trunk/imagery/i.eb.eta/main.c
===================================================================
--- grass/trunk/imagery/i.eb.eta/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.eb.eta/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -76,15 +76,15 @@
tempk = input3->answer;
result1 = output1->answer;
- if ((infd_rnetday = Rast_open_cell_old(rnetday, "")) < 0)
+ if ((infd_rnetday = Rast_open_old(rnetday, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), rnetday);
inrast_rnetday = Rast_allocate_d_buf();
- if ((infd_evapfr = Rast_open_cell_old(evapfr, "")) < 0)
+ if ((infd_evapfr = Rast_open_old(evapfr, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), evapfr);
inrast_evapfr = Rast_allocate_d_buf();
- if ((infd_tempk = Rast_open_cell_old(tempk, "")) < 0)
+ if ((infd_tempk = Rast_open_old(tempk, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), tempk);
inrast_tempk = Rast_allocate_d_buf();
@@ -92,7 +92,7 @@
ncols = G_window_cols();
outrast1 = Rast_allocate_d_buf();
- if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
+ if ((outfd1 = Rast_open_new(result1, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result1);
/* Process pixels */
Modified: grass/trunk/imagery/i.eb.evapfr/main.c
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -95,17 +95,17 @@
makin = flag1->answer;
/***************************************************/
- if ((infd_rnet = Rast_open_cell_old(rnet, "")) < 0)
+ if ((infd_rnet = Rast_open_old(rnet, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), rnet);
inrast_rnet = Rast_allocate_d_buf();
/***************************************************/
- if ((infd_g0 = Rast_open_cell_old(g0, "")) < 0)
+ if ((infd_g0 = Rast_open_old(g0, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), g0);
inrast_g0 = Rast_allocate_d_buf();
/***************************************************/
- if ((infd_h0 = Rast_open_cell_old(h0, "")) < 0)
+ if ((infd_h0 = Rast_open_old(h0, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), h0);
inrast_h0 = Rast_allocate_d_buf();
@@ -118,10 +118,10 @@
outrast2 = Rast_allocate_d_buf();
/* Create New raster files */
- if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
+ if ((outfd1 = Rast_open_new(result1, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result1);
if (makin)
- if ((outfd2 = Rast_open_raster_new(result2, DCELL_TYPE)) < 0)
+ if ((outfd2 = Rast_open_new(result2, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result2);
/* Process pixels */
Modified: grass/trunk/imagery/i.eb.h_SEBAL01/main.c
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -204,13 +204,13 @@
if (G_legal_filename(h0) < 0)
G_fatal_error(_("<%s> is an illegal name"), h0);
- if ((infd_Rn = Rast_open_cell_old(Rn, "")) < 0)
+ if ((infd_Rn = Rast_open_old(Rn, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), Rn);
- if ((infd_g0 = Rast_open_cell_old(g0, "")) < 0)
+ if ((infd_g0 = Rast_open_old(g0, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), g0);
- if ((infd_z0m = Rast_open_cell_old(z0m, "")) < 0)
+ if ((infd_z0m = Rast_open_old(z0m, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), z0m);
- if ((infd_t0dem = Rast_open_cell_old(t0dem, "")) < 0)
+ if ((infd_t0dem = Rast_open_old(t0dem, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), t0dem);
if (Rast_get_cellhd(Rn, "", &cellhd) < 0)
@@ -247,7 +247,7 @@
/***************************************************/
outrast = Rast_allocate_d_buf();
- if ((outfd = Rast_open_raster_new(h0, DCELL_TYPE)) < 0)
+ if ((outfd = Rast_open_new(h0, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), h0);
/***************************************************/
Modified: grass/trunk/imagery/i.eb.soilheatflux/main.c
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.eb.soilheatflux/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -94,23 +94,23 @@
result = output1->answer;
roerink = flag1->answer;
- if ((infd_albedo = Rast_open_cell_old(albedo, "")) < 0)
+ if ((infd_albedo = Rast_open_old(albedo, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), albedo);
inrast_albedo = Rast_allocate_d_buf();
- if ((infd_ndvi = Rast_open_cell_old(ndvi, "")) < 0)
+ if ((infd_ndvi = Rast_open_old(ndvi, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), ndvi);
inrast_ndvi = Rast_allocate_d_buf();
- if ((infd_tempk = Rast_open_cell_old(tempk, "")) < 0)
+ if ((infd_tempk = Rast_open_old(tempk, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), tempk);
inrast_tempk = Rast_allocate_d_buf();
- if ((infd_rnet = Rast_open_cell_old(rnet, "")) < 0)
+ if ((infd_rnet = Rast_open_old(rnet, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), rnet);
inrast_rnet = Rast_allocate_d_buf();
- if ((infd_time = Rast_open_cell_old(time, "")) < 0)
+ if ((infd_time = Rast_open_old(time, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), time);
inrast_time = Rast_allocate_d_buf();
@@ -119,7 +119,7 @@
outrast = Rast_allocate_d_buf();
/* Create New raster files */
- if ((outfd = Rast_open_raster_new(result,DCELL_TYPE)) < 0)
+ if ((outfd = Rast_open_new(result,DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
/* Process pixels */
Modified: grass/trunk/imagery/i.emissivity/main.c
===================================================================
--- grass/trunk/imagery/i.emissivity/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.emissivity/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -62,7 +62,7 @@
result1 = output->answer;
/***************************************************/
- if ((infd = Rast_open_cell_old(ndvi, "")) < 0)
+ if ((infd = Rast_open_old(ndvi, "")) < 0)
G_fatal_error(_("Cannot open cell file [%s]"), ndvi);
inr = Rast_allocate_d_buf();
@@ -72,7 +72,7 @@
outr = Rast_allocate_d_buf();
/* Create New raster files */
- if ((outfd = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
+ if ((outfd = Rast_open_new(result1, DCELL_TYPE)) < 0)
G_fatal_error(_("Could not open <%s>"), result1);
/* Process pixels */
Modified: grass/trunk/imagery/i.evapo.time_integration/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -165,14 +165,14 @@
}
if (!ok)
continue;
- infd[nfiles] = Rast_open_cell_old(name, mapset);
+ infd[nfiles] = Rast_open_old(name, mapset);
if (infd[nfiles] < 0) {
ok = 0;
continue;
}
/* Allocate input buffer */
- in_data_type[nfiles] = Rast_raster_map_type(name, mapset);
- if ((infd[nfiles] = Rast_open_cell_old(name, mapset)) < 0)
+ in_data_type[nfiles] = Rast_map_type(name, mapset);
+ if ((infd[nfiles] = Rast_open_old(name, mapset)) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
if ((Rast_get_cellhd(name, mapset, &cellhd)) < 0)
G_fatal_error(_("Unable to read file header of raster map <%s>"), name);
@@ -198,14 +198,14 @@
}
if (!ok)
continue;
- infd1[nfiles1] = Rast_open_cell_old(name1, mapset);
+ infd1[nfiles1] = Rast_open_old(name1, mapset);
if (infd1[nfiles1] < 0) {
ok = 0;
continue;
}
/* Allocate input buffer */
- in_data_type1[nfiles1] = Rast_raster_map_type(name1, mapset);
- if ((infd1[nfiles1] = Rast_open_cell_old(name1, mapset)) < 0)
+ in_data_type1[nfiles1] = Rast_map_type(name1, mapset);
+ if ((infd1[nfiles1] = Rast_open_old(name1, mapset)) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name1);
if ((Rast_get_cellhd(name1, mapset, &cellhd)) < 0)
G_fatal_error(_("Unable to read file header of raster map <%s>"), name1);
@@ -237,14 +237,14 @@
}
if (!ok)
continue;
- infd2[nfiles2] = Rast_open_cell_old(name2, mapset);
+ infd2[nfiles2] = Rast_open_old(name2, mapset);
if (infd2[nfiles2] < 0) {
ok = 0;
continue;
}
/* Allocate input buffer */
- in_data_type2[nfiles2] = Rast_raster_map_type(name2, mapset);
- if ((infd2[nfiles2] = Rast_open_cell_old(name2, mapset)) < 0) {
+ in_data_type2[nfiles2] = Rast_map_type(name2, mapset);
+ if ((infd2[nfiles2] = Rast_open_old(name2, mapset)) < 0) {
G_fatal_error(_("Unable to open raster map <%s>"), name2);
}
if ((Rast_get_cellhd(name2, mapset, &cellhd)) < 0) {
@@ -264,7 +264,7 @@
/* Create New raster files */
- if ((outfd = Rast_open_raster_new(result, 1)) < 0)
+ if ((outfd = Rast_open_new(result, 1)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
/*******************/
Modified: grass/trunk/imagery/i.fft/main.c
===================================================================
--- grass/trunk/imagery/i.fft/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.fft/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -100,7 +100,7 @@
Cellmap_real = opt.real->answer;
Cellmap_imag = opt.imag->answer;
- inputfd = Rast_open_cell_old(Cellmap_orig, "");
+ inputfd = Rast_open_old(Cellmap_orig, "");
if (inputfd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), Cellmap_orig);
@@ -150,9 +150,9 @@
fft2(-1, data, totsize, cols, rows);
/* open the output cell maps */
- if ((realfd = Rast_open_fp_cell_new(Cellmap_real)) < 0)
+ if ((realfd = Rast_open_fp_new(Cellmap_real)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), Cellmap_real);
- if ((imagfd = Rast_open_fp_cell_new(Cellmap_imag)) < 0)
+ if ((imagfd = Rast_open_fp_new(Cellmap_imag)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), Cellmap_imag);
#define SWAP1(a, b) \
Modified: grass/trunk/imagery/i.gensig/openfiles.c
===================================================================
--- grass/trunk/imagery/i.gensig/openfiles.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.gensig/openfiles.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -30,7 +30,7 @@
/* open training map for reading */
mapset = G_find_cell2(parms->training_map, "");
- files->train_fd = Rast_open_cell_old(parms->training_map, mapset);
+ files->train_fd = Rast_open_old(parms->training_map, mapset);
if (files->train_fd < 0)
G_fatal_error(_("Unable to open training map <%s>"),
parms->training_map);
@@ -39,7 +39,7 @@
/* open all maps for reading */
for (n = 0; n < Ref.nfiles; n++) {
files->band_fd[n] =
- Rast_open_cell_old(Ref.file[n].name, Ref.file[n].mapset);
+ Rast_open_old(Ref.file[n].name, Ref.file[n].mapset);
if (files->band_fd[n] < 0)
G_fatal_error(_("Unable to open training map <%s in %s>"),
Ref.file[n].name, Ref.file[n].mapset);
Modified: grass/trunk/imagery/i.gensigset/openfiles.c
===================================================================
--- grass/trunk/imagery/i.gensigset/openfiles.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.gensigset/openfiles.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -30,7 +30,7 @@
/* open training map for reading */
mapset = G_find_cell2(parms->training_map, "");
- files->train_fd = Rast_open_cell_old(parms->training_map, mapset);
+ files->train_fd = Rast_open_old(parms->training_map, mapset);
if (files->train_fd < 0)
G_fatal_error(_("Unable to open training map <%s>"),
parms->training_map);
@@ -39,7 +39,7 @@
/* open all maps for reading */
for (n = 0; n < Ref.nfiles; n++) {
files->band_fd[n] =
- Rast_open_cell_old(Ref.file[n].name, Ref.file[n].mapset);
+ Rast_open_old(Ref.file[n].name, Ref.file[n].mapset);
if (files->band_fd[n] < 0)
G_fatal_error(_("Unable to open training map <%s in %s>"),
Ref.file[n].name, Ref.file[n].mapset);
Modified: grass/trunk/imagery/i.his.rgb/openfiles.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/openfiles.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.his.rgb/openfiles.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -10,11 +10,11 @@
int fd_input[3], int fd_output[3], CELL * rowbuf[3])
{
/* open output files */
- if ((fd_output[0] = Rast_open_cell_new(r_name)) < 0)
+ if ((fd_output[0] = Rast_open_c_new(r_name)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), r_name);
- if ((fd_output[1] = Rast_open_cell_new(g_name)) < 0)
+ if ((fd_output[1] = Rast_open_c_new(g_name)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), g_name);
- if ((fd_output[2] = Rast_open_cell_new(b_name)) < 0)
+ if ((fd_output[2] = Rast_open_c_new(b_name)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), b_name);
/* allocate the cell row buffer */
@@ -26,12 +26,12 @@
G_fatal_error(_("Unable to allocate the input row buffer"));
/* open input files (maps can be in different mapsets) */
- if ((fd_input[0] = Rast_open_cell_old(h_name, "")) < 0)
+ if ((fd_input[0] = Rast_open_old(h_name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), h_name);
- if ((fd_input[1] = Rast_open_cell_old(i_name, "")) < 0)
+ if ((fd_input[1] = Rast_open_old(i_name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), i_name);
- if ((fd_input[2] = Rast_open_cell_old(s_name, "")) < 0)
+ if ((fd_input[2] = Rast_open_old(s_name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), s_name);
}
Modified: grass/trunk/imagery/i.ifft/main.c
===================================================================
--- grass/trunk/imagery/i.ifft/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.ifft/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -101,12 +101,12 @@
Cellmap_orig = opt.orig->answer;
/* open input raster map */
- realfd = Rast_open_cell_old(Cellmap_real, "");
+ realfd = Rast_open_old(Cellmap_real, "");
if (realfd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
Cellmap_real);
- imagfd = Rast_open_cell_old(Cellmap_imag, "");
+ imagfd = Rast_open_old(Cellmap_imag, "");
if (imagfd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
Cellmap_imag);
@@ -212,7 +212,7 @@
fft2(1, data, totsize, cols, rows);
/* open the output cell map */
- if ((outputfd = Rast_open_fp_cell_new(Cellmap_orig)) < 0)
+ if ((outputfd = Rast_open_fp_new(Cellmap_orig)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
Cellmap_orig);
Modified: grass/trunk/imagery/i.latlong/main.c
===================================================================
--- grass/trunk/imagery/i.latlong/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.latlong/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -78,7 +78,7 @@
result1 = output1->answer;
/***************************************************/
- if ((infd = Rast_open_cell_old(in, "")) < 0)
+ if ((infd = Rast_open_old(in, "")) < 0)
G_fatal_error(_("Cannot open cell file [%s]"), in);
if (Rast_get_cellhd(in, "", &cellhd) < 0)
G_fatal_error(_("Cannot read file header of [%s])"), in);
@@ -119,7 +119,7 @@
outrast1 = Rast_allocate_d_buf();
- if ((outfd1 = Rast_open_raster_new(result1,DCELL_TYPE)) < 0)
+ if ((outfd1 = Rast_open_new(result1,DCELL_TYPE)) < 0)
G_fatal_error(_("Could not open <%s>"), result1);
for (row = 0; row < nrows; row++)
Modified: grass/trunk/imagery/i.maxlik/open.c
===================================================================
--- grass/trunk/imagery/i.maxlik/open.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.maxlik/open.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -38,7 +38,7 @@
cell[n] = Rast_allocate_d_buf();
name = Ref.file[n].name;
mapset = Ref.file[n].mapset;
- if ((cellfd[n] = Rast_open_cell_old(name, mapset)) < 0)
+ if ((cellfd[n] = Rast_open_old(name, mapset)) < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
G_fully_qualified_name(name, mapset));
}
@@ -62,7 +62,7 @@
B = (double *)G_malloc(S.nsigs * sizeof(double));
invert_signatures();
- class_fd = Rast_open_cell_new(class_name);
+ class_fd = Rast_open_c_new(class_name);
if (class_fd < 0)
exit(EXIT_FAILURE);
@@ -70,7 +70,7 @@
reject_cell = NULL;
if (reject_name) {
- reject_fd = Rast_open_cell_new(reject_name);
+ reject_fd = Rast_open_c_new(reject_name);
if (reject_fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
reject_name);
Modified: grass/trunk/imagery/i.modis.qc/main.c
===================================================================
--- grass/trunk/imagery/i.modis.qc/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.modis.qc/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -197,7 +197,7 @@
(!strcmp(qcflag, "pixel_adjacent_to_cloud") && (strcmp(product, "mod09A1s"))))
G_fatal_error(_("This flag is only available for MOD09A1s @ 500m products"));
- if ((infd = Rast_open_cell_old(qcchan, "")) < 0)
+ if ((infd = Rast_open_old(qcchan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), qcchan);
if (Rast_get_cellhd(qcchan, "", &cellhd) < 0)
@@ -211,7 +211,7 @@
outrast = Rast_allocate_c_buf();
/* Create New raster files */
- if ((outfd = Rast_open_raster_new(result, data_type_output)) < 0)
+ if ((outfd = Rast_open_new(result, data_type_output)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
/* Process pixels */
Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.pca/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -127,7 +127,7 @@
sprintf(tmpbuf, "%s.%d", opt_out->answer, i + 1);
G_check_input_output_name(opt_in->answers[i], tmpbuf, GR_FATAL_EXIT);
- if ((inp_fd[i] = Rast_open_cell_old(opt_in->answers[i], "")) < 0)
+ if ((inp_fd[i] = Rast_open_old(opt_in->answers[i], "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
opt_in->answers[i]);
}
@@ -239,7 +239,7 @@
int row, col;
double sum = 0.;
- maptype = Rast_get_raster_map_type(fds[i]);
+ maptype = Rast_get_map_type(fds[i]);
/* don't assume each image is of the same type */
if (rowbuf)
@@ -287,7 +287,7 @@
int row, col;
for (j = 0; j < bands; j++) {
- RASTER_MAP_TYPE maptype = Rast_get_raster_map_type(fds[j]);
+ RASTER_MAP_TYPE maptype = Rast_get_map_type(fds[j]);
void *rowbuf1 = NULL;
void *rowbuf2 = NULL;
@@ -309,7 +309,7 @@
G_fatal_error(_("Unable to read raster map row %d"), row);
for (k = j; k < bands; k++) {
- RASTER_MAP_TYPE maptype2 = Rast_get_raster_map_type(fds[k]);
+ RASTER_MAP_TYPE maptype2 = Rast_get_map_type(fds[k]);
/* don't assume each image is of the same type */
if (rowbuf2)
@@ -390,9 +390,9 @@
/* open a new file for output */
if (scale)
- out_fd = Rast_open_cell_new(name);
+ out_fd = Rast_open_c_new(name);
else {
- out_fd = Rast_open_fp_cell_new(name);
+ out_fd = Rast_open_fp_new(name);
Rast_set_fp_type(DCELL_TYPE);
}
@@ -424,7 +424,7 @@
for (j = 0; j < bands; j++) {
RASTER_MAP_TYPE maptype =
- Rast_get_raster_map_type(inp_fd[j]);
+ Rast_get_map_type(inp_fd[j]);
/* don't assume each image is of the same type */
if (rowbuf)
Modified: grass/trunk/imagery/i.pca/support.c
===================================================================
--- grass/trunk/imagery/i.pca/support.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.pca/support.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -21,7 +21,7 @@
Rast_make_grey_scale_fp_colors(&colors, min, max);
- if (Rast_raster_map_is_fp(outname, mapset))
+ if (Rast_map_is_fp(outname, mapset))
Rast_mark_colors_as_fp(&colors);
if (Rast_write_colors(outname, mapset, &colors) < 0)
Modified: grass/trunk/imagery/i.points/drawcell.c
===================================================================
--- grass/trunk/imagery/i.points/drawcell.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.points/drawcell.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -49,7 +49,7 @@
if (getenv("NO_DRAW"))
return 1;
- fd = Rast_open_cell_old(view->cell.name, view->cell.mapset);
+ fd = Rast_open_old(view->cell.name, view->cell.mapset);
if (fd < 0)
return 0;
dcell = Rast_allocate_d_buf();
Modified: grass/trunk/imagery/i.rectify/rectify.c
===================================================================
--- grass/trunk/imagery/i.rectify/rectify.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.rectify/rectify.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -42,12 +42,12 @@
* set window to cellhd first to be able to read file exactly
*/
Rast_set_window(&cellhd);
- infd = Rast_open_cell_old(name, mapset);
+ infd = Rast_open_old(name, mapset);
if (infd < 0) {
close(infd);
return 0;
}
- map_type = Rast_get_raster_map_type(infd);
+ map_type = Rast_get_map_type(infd);
rast = (void *)G_calloc(G_window_cols() + 1, Rast_cell_size(map_type));
Rast_set_null_value(rast, G_window_cols() + 1, map_type);
Modified: grass/trunk/imagery/i.rectify/write.c
===================================================================
--- grass/trunk/imagery/i.rectify/write.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.rectify/write.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -46,7 +46,7 @@
rast = Rast_allocate_buf(map_type);
close(temp_fd);
temp_fd = open(temp_name, 0);
- fd = Rast_open_raster_new(name, map_type);
+ fd = Rast_open_new(name, map_type);
if (fd <= 0)
G_fatal_error(_("Unable to create raster map <%s>"), name);
Modified: grass/trunk/imagery/i.rgb.his/openfiles.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/openfiles.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.rgb.his/openfiles.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -9,19 +9,19 @@
char *h_name, char *i_name, char *s_name,
int fd_input[3], int fd_output[3], CELL * rowbuf[3])
{
- if ((fd_input[0] = Rast_open_cell_old(r_name, "")) < 0)
+ if ((fd_input[0] = Rast_open_old(r_name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), r_name);
- if ((fd_input[1] = Rast_open_cell_old(g_name, "")) < 0)
+ if ((fd_input[1] = Rast_open_old(g_name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), g_name);
- if ((fd_input[2] = Rast_open_cell_old(b_name, "")) < 0)
+ if ((fd_input[2] = Rast_open_old(b_name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), b_name);
/* open output files */
- if ((fd_output[0] = Rast_open_cell_new(h_name)) < 0)
+ if ((fd_output[0] = Rast_open_c_new(h_name)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), h_name);
- if ((fd_output[1] = Rast_open_cell_new(i_name)) < 0)
+ if ((fd_output[1] = Rast_open_c_new(i_name)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), i_name);
- if ((fd_output[2] = Rast_open_cell_new(s_name)) < 0)
+ if ((fd_output[2] = Rast_open_c_new(s_name)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), s_name);
/* allocate the cell row buffer */
Modified: grass/trunk/imagery/i.smap/opencell.c
===================================================================
--- grass/trunk/imagery/i.smap/opencell.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.smap/opencell.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -10,7 +10,7 @@
if (mapset == NULL)
mapset = G_find_cell2(name, "");
- fd = Rast_open_cell_old(name, mapset);
+ fd = Rast_open_old(name, mapset);
if (fd >= 0)
return fd;
@@ -24,7 +24,7 @@
{
int fd;
- fd = Rast_open_cell_new(name);
+ fd = Rast_open_c_new(name);
if (fd >= 0)
return fd;
Modified: grass/trunk/imagery/i.sunhours/main.c
===================================================================
--- grass/trunk/imagery/i.sunhours/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.sunhours/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -70,12 +70,12 @@
result1 = output1->answer;
/***************************************************/
- if ((infd_doy = Rast_open_cell_old(doy, "")) < 0)
+ if ((infd_doy = Rast_open_old(doy, "")) < 0)
G_fatal_error(_("Cannot open cell file [%s]"), doy);
inrast_doy = Rast_allocate_d_buf();
/***************************************************/
- if ((infd_lat = Rast_open_cell_old(lat, "")) < 0)
+ if ((infd_lat = Rast_open_old(lat, "")) < 0)
G_fatal_error(_("Cannot open cell file [%s]"), lat);
inrast_lat = Rast_allocate_d_buf();
@@ -85,7 +85,7 @@
outrast1 = Rast_allocate_d_buf();
- if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
+ if ((outfd1 = Rast_open_new(result1, DCELL_TYPE)) < 0)
G_fatal_error(_("Could not open <%s>"), result1);
for (row = 0; row < nrows; row++)
Modified: grass/trunk/imagery/i.vi/main.c
===================================================================
--- grass/trunk/imagery/i.vi/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.vi/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -210,36 +210,36 @@
|| !(input6->answer) || !(input7->answer)) )
G_fatal_error(_("gvi index requires blue, green, red, nir, chan5 and chan7 maps"));
- if ((infd_redchan = Rast_open_cell_old(redchan, "")) < 0)
+ if ((infd_redchan = Rast_open_old(redchan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), redchan);
inrast_redchan = Rast_allocate_d_buf();
if (nirchan) {
- if ((infd_nirchan = Rast_open_cell_old(nirchan, "")) < 0)
+ if ((infd_nirchan = Rast_open_old(nirchan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), nirchan);
inrast_nirchan = Rast_allocate_d_buf();
}
if (greenchan) {
- if ((infd_greenchan = Rast_open_cell_old(greenchan, "")) < 0)
+ if ((infd_greenchan = Rast_open_old(greenchan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), greenchan);
inrast_greenchan = Rast_allocate_d_buf();
}
if (bluechan) {
- if ((infd_bluechan = Rast_open_cell_old(bluechan, "")) < 0)
+ if ((infd_bluechan = Rast_open_old(bluechan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), bluechan);
inrast_bluechan = Rast_allocate_d_buf();
}
if (chan5chan) {
- if ((infd_chan5chan = Rast_open_cell_old(chan5chan, "")) < 0)
+ if ((infd_chan5chan = Rast_open_old(chan5chan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), chan5chan);
inrast_chan5chan = Rast_allocate_d_buf();
}
if (chan7chan) {
- if ((infd_chan7chan = Rast_open_cell_old(chan7chan, "")) < 0)
+ if ((infd_chan7chan = Rast_open_old(chan7chan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), chan7chan);
inrast_chan7chan = Rast_allocate_d_buf();
}
@@ -249,7 +249,7 @@
outrast = Rast_allocate_d_buf();
/* Create New raster files */
- if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
+ if ((outfd = Rast_open_new(result, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
/* Process pixels */
Modified: grass/trunk/imagery/i.vpoints/drawcell.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -59,7 +59,7 @@
if (getenv("NO_DRAW"))
return 1;
- fd = Rast_open_cell_old(view->cell.name, view->cell.mapset);
+ fd = Rast_open_old(view->cell.name, view->cell.mapset);
if (fd < 0)
return 0;
dcell = Rast_allocate_d_buf();
Modified: grass/trunk/imagery/i.zc/main.c
===================================================================
--- grass/trunk/imagery/i.zc/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/imagery/i.zc/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -100,7 +100,7 @@
exit(EXIT_FAILURE);
/* open input cell map */
- inputfd = Rast_open_cell_old(input_map->answer, "");
+ inputfd = Rast_open_old(input_map->answer, "");
if (inputfd < 0)
exit(EXIT_FAILURE);
@@ -172,7 +172,7 @@
/* open the output cell maps and allocate cell row buffers */
G_message(_("Writing transformed data to file..."));
- if ((zcfd = Rast_open_cell_new(output_map->answer)) < 0)
+ if ((zcfd = Rast_open_c_new(output_map->answer)) < 0)
exit(EXIT_FAILURE);
cell_row = Rast_allocate_c_buf();
Modified: grass/trunk/include/raster.h
===================================================================
--- grass/trunk/include/raster.h 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/include/raster.h 2009-06-29 21:09:01 UTC (rev 38120)
@@ -379,22 +379,22 @@
void Rast__init_null_bits(unsigned char *, int);
/* opencell.c */
-int Rast_open_cell_old(const char *, const char *);
-int Rast__open_cell_old(const char *, const char *);
-int Rast_open_cell_new(const char *);
-int Rast_open_cell_new_uncompressed(const char *);
+int Rast_open_old(const char *, const char *);
+int Rast__open_old(const char *, const char *);
+int Rast_open_new(const char *);
+int Rast_open_new_uncompressed(const char *);
void Rast_want_histogram(int);
void Rast_set_cell_format(int);
-int Rast_cellvalue_format(CELL);
-int Rast_open_fp_cell_new(const char *);
-int Rast_open_fp_cell_new_uncompressed(const char *);
+int Rast_get_cell_format(CELL);
+int Rast_open_fp_new(const char *);
+int Rast_open_fp_new_uncompressed(const char *);
int Rast_set_fp_type(RASTER_MAP_TYPE);
-int Rast_raster_map_is_fp(const char *, const char *);
-RASTER_MAP_TYPE Rast_raster_map_type(const char *, const char *);
+int Rast_map_is_fp(const char *, const char *);
+RASTER_MAP_TYPE Rast_map_type(const char *, const char *);
RASTER_MAP_TYPE Rast__check_fp_type(const char *, const char *);
-RASTER_MAP_TYPE Rast_get_raster_map_type(int);
-int Rast_open_raster_new(const char *, RASTER_MAP_TYPE);
-int Rast_open_raster_new_uncompressed(const char *, RASTER_MAP_TYPE);
+RASTER_MAP_TYPE Rast_get_map_type(int);
+int Rast_open_new(const char *, RASTER_MAP_TYPE);
+int Rast_open_new_uncompressed(const char *, RASTER_MAP_TYPE);
int Rast_set_quant_rules(int, struct Quant *);
/* put_cellhd.c */
Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/gpde/N_arrays_io.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -64,11 +64,11 @@
cols = region.cols;
/*open the raster map */
- map = Rast_open_cell_old(name, G_find_cell2(name, ""));
+ map = Rast_open_old(name, G_find_cell2(name, ""));
if (map < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
- type = Rast_get_raster_map_type(map);
+ type = Rast_get_map_type(map);
/*if the array is NULL create a new one with the data type of the raster map */
/*the offset is 0 by default */
@@ -199,7 +199,7 @@
type = array->type;
/*Open the new map */
- map = Rast_open_raster_new(name, type);
+ map = Rast_open_new(name, type);
if (map < 0)
G_fatal_error(_("Unable to create raster map <%s>"), name);
Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/ogsf/Gs3.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -134,7 +134,7 @@
G_fatal_error(_("Unable to allocate memory for a null buffer"));
}
- if ((cellfile = Rast_open_cell_old(map_name, map_set)) == -1) {
+ if ((cellfile = Rast_open_old(map_name, map_set)) == -1) {
G_fatal_error(_("Unable to open raster map <%s>"), map_name);
}
@@ -209,7 +209,7 @@
G_fatal_error(_("Unable to allocate memory for a null buffer"));
}
- if ((cellfile = Rast_open_cell_old(map_name, map_set)) == -1) {
+ if ((cellfile = Rast_open_old(map_name, map_set)) == -1) {
G_fatal_error(_("Unable to open raster map <%s>"), map_name);
}
@@ -288,7 +288,7 @@
return -1;
}
- if (Rast_raster_map_is_fp(filename, mapset)) {
+ if (Rast_map_is_fp(filename, mapset)) {
G_debug(3, "Gs_numtype(): fp map detected");
return (ATTY_FLOAT);
@@ -367,7 +367,7 @@
G_fatal_error(_("Unable to allocate memory for a null buffer"));
}
- if ((cellfile = Rast_open_cell_old(map_name, map_set)) == -1) {
+ if ((cellfile = Rast_open_old(map_name, map_set)) == -1) {
G_fatal_error(_("Unable to open raster map <%s>"), map_name);
}
@@ -483,7 +483,7 @@
G_fatal_error(_("Unable to allocate memory for a null buffer"));
}
- if ((cellfile = Rast_open_cell_old(map_name, map_set)) == -1) {
+ if ((cellfile = Rast_open_old(map_name, map_set)) == -1) {
G_fatal_error(_("Unable to open raster map <%s>"), map_name);
}
@@ -574,7 +574,7 @@
return -1;
}
- if ((cellfile = Rast_open_cell_old(map_name, map_set)) == -1) {
+ if ((cellfile = Rast_open_old(map_name, map_set)) == -1) {
G_fatal_error(_("Unable to open raster map <%s>"), map_name);
}
@@ -838,8 +838,8 @@
}
if (-1 != Rast_read_cats(filename, mapset, &cats)) {
- fd = Rast_open_cell_old(filename, mapset);
- map_type = Rast_get_raster_map_type(fd);
+ fd = Rast_open_old(filename, mapset);
+ map_type = Rast_get_map_type(fd);
if (map_type == CELL_TYPE) {
buf = Rast_allocate_c_buf();
Modified: grass/trunk/lib/ogsf/gsd_legend.c
===================================================================
--- grass/trunk/lib/ogsf/gsd_legend.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/ogsf/gsd_legend.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -240,7 +240,7 @@
return (-1);
}
- is_fp = Rast_raster_map_is_fp(name, mapset);
+ is_fp = Rast_map_is_fp(name, mapset);
if (Rast_read_colors(name, mapset, &colors) == -1) {
G_warning(_("Unable to read color file of raster map <%s>"), name);
Modified: grass/trunk/lib/raster/auto_mask.c
===================================================================
--- grass/trunk/lib/raster/auto_mask.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/auto_mask.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -61,7 +61,7 @@
}
Rast_unopen(R__.mask_fd);
- R__.mask_fd = Rast__open_cell_old("MASK", G_mapset());
+ R__.mask_fd = Rast__open_old("MASK", G_mapset());
if (R__.mask_fd < 0) {
R__.auto_mask = 0;
G_warning(_("Unable to open automatic MASK file"));
Modified: grass/trunk/lib/raster/cats.c
===================================================================
--- grass/trunk/lib/raster/cats.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/cats.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -196,7 +196,7 @@
if (strncmp(element, "dig", 3) == 0)
fp_map = 0;
else
- fp_map = Rast_raster_map_is_fp(name, mapset);
+ fp_map = Rast_map_is_fp(name, mapset);
if (!(fd = G_fopen_old(element, name, mapset)))
return -2;
@@ -981,7 +981,7 @@
if (strncmp(element, "dig", 3) == 0)
fp_map = 0;
else
- fp_map = Rast_raster_map_is_fp(name, G_mapset());
+ fp_map = Rast_map_is_fp(name, G_mapset());
if (!fp_map)
Rast_sort_cats(cats);
Modified: grass/trunk/lib/raster/color_read.c
===================================================================
--- grass/trunk/lib/raster/color_read.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/color_read.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -65,7 +65,7 @@
CELL min, max;
DCELL dmin, dmax;
- fp = Rast_raster_map_is_fp(name, mapset);
+ fp = Rast_map_is_fp(name, mapset);
Rast_init_colors(colors);
strcpy(xname, name);
Modified: grass/trunk/lib/raster/gdal.c
===================================================================
--- grass/trunk/lib/raster/gdal.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/gdal.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -186,7 +186,7 @@
if (!G_find_cell2(name, mapset))
return NULL;
- map_type = Rast_raster_map_type(name, mapset);
+ map_type = Rast_map_type(name, mapset);
if (map_type < 0)
return NULL;
Modified: grass/trunk/lib/raster/get_row_colr.c
===================================================================
--- grass/trunk/lib/raster/get_row_colr.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/get_row_colr.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -42,7 +42,7 @@
unsigned char *blu, unsigned char *nul)
{
int cols = G_window_cols();
- int type = Rast_get_raster_map_type(fd);
+ int type = Rast_get_map_type(fd);
int size = Rast_cell_size(type);
void *array;
unsigned char *set;
Modified: grass/trunk/lib/raster/opencell.c
===================================================================
--- grass/trunk/lib/raster/opencell.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/opencell.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -66,7 +66,7 @@
* for the map using Rast_read_quant(). If the programmer wants to read
* the floating point map using uing quant rules other than the ones
* stored in map's quant file, he/she should call Rast_set_quant_rules()
- * after the call to Rast_open_cell_old().
+ * after the call to Rast_open_old().
*
* \param name map name
* \param open_mode mode
@@ -105,11 +105,11 @@
\return nonnegative file descriptor (int)
\return -1 on failure
*/
-int Rast_open_cell_old(const char *name, const char *mapset)
+int Rast_open_old(const char *name, const char *mapset)
{
int fd;
- if ((fd = Rast__open_cell_old(name, mapset)) < 0) {
+ if ((fd = Rast__open_old(name, mapset)) < 0) {
G_warning(_("Unable to open raster map <%s@%s>"), name, mapset);
return fd;
}
@@ -143,7 +143,7 @@
Note: This routine does NOT open the MASK layer. If it did we would
get infinite recursion. This routine is called to open the mask by
- Rast__check_for_auto_masking() which is called by Rast_open_cell_old().
+ Rast__check_for_auto_masking() which is called by Rast_open_old().
\param name map name
\param mapset mapset of cell file to be opened
@@ -151,7 +151,7 @@
\return open file descriptor
\return -1 if error
*/
-int Rast__open_cell_old(const char *name, const char *mapset)
+int Rast__open_old(const char *name, const char *mapset)
{
struct fileinfo *fcb;
int fd;
@@ -207,7 +207,7 @@
return -1;
/* now check the type */
- MAP_TYPE = Rast_raster_map_type(r_name, r_mapset);
+ MAP_TYPE = Rast_map_type(r_name, r_mapset);
if (MAP_TYPE < 0)
return -1;
@@ -359,7 +359,7 @@
The file is created and filled with no data it is assumed that the
new cell file is to conform to the current window.
- The file must be written sequentially. Use Rast_open_cell_new_random()
+ The file must be written sequentially. Use Rast_open_new_random()
for non sequential writes.
Note: the open actually creates a temporary file Rast_close() will
@@ -377,7 +377,7 @@
\return open file descriptor ( >= 0) if successful
\return negative integer if error
*/
-int Rast_open_cell_new(const char *name)
+int Rast_open_c_new(const char *name)
{
return G__open_raster_new(name, OPEN_NEW_COMPRESSED, CELL_TYPE);
}
@@ -385,14 +385,14 @@
/*!
\brief Opens a new cell file in a database (uncompressed)
- See also Rast_open_cell_new().
+ See also Rast_open_new().
\param name map name
\return open file descriptor ( >= 0) if successful
\return negative integer if error
*/
-int Rast_open_cell_new_uncompressed(const char *name)
+int Rast_open_c_new_uncompressed(const char *name)
{
return G__open_raster_new(name, OPEN_NEW_UNCOMPRESSED, CELL_TYPE);
}
@@ -439,7 +439,7 @@
\return cell format
*/
-int Rast_cellvalue_format(CELL v)
+int Rast_get_cell_format(CELL v)
{
unsigned int i;
@@ -460,14 +460,14 @@
Use Rast_set_fp_type() where type is one of DCELL_TYPE or FCELL_TYPE.
- See warnings and notes for Rast_open_cell_new().
+ See warnings and notes for Rast_open_new().
\param name map name
\return nonnegative file descriptor (int)
\return -1 on error
*/
-int Rast_open_fp_cell_new(const char *name)
+int Rast_open_fp_new(const char *name)
{
return G__open_raster_new(name, OPEN_NEW_COMPRESSED, R__.fp_type);
}
@@ -475,14 +475,14 @@
/*!
\brief Opens new fcell file in a database (uncompressed)
- See Rast_open_fp_cell_new() for details.
+ See Rast_open_fp_new() for details.
\param name map name
\return nonnegative file descriptor (int)
\return -1 on error
*/
-int Rast_open_fp_cell_new_uncompressed(const char *name)
+int Rast_open_fp_new_uncompressed(const char *name)
{
return G__open_raster_new(name, OPEN_NEW_UNCOMPRESSED, R__.fp_type);
}
@@ -751,7 +751,7 @@
\return 1 floating-point
\return 0 int
*/
-int Rast_raster_map_is_fp(const char *name, const char *mapset)
+int Rast_map_is_fp(const char *name, const char *mapset)
{
char path[GPATH_MAX];
const char *xmapset;
@@ -783,7 +783,7 @@
\return raster data type
*/
-RASTER_MAP_TYPE Rast_raster_map_type(const char *name, const char *mapset)
+RASTER_MAP_TYPE Rast_map_type(const char *name, const char *mapset)
{
char path[GPATH_MAX];
const char *xmapset;
@@ -820,7 +820,7 @@
\return raster data type
*/
-RASTER_MAP_TYPE Rast_get_raster_map_type(int fd)
+RASTER_MAP_TYPE Rast_get_map_type(int fd)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
@@ -892,14 +892,14 @@
Opens a new raster map of type <i>wr_type</i>
- See warnings and notes for Rast_open_cell_new().
+ See warnings and notes for Rast_open_new().
Supported data types:
- CELL_TYPE
- FCELL_TYPE
- DCELL_TYPE
- On CELL_TYPE calls Rast_open_cell_new() otherwise Rast_open_fp_cell_new().
+ On CELL_TYPE calls Rast_open_new() otherwise Rast_open_fp_new().
\param name map name
\param wr_type raster data type
@@ -907,7 +907,7 @@
\return nonnegative file descriptor (int)
\return -1 on error
*/
-int Rast_open_raster_new(const char *name, RASTER_MAP_TYPE wr_type)
+int Rast_open_new(const char *name, RASTER_MAP_TYPE wr_type)
{
return G__open_raster_new(name, OPEN_NEW_COMPRESSED, wr_type);
}
@@ -915,7 +915,7 @@
/*!
\brief Opens a new raster map (uncompressed)
- See Rast_open_raster_new().
+ See Rast_open_new().
\param name map name
\param wr_type raster data type
@@ -923,7 +923,7 @@
\return nonnegative file descriptor (int)
\return -1 on error
*/
-int Rast_open_raster_new_uncompressed(const char *name, RASTER_MAP_TYPE wr_type)
+int Rast_open_new_uncompressed(const char *name, RASTER_MAP_TYPE wr_type)
{
return G__open_raster_new(name, OPEN_NEW_UNCOMPRESSED, wr_type);
}
@@ -932,7 +932,7 @@
\brief Sets quant translation rules for raster map opened for
reading.
- Returned by Rast_open_cell_old(). After calling this function,
+ Returned by Rast_open_old(). After calling this function,
Rast_get_c_row() and Rast_get_c_row() will use rules defined by q
(instead of using rules defined in map's quant file) to convert floats to
ints.
Modified: grass/trunk/lib/raster/put_row.c
===================================================================
--- grass/trunk/lib/raster/put_row.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/put_row.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -7,7 +7,7 @@
*
* Writes the next row for the cell file opened on 'fd' from 'buf'
* All writes go into NEW files that exactly match the current window.
- * The file must have been opened with Rast_open_cell_new()
+ * The file must have been opened with Rast_open_new()
* and be written sequentially, ie no skipping rows
*
* when the null values are embeded into the data, corresponding cells are
@@ -38,7 +38,7 @@
*
* Writes the next row for the cell file opened on 'fd' from 'buf'
* All writes go into NEW files that exactly match the current window.
- * The file must have been opened with Rast_open_cell_new()
+ * The file must have been opened with Rast_open_new()
* and be written sequentially, ie no skipping rows
*
* NULLS are written into null bitmap file for all cells which are zero,
Modified: grass/trunk/lib/raster/quant_io.c
===================================================================
--- grass/trunk/lib/raster/quant_io.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/quant_io.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -120,7 +120,7 @@
Rast_quant_free(quant);
- if (Rast_raster_map_type(name, mapset) == CELL_TYPE) {
+ if (Rast_map_type(name, mapset) == CELL_TYPE) {
G_warning (_("Rast__quant_import: attempt to open quantization"
" table for CELL_TYPE file [%s] in mapset {%s]"),
name, mapset);
Modified: grass/trunk/lib/raster/quant_rw.c
===================================================================
--- grass/trunk/lib/raster/quant_rw.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/quant_rw.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -187,7 +187,7 @@
CELL cell_min, cell_max;
DCELL d_min, d_max;
- if (Rast_raster_map_type(name, mapset) == CELL_TYPE) {
+ if (Rast_map_type(name, mapset) == CELL_TYPE) {
G_warning(_("Unable to write quant rules: raster map <%s> is integer"),
name);
return -1;
Modified: grass/trunk/lib/raster/range.c
===================================================================
--- grass/trunk/lib/raster/range.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/raster/range.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -79,7 +79,7 @@
Rast_init_fp_range(drange);
- if (Rast_raster_map_type(name, mapset) == CELL_TYPE) {
+ if (Rast_map_type(name, mapset) == CELL_TYPE) {
/* if map is integer
read integer range and convert it to double */
@@ -168,7 +168,7 @@
fd = NULL;
/* if map is not integer, read quant rules, and get limits */
- if (Rast_raster_map_type(name, mapset) != CELL_TYPE) {
+ if (Rast_map_type(name, mapset) != CELL_TYPE) {
DCELL dmin, dmax;
if (Rast_read_quant(name, mapset, &quant) < 0) {
@@ -265,7 +265,7 @@
{
FILE *fd;
- if (Rast_raster_map_type(name, G_mapset()) != CELL_TYPE) {
+ if (Rast_map_type(name, G_mapset()) != CELL_TYPE) {
G_remove_misc("cell_misc", "range", name); /* remove the old file with this name */
G_warning(_("Unable to write range file for <%s>"),
name);
Modified: grass/trunk/lib/rst/interp_float/input2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/input2d.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/rst/interp_float/input2d.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -50,7 +50,7 @@
params->maskmap);
cellmask = Rast_allocate_c_buf();
- cfmask = Rast_open_cell_old(params->maskmap, mapsetm);
+ cfmask = Rast_open_old(params->maskmap, mapsetm);
}
else
cellmask = NULL;
Modified: grass/trunk/lib/rst/interp_float/output2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/output2d.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/rst/interp_float/output2d.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -62,7 +62,7 @@
* G_set_embedded_null_value_mode(1);
*/
if (params->elev != NULL) {
- cf1 = Rast_open_fp_cell_new(params->elev);
+ cf1 = Rast_open_fp_new(params->elev);
if (cf1 < 0) {
G_warning(_("Unable to create raster map <%s>"), params->elev);
return -1;
@@ -70,7 +70,7 @@
}
if (params->slope != NULL) {
- cf2 = Rast_open_fp_cell_new(params->slope);
+ cf2 = Rast_open_fp_new(params->slope);
if (cf2 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->slope);
@@ -79,7 +79,7 @@
}
if (params->aspect != NULL) {
- cf3 = Rast_open_fp_cell_new(params->aspect);
+ cf3 = Rast_open_fp_new(params->aspect);
if (cf3 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->aspect);
@@ -88,7 +88,7 @@
}
if (params->pcurv != NULL) {
- cf4 = Rast_open_fp_cell_new(params->pcurv);
+ cf4 = Rast_open_fp_new(params->pcurv);
if (cf4 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->pcurv);
@@ -97,7 +97,7 @@
}
if (params->tcurv != NULL) {
- cf5 = Rast_open_fp_cell_new(params->tcurv);
+ cf5 = Rast_open_fp_new(params->tcurv);
if (cf5 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->tcurv);
@@ -106,7 +106,7 @@
}
if (params->mcurv != NULL) {
- cf6 = Rast_open_fp_cell_new(params->mcurv);
+ cf6 = Rast_open_fp_new(params->mcurv);
if (cf6 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->mcurv);
Modified: grass/trunk/lib/rst/interp_float/resout2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -67,7 +67,7 @@
cell1 = Rast_allocate_f_buf();
if (params->elev != NULL) {
- cf1 = Rast_open_fp_cell_new(params->elev);
+ cf1 = Rast_open_fp_new(params->elev);
if (cf1 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->elev);
@@ -76,7 +76,7 @@
}
if (params->slope != NULL) {
- cf2 = Rast_open_fp_cell_new(params->slope);
+ cf2 = Rast_open_fp_new(params->slope);
if (cf2 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->elev);
@@ -85,7 +85,7 @@
}
if (params->aspect != NULL) {
- cf3 = Rast_open_fp_cell_new(params->aspect);
+ cf3 = Rast_open_fp_new(params->aspect);
if (cf3 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->elev);
@@ -94,7 +94,7 @@
}
if (params->pcurv != NULL) {
- cf4 = Rast_open_fp_cell_new(params->pcurv);
+ cf4 = Rast_open_fp_new(params->pcurv);
if (cf4 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->elev);
@@ -103,7 +103,7 @@
}
if (params->tcurv != NULL) {
- cf5 = Rast_open_fp_cell_new(params->tcurv);
+ cf5 = Rast_open_fp_new(params->tcurv);
if (cf5 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->elev);
@@ -112,7 +112,7 @@
}
if (params->mcurv != NULL) {
- cf6 = Rast_open_fp_cell_new(params->mcurv);
+ cf6 = Rast_open_fp_new(params->mcurv);
if (cf6 < 0) {
G_warning(_("Unable to create raster map <%s>"),
params->elev);
Modified: grass/trunk/ps/ps.map/outl_io.c
===================================================================
--- grass/trunk/ps/ps.map/outl_io.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/ps/ps.map/outl_io.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -64,10 +64,10 @@
{
/* open raster map */
sscanf(cell, "%s", cell_name);
- if ((in_file_d = Rast_open_cell_old(cell_name, "")) < 0)
+ if ((in_file_d = Rast_open_old(cell_name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), cell_name);
- map_type = Rast_get_raster_map_type(in_file_d);
+ map_type = Rast_get_map_type(in_file_d);
raster_size = Rast_cell_size(map_type);
first_read = 1;
last_read = 0;
Modified: grass/trunk/ps/ps.map/ps_raster.c
===================================================================
--- grass/trunk/ps/ps.map/ps_raster.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/ps/ps.map/ps_raster.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -108,7 +108,7 @@
/* build the image RGB string */
if (PS.do_raster) {
- map_type = Rast_get_raster_map_type(PS.cell_fd);
+ map_type = Rast_get_map_type(PS.cell_fd);
cellbuf = Rast_allocate_buf(map_type);
n = 0;
for (row = 0; row < PS.w.rows; row++) {
@@ -149,7 +149,7 @@
void *cptr[3];
for (i = 0; i < 3; i++) {
- grp_map_type[i] = Rast_get_raster_map_type(grp.fd[i]);
+ grp_map_type[i] = Rast_get_map_type(grp.fd[i]);
cbuf[i] = Rast_allocate_buf(grp_map_type[i]);
}
n = 0;
Modified: grass/trunk/ps/ps.map/r_cell.c
===================================================================
--- grass/trunk/ps/ps.map/r_cell.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/ps/ps.map/r_cell.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -30,7 +30,7 @@
Rast_get_c_color_range(&PS.min_color, &PS.max_color, &PS.colors);
/* open raster map for reading */
- if ((PS.cell_fd = Rast_open_cell_old(name, mapset)) < 0) {
+ if ((PS.cell_fd = Rast_open_old(name, mapset)) < 0) {
error(fullname, "", "can't open raster map");
Rast_free_colors(&PS.colors);
return 0;
Modified: grass/trunk/ps/ps.map/r_colortable.c
===================================================================
--- grass/trunk/ps/ps.map/r_colortable.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/ps/ps.map/r_colortable.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -169,7 +169,7 @@
/* set default if legend type was not specified */
if (ct.discrete == -1) {
- if (Rast_raster_map_is_fp(ct.name, ct.mapset))
+ if (Rast_map_is_fp(ct.name, ct.mapset))
ct.discrete = FALSE;
else
ct.discrete = TRUE;
Modified: grass/trunk/ps/ps.map/r_group.c
===================================================================
--- grass/trunk/ps/ps.map/r_group.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/ps/ps.map/r_group.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -51,7 +51,7 @@
/* open raster maps for reading */
for (i = 0; i < 3; i++) {
- if ((grp.fd[i] = Rast_open_cell_old(grp.name[i], grp.mapset[i])) < 0) {
+ if ((grp.fd[i] = Rast_open_old(grp.name[i], grp.mapset[i])) < 0) {
sprintf(fullname, "%s in %s", grp.name[i], grp.mapset[i]);
error(fullname, "", "can't open raster map");
Rast_free_colors(&(grp.colors[i]));
Modified: grass/trunk/ps/ps.map/r_rgb.c
===================================================================
--- grass/trunk/ps/ps.map/r_rgb.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/ps/ps.map/r_rgb.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -74,7 +74,7 @@
}
/* open raster maps for reading */
- if ((grp.fd[i] = Rast_open_cell_old(grp.name[i], grp.mapset[i])) < 0) {
+ if ((grp.fd[i] = Rast_open_old(grp.name[i], grp.mapset[i])) < 0) {
sprintf(fullname, "%s in %s", grp.name[i], grp.mapset[i]);
error(fullname, "", "can't open raster map");
Rast_free_colors(&(grp.colors[i]));
Modified: grass/trunk/raster/r.basins.fill/main.c
===================================================================
--- grass/trunk/raster/r.basins.fill/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.basins.fill/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -104,7 +104,7 @@
drain = read_map(drain_name, NOMASK, nrows, ncols);
ridge = read_map(ridge_name, NOMASK, nrows, ncols);
- partfd = Rast_open_cell_new(part_name);
+ partfd = Rast_open_c_new(part_name);
if (partfd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), part_name);
Modified: grass/trunk/raster/r.basins.fill/read_map.c
===================================================================
--- grass/trunk/raster/r.basins.fill/read_map.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.basins.fill/read_map.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -33,7 +33,7 @@
map = (CELL *) G_malloc(nrows * ncols * sizeof(CELL));
/* open the map */
- if ((fd = Rast_open_cell_old(name, "")) < 0)
+ if ((fd = Rast_open_old(name, "")) < 0)
G_fatal_error(_("Unable to open <%s>"), name);
/* read the map */
Modified: grass/trunk/raster/r.bitpattern/main.c
===================================================================
--- grass/trunk/raster/r.bitpattern/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.bitpattern/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -97,11 +97,11 @@
patv = atoi(patval->answer);
/*if Gispf() error */
- if ((infd = Rast_open_cell_old(name, "")) < 0)
+ if ((infd = Rast_open_old(name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
/* determine the inputmap type (CELL/FCELL/DCELL) */
- data_type = Rast_get_raster_map_type(infd);
+ data_type = Rast_get_map_type(infd);
if (Rast_get_cellhd(name, "", &cellhd) < 0)
G_fatal_error(_("Unable to read header of raster map <%s>"), name);
@@ -114,7 +114,7 @@
ncols = G_window_cols();
outrast = Rast_allocate_buf(data_type);
- if ((outfd = Rast_open_raster_new(result, data_type)) < 0)
+ if ((outfd = Rast_open_new(result, data_type)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
for (row = 0; row < nrows; row++) {
Modified: grass/trunk/raster/r.buffer/read_map.c
===================================================================
--- grass/trunk/raster/r.buffer/read_map.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.buffer/read_map.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -38,7 +38,7 @@
map = (MAPTYPE *) G_malloc(window.rows * window.cols * sizeof(MAPTYPE));
- fd = Rast_open_cell_old(input, mapset);
+ fd = Rast_open_old(input, mapset);
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), input);
Modified: grass/trunk/raster/r.buffer/write_map.c
===================================================================
--- grass/trunk/raster/r.buffer/write_map.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.buffer/write_map.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -36,12 +36,12 @@
register MAPTYPE *ptr;
int k;
- fd_out = Rast_open_cell_new(output);
+ fd_out = Rast_open_c_new(output);
if (fd_out < 0)
G_fatal_error(_("Unable to create raster map <%s>"), output);
if (offset) {
- fd_in = Rast_open_cell_old(output, G_mapset());
+ fd_in = Rast_open_old(output, G_mapset());
if (fd_in < 0)
G_fatal_error(_("Unable to open raster map <%s>"), output);
}
Modified: grass/trunk/raster/r.carve/main.c
===================================================================
--- grass/trunk/raster/r.carve/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.carve/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -161,15 +161,15 @@
if ((rmapset = G_find_file2("cell", parm.inrast->answer, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), parm.inrast->answer);
- if ((infd = Rast_open_cell_old(parm.inrast->answer, rmapset)) == -1)
+ if ((infd = Rast_open_old(parm.inrast->answer, rmapset)) == -1)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.inrast->answer);
- parm.raster_type = Rast_get_raster_map_type(infd);
+ parm.raster_type = Rast_get_map_type(infd);
/* open new map for output */
if ((outfd =
- Rast_open_raster_new(parm.outrast->answer, parm.raster_type)) < 0)
+ Rast_open_new(parm.outrast->answer, parm.raster_type)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
parm.outrast->answer);
Modified: grass/trunk/raster/r.category/cats.c
===================================================================
--- grass/trunk/raster/r.category/cats.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.category/cats.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -39,7 +39,7 @@
Rast_set_window(&cellhd);
/* open the raster map */
- fd = Rast_open_cell_old(name, mapset);
+ fd = Rast_open_old(name, mapset);
if (fd < 0)
G_fatal_error(_("Cannot open cell file of raster map <%s> in <%s>"),
name, mapset);
Modified: grass/trunk/raster/r.category/main.c
===================================================================
--- grass/trunk/raster/r.category/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.category/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -125,7 +125,7 @@
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), name);
- map_type = Rast_raster_map_type(name, mapset);
+ map_type = Rast_map_type(name, mapset);
/* create category labels */
@@ -147,7 +147,7 @@
G_fatal_error(_("Raster map <%s> not found"),
parm.raster->answer);
- if ((fd = Rast_open_cell_old(name, mapset)) < 0)
+ if ((fd = Rast_open_old(name, mapset)) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
Rast_init_cats("", &cats);
Modified: grass/trunk/raster/r.circle/main.c
===================================================================
--- grass/trunk/raster/r.circle/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.circle/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -124,7 +124,7 @@
G_get_set_window(&w);
- if ((cellfile = Rast_open_cell_new(out_file->answer)) == -1)
+ if ((cellfile = Rast_open_c_new(out_file->answer)) == -1)
G_fatal_error(_("Unable to create raster map <%s>"),
out_file->answer);
Modified: grass/trunk/raster/r.clump/main.c
===================================================================
--- grass/trunk/raster/r.clump/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.clump/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -69,11 +69,11 @@
strcpy(name, INPUT);
- in_fd = Rast_open_cell_old(name, "");
+ in_fd = Rast_open_old(name, "");
if (in_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), INPUT);
- out_fd = Rast_open_cell_new(OUTPUT);
+ out_fd = Rast_open_c_new(OUTPUT);
if (out_fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), OUTPUT);
Modified: grass/trunk/raster/r.colors/main.c
===================================================================
--- grass/trunk/raster/r.colors/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.colors/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -286,7 +286,7 @@
G_suppress_warnings(0);
- fp = Rast_raster_map_is_fp(name, mapset);
+ fp = Rast_map_is_fp(name, mapset);
Rast_read_fp_range(name, mapset, &range);
Rast_get_fp_range_min_max(&range, &min, &max);
Modified: grass/trunk/raster/r.colors/stats.c
===================================================================
--- grass/trunk/raster/r.colors/stats.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.colors/stats.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -30,7 +30,7 @@
int row, nrows, ncols;
int fd;
- if ((fd = Rast_open_cell_old(name, mapset)) < 0)
+ if ((fd = Rast_open_old(name, mapset)) < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
G_fully_qualified_name(name, mapset));
@@ -63,7 +63,7 @@
int row, col, nrows, ncols;
int fd;
- if ((fd = Rast_open_cell_old(name, mapset)) < 0)
+ if ((fd = Rast_open_old(name, mapset)) < 0)
G_fatal_error("Unable to open raster map <%s>",
G_fully_qualified_name(name, mapset));
Modified: grass/trunk/raster/r.composite/main.c
===================================================================
--- grass/trunk/raster/r.composite/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.composite/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -152,10 +152,10 @@
b->name = b->opt_name->answer;
/* Make sure map is available */
- if ((b->file = Rast_open_cell_old(b->name, "")) == -1)
+ if ((b->file = Rast_open_old(b->name, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), b->name);
- b->type = Rast_get_raster_map_type(b->file);
+ b->type = Rast_get_map_type(b->file);
b->size = Rast_cell_size(b->type);
@@ -181,7 +181,7 @@
/* open output files */
out_name = opt_out->answer;
- if ((out_file = Rast_open_cell_new(out_name)) < 0)
+ if ((out_file = Rast_open_c_new(out_name)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), out_name);
out_array = Rast_allocate_c_buf();
Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.compress/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -113,7 +113,7 @@
return 1;
}
- map_type = Rast_raster_map_type(name, G_mapset());
+ map_type = Rast_map_type(name, G_mapset());
G_suppress_warnings(1);
colr_ok = Rast_read_colors(name, G_mapset(), &colr) > 0;
@@ -191,22 +191,22 @@
Rast_set_window(&cellhd);
- old = Rast_open_cell_old(name, G_mapset());
+ old = Rast_open_old(name, G_mapset());
if (old < 0)
return 1;
if (uncompress) {
if (map_type == CELL_TYPE) {
Rast_set_cell_format(cellhd.format);
- new = Rast_open_cell_new_uncompressed(name);
+ new = Rast_open_c_new_uncompressed(name);
}
else {
Rast_set_fp_type(map_type);
- new = Rast_open_fp_cell_new_uncompressed(name);
+ new = Rast_open_fp_new_uncompressed(name);
}
}
else
- new = Rast_open_raster_new(name, map_type);
+ new = Rast_open_new(name, map_type);
if (new < 0)
return 1;
@@ -231,7 +231,7 @@
}
Rast_close(new);
newsize = 0;
- old = Rast_open_cell_old(name, G_mapset());
+ old = Rast_open_old(name, G_mapset());
newsize = lseek(old, (off_t) 0, SEEK_END);
Rast_close(old);
return 0;
Modified: grass/trunk/raster/r.contour/main.c
===================================================================
--- grass/trunk/raster/r.contour/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.contour/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -135,7 +135,7 @@
name = map->answer;
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.cost/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -350,12 +350,12 @@
/* Open cost cell layer for reading */
- cost_fd = Rast_open_cell_old(cost_layer, cost_mapset);
+ cost_fd = Rast_open_old(cost_layer, cost_mapset);
if (cost_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), cost_layer);
- data_type = Rast_get_raster_map_type(cost_fd);
+ data_type = Rast_get_map_type(cost_fd);
cell = Rast_allocate_buf(data_type);
/* Parameters for map submatrices */
@@ -632,12 +632,12 @@
search_mapset = G_find_file("cell", opt9->answer, "");
- fd = Rast_open_cell_old(opt9->answer, search_mapset);
+ fd = Rast_open_old(opt9->answer, search_mapset);
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
opt9->answer);
- data_type2 = Rast_get_raster_map_type(fd);
+ data_type2 = Rast_get_map_type(fd);
dsize2 = Rast_cell_size(data_type2);
@@ -977,10 +977,10 @@
OUT:
/* Open cumulative cost layer for writing */
- cum_fd = Rast_open_raster_new(cum_cost_layer, data_type);
+ cum_fd = Rast_open_new(cum_cost_layer, data_type);
if (dir == 1) {
- dir_fd = Rast_open_raster_new(move_dir_layer, dir_data_type);
+ dir_fd = Rast_open_new(move_dir_layer, dir_data_type);
dir_cell = Rast_allocate_buf(dir_data_type);
}
Modified: grass/trunk/raster/r.covar/main.c
===================================================================
--- grass/trunk/raster/r.covar/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.covar/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -76,7 +76,7 @@
sum2[i] = (double *)G_calloc(nfiles, sizeof(double));
dcell[i] = Rast_allocate_d_buf();
name = maps->answers[i];
- fd[i] = Rast_open_cell_old(name, "");
+ fd[i] = Rast_open_old(name, "");
if (fd[i] < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
}
Modified: grass/trunk/raster/r.cross/main.c
===================================================================
--- grass/trunk/raster/r.cross/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.cross/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -108,7 +108,7 @@
if (!mapset)
G_fatal_error(_("Raster map <%s> not found"), name);
names[nfiles] = name;
- fd[nfiles] = Rast_open_cell_old(name, mapset);
+ fd[nfiles] = Rast_open_old(name, mapset);
if (fd[nfiles] < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
Rast_read_range(name, mapset, &range);
@@ -123,7 +123,7 @@
if (nfiles <= 1)
G_fatal_error(_("Must specify 2 or more input maps"));
output = parm.output->answer;
- outfd = Rast_open_cell_new(output);
+ outfd = Rast_open_c_new(output);
if (outfd < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
@@ -170,8 +170,8 @@
Rast_free_cats(&labels[i]);
/* reopen the output cell for reading and for writing */
- fd[0] = Rast_open_cell_old(output, G_mapset());
- outfd = Rast_open_cell_new(output);
+ fd[0] = Rast_open_old(output, G_mapset());
+ outfd = Rast_open_c_new(output);
renumber(fd[0], outfd);
Modified: grass/trunk/raster/r.describe/describe.c
===================================================================
--- grass/trunk/raster/r.describe/describe.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.describe/describe.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -49,11 +49,11 @@
Rast_set_window(&window);
get_row = Rast_get_c_row_nomask;
}
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
return 0;
- map_type = Rast_get_raster_map_type(fd);
+ map_type = Rast_get_map_type(fd);
if (as_int)
map_type = CELL_TYPE; /* read as int */
Modified: grass/trunk/raster/r.distance/distance.c
===================================================================
--- grass/trunk/raster/r.distance/distance.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.distance/distance.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -88,13 +88,13 @@
/* NOTE: no need to controll, if the map exists. it should be checked in edge.c */
mapset = G_find_cell2(name1, "");
- maptype1 = Rast_raster_map_type(name1, mapset);
- mapd1 = Rast_open_cell_old(name1, mapset);
+ maptype1 = Rast_map_type(name1, mapset);
+ mapd1 = Rast_open_old(name1, mapset);
inrast1 = Rast_allocate_buf(maptype1);
mapset = G_find_cell2(name2, "");
- maptype2 = Rast_raster_map_type(name2, mapset);
- mapd2 = Rast_open_cell_old(name2, mapset);
+ maptype2 = Rast_map_type(name2, mapset);
+ mapd2 = Rast_open_old(name2, mapset);
inrast2 = Rast_allocate_buf(maptype2);
G_message(_("Reading maps <%s,%s> while finding 0 distance ..."), name1,
Modified: grass/trunk/raster/r.distance/edges.c
===================================================================
--- grass/trunk/raster/r.distance/edges.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.distance/edges.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -57,7 +57,7 @@
buf2[col] = 0;
}
- fd = Rast_open_cell_old(map->name, map->mapset);
+ fd = Rast_open_old(map->name, map->mapset);
if (fd < 0)
exit(1);
Modified: grass/trunk/raster/r.drain/main.c
===================================================================
--- grass/trunk/raster/r.drain/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.drain/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -181,7 +181,7 @@
("Direction raster not specified, if direction flag is on, a direction raster must be given"));
}
strcpy(dir_name, opt3->answer);
- dir_data_type = Rast_raster_map_type(dir_name, "");
+ dir_data_type = Rast_map_type(dir_name, "");
}
if (costmode == 0) {
if (opt3->answer) {
@@ -203,7 +203,7 @@
Vect_hist_command(&vout);
}
/* allocate cell buf for the map layer */
- in_type = Rast_raster_map_type(map_name, "");
+ in_type = Rast_map_type(map_name, "");
/* set the pointers for multi-typed functions */
set_func_pointers(in_type);
@@ -343,7 +343,7 @@
in_buf = get_buf();
/* open the original map and get its file id */
- map_id = Rast_open_cell_old(map_name, "");
+ map_id = Rast_open_old(map_name, "");
/* get some temp files */
tempfile1 = G_tempfile();
@@ -361,7 +361,7 @@
if (costmode == 1) {
dir_buf = Rast_allocate_d_buf();
- dir_id = Rast_open_cell_old(dir_name, "");
+ dir_id = Rast_open_old(dir_name, "");
tempfile3 = G_tempfile();
dir_fd = open(tempfile3, O_RDWR | O_CREAT, 0666);
@@ -416,7 +416,7 @@
/* Output will be a cell map */
/* open a new file and allocate an output buffer */
- new_id = Rast_open_cell_new(new_map_name);
+ new_id = Rast_open_c_new(new_map_name);
out_buf = Rast_allocate_c_buf();
/* mark each cell */
@@ -461,7 +461,7 @@
else { /* mode = 1 or 2 */
/* Output will be of the same type as input */
/* open a new file and allocate an output buffer */
- new_id = Rast_open_raster_new(new_map_name, in_type);
+ new_id = Rast_open_new(new_map_name, in_type);
out_buf = get_buf();
bsz = ncols * bpe();
Modified: grass/trunk/raster/r.fill.dir/main.c
===================================================================
--- grass/trunk/raster/r.fill.dir/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.fill.dir/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -174,10 +174,10 @@
G_fatal_error(_("Raster map <%s> not found"), map_name);
/* open the maps and get their file id */
- map_id = Rast_open_cell_old(map_name, map_mapset);
+ map_id = Rast_open_old(map_name, map_mapset);
/* allocate cell buf for the map layer */
- in_type = Rast_get_raster_map_type(map_id);
+ in_type = Rast_get_map_type(map_id);
/* set the pointers for multi-typed functions */
set_func_pointers(in_type);
@@ -254,14 +254,14 @@
bufsz = ncols * sizeof(CELL);
lseek(fe, 0, SEEK_SET);
- new_id = Rast_open_raster_new(new_map_name, in_type);
+ new_id = Rast_open_new(new_map_name, in_type);
lseek(fd, 0, SEEK_SET);
- dir_id = Rast_open_raster_new(dir_name, CELL_TYPE);
+ dir_id = Rast_open_new(dir_name, CELL_TYPE);
if (opt5->answer != NULL) {
lseek(fm, 0, SEEK_SET);
- bas_id = Rast_open_raster_new(bas_name, CELL_TYPE);
+ bas_id = Rast_open_new(bas_name, CELL_TYPE);
for (i = 0; i < nrows; i++) {
read(fm, out_buf, bufsz);
Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.flow/io.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -66,7 +66,7 @@
if (chd && (Rast_get_cellhd(fname, mapset, chd) < 0))
G_fatal_error(_("Unable to get header for %s"), fname);
- return Rast_open_cell_old(fname, mapset);
+ return Rast_open_old(fname, mapset);
}
void read_input_files(void)
@@ -164,7 +164,7 @@
}
if (parm.lgout &&
- ((lgfd = Rast_open_raster_new(parm.lgout, FCELL_TYPE)) < 0))
+ ((lgfd = Rast_open_new(parm.lgout, FCELL_TYPE)) < 0))
G_fatal_error(_("Unable to create raster map <%s>"), parm.lgout);
if (parm.flout && (Vect_open_new(&fl, parm.flout, 0) < 0))
@@ -199,7 +199,7 @@
G_fatal_error(_("Cannot reset current region"));
G_message(_("Writing density file"));
- dsfd = Rast_open_raster_new(parm.dsout, DCELL_TYPE);
+ dsfd = Rast_open_new(parm.dsout, DCELL_TYPE);
if (dsfd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), parm.dsout);
Modified: grass/trunk/raster/r.grow/main.c
===================================================================
--- grass/trunk/raster/r.grow/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.grow/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -182,13 +182,13 @@
else
G_fatal_error(_("Unknown metric: [%s]."), opt.met->answer);
- in_fd = Rast_open_cell_old(in_name, "");
+ in_fd = Rast_open_old(in_name, "");
if (in_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), in_name);
- type = Rast_get_raster_map_type(in_fd);
+ type = Rast_get_map_type(in_fd);
- out_fd = Rast_open_raster_new(out_name, type);
+ out_fd = Rast_open_new(out_name, type);
if (out_fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), out_name);
Modified: grass/trunk/raster/r.grow.distance/main.c
===================================================================
--- grass/trunk/raster/r.grow.distance/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.grow.distance/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -208,18 +208,18 @@
if (flag.m->answer)
scale = G_database_units_to_meters_factor();
- in_fd = Rast_open_cell_old(in_name, "");
+ in_fd = Rast_open_old(in_name, "");
if (in_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), in_name);
if (dist_name) {
- dist_fd = Rast_open_raster_new(dist_name, DCELL_TYPE);
+ dist_fd = Rast_open_new(dist_name, DCELL_TYPE);
if (dist_fd < 0)
G_fatal_error(_("Unable to create distance map <%s>"), dist_name);
}
if (val_name) {
- val_fd = Rast_open_raster_new(val_name, DCELL_TYPE);
+ val_fd = Rast_open_new(val_name, DCELL_TYPE);
if (val_fd < 0)
G_fatal_error(_("Unable to create value map <%s>"), val_name);
}
Modified: grass/trunk/raster/r.his/main.c
===================================================================
--- grass/trunk/raster/r.his/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.his/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -122,7 +122,7 @@
name_h = opt_h->answer;
/* Make sure map is available */
- if ((hue_file = Rast_open_cell_old(name_h, "")) == -1)
+ if ((hue_file = Rast_open_old(name_h, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), name_h);
hue_r = G_malloc(window.cols);
@@ -143,7 +143,7 @@
name_i = opt_i->answer;
int_used = 1;
/* Make sure map is available */
- if ((int_file = Rast_open_cell_old(name_i, "")) == -1)
+ if ((int_file = Rast_open_old(name_i, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), name_i);
int_r = G_malloc(window.cols);
@@ -162,7 +162,7 @@
sat_used = 1;
/* Make sure map is available */
- if ((sat_file = Rast_open_cell_old(name_s, "")) == -1)
+ if ((sat_file = Rast_open_old(name_s, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), name_s);
sat_r = G_malloc(window.cols);
@@ -178,7 +178,7 @@
if (opt_r->answer != NULL) {
name_r = opt_r->answer;
- if ((r_file = Rast_open_cell_new(name_r)) < 0)
+ if ((r_file = Rast_open_c_new(name_r)) < 0)
r_used = 0;
else
r_used = 1;
@@ -189,7 +189,7 @@
if (opt_g->answer != NULL) {
name_g = opt_g->answer;
- if ((g_file = Rast_open_cell_new(name_g)) < 0)
+ if ((g_file = Rast_open_c_new(name_g)) < 0)
g_used = 0;
else
g_used = 1;
@@ -200,7 +200,7 @@
if (opt_b->answer != NULL) {
name_b = opt_b->answer;
- if ((b_file = Rast_open_cell_new(name_b)) < 0)
+ if ((b_file = Rast_open_c_new(name_b)) < 0)
b_used = 0;
else
b_used = 1;
Modified: grass/trunk/raster/r.horizon/main.c
===================================================================
--- grass/trunk/raster/r.horizon/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.horizon/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -553,7 +553,7 @@
if ((mapset = G_find_cell2(elevin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), elevin);
- fd1 = Rast_open_cell_old(elevin, mapset);
+ fd1 = Rast_open_old(elevin, mapset);
for (row = 0; row < m; row++) {
Rast_get_f_row(fd1, cell1, row);
@@ -618,7 +618,7 @@
if (horizon != NULL) {
cell1 = Rast_allocate_f_buf();
- fd1 = Rast_open_fp_cell_new(shad_filename);
+ fd1 = Rast_open_fp_new(shad_filename);
if (fd1 < 0)
G_fatal_error(_("Unable to create raster map %s"), shad_filename);
}
Modified: grass/trunk/raster/r.in.arc/main.c
===================================================================
--- grass/trunk/raster/r.in.arc/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.in.arc/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -150,7 +150,7 @@
dcell = Rast_allocate_d_buf();
break;
}
- cf = Rast_open_raster_new(output, rtype);
+ cf = Rast_open_new(output, rtype);
if (cf < 0)
G_fatal_error(_("Unable to create raster map <%s>"), output);
Modified: grass/trunk/raster/r.in.ascii/main.c
===================================================================
--- grass/trunk/raster/r.in.ascii/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.in.ascii/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -202,7 +202,7 @@
rast_ptr = Rast_allocate_buf(data_type);
rast = rast_ptr;
- cf = Rast_open_raster_new(output, data_type);
+ cf = Rast_open_new(output, data_type);
if (cf < 0)
G_fatal_error(_("Unable to create raster map <%s>"), output);
for (row = 0; row < nrows; row++) {
Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.in.bin/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -493,7 +493,7 @@
map_type = CELL_TYPE;
}
- cf = Rast_open_raster_new(output, map_type);
+ cf = Rast_open_new(output, map_type);
if (cf < 0) {
G_fatal_error(_("Unable to create raster map <%s>"), output);
exit(EXIT_FAILURE);
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.in.gdal/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -680,7 +680,7 @@
char outputReal[GNAME_MAX], outputImg[GNAME_MAX];
char *nullFlags = NULL;
int (*raster_open_new_func) (const char *, RASTER_MAP_TYPE) =
- Rast_open_raster_new;
+ Rast_open_new;
struct History history;
/* -------------------------------------------------------------------- */
@@ -701,7 +701,7 @@
eGDT = GDT_Int32;
complex = FALSE;
Rast_set_cell_format(0);
- /* raster_open_new_func = Rast_open_raster_new_uncompressed; *//* ?? */
+ /* raster_open_new_func = Rast_open_new_uncompressed; *//* ?? */
break;
case GDT_Int16:
@@ -710,7 +710,7 @@
eGDT = GDT_Int32;
complex = FALSE;
Rast_set_cell_format(1);
- /* raster_open_new_func = Rast_open_raster_new_uncompressed; *//* ?? */
+ /* raster_open_new_func = Rast_open_new_uncompressed; *//* ?? */
break;
default:
Modified: grass/trunk/raster/r.in.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.in.gridatb/file_io.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.in.gridatb/file_io.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -43,7 +43,7 @@
}
}
- fd = Rast_open_raster_new(oname, FCELL_TYPE);
+ fd = Rast_open_new(oname, FCELL_TYPE);
cell = (FCELL *) G_malloc(sizeof(FCELL) * cellhd.cols);
Modified: grass/trunk/raster/r.in.mat/main.c
===================================================================
--- grass/trunk/raster/r.in.mat/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.in.mat/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -409,7 +409,7 @@
/* prep memory */
raster = Rast_allocate_buf(map_type);
- cf = Rast_open_raster_new(map_name, map_type);
+ cf = Rast_open_new(map_name, map_type);
if (cf < 0)
G_fatal_error(_("Unable to create raster map <%s>"), outfile);
Modified: grass/trunk/raster/r.in.poly/poly2rast.c
===================================================================
--- grass/trunk/raster/r.in.poly/poly2rast.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.in.poly/poly2rast.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -32,7 +32,7 @@
exit(EXIT_FAILURE);
}
- rfd = Rast_open_cell_new(raster_map);
+ rfd = Rast_open_c_new(raster_map);
if (rfd < 0)
G_fatal_error(_("Can't create raster map <%s>"), raster_map);
Modified: grass/trunk/raster/r.in.xyz/main.c
===================================================================
--- grass/trunk/raster/r.in.xyz/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.in.xyz/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -495,7 +495,7 @@
/* open output map */
- out_fd = Rast_open_raster_new(outmap, rtype);
+ out_fd = Rast_open_new(outmap, rtype);
if (out_fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), outmap);
Modified: grass/trunk/raster/r.info/main.c
===================================================================
--- grass/trunk/raster/r.info/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.info/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -123,7 +123,7 @@
cats_ok = Rast_read_cats(name, "", &cats) >= 0;
hist_ok = Rast_read_history(name, "", &hist) >= 0;
is_reclass = Rast_get_reclass(name, "", &reclass);
- data_type = Rast_raster_map_type(name, "");
+ data_type = Rast_map_type(name, "");
if (Rast_read_raster_units(name, "", units) != 0)
units[0] = '\0';
Modified: grass/trunk/raster/r.lake/main.c
===================================================================
--- grass/trunk/raster/r.lake/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.lake/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -213,7 +213,7 @@
/* If lakemap is set, write to it, else is set overwrite flag and we should write to seedmap. */
if (lakemap) {
- lake_fd = Rast_open_raster_new(lakemap, 1);
+ lake_fd = Rast_open_new(lakemap, 1);
if (lake_fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), lakemap);
}
@@ -238,13 +238,13 @@
}
/* Open terran map */
- in_terran_fd = Rast_open_cell_old(terrainmap, "");
+ in_terran_fd = Rast_open_old(terrainmap, "");
if (in_terran_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), terrainmap);
/* Open seed map */
if (smap_opt->answer) {
- out_fd = Rast_open_cell_old(seedmap, "");
+ out_fd = Rast_open_old(seedmap, "");
if (out_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), seedmap);
}
@@ -292,7 +292,7 @@
out_fd = lake_fd;
}
else {
- out_fd = Rast_open_raster_new(seedmap, 1);
+ out_fd = Rast_open_new(seedmap, 1);
if (out_fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), seedmap);
}
Modified: grass/trunk/raster/r.le/r.le.patch/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -72,7 +72,7 @@
map remains open on finput while all the programs
run, so it is globally available */
- if (0 > (finput = Rast_open_cell_old(choice->fn, G_mapset()))) {
+ if (0 > (finput = Rast_open_old(choice->fn, G_mapset()))) {
fprintf(stderr, "\n");
fprintf(stderr,
" ******* *************************************************\n");
@@ -90,7 +90,7 @@
double (DCELL_TYPE) and make globally available */
else
- data_type = Rast_raster_map_type(choice->fn, G_mapset());
+ data_type = Rast_map_type(choice->fn, G_mapset());
/* if using a moving window, get the parameters,
@@ -551,49 +551,49 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a1,a1bak");
system(cmdbuf);
}
- a1 = Rast_open_raster_new("a1", DCELL_TYPE);
+ a1 = Rast_open_new("a1", DCELL_TYPE);
}
if (choice->att[2]) {
if (G_find_cell("a2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a2,a2bak");
system(cmdbuf);
}
- a2 = Rast_open_raster_new("a2", DCELL_TYPE);
+ a2 = Rast_open_new("a2", DCELL_TYPE);
}
if (choice->att[3]) {
if (G_find_cell("a3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a3,a3bak");
system(cmdbuf);
}
- a3 = Rast_open_raster_new("a3", DCELL_TYPE);
+ a3 = Rast_open_new("a3", DCELL_TYPE);
}
if (choice->att[4]) {
if (G_find_cell("a4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a4,a4bak");
system(cmdbuf);
}
- a4 = Rast_open_raster_new("a4", DCELL_TYPE);
+ a4 = Rast_open_new("a4", DCELL_TYPE);
}
if (choice->att[5]) {
if (G_find_cell("a5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a5,a5bak");
system(cmdbuf);
}
- a5 = Rast_open_raster_new("a5", DCELL_TYPE);
+ a5 = Rast_open_new("a5", DCELL_TYPE);
}
if (choice->att[6]) {
if (G_find_cell("a6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a6,a6bak");
system(cmdbuf);
}
- a6 = Rast_open_raster_new("a6", DCELL_TYPE);
+ a6 = Rast_open_new("a6", DCELL_TYPE);
}
if (choice->att[7]) {
if (G_find_cell("a7", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a7,a7bak");
system(cmdbuf);
}
- a7 = Rast_open_raster_new("a7", DCELL_TYPE);
+ a7 = Rast_open_new("a7", DCELL_TYPE);
}
if (choice->att[8]) {
@@ -601,7 +601,7 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=a8,a8bak");
system(cmdbuf);
}
- a8 = Rast_open_raster_new("a8", DCELL_TYPE);
+ a8 = Rast_open_new("a8", DCELL_TYPE);
}
if (choice->size[1]) {
@@ -609,42 +609,42 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s1,s1bak");
system(cmdbuf);
}
- s1 = Rast_open_raster_new("s1", DCELL_TYPE);
+ s1 = Rast_open_new("s1", DCELL_TYPE);
}
if (choice->size[2]) {
if (G_find_cell("s2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s2,s2bak");
system(cmdbuf);
}
- s2 = Rast_open_raster_new("s2", DCELL_TYPE);
+ s2 = Rast_open_new("s2", DCELL_TYPE);
}
if (choice->size[3]) {
if (G_find_cell("s3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s3,s3bak");
system(cmdbuf);
}
- s3 = Rast_open_raster_new("s3", DCELL_TYPE);
+ s3 = Rast_open_new("s3", DCELL_TYPE);
}
if (choice->size[4]) {
if (G_find_cell("s4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s4,s4bak");
system(cmdbuf);
}
- s4 = Rast_open_raster_new("s4", DCELL_TYPE);
+ s4 = Rast_open_new("s4", DCELL_TYPE);
}
if (choice->size[5]) {
if (G_find_cell("s5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s5,s5bak");
system(cmdbuf);
}
- s5 = Rast_open_raster_new("s5", DCELL_TYPE);
+ s5 = Rast_open_new("s5", DCELL_TYPE);
}
if (choice->size[6]) {
if (G_find_cell("s6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s6,s6bak");
system(cmdbuf);
}
- s6 = Rast_open_raster_new("s6", DCELL_TYPE);
+ s6 = Rast_open_new("s6", DCELL_TYPE);
}
if (choice->size[7]) {
@@ -652,7 +652,7 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s7,s7bak");
system(cmdbuf);
}
- s7 = Rast_open_raster_new("s7", DCELL_TYPE);
+ s7 = Rast_open_new("s7", DCELL_TYPE);
}
if (choice->size[8]) {
@@ -660,7 +660,7 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=s8,s8bak");
system(cmdbuf);
}
- s8 = Rast_open_raster_new("s8", DCELL_TYPE);
+ s8 = Rast_open_new("s8", DCELL_TYPE);
}
if (choice->core[1]) {
@@ -668,70 +668,70 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c1,c1bak");
system(cmdbuf);
}
- c1 = Rast_open_raster_new("c1", DCELL_TYPE);
+ c1 = Rast_open_new("c1", DCELL_TYPE);
}
if (choice->core[2]) {
if (G_find_cell("c2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c2,c2bak");
system(cmdbuf);
}
- c2 = Rast_open_raster_new("c2", DCELL_TYPE);
+ c2 = Rast_open_new("c2", DCELL_TYPE);
}
if (choice->core[3]) {
if (G_find_cell("c3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c3,c3bak");
system(cmdbuf);
}
- c3 = Rast_open_raster_new("c3", DCELL_TYPE);
+ c3 = Rast_open_new("c3", DCELL_TYPE);
}
if (choice->core[4]) {
if (G_find_cell("c4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c4,c4bak");
system(cmdbuf);
}
- c4 = Rast_open_raster_new("c4", DCELL_TYPE);
+ c4 = Rast_open_new("c4", DCELL_TYPE);
}
if (choice->core[5]) {
if (G_find_cell("c5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c5,c5bak");
system(cmdbuf);
}
- c5 = Rast_open_raster_new("c5", DCELL_TYPE);
+ c5 = Rast_open_new("c5", DCELL_TYPE);
}
if (choice->core[6]) {
if (G_find_cell("c6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c6,c6bak");
system(cmdbuf);
}
- c6 = Rast_open_raster_new("c6", DCELL_TYPE);
+ c6 = Rast_open_new("c6", DCELL_TYPE);
}
if (choice->core[7]) {
if (G_find_cell("c7", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c7,c7bak");
system(cmdbuf);
}
- c7 = Rast_open_raster_new("c7", DCELL_TYPE);
+ c7 = Rast_open_new("c7", DCELL_TYPE);
}
if (choice->core[8]) {
if (G_find_cell("c8", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c8,c8bak");
system(cmdbuf);
}
- c8 = Rast_open_raster_new("c8", DCELL_TYPE);
+ c8 = Rast_open_new("c8", DCELL_TYPE);
}
if (choice->core[9]) {
if (G_find_cell("c9", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c9,c9bak");
system(cmdbuf);
}
- c9 = Rast_open_raster_new("c9", DCELL_TYPE);
+ c9 = Rast_open_new("c9", DCELL_TYPE);
}
if (choice->core[10]) {
if (G_find_cell("c10", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=c10,c10bak");
system(cmdbuf);
}
- c10 = Rast_open_raster_new("c10", DCELL_TYPE);
+ c10 = Rast_open_new("c10", DCELL_TYPE);
}
if (choice->shape[1]) {
@@ -739,42 +739,42 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h1,h1bak");
system(cmdbuf);
}
- h1 = Rast_open_raster_new("h1", DCELL_TYPE);
+ h1 = Rast_open_new("h1", DCELL_TYPE);
}
if (choice->shape[2]) {
if (G_find_cell("h2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h2,h2bak");
system(cmdbuf);
}
- h2 = Rast_open_raster_new("h2", DCELL_TYPE);
+ h2 = Rast_open_new("h2", DCELL_TYPE);
}
if (choice->shape[3]) {
if (G_find_cell("h3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h3,h3bak");
system(cmdbuf);
}
- h3 = Rast_open_raster_new("h3", DCELL_TYPE);
+ h3 = Rast_open_new("h3", DCELL_TYPE);
}
if (choice->shape[4]) {
if (G_find_cell("h4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h4,h4bak");
system(cmdbuf);
}
- h4 = Rast_open_raster_new("h4", DCELL_TYPE);
+ h4 = Rast_open_new("h4", DCELL_TYPE);
}
if (choice->shape[5]) {
if (G_find_cell("h5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h5,h5bak");
system(cmdbuf);
}
- h5 = Rast_open_raster_new("h5", DCELL_TYPE);
+ h5 = Rast_open_new("h5", DCELL_TYPE);
}
if (choice->shape[6]) {
if (G_find_cell("h6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=h6,h6bak");
system(cmdbuf);
}
- h6 = Rast_open_raster_new("h6", DCELL_TYPE);
+ h6 = Rast_open_new("h6", DCELL_TYPE);
}
if (choice->boundary[1]) {
@@ -782,7 +782,7 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n1,n1bak");
system(cmdbuf);
}
- n1 = Rast_open_raster_new("n1", DCELL_TYPE);
+ n1 = Rast_open_new("n1", DCELL_TYPE);
}
if (choice->boundary[2]) {
@@ -790,7 +790,7 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n2,n2bak");
system(cmdbuf);
}
- n2 = Rast_open_raster_new("n2", DCELL_TYPE);
+ n2 = Rast_open_new("n2", DCELL_TYPE);
}
if (choice->boundary[3]) {
@@ -798,7 +798,7 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n3,n3bak");
system(cmdbuf);
}
- n3 = Rast_open_raster_new("n3", DCELL_TYPE);
+ n3 = Rast_open_new("n3", DCELL_TYPE);
}
if (choice->boundary[4]) {
@@ -806,7 +806,7 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=n4,n4bak");
system(cmdbuf);
}
- n4 = Rast_open_raster_new("n4", DCELL_TYPE);
+ n4 = Rast_open_new("n4", DCELL_TYPE);
}
if (choice->perim[1]) {
@@ -814,42 +814,42 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p1,p1bak");
system(cmdbuf);
}
- p1 = Rast_open_raster_new("p1", DCELL_TYPE);
+ p1 = Rast_open_new("p1", DCELL_TYPE);
}
if (choice->perim[2]) {
if (G_find_cell("p2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p2,p2bak");
system(cmdbuf);
}
- p2 = Rast_open_raster_new("p2", DCELL_TYPE);
+ p2 = Rast_open_new("p2", DCELL_TYPE);
}
if (choice->perim[3]) {
if (G_find_cell("p3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p3,p3bak");
system(cmdbuf);
}
- p3 = Rast_open_raster_new("p3", DCELL_TYPE);
+ p3 = Rast_open_new("p3", DCELL_TYPE);
}
if (choice->perim[4]) {
if (G_find_cell("p4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p4,p4bak");
system(cmdbuf);
}
- p4 = Rast_open_raster_new("p4", DCELL_TYPE);
+ p4 = Rast_open_new("p4", DCELL_TYPE);
}
if (choice->perim[5]) {
if (G_find_cell("p5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p5,p5bak");
system(cmdbuf);
}
- p5 = Rast_open_raster_new("p5", DCELL_TYPE);
+ p5 = Rast_open_new("p5", DCELL_TYPE);
}
if (choice->perim[6]) {
if (G_find_cell("p6", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=p6,p6bak");
system(cmdbuf);
}
- p6 = Rast_open_raster_new("p6", DCELL_TYPE);
+ p6 = Rast_open_new("p6", DCELL_TYPE);
}
/* get the moving window parameters */
@@ -915,7 +915,7 @@
fprintf(stderr,
" warning may be printed or appear in a window; ignore this warning.\n");
fprintf(stderr, "If a MASK is present there will be no warning.\n");
- fmask = Rast_open_cell_old("MASK", G_mapset());
+ fmask = Rast_open_old("MASK", G_mapset());
fprintf(stderr, "\n");
/* allocate memory for the buffer that
@@ -2702,7 +2702,7 @@
if (choice->units) {
strcpy(unitname, "units_");
strcat(unitname, istr);
- fd = Rast_open_raster_new(unitname, CELL_TYPE);
+ fd = Rast_open_new(unitname, CELL_TYPE);
unit_buf = Rast_allocate_buf(CELL_TYPE);
for (k = 1; k < wind.rows + 1; k++) {
Rast_zero_raster_buf(unit_buf, CELL_TYPE);
@@ -2817,7 +2817,7 @@
}
else {
regcnt = 0;
- fr = Rast_open_cell_old(choice->reg, G_mapset());
+ fr = Rast_open_old(choice->reg, G_mapset());
row_buf = Rast_allocate_buf(CELL_TYPE);
for (i = 0; i < nrows; i++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
Modified: grass/trunk/raster/r.le/r.le.patch/trace.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/trace.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.le/r.le.patch/trace.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -105,7 +105,7 @@
name = choice->fn;
mapset = G_mapset();
- data_type = Rast_raster_map_type(name, mapset);
+ data_type = Rast_map_type(name, mapset);
/* dynamically allocate storage for the
buffer that will hold the contents of
@@ -178,7 +178,7 @@
categories, history, quant) into the
corresponding data structures */
- infd = Rast_open_cell_old(name, mapset);
+ infd = Rast_open_old(name, mapset);
colr_ok = Rast_read_colors(name, mapset, &colr) > 0;
cats_ok = Rast_read_cats(name, mapset, &cats) >= 0;
hist_ok = Rast_read_history(name, mapset, &hist) >= 0;
@@ -210,7 +210,7 @@
switch (data_type) {
case CELL_TYPE:
cor_cell_buf = Rast_allocate_buf(CELL_TYPE);
- fe = Rast_open_raster_new("interior", CELL_TYPE);
+ fe = Rast_open_new("interior", CELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(cor_cell_buf, CELL_TYPE);
for (j = 1; j < ncols + 1; j++)
@@ -224,7 +224,7 @@
break;
case FCELL_TYPE:
cor_fcell_buf = Rast_allocate_buf(FCELL_TYPE);
- fe = Rast_open_raster_new("interior", FCELL_TYPE);
+ fe = Rast_open_new("interior", FCELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(cor_fcell_buf, FCELL_TYPE);
for (j = 1; j < ncols + 1; j++) {
@@ -237,7 +237,7 @@
break;
case DCELL_TYPE:
cor_dcell_buf = Rast_allocate_buf(DCELL_TYPE);
- fe = Rast_open_raster_new("interior", DCELL_TYPE);
+ fe = Rast_open_new("interior", DCELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(cor_dcell_buf, DCELL_TYPE);
for (j = 1; j < ncols + 1; j++)
@@ -255,7 +255,7 @@
complete the details of map creation */
if (choice->patchmap) {
- fd = Rast_open_raster_new("num", CELL_TYPE);
+ fd = Rast_open_new("num", CELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
pat_buf = Rast_allocate_buf(CELL_TYPE);
Rast_zero_raster_buf(pat_buf, CELL_TYPE);
@@ -510,7 +510,7 @@
an integer (CELL_TYPE) map */
if (choice->wrum == 'r') {
- if (0 > (fr = Rast_open_cell_old(choice->reg, G_mapset()))) {
+ if (0 > (fr = Rast_open_old(choice->reg, G_mapset()))) {
fprintf(stderr, "\n");
fprintf(stderr,
" *******************************************************\n");
@@ -524,7 +524,7 @@
" *******************************************************\n");
exit(EXIT_FAILURE);
}
- if (Rast_raster_map_type(choice->reg, G_mapset()) > 0) {
+ if (Rast_map_type(choice->reg, G_mapset()) > 0) {
fprintf(stderr, "\n");
fprintf(stderr,
" *******************************************************\n");
@@ -545,7 +545,7 @@
fprintf(stderr, "Analyzing region number %d...\n", index);
}
- data_type = Rast_raster_map_type(choice->fn, G_mapset());
+ data_type = Rast_map_type(choice->fn, G_mapset());
/* allocate memory to store a row of the
Modified: grass/trunk/raster/r.le/r.le.pixel/cellclip.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/cellclip.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.le/r.le.pixel/cellclip.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -59,7 +59,7 @@
name = choice->fn;
mapset = G_mapset();
- data_type = Rast_raster_map_type(name, mapset);
+ data_type = Rast_map_type(name, mapset);
/* dynamically allocate storage for the
buffer that will hold the contents of
@@ -254,14 +254,14 @@
i, j = indices to rows and cols of the arrays
*/
- data_type = Rast_raster_map_type(choice->fn, G_mapset());
+ data_type = Rast_map_type(choice->fn, G_mapset());
/* if sampling by region was chosen, check
for the region map and make sure it is
an integer (CELL_TYPE) map */
if (choice->wrum == 'r') {
- if (0 > (fr = Rast_open_cell_old(choice->reg, G_mapset()))) {
+ if (0 > (fr = Rast_open_old(choice->reg, G_mapset()))) {
fprintf(stderr, "\n");
fprintf(stderr,
" *******************************************************\n");
@@ -275,7 +275,7 @@
" *******************************************************\n");
exit(1);
}
- if (Rast_raster_map_type(choice->reg, G_mapset()) > 0) {
+ if (Rast_map_type(choice->reg, G_mapset()) > 0) {
fprintf(stderr, "\n");
fprintf(stderr,
" *******************************************************\n");
Modified: grass/trunk/raster/r.le/r.le.pixel/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -51,7 +51,7 @@
/* check for input raster map */
- if (0 > (finput = Rast_open_cell_old(choice->fn, G_mapset()))) {
+ if (0 > (finput = Rast_open_old(choice->fn, G_mapset()))) {
fprintf(stdout, "\n");
fprintf(stdout,
" ********************************************************\n");
@@ -69,7 +69,7 @@
double (DCELL_TYPE) and make globally available */
else
- data_type = Rast_raster_map_type(choice->fn, G_mapset());
+ data_type = Rast_map_type(choice->fn, G_mapset());
/* if using a moving window, get the parameters,
and start the moving window driver */
@@ -198,28 +198,28 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b1,b1bak");
system(cmdbuf);
}
- b1 = Rast_open_raster_new("b1", DCELL_TYPE);
+ b1 = Rast_open_new("b1", DCELL_TYPE);
}
if (choice->att[2]) {
if (G_find_cell("b2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b2,b2bak");
system(cmdbuf);
}
- b2 = Rast_open_raster_new("b2", DCELL_TYPE);
+ b2 = Rast_open_new("b2", DCELL_TYPE);
}
if (choice->att[3]) {
if (G_find_cell("b3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b3,b3bak");
system(cmdbuf);
}
- b3 = Rast_open_raster_new("b3", DCELL_TYPE);
+ b3 = Rast_open_new("b3", DCELL_TYPE);
}
if (choice->att[4]) {
if (G_find_cell("b4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=b4,b4bak");
system(cmdbuf);
}
- b4 = Rast_open_raster_new("b4", DCELL_TYPE);
+ b4 = Rast_open_new("b4", DCELL_TYPE);
}
if (choice->div[1]) {
@@ -227,28 +227,28 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d1,d1bak");
system(cmdbuf);
}
- d1 = Rast_open_raster_new("d1", DCELL_TYPE);
+ d1 = Rast_open_new("d1", DCELL_TYPE);
}
if (choice->div[2]) {
if (G_find_cell("d2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d2,d2bak");
system(cmdbuf);
}
- d2 = Rast_open_raster_new("d2", DCELL_TYPE);
+ d2 = Rast_open_new("d2", DCELL_TYPE);
}
if (choice->div[3]) {
if (G_find_cell("d3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d3,d3bak");
system(cmdbuf);
}
- d3 = Rast_open_raster_new("d3", DCELL_TYPE);
+ d3 = Rast_open_new("d3", DCELL_TYPE);
}
if (choice->div[4]) {
if (G_find_cell("d4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=d4,d4bak");
system(cmdbuf);
}
- d4 = Rast_open_raster_new("d4", DCELL_TYPE);
+ d4 = Rast_open_new("d4", DCELL_TYPE);
}
if (choice->te2[1]) {
@@ -256,35 +256,35 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t1,t1bak");
system(cmdbuf);
}
- t1 = Rast_open_raster_new("t1", DCELL_TYPE);
+ t1 = Rast_open_new("t1", DCELL_TYPE);
}
if (choice->te2[2]) {
if (G_find_cell("t2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t2,t2bak");
system(cmdbuf);
}
- t2 = Rast_open_raster_new("t2", DCELL_TYPE);
+ t2 = Rast_open_new("t2", DCELL_TYPE);
}
if (choice->te2[3]) {
if (G_find_cell("t3", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t3,t3bak");
system(cmdbuf);
}
- t3 = Rast_open_raster_new("t3", DCELL_TYPE);
+ t3 = Rast_open_new("t3", DCELL_TYPE);
}
if (choice->te2[4]) {
if (G_find_cell("t4", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t4,t4bak");
system(cmdbuf);
}
- t4 = Rast_open_raster_new("t4", DCELL_TYPE);
+ t4 = Rast_open_new("t4", DCELL_TYPE);
}
if (choice->te2[5]) {
if (G_find_cell("t5", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=t5,t5bak");
system(cmdbuf);
}
- t5 = Rast_open_raster_new("t5", DCELL_TYPE);
+ t5 = Rast_open_new("t5", DCELL_TYPE);
}
if (choice->jux[1]) {
@@ -292,28 +292,28 @@
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=j1,j1bak");
system(cmdbuf);
}
- j1 = Rast_open_raster_new("j1", DCELL_TYPE);
+ j1 = Rast_open_new("j1", DCELL_TYPE);
}
if (choice->jux[2]) {
if (G_find_cell("j2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=j2,j2bak");
system(cmdbuf);
}
- j2 = Rast_open_raster_new("j2", DCELL_TYPE);
+ j2 = Rast_open_new("j2", DCELL_TYPE);
}
if (choice->edg[1]) {
if (G_find_cell("e1", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=e1,e1bak");
system(cmdbuf);
}
- e1 = Rast_open_raster_new("e1", DCELL_TYPE);
+ e1 = Rast_open_new("e1", DCELL_TYPE);
}
if (choice->edg[2]) {
if (G_find_cell("e2", G_mapset()) != NULL) {
sprintf(cmdbuf, "%s %s", "g.rename -o", "rast=e2,e2bak");
system(cmdbuf);
}
- e2 = Rast_open_raster_new("e2", DCELL_TYPE);
+ e2 = Rast_open_new("e2", DCELL_TYPE);
}
@@ -383,7 +383,7 @@
fprintf(stdout,
" warning may be printed or appear in a window; ignore this warning.\n");
fprintf(stdout, "If a MASK is present there will be no warning.\n");
- fmask = Rast_open_cell_old("MASK", G_mapset());
+ fmask = Rast_open_old("MASK", G_mapset());
fprintf(stdout, "\n");
/* allocate memory for the buffer */
@@ -1524,7 +1524,7 @@
if (choice->units) {
strcpy(unitname, "units_");
strcat(unitname, istr);
- fd = Rast_open_raster_new(unitname, CELL_TYPE);
+ fd = Rast_open_new(unitname, CELL_TYPE);
unit_buf = Rast_allocate_buf(CELL_TYPE);
for (k = 1; k < wind.rows + 1; k++) {
Rast_zero_raster_buf(unit_buf, CELL_TYPE);
@@ -1638,7 +1638,7 @@
REGLIST *ptrfirst, *ptrthis, *ptrnew;
RASTER_MAP_TYPE data_type;
- data_type = Rast_raster_map_type(choice->fn, G_mapset());
+ data_type = Rast_map_type(choice->fn, G_mapset());
nrows = G_window_rows();
ncols = G_window_cols();
@@ -1750,7 +1750,7 @@
}
else {
regcnt = 0;
- fr = Rast_open_cell_old(choice->reg, G_mapset());
+ fr = Rast_open_old(choice->reg, G_mapset());
row_buf = Rast_allocate_buf(CELL_TYPE);
for (i = 0; i < nrows; i++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
Modified: grass/trunk/raster/r.le/r.le.pixel/texture.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/texture.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.le/r.le.pixel/texture.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -259,7 +259,7 @@
DCELL **edgemap_d, *edge_buf_d, *zscor_buf;
RASTER_MAP_TYPE data_type;
- data_type = Rast_raster_map_type(choice->fn, G_mapset());
+ data_type = Rast_map_type(choice->fn, G_mapset());
/* set the contents of the arrays
used to stored the results of the
@@ -464,7 +464,7 @@
/* if the edge map was requested */
if (choice->edgemap) {
- fc = Rast_open_raster_new("edge", data_type);
+ fc = Rast_open_new("edge", data_type);
switch (data_type) {
case (CELL_TYPE):
edge_buf_c = Rast_allocate_buf(CELL_TYPE);
@@ -532,7 +532,7 @@
/* if the zscore map was requested */
if (choice->z) {
- fd = Rast_open_raster_new("zscores", DCELL_TYPE);
+ fd = Rast_open_new("zscores", DCELL_TYPE);
zscor_buf = Rast_allocate_buf(DCELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(zscor_buf, DCELL_TYPE);
Modified: grass/trunk/raster/r.le/r.le.setup/mv_wind.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/mv_wind.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.le/r.le.setup/mv_wind.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -102,7 +102,7 @@
fprintf(stderr,
" If a MASK is present there will be no warning.\n");
- fmask = Rast_open_cell_old("MASK", G_mapset());
+ fmask = Rast_open_old("MASK", G_mapset());
fprintf(stderr, "\n");
Modified: grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -68,7 +68,7 @@
record = Rast_allocate_c_buf();
- if ((newmap = Rast_open_cell_new(argv[1])) == -1) {
+ if ((newmap = Rast_open_c_new(argv[1])) == -1) {
fprintf(stderr, "ERROR bmif_to_cell: can't open raster map %s\n",
argv[1]);
quit();
Modified: grass/trunk/raster/r.le/r.le.setup/sample.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -101,7 +101,7 @@
" and a WARNING may be printed that can be ignored.\n");
fprintf(stderr,
" If a MASK is present there will be no warning.\n");
- fmask = Rast_open_cell_old("MASK", G_mapset());
+ fmask = Rast_open_old("MASK", G_mapset());
fprintf(stderr, "\n");
@@ -353,7 +353,7 @@
if (fmask > 0) {
count = 0;
row_buf = Rast_allocate_buf(CELL_TYPE);
- fr = Rast_open_cell_old(n1, G_mapset());
+ fr = Rast_open_old(n1, G_mapset());
for (j = t; j < b; j++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
Rast_get_row(fr, row_buf, j, CELL_TYPE);
@@ -410,7 +410,7 @@
if (fmask > 0) {
count = 0;
row_buf = Rast_allocate_buf(CELL_TYPE);
- fr = Rast_open_cell_old(n1, G_mapset());
+ fr = Rast_open_old(n1, G_mapset());
for (j = t; j < b; j++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
Rast_get_row(fr, row_buf, j, CELL_TYPE);
Modified: grass/trunk/raster/r.le/r.le.trace/main.c
===================================================================
--- grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -434,7 +434,7 @@
name = choice->fn;
mapset = G_mapset();
- data_type = Rast_raster_map_type(name, mapset);
+ data_type = Rast_map_type(name, mapset);
/* dynamically allocate storage for the
buffer that will hold the contents of
@@ -552,7 +552,7 @@
map remains open on finput while all the programs
run, so it is globally available */
- if (0 > (finput = Rast_open_cell_old(choice->fn, G_mapset()))) {
+ if (0 > (finput = Rast_open_old(choice->fn, G_mapset()))) {
fprintf(stderr, "\n");
fprintf(stderr,
" ********************************************************\n");
@@ -566,7 +566,7 @@
}
else
- data_type = Rast_raster_map_type(choice->fn, G_mapset());
+ data_type = Rast_map_type(choice->fn, G_mapset());
/* allocate memory to store a row of the
raster map, depending on the type of
Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -113,7 +113,7 @@
/* struct Cell_head cellhd_r, cellhd_new;
char *mapset; */
/*creating new raster file */
- mv_fd = Rast_open_raster_new(output, DCELL_TYPE);
+ mv_fd = Rast_open_new(output, DCELL_TYPE);
if (mv_fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), output);
Modified: grass/trunk/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -59,13 +59,13 @@
pid = getpid();
ad = malloc(sizeof(struct area_entry));
/* open raster map */
- fd = Rast_open_cell_old(raster, "");
+ fd = Rast_open_old(raster, "");
if (Rast_get_cellhd(raster, "", &hd) == -1) {
G_message(_("CHILD[pid = %i] cannot open raster map"), pid);
exit(EXIT_FAILURE);
}
/* read data type to allocate cache */
- data_type = Rast_raster_map_type(raster, "");
+ data_type = Rast_map_type(raster, "");
/* calculate rows in cache */
switch (data_type) {
case CELL_TYPE:{
@@ -240,7 +240,7 @@
add_col = 1.0 * oldcell.cols / cl;
tmp_file = G_tempfile();
mask_fd = open(tmp_file, O_RDWR | O_CREAT, 0755);
- old_fd = Rast_open_cell_old(mask, "");
+ old_fd = Rast_open_old(mask, "");
old = Rast_allocate_c_buf();
for (i = 0; i < rl; i++) {
int riga;
Modified: grass/trunk/raster/r.los/main.c
===================================================================
--- grass/trunk/raster/r.los/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.los/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -200,21 +200,21 @@
ncols = G_window_cols();
/* open elevation overlay file for reading */
- old = Rast_open_cell_old(elev_layer, old_mapset);
+ old = Rast_open_old(elev_layer, old_mapset);
if (old < 0)
G_fatal_error(_("Unable to open raster map <%s>"), elev_layer);
/* open cell layer for writing output */
- new = Rast_open_raster_new(out_layer, FCELL_TYPE);
+ new = Rast_open_new(out_layer, FCELL_TYPE);
if (new < 0)
G_fatal_error(_("Unable to create raster map <%s>"), out_layer);
/* if pattern layer specified, open it for reading */
if (patt_flag == TRUE) {
- patt = Rast_open_cell_old(patt_layer, patt_mapset);
+ patt = Rast_open_old(patt_layer, patt_mapset);
if (patt < 0)
G_fatal_error(_("Unable to open raster map <%s>"), patt_layer);
- if (Rast_get_raster_map_type(patt) != CELL_TYPE)
+ if (Rast_get_map_type(patt) != CELL_TYPE)
G_fatal_error(_("Pattern map should be a binary 0/1 CELL map"));
}
Modified: grass/trunk/raster/r.mapcalc/map.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.mapcalc/map.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -468,7 +468,7 @@
case 'M':
tmpname = G_store((char *)name);
mapset = G_find_cell2(tmpname, "");
- result = mapset ? Rast_raster_map_type(tmpname, mapset) : -1;
+ result = mapset ? Rast_map_type(tmpname, mapset) : -1;
G_free(tmpname);
return result;
case '@':
@@ -508,7 +508,7 @@
if (!mapset)
G_fatal_error(_("Raster map <%s> not found"), name);
- fd = Rast_open_cell_old(name, mapset);
+ fd = Rast_open_old(name, mapset);
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s@%s>"), name, mapset);
@@ -573,7 +573,7 @@
if (use_colors)
init_colors(m);
- m->fd = Rast_open_cell_old(name, mapset);
+ m->fd = Rast_open_old(name, mapset);
if (m->fd < 0)
G_fatal_error(_("Unable to open raster map <%s@%s>"), name, mapset);
@@ -660,7 +660,7 @@
{
int fd;
- fd = Rast_open_raster_new((char *)name, res_type);
+ fd = Rast_open_new((char *)name, res_type);
if (fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), name);
Modified: grass/trunk/raster/r.mfilter/perform.c
===================================================================
--- grass/trunk/raster/r.mfilter/perform.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.mfilter/perform.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -30,7 +30,7 @@
G_debug(1, "Filter %d", n + 1);
if (count == 0) {
- in = Rast_open_cell_old(in_name, "");
+ in = Rast_open_old(in_name, "");
G_debug(1, "Open raster map %s = %d", in_name, in);
@@ -79,7 +79,7 @@
/* copy final result to output raster map */
in = out;
- out = Rast_open_fp_cell_new(out_name);
+ out = Rast_open_fp_new(out_name);
if (out < 0) {
G_fatal_error(_("Cannot create raster map <%s>"), out_name);
}
Modified: grass/trunk/raster/r.neighbors/main.c
===================================================================
--- grass/trunk/raster/r.neighbors/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.neighbors/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -215,11 +215,11 @@
ncols = G_window_cols();
/* open raster maps */
- if ((in_fd = Rast_open_cell_old(ncb.oldcell, "")) < 0)
+ if ((in_fd = Rast_open_old(ncb.oldcell, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
ncb.oldcell);
- map_type = Rast_get_raster_map_type(in_fd);
+ map_type = Rast_get_map_type(in_fd);
/* get the method */
for (method = 0; (p = menu[method].name); method++)
@@ -285,12 +285,12 @@
readcell(in_fd, readrow++, nrows, ncols);
/* open raster map */
- in_fd = Rast_open_cell_old(ncb.oldcell, "");
+ in_fd = Rast_open_old(ncb.oldcell, "");
if (in_fd < 0)
exit(EXIT_FAILURE);
/*open the new raster map */
- out_fd = Rast_open_raster_new(ncb.newcell, map_type);
+ out_fd = Rast_open_new(ncb.newcell, map_type);
if (out_fd < 0)
exit(EXIT_FAILURE);
Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.null/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -133,7 +133,7 @@
parms.null->answer);
}
- map_type = Rast_raster_map_type(name, mapset);
+ map_type = Rast_map_type(name, mapset);
if (only_null && G_find_file2_misc("cell_misc", "null", name, mapset))
G_fatal_error(_("Raster map <%s> already has a null bitmap file"), name);
@@ -314,11 +314,11 @@
Rast_set_window(&cellhd);
- old = Rast_open_cell_old(name, mapset);
+ old = Rast_open_old(name, mapset);
if (old < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
- new = Rast_open_raster_new(name, map_type);
+ new = Rast_open_new(name, map_type);
if (new < 0)
G_fatal_error(_("Unable to create raster map <%s>"), name);
Modified: grass/trunk/raster/r.out.arc/main.c
===================================================================
--- grass/trunk/raster/r.out.arc/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.arc/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -116,11 +116,11 @@
sprintf(null_str, "-9999");
- fd = Rast_open_cell_old(parm.map->answer, "");
+ fd = Rast_open_old(parm.map->answer, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), parm.map->answer);
- map_type = Rast_get_raster_map_type(fd);
+ map_type = Rast_get_map_type(fd);
out_type = map_type;
/*
Modified: grass/trunk/raster/r.out.ascii/main.c
===================================================================
--- grass/trunk/raster/r.out.ascii/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.ascii/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -143,11 +143,11 @@
name = parm.map->answer;
/* open raster map */
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
- map_type = Rast_get_raster_map_type(fd);
+ map_type = Rast_get_map_type(fd);
if (!flag.int_out->answer)
out_type = map_type;
Modified: grass/trunk/raster/r.out.bin/main.c
===================================================================
--- grass/trunk/raster/r.out.bin/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.bin/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -123,11 +123,11 @@
G_get_window(®ion);
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
- map_type = Rast_get_raster_map_type(fd);
+ map_type = Rast_get_map_type(fd);
if (!flag.int_out->answer)
out_type = map_type;
else
Modified: grass/trunk/raster/r.out.gdal/export_band.c
===================================================================
--- grass/trunk/raster/r.out.gdal/export_band.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.gdal/export_band.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -50,7 +50,7 @@
int ret = 0;
/* Open GRASS raster */
- fd = Rast_open_cell_old(name, mapset);
+ fd = Rast_open_old(name, mapset);
if (fd < 0) {
G_warning(_("Unable to open raster map <%s>"), name);
return -1;
Modified: grass/trunk/raster/r.out.gdal/main.c
===================================================================
--- grass/trunk/raster/r.out.gdal/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.gdal/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -381,7 +381,7 @@
/* GDAL datatype not set by user, determine suitable datatype */
if (datatype == GDT_Unknown) {
/* Use raster data type from first GRASS raster in a group */
- maptype = Rast_raster_map_type(ref.file[0].name, ref.file[0].mapset);
+ maptype = Rast_map_type(ref.file[0].name, ref.file[0].mapset);
if (maptype == FCELL_TYPE) {
datatype = GDT_Float32;
}
@@ -430,7 +430,7 @@
/* Precision tests */
for (band = 0; band < ref.nfiles; band++) {
testmaptype =
- Rast_raster_map_type(ref.file[band].name, ref.file[band].mapset);
+ Rast_map_type(ref.file[band].name, ref.file[band].mapset);
/* Exporting floating point rasters to some integer type ? */
if ((testmaptype == FCELL_TYPE || testmaptype == DCELL_TYPE) &&
(datatype == GDT_Byte || datatype == GDT_Int16 ||
Modified: grass/trunk/raster/r.out.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -14,11 +14,11 @@
FCELL *fcell;
RASTER_MAP_TYPE data_type;
- fd = Rast_open_cell_old(iname, "");
+ fd = Rast_open_old(iname, "");
if (fd < 0)
G_fatal_error("%s - could not read", iname);
- data_type = Rast_get_raster_map_type(fd);
+ data_type = Rast_get_map_type(fd);
switch (data_type) {
case CELL_TYPE:
cell = Rast_allocate_c_buf();
Modified: grass/trunk/raster/r.out.mat/main.c
===================================================================
--- grass/trunk/raster/r.out.mat/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.mat/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -83,11 +83,11 @@
outfile = G_malloc(strlen(basename) + 5);
sprintf(outfile, "%s.mat", basename);
- fd = Rast_open_cell_old(infile, "");
+ fd = Rast_open_old(infile, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), infile);
- map_type = Rast_get_raster_map_type(fd);
+ map_type = Rast_get_map_type(fd);
/* open bin file for writing */
fp1 = fopen(outfile, "wb");
Modified: grass/trunk/raster/r.out.mpeg/main.c
===================================================================
--- grass/trunk/raster/r.out.mpeg/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.mpeg/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -282,14 +282,14 @@
if (!quiet)
G_message("\r%s <%s>", _("Reading file"), name);
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
G_fatal_error(_("Raster map <%s> not found"), name);
if (Rast_read_colors(name, "", &colors) < 0)
G_fatal_error(_("Unable to read color table for <%s>"), name);
- rtype = Rast_get_raster_map_type(fd);
+ rtype = Rast_get_map_type(fd);
voidc = Rast_allocate_buf(rtype);
for (row = 0; row < vrows; row++) {
Modified: grass/trunk/raster/r.out.png/main.c
===================================================================
--- grass/trunk/raster/r.out.png/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.png/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -152,7 +152,7 @@
G_message(_("rows = %d, cols = %d"), w.rows, w.cols);
/* open raster map for reading */
- if ((cellfile = Rast_open_cell_old(rast->answer, "")) == -1)
+ if ((cellfile = Rast_open_old(rast->answer, "")) == -1)
G_fatal_error(_("Unable to open cellfile for <%s>"), rastermap);
cell_buf = Rast_allocate_c_buf();
@@ -224,7 +224,7 @@
Rast_read_colors(rast->answer, "", &colors);
- rtype = Rast_get_raster_map_type(cellfile);
+ rtype = Rast_get_map_type(cellfile);
if (rtype == CELL_TYPE)
voidc = (CELL *) cell_buf;
else if (rtype == FCELL_TYPE)
Modified: grass/trunk/raster/r.out.pov/main.c
===================================================================
--- grass/trunk/raster/r.out.pov/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.pov/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -162,7 +162,7 @@
name = parm.map->answer;
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
Modified: grass/trunk/raster/r.out.ppm/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.ppm/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -97,7 +97,7 @@
G_message(_("rows = %d, cols = %d"), w.rows, w.cols);
/* open raster map for reading */
- if ((cellfile = Rast_open_cell_old(rast->answer, "")) == -1)
+ if ((cellfile = Rast_open_old(rast->answer, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), rast->answer);
cell_buf = Rast_allocate_c_buf();
@@ -150,7 +150,7 @@
Rast_read_colors(rast->answer, "", &colors);
- rtype = Rast_get_raster_map_type(cellfile);
+ rtype = Rast_get_map_type(cellfile);
if (rtype == CELL_TYPE)
voidc = (CELL *) cell_buf;
else if (rtype == FCELL_TYPE)
Modified: grass/trunk/raster/r.out.ppm3/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm3/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.ppm3/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -100,11 +100,11 @@
char *name = B[i].opt->answer;
/* Open raster map */
- if ((B[i].file = Rast_open_cell_old(name, "")) == -1)
+ if ((B[i].file = Rast_open_old(name, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), name);
/* Get map type (CELL/FCELL/DCELL) */
- B[i].type = Rast_get_raster_map_type(B[i].file);
+ B[i].type = Rast_get_map_type(B[i].file);
/* Get color table */
if (Rast_read_colors(name, "", &B[i].colors) == -1)
Modified: grass/trunk/raster/r.out.tiff/main.c
===================================================================
--- grass/trunk/raster/r.out.tiff/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.tiff/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -147,7 +147,7 @@
G_get_window(&cellhd);
Rast_read_colors(inopt->answer, "", &colors);
- if ((isfp = Rast_raster_map_is_fp(inopt->answer, "")))
+ if ((isfp = Rast_map_is_fp(inopt->answer, "")))
G_warning(_("Raster map <%s>> is a floating point "
"map. Fractional values will be rounded to integer"),
inopt->answer);
@@ -158,7 +158,7 @@
"than 256 colors for the available range of data"));
cell = Rast_allocate_c_buf();
- if ((in = Rast_open_cell_old(inopt->answer, "")) < 0)
+ if ((in = Rast_open_old(inopt->answer, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), inopt->answer);
basename = G_store(outopt->answer);
Modified: grass/trunk/raster/r.out.vrml/main.c
===================================================================
--- grass/trunk/raster/r.out.vrml/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.vrml/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -83,7 +83,7 @@
G_get_set_window(&W);
- if ((elevfd = Rast_open_cell_old(rast_el->answer, "")) == -1)
+ if ((elevfd = Rast_open_old(rast_el->answer, "")) == -1)
G_fatal_error("Unable to open cellfile for <%s>", rast_el->answer);
{
@@ -93,7 +93,7 @@
DCELL dmin, dmax;
struct FPRange fp_range;
- is_fp = Rast_raster_map_is_fp(rast_el->answer, "");
+ is_fp = Rast_map_is_fp(rast_el->answer, "");
if (is_fp) {
if (Rast_read_fp_range(rast_el->answer, "", &fp_range) != 1) {
G_fatal_error(_("Range info for [%s] not available (run r.support)"),
@@ -115,7 +115,7 @@
}
if (rast_co->answer) {
- if ((colorfd = Rast_open_cell_old(rast_co->answer, "")) == -1)
+ if ((colorfd = Rast_open_old(rast_co->answer, "")) == -1)
G_warning(_("Unable to open cellfile for <%s>"), rast_co->answer);
else {
Rast_read_colors(rast_co->answer, "", &colr);
Modified: grass/trunk/raster/r.out.vtk/main.c
===================================================================
--- grass/trunk/raster/r.out.vtk/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.out.vtk/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -123,12 +123,12 @@
G_debug(3, _("Open Raster file %s"), param.elevationmap->answer);
/* open raster map */
- fd = Rast_open_cell_old(param.elevationmap->answer, "");
+ fd = Rast_open_old(param.elevationmap->answer, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
param.elevationmap->answer);
- out_type = Rast_get_raster_map_type(fd);
+ out_type = Rast_get_map_type(fd);
/*The write the Coordinates */
if (param.usestruct->answer) {
@@ -186,11 +186,11 @@
G_debug(3, _("Open Raster file %s"), param.input->answers[i]);
/* open raster map */
- fd = Rast_open_cell_old(param.input->answers[i], "");
+ fd = Rast_open_old(param.input->answers[i], "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
param.input->answers[i]);
- out_type = Rast_get_raster_map_type(fd);
+ out_type = Rast_get_map_type(fd);
/*Now write the data */
write_vtk_data(fd, fp, param.input->answers[i], region, out_type,
null_value, digits);
@@ -211,11 +211,11 @@
param.rgbmaps->answers[i]);
/* open raster map */
- rgbfd[i] = Rast_open_cell_old(param.rgbmaps->answers[i], "");
+ rgbfd[i] = Rast_open_old(param.rgbmaps->answers[i], "");
if (rgbfd[i] < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
param.rgbmaps->answers[i]);
- celltype[i] = Rast_get_raster_map_type(rgbfd[i]);
+ celltype[i] = Rast_get_map_type(rgbfd[i]);
}
/*Maps have to be from the same type */
@@ -254,11 +254,11 @@
/* open raster map */
vectfd[i] =
- Rast_open_cell_old(param.vectmaps->answers[i], "");
+ Rast_open_old(param.vectmaps->answers[i], "");
if (vectfd[i] < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
param.vectmaps->answers[i]);
- celltype[i] = Rast_get_raster_map_type(vectfd[i]);
+ celltype[i] = Rast_get_map_type(vectfd[i]);
}
/*Maps have to be from the same type */
Modified: grass/trunk/raster/r.param.scale/open_files.c
===================================================================
--- grass/trunk/raster/r.param.scale/open_files.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.param.scale/open_files.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -23,17 +23,17 @@
{
/* Open existing file and set the input file descriptor. */
- if ((fd_in = Rast_open_cell_old(rast_in_name, "")) < 0)
+ if ((fd_in = Rast_open_old(rast_in_name, "")) < 0)
G_fatal_error(_("Cannot open raster map <%s>"), rast_in_name);
/* Open new file and set the output file descriptor. */
if (mparam != FEATURE) {
- if ((fd_out = Rast_open_raster_new(rast_out_name, DCELL_TYPE)) < 0)
+ if ((fd_out = Rast_open_new(rast_out_name, DCELL_TYPE)) < 0)
G_fatal_error(_("Cannot create raster map <%s>"), rast_out_name);
}
else {
- if ((fd_out = Rast_open_raster_new(rast_out_name, CELL_TYPE)) < 0)
+ if ((fd_out = Rast_open_new(rast_out_name, CELL_TYPE)) < 0)
G_fatal_error(_("Cannot create raster map <%s>"), rast_out_name);
}
Modified: grass/trunk/raster/r.patch/main.c
===================================================================
--- grass/trunk/raster/r.patch/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.patch/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -99,7 +99,7 @@
if (!ok)
continue;
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0) {
ok = 0;
continue;
@@ -107,7 +107,7 @@
infd[i] = fd;
- map_type = Rast_get_raster_map_type(fd);
+ map_type = Rast_get_map_type(fd);
if (map_type == FCELL_TYPE && out_type == CELL_TYPE)
out_type = FCELL_TYPE;
else if (map_type == DCELL_TYPE)
@@ -120,7 +120,7 @@
G_fatal_error(_("One or more input raster maps not found"));
rname = opt2->answer;
- outfd = Rast_open_raster_new(new_name = rname, out_type);
+ outfd = Rast_open_new(new_name = rname, out_type);
if (outfd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), new_name);
Modified: grass/trunk/raster/r.profile/main.c
===================================================================
--- grass/trunk/raster/r.profile/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.profile/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -129,7 +129,7 @@
coords = 1;
/* Open Raster File */
- if ((fd = Rast_open_cell_old(name, "")) < 0)
+ if ((fd = Rast_open_old(name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
/* initialize color structure */
@@ -146,7 +146,7 @@
G_fatal_error(_("Unable to open file <%s>"), outfile);
/* Get Raster Type */
- data_type = Rast_get_raster_map_type(fd);
+ data_type = Rast_get_map_type(fd);
/* Done with file */
/* Show message giving output format */
Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.proj/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -389,8 +389,8 @@
/* open and read the relevant parts of the input map and close it */
G__switch_env();
Rast_set_window(&incellhd);
- fdi = Rast_open_cell_old(inmap->answer, setname);
- cell_type = Rast_get_raster_map_type(fdi);
+ fdi = Rast_open_old(inmap->answer, setname);
+ cell_type = Rast_get_map_type(fdi);
ibuffer = readcell(fdi, memory->answer);
Rast_close(fdi);
@@ -398,11 +398,11 @@
Rast_set_window(&outcellhd);
if (strcmp(interpol->answer, "nearest") == 0) {
- fdo = Rast_open_raster_new(mapname, cell_type);
+ fdo = Rast_open_new(mapname, cell_type);
obuffer = (CELL *) Rast_allocate_buf(cell_type);
}
else {
- fdo = Rast_open_fp_cell_new(mapname);
+ fdo = Rast_open_fp_new(mapname);
cell_type = FCELL_TYPE;
obuffer = (FCELL *) Rast_allocate_buf(cell_type);
}
Modified: grass/trunk/raster/r.quant/main.c
===================================================================
--- grass/trunk/raster/r.quant/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.quant/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -123,7 +123,7 @@
for (noi = 0; input->answers[noi]; noi++) {
name[noi] = G_store(input->answers[noi]);
- if (Rast_raster_map_type(name[noi], G_mapset()) == CELL_TYPE)
+ if (Rast_map_type(name[noi], G_mapset()) == CELL_TYPE)
G_fatal_error(_("%s is integer map, it can't be quantized"),
name[noi]);
}
@@ -144,7 +144,7 @@
else if (basename)
/* set the quant to that of basemap */
{
- if (Rast_raster_map_type(basename, "") == CELL_TYPE)
+ if (Rast_map_type(basename, "") == CELL_TYPE)
G_fatal_error(_("%s is integer map, it can't be used as basemap"),
basename);
Modified: grass/trunk/raster/r.quantile/main.c
===================================================================
--- grass/trunk/raster/r.quantile/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.quantile/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -308,7 +308,7 @@
quants[i] = 1.0 * (i + 1) / (num_quants + 1);
}
- infile = Rast_open_cell_old(opt.input->answer, "");
+ infile = Rast_open_old(opt.input->answer, "");
if (infile < 0)
G_fatal_error(_("Unable to open raster map <%s>"), opt.input->answer);
Modified: grass/trunk/raster/r.random/count.c
===================================================================
--- grass/trunk/raster/r.random/count.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.random/count.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -20,20 +20,20 @@
{
int nrows, ncols, row, col;
- theState->fd_old = Rast_open_cell_old(theState->inraster, "");
+ theState->fd_old = Rast_open_old(theState->inraster, "");
if (theState->fd_old < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
theState->inraster);
if (theState->docover == 1) {
- theState->fd_cold = Rast_open_cell_old(theState->inrcover, "");
+ theState->fd_cold = Rast_open_old(theState->inrcover, "");
if (theState->fd_cold < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
theState->inrcover);
}
- theState->buf.type = Rast_get_raster_map_type(theState->fd_old);
+ theState->buf.type = Rast_get_map_type(theState->fd_old);
theState->buf.data.v = Rast_allocate_buf(theState->buf.type);
if (theState->docover == 1) {
- theState->cover.type = Rast_get_raster_map_type(theState->fd_cold);
+ theState->cover.type = Rast_get_map_type(theState->fd_cold);
theState->cover.data.v = Rast_allocate_buf(theState->cover.type);
}
Modified: grass/trunk/raster/r.random/random.c
===================================================================
--- grass/trunk/raster/r.random/random.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.random/random.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -52,7 +52,7 @@
type = theState->cover.type;
else
type = theState->buf.type;
- if ((outfd = Rast_open_raster_new(theState->outraster, type)) < 0)
+ if ((outfd = Rast_open_new(theState->outraster, type)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
theState->outraster);
theState->fd_new = outfd;
Modified: grass/trunk/raster/r.random.cells/indep.c
===================================================================
--- grass/trunk/raster/r.random.cells/indep.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.random.cells/indep.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -129,7 +129,7 @@
}
G_debug(2, "outputting()");
- OutFD = Rast_open_cell_new(Output->answer);
+ OutFD = Rast_open_c_new(Output->answer);
if (OutFD < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
Output->answer);
Modified: grass/trunk/raster/r.random.cells/init.c
===================================================================
--- grass/trunk/raster/r.random.cells/init.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.random.cells/init.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -42,7 +42,7 @@
Cells = FlagCreate(Rs, Cs);
CellCount = 0;
if (NULL != G_find_file("cell", "MASK", G_mapset())) {
- if ((FD = Rast_open_cell_old("MASK", G_mapset())) < 0) {
+ if ((FD = Rast_open_old("MASK", G_mapset())) < 0) {
G_fatal_error(_("Unable to open raster map <%s>"), "MASK");
}
else {
Modified: grass/trunk/raster/r.random.surface/init.c
===================================================================
--- grass/trunk/raster/r.random.surface/init.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.random.surface/init.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -42,7 +42,7 @@
FDM = -1;
}
else {
- if ((FDM = Rast_open_cell_old("MASK", G_mapset())) < 0) {
+ if ((FDM = Rast_open_old("MASK", G_mapset())) < 0) {
G_fatal_error(_("Unable to open raster map <%s>"), "MASK");
}
else {
Modified: grass/trunk/raster/r.random.surface/main.c
===================================================================
--- grass/trunk/raster/r.random.surface/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.random.surface/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -123,7 +123,7 @@
CalcSD();
for (DoMap = 0; DoMap < NumMaps; DoMap++) {
- OutFD = Rast_open_cell_new(OutNames[DoMap]);
+ OutFD = Rast_open_c_new(OutNames[DoMap]);
if (OutFD < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
OutNames[DoMap]);
Modified: grass/trunk/raster/r.random.surface/save.c
===================================================================
--- grass/trunk/raster/r.random.surface/save.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.random.surface/save.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -19,7 +19,7 @@
G_debug(2, "SaveMap()");
- OutFD = Rast_open_cell_new(OutNames[NumMap]);
+ OutFD = Rast_open_c_new(OutNames[NumMap]);
if (OutFD < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
OutNames[NumMap]);
Modified: grass/trunk/raster/r.reclass/main.c
===================================================================
--- grass/trunk/raster/r.reclass/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.reclass/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -93,7 +93,7 @@
tty = isatty(fileno(srcfp));
Rast_init_cats("", &cats);
- fp = Rast_raster_map_is_fp(parm.input->answer, old_mapset);
+ fp = Rast_map_is_fp(parm.input->answer, old_mapset);
Rast_read_fp_range(parm.input->answer, old_mapset, &range);
Rast_get_fp_range_min_max(&range, &min, &max);
rules = tail = NULL;
Modified: grass/trunk/raster/r.recode/read_rules.c
===================================================================
--- grass/trunk/raster/r.recode/read_rules.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.recode/read_rules.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -14,7 +14,7 @@
char buff[1024], buff2[300];
RASTER_MAP_TYPE inp_type;
- inp_type = Rast_raster_map_type(name, "");
+ inp_type = Rast_map_type(name, "");
if (inp_type != CELL_TYPE) {
if (Rast_read_fp_range(name, "", &drange) <= 0)
G_fatal_error(_("Unable to read f_range for map %s"), name);
Modified: grass/trunk/raster/r.recode/recode.c
===================================================================
--- grass/trunk/raster/r.recode/recode.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.recode/recode.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -41,11 +41,11 @@
ncols = G_window_cols();
/* open the input file for reading */
- in_fd = Rast_open_cell_old(name, "");
+ in_fd = Rast_open_old(name, "");
if (in_fd < 0)
G_fatal_error("Can't open input map");
- out_fd = Rast_open_raster_new(result, out_type);
+ out_fd = Rast_open_new(result, out_type);
out_rast = Rast_allocate_buf(out_type);
in_rast = Rast_allocate_buf(in_type);
Modified: grass/trunk/raster/r.report/parse.c
===================================================================
--- grass/trunk/raster/r.report/parse.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.report/parse.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -249,7 +249,7 @@
DMAX = (DCELL *) G_realloc(DMAX, (nlayers + 1) * sizeof(DCELL));
DMIN = (DCELL *) G_realloc(DMIN, (nlayers + 1) * sizeof(DCELL));
if (!as_int)
- is_fp[n] = Rast_raster_map_is_fp(name, mapset);
+ is_fp[n] = Rast_map_is_fp(name, mapset);
else
is_fp[n] = 0;
if (is_fp[n]) {
Modified: grass/trunk/raster/r.resamp.interp/main.c
===================================================================
--- grass/trunk/raster/r.resamp.interp/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.resamp.interp/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -130,7 +130,7 @@
cur_row = -100;
/* open old map */
- infile = Rast_open_cell_old(rastin->answer, "");
+ infile = Rast_open_old(rastin->answer, "");
if (infile < 0)
G_fatal_error(_("Unable to open raster map <%s>"), rastin->answer);
@@ -140,7 +140,7 @@
outbuf = Rast_allocate_d_buf();
/* open new map */
- outfile = Rast_open_raster_new(rastout->answer, DCELL_TYPE);
+ outfile = Rast_open_new(rastout->answer, DCELL_TYPE);
if (outfile < 0)
G_fatal_error(_("Unable to create raster map <%s>"), rastout->answer);
Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.resamp.rst/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -366,7 +366,7 @@
if (smooth != NULL) {
- if ((fdsmooth = Rast_open_cell_old(smooth, "")) < 0)
+ if ((fdsmooth = Rast_open_old(smooth, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), smooth);
if (Rast_get_cellhd(smooth, "", &smhd) < 0)
@@ -390,7 +390,7 @@
if ((winhd.ew_res != inphd.ew_res) || (winhd.ns_res != inphd.ns_res))
G_fatal_error(_("Input map resolution differs from current region resolution!"));
- if ((fdinp = Rast_open_cell_old(input, "")) < 0)
+ if ((fdinp = Rast_open_old(input, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), input);
Modified: grass/trunk/raster/r.resamp.stats/main.c
===================================================================
--- grass/trunk/raster/r.resamp.stats/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.resamp.stats/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -337,7 +337,7 @@
bufs[row] = Rast_allocate_d_buf();
/* open old map */
- infile = Rast_open_cell_old(parm.rastin->answer, "");
+ infile = Rast_open_old(parm.rastin->answer, "");
if (infile < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.rastin->answer);
@@ -349,7 +349,7 @@
outbuf = Rast_allocate_d_buf();
/* open new map */
- outfile = Rast_open_raster_new(parm.rastout->answer, DCELL_TYPE);
+ outfile = Rast_open_new(parm.rastout->answer, DCELL_TYPE);
if (outfile < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
parm.rastout->answer);
Modified: grass/trunk/raster/r.resample/main.c
===================================================================
--- grass/trunk/raster/r.resample/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.resample/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -87,14 +87,14 @@
Rast_init_cats(Rast_get_cats_title(&cats), &newcats);
}
- infd = Rast_open_cell_old(name, "");
+ infd = Rast_open_old(name, "");
if (infd < 0)
G_fatal_error(_("Unable to open input map <%s>"), name);
/* determine the map type;
data_type is the type of data being processed,
out_type is the type of map being created. */
- data_type = Rast_get_raster_map_type(infd);
+ data_type = Rast_get_map_type(infd);
out_type = data_type;
if (Rast_get_cellhd(name, "", &cellhd) < 0)
@@ -108,7 +108,7 @@
rast = G_realloc(rast, 2 * Rast_cell_size(data_type));
/* we need the buffer at least 2 cells large */
- outfd = Rast_open_raster_new(result, out_type);
+ outfd = Rast_open_new(result, out_type);
Rast_set_null_value(rast, ncols, out_type);
if (outfd < 0)
Modified: grass/trunk/raster/r.rescale/get_range.c
===================================================================
--- grass/trunk/raster/r.rescale/get_range.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.rescale/get_range.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -18,7 +18,7 @@
Rast_get_cellhd(name, "", &cellhd);
Rast_set_window(&cellhd);
cell = Rast_allocate_c_buf();
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
exit(1);
nrows = G_window_rows();
Modified: grass/trunk/raster/r.rescale.eq/get_stats.c
===================================================================
--- grass/trunk/raster/r.rescale.eq/get_stats.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.rescale.eq/get_stats.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -10,7 +10,7 @@
CELL *cell;
int row, nrows, ncols;
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
exit(1);
nrows = G_window_rows();
Modified: grass/trunk/raster/r.ros/main.c
===================================================================
--- grass/trunk/raster/r.ros/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.ros/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -465,7 +465,7 @@
/* Open input cell layers for reading */
fuel_fd =
- Rast_open_cell_old(parm.model->answer,
+ Rast_open_old(parm.model->answer,
G_find_cell2(parm.model->answer, ""));
if (fuel_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
@@ -473,7 +473,7 @@
if (parm.mois_1h->answer) {
mois_1h_fd =
- Rast_open_cell_old(parm.mois_1h->answer,
+ Rast_open_old(parm.mois_1h->answer,
G_find_cell2(parm.mois_1h->answer, ""));
if (mois_1h_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
@@ -481,7 +481,7 @@
}
if (parm.mois_10h->answer) {
mois_10h_fd =
- Rast_open_cell_old(parm.mois_10h->answer,
+ Rast_open_old(parm.mois_10h->answer,
G_find_cell2(parm.mois_10h->answer, ""));
if (mois_10h_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
@@ -489,7 +489,7 @@
}
if (parm.mois_100h->answer) {
mois_100h_fd =
- Rast_open_cell_old(parm.mois_100h->answer,
+ Rast_open_old(parm.mois_100h->answer,
G_find_cell2(parm.mois_100h->answer, ""));
if (mois_100h_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
@@ -497,7 +497,7 @@
}
mois_live_fd =
- Rast_open_cell_old(parm.mois_live->answer,
+ Rast_open_old(parm.mois_live->answer,
G_find_cell2(parm.mois_live->answer, ""));
if (mois_live_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
@@ -505,7 +505,7 @@
if (parm.vel->answer) {
vel_fd =
- Rast_open_cell_old(parm.vel->answer,
+ Rast_open_old(parm.vel->answer,
G_find_cell2(parm.vel->answer, ""));
if (vel_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
@@ -513,7 +513,7 @@
}
if (parm.dir->answer) {
dir_fd =
- Rast_open_cell_old(parm.dir->answer,
+ Rast_open_old(parm.dir->answer,
G_find_cell2(parm.dir->answer, ""));
if (dir_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
@@ -522,7 +522,7 @@
if (parm.slope->answer) {
slope_fd =
- Rast_open_cell_old(parm.slope->answer,
+ Rast_open_old(parm.slope->answer,
G_find_cell2(parm.slope->answer, ""));
if (slope_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
@@ -530,7 +530,7 @@
}
if (parm.aspect->answer) {
aspect_fd =
- Rast_open_cell_old(parm.aspect->answer,
+ Rast_open_old(parm.aspect->answer,
G_find_cell2(parm.aspect->answer, ""));
if (aspect_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
@@ -539,18 +539,18 @@
if (spotting) {
elev_fd =
- Rast_open_cell_old(parm.elev->answer,
+ Rast_open_old(parm.elev->answer,
G_find_cell2(parm.elev->answer, ""));
if (elev_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
parm.elev->answer);
}
- base_fd = Rast_open_cell_new(name_base);
- max_fd = Rast_open_cell_new(name_max);
- maxdir_fd = Rast_open_cell_new(name_maxdir);
+ base_fd = Rast_open_c_new(name_base);
+ max_fd = Rast_open_c_new(name_max);
+ maxdir_fd = Rast_open_c_new(name_maxdir);
if (spotting)
- spotdist_fd = Rast_open_cell_new(name_spotdist);
+ spotdist_fd = Rast_open_c_new(name_spotdist);
/*compute weights, combined wo, and combined sigma */
/*wo[model] -- simple sum of WO[class][model] by all fuel subCLASS */
Modified: grass/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.series/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -188,7 +188,7 @@
p->name = parm.input->answers[i];
G_message(_("Reading raster map <%s>..."), p->name);
- p->fd = Rast_open_cell_old(p->name, "");
+ p->fd = Rast_open_old(p->name, "");
if (p->fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
p->name);
@@ -219,8 +219,8 @@
? atof(parm.quantile->answers[i])
: 0;
out->buf = Rast_allocate_d_buf();
- out->fd = Rast_open_raster_new(
- output_name, menu[method].is_int ? CELL_TYPE : DCELL_TYPE);
+ out->fd = Rast_open_new(output_name,
+ menu[method].is_int ? CELL_TYPE : DCELL_TYPE);
if (out->fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), out->name);
}
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.slope.aspect/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -441,7 +441,7 @@
*/
/* open the elevation file for reading */
- elevation_fd = Rast_open_cell_old(elev_name, "");
+ elevation_fd = Rast_open_old(elev_name, "");
if (elevation_fd < 0)
exit(EXIT_FAILURE);
elev_cell[0] = (DCELL *) G_calloc(ncols + 1, sizeof(DCELL));
Modified: grass/trunk/raster/r.slope.aspect/opennew.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/opennew.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.slope.aspect/opennew.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -9,9 +9,9 @@
int fd;
if (wr_type < 0) /* default fp type */
- fd = Rast_open_fp_cell_new(name);
+ fd = Rast_open_fp_new(name);
else
- fd = Rast_open_raster_new(name, wr_type);
+ fd = Rast_open_new(name, wr_type);
if (fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), name);
Modified: grass/trunk/raster/r.spread/main.c
===================================================================
--- grass/trunk/raster/r.spread/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.spread/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -375,30 +375,30 @@
/* Open input cell layers for reading */
- max_fd = Rast_open_cell_old(max_layer, G_find_cell2(max_layer, ""));
+ max_fd = Rast_open_old(max_layer, G_find_cell2(max_layer, ""));
if (max_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), max_layer);
- dir_fd = Rast_open_cell_old(dir_layer, G_find_cell2(dir_layer, ""));
+ dir_fd = Rast_open_old(dir_layer, G_find_cell2(dir_layer, ""));
if (dir_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), dir_layer);
- base_fd = Rast_open_cell_old(base_layer, G_find_cell2(base_layer, ""));
+ base_fd = Rast_open_old(base_layer, G_find_cell2(base_layer, ""));
if (base_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), base_layer);
if (spotting) {
spotdist_fd =
- Rast_open_cell_old(spotdist_layer, G_find_cell2(spotdist_layer, ""));
+ Rast_open_old(spotdist_layer, G_find_cell2(spotdist_layer, ""));
if (spotdist_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), spotdist_layer);
velocity_fd =
- Rast_open_cell_old(velocity_layer, G_find_cell2(velocity_layer, ""));
+ Rast_open_old(velocity_layer, G_find_cell2(velocity_layer, ""));
if (velocity_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), velocity_layer);
- mois_fd = Rast_open_cell_old(mois_layer, G_find_cell2(mois_layer, ""));
+ mois_fd = Rast_open_old(mois_layer, G_find_cell2(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_cell_old(start_layer, G_find_cell2(start_layer, ""));
+ start_fd = Rast_open_old(start_layer, G_find_cell2(start_layer, ""));
if (start_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), start_layer);
@@ -493,11 +493,11 @@
/* Open cumulative cost layer (and x, y direction layers) for writing */
- cum_fd = Rast_open_cell_new(out_layer);
+ cum_fd = Rast_open_c_new(out_layer);
if (x_out)
- x_fd = Rast_open_cell_new(x_out_layer);
+ x_fd = Rast_open_c_new(x_out_layer);
if (y_out)
- y_fd = Rast_open_cell_new(y_out_layer);
+ y_fd = Rast_open_c_new(y_out_layer);
/* prepare output -- adjust from cm to m */
window.ew_res = window.ew_res / 100;
Modified: grass/trunk/raster/r.spreadpath/main.c
===================================================================
--- grass/trunk/raster/r.spreadpath/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.spreadpath/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -168,11 +168,11 @@
cell = Rast_allocate_c_buf();
/* Open back cell layers for reading */
- backrow_fd = Rast_open_cell_old(backrow_layer, backrow_mapset);
+ backrow_fd = Rast_open_old(backrow_layer, backrow_mapset);
if (backrow_fd < 0)
G_fatal_error("%s - can't open raster map", backrow_layer);
- backcol_fd = Rast_open_cell_old(backcol_layer, backcol_mapset);
+ backcol_fd = Rast_open_old(backcol_layer, backcol_mapset);
if (backcol_fd < 0)
G_fatal_error("%s - can't open raster map", backcol_layer);
@@ -277,7 +277,7 @@
/* If the output layer containing the starting positions */
/* create a linked list of of them */
if (flag == 1) {
- path_fd = Rast_open_cell_old(path_layer, path_mapset);
+ path_fd = Rast_open_old(path_layer, path_mapset);
if (path_fd < 0)
G_fatal_error("%s -can't open raster map", path_layer);
@@ -328,7 +328,7 @@
if (verbose)
G_message("\nWriting the output map -%s-...", path_layer);
- path_fd = Rast_open_cell_new(path_layer);
+ path_fd = Rast_open_c_new(path_layer);
for (row = 0; row < nrows; row++) {
segment_get_row(&out_seg, cell, row);
if (Rast_put_raster_row(path_fd, cell, CELL_TYPE) < 0)
Modified: grass/trunk/raster/r.statistics/main.c
===================================================================
--- grass/trunk/raster/r.statistics/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.statistics/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -94,10 +94,10 @@
if (G_parser(argc, argv))
exit(EXIT_FAILURE);
- if (Rast_raster_map_is_fp(basemap->answer, "") != 0)
+ if (Rast_map_is_fp(basemap->answer, "") != 0)
G_fatal_error(_("This module currently only works for integer (CELL) maps"));
- if (Rast_raster_map_is_fp(covermap->answer, "") != 0)
+ if (Rast_map_is_fp(covermap->answer, "") != 0)
G_fatal_error(_("This module currently only works for integer (CELL) maps"));
if (Rast_read_cats(covermap->answer, "", &cats) < 0) {
Modified: grass/trunk/raster/r.statistics2/main.c
===================================================================
--- grass/trunk/raster/r.statistics2/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.statistics2/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -169,18 +169,18 @@
method = menu[i].val;
- base_fd = Rast_open_cell_old(basemap, "");
+ base_fd = Rast_open_old(basemap, "");
if (base_fd < 0)
G_fatal_error(_("Unable to open base map <%s>"), basemap);
- cover_fd = Rast_open_cell_old(covermap, "");
+ cover_fd = Rast_open_old(covermap, "");
if (cover_fd < 0)
G_fatal_error(_("Unable to open cover map <%s>"), covermap);
if (usecats && Rast_read_cats(covermap, "", &cats) < 0)
G_fatal_error(_("Unable to read category file of cover map <%s>"), covermap);
- if (Rast_raster_map_is_fp(basemap, "") != 0)
+ if (Rast_map_is_fp(basemap, "") != 0)
G_fatal_error(_("The base map must be an integer (CELL) map"));
if (Rast_read_range(basemap, "", &range) < 0)
@@ -497,7 +497,7 @@
G_message(_("Writing output map"));
- out_fd = Rast_open_fp_cell_new(output);
+ out_fd = Rast_open_fp_new(output);
if (out_fd < 0)
G_fatal_error(_("Unable to open output map <%s>"), output);
Modified: grass/trunk/raster/r.statistics3/main.c
===================================================================
--- grass/trunk/raster/r.statistics3/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.statistics3/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -335,7 +335,7 @@
for (quant = 0; quant < num_quants; quant++) {
const char *output = outputs[quant];
- out_fd[quant] = Rast_open_fp_cell_new(output);
+ out_fd[quant] = Rast_open_fp_new(output);
if (out_fd[quant] < 0)
G_fatal_error(_("Unable to open output map <%s>"), output);
}
@@ -472,15 +472,15 @@
num_quants, i);
}
- base_fd = Rast_open_cell_old(basemap, "");
+ base_fd = Rast_open_old(basemap, "");
if (base_fd < 0)
G_fatal_error(_("Unable to open base map <%s>"), basemap);
- cover_fd = Rast_open_cell_old(covermap, "");
+ cover_fd = Rast_open_old(covermap, "");
if (cover_fd < 0)
G_fatal_error(_("Unable to open cover map <%s>"), covermap);
- if (Rast_raster_map_is_fp(basemap, "") != 0)
+ if (Rast_map_is_fp(basemap, "") != 0)
G_fatal_error(_("The base map must be an integer (CELL) map"));
if (Rast_read_range(basemap, "", &range) < 0)
Modified: grass/trunk/raster/r.stats/main.c
===================================================================
--- grass/trunk/raster/r.stats/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.stats/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -270,11 +270,11 @@
DMAX = (DCELL *) G_realloc(DMAX, (nfiles + 1) * sizeof(DCELL));
DMIN = (DCELL *) G_realloc(DMIN, (nfiles + 1) * sizeof(DCELL));
- fd[nfiles] = Rast_open_cell_old(name, "");
+ fd[nfiles] = Rast_open_old(name, "");
if (fd[nfiles] < 0)
exit(1);
if (!as_int)
- is_fp[nfiles] = Rast_raster_map_is_fp(name, "");
+ is_fp[nfiles] = Rast_map_is_fp(name, "");
else {
is_fp[nfiles] = 0;
if (cat_ranges || nsteps != 255)
Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.sun/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -515,9 +515,9 @@
}
- fd1 = Rast_open_cell_old(elevin, "");
- fd2 = Rast_open_cell_old(aspin, "");
- fd3 = Rast_open_cell_old(slopein, "");
+ fd1 = Rast_open_old(elevin, "");
+ fd2 = Rast_open_old(aspin, "");
+ fd3 = Rast_open_old(slopein, "");
if (linkein != NULL) {
cell4 = Rast_allocate_f_buf();
@@ -525,7 +525,7 @@
for (l = 0; l < m; l++)
li[l] = (float *)G_malloc(sizeof(float) * (n));
- fd4 = Rast_open_cell_old(linkein, "");
+ fd4 = Rast_open_old(linkein, "");
}
if (albedo != NULL) {
@@ -534,7 +534,7 @@
for (l = 0; l < m; l++)
a[l] = (float *)G_malloc(sizeof(float) * (n));
- fd5 = Rast_open_cell_old(albedo, "");
+ fd5 = Rast_open_old(albedo, "");
}
if (latin != NULL) {
@@ -543,7 +543,7 @@
for (l = 0; l < m; l++)
la[l] = (float *)G_malloc(sizeof(float) * (n));
- fd6 = Rast_open_cell_old(latin, "");
+ fd6 = Rast_open_old(latin, "");
}
if (coefbh != NULL) {
@@ -552,7 +552,7 @@
for (l = 0; l < m; l++)
cbhr[l] = (float *)G_malloc(sizeof(float) * (n));
- fr1 = Rast_open_cell_old(coefbh, "");
+ fr1 = Rast_open_old(coefbh, "");
}
if (coefdh != NULL) {
@@ -561,7 +561,7 @@
for (l = 0; l < m; l++)
cdhr[l] = (float *)G_malloc(sizeof(float) * (n));
- fr2 = Rast_open_cell_old(coefdh, "");
+ fr2 = Rast_open_old(coefdh, "");
}
@@ -697,35 +697,35 @@
if (incidout != NULL) {
cell7 = Rast_allocate_f_buf();
- fd7 = Rast_open_fp_cell_new(incidout);
+ fd7 = Rast_open_fp_new(incidout);
if (fd7 < 0)
G_fatal_error(_("Unable to create raster map %s"), incidout);
}
if (beam_rad != NULL) {
cell8 = Rast_allocate_f_buf();
- fd8 = Rast_open_fp_cell_new(beam_rad);
+ fd8 = Rast_open_fp_new(beam_rad);
if (fd8 < 0)
G_fatal_error(_("Unable to create raster map %s"), beam_rad);
}
if (insol_time != NULL) {
cell11 = Rast_allocate_f_buf();
- fd11 = Rast_open_fp_cell_new(insol_time);
+ fd11 = Rast_open_fp_new(insol_time);
if (fd11 < 0)
G_fatal_error(_("Unable to create raster map %s"), insol_time);
}
if (diff_rad != NULL) {
cell9 = Rast_allocate_f_buf();
- fd9 = Rast_open_fp_cell_new(diff_rad);
+ fd9 = Rast_open_fp_new(diff_rad);
if (fd9 < 0)
G_fatal_error(_("Unable to create raster map %s"), diff_rad);
}
if (refl_rad != NULL) {
cell10 = Rast_allocate_f_buf();
- fd10 = Rast_open_fp_cell_new(refl_rad);
+ fd10 = Rast_open_fp_new(refl_rad);
if (fd10 < 0)
G_fatal_error(_("Unable to create raster map %s"), refl_rad);
}
Modified: grass/trunk/raster/r.sun2/main.c
===================================================================
--- grass/trunk/raster/r.sun2/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.sun2/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -813,7 +813,7 @@
G_fatal_error(_("Raster map <%s> not found"), elevin);
- fd1 = Rast_open_cell_old(elevin, mapset);
+ fd1 = Rast_open_old(elevin, mapset);
if (slopein != NULL) {
cell3 = Rast_allocate_f_buf();
@@ -826,7 +826,7 @@
}
if ((mapset = G_find_cell2(slopein, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), slopein);
- fd3 = Rast_open_cell_old(slopein, mapset);
+ fd3 = Rast_open_old(slopein, mapset);
}
@@ -843,7 +843,7 @@
if ((mapset = G_find_cell2(aspin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), aspin);
- fd2 = Rast_open_cell_old(aspin, mapset);
+ fd2 = Rast_open_old(aspin, mapset);
}
@@ -857,7 +857,7 @@
}
if ((mapset = G_find_cell2(linkein, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), linkein);
- fd4 = Rast_open_cell_old(linkein, mapset);
+ fd4 = Rast_open_old(linkein, mapset);
}
if (albedo != NULL) {
@@ -869,7 +869,7 @@
}
if ((mapset = G_find_cell2(albedo, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), albedo);
- fd5 = Rast_open_cell_old(albedo, mapset);
+ fd5 = Rast_open_old(albedo, mapset);
}
if (latin != NULL) {
@@ -881,7 +881,7 @@
}
if ((mapset = G_find_cell2(latin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), latin);
- fd6 = Rast_open_cell_old(latin, mapset);
+ fd6 = Rast_open_old(latin, mapset);
}
if (longin != NULL) {
@@ -892,7 +892,7 @@
if ((mapset = G_find_cell2(longin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), longin);
- fd7 = Rast_open_cell_old(longin, mapset);
+ fd7 = Rast_open_old(longin, mapset);
}
if (coefbh != NULL) {
@@ -904,7 +904,7 @@
}
if ((mapset = G_find_cell2(coefbh, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), coefbh);
- fr1 = Rast_open_cell_old(coefbh, mapset);
+ fr1 = Rast_open_old(coefbh, mapset);
}
if (coefdh != NULL) {
@@ -916,7 +916,7 @@
}
if ((mapset = G_find_cell2(coefdh, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), coefdh);
- fr2 = Rast_open_cell_old(coefdh, mapset);
+ fr2 = Rast_open_old(coefdh, mapset);
}
if (useHorizonData()) {
@@ -937,7 +937,7 @@
* if((mapset=G_find_cell2(shad_filename,""))==NULL)
* G_message("Horizon file no. %d not found\n", arrayNumInt);
*
- * fd_shad[0] = Rast_open_cell_old(shad_filename,mapset);
+ * fd_shad[0] = Rast_open_old(shad_filename,mapset);
* }
* else
* {
@@ -950,7 +950,7 @@
if ((mapset = G_find_cell2(shad_filename, "")) == NULL)
G_fatal_error(_("Horizon file no. %d <%s> not found"), i,
shad_filename);
- fd_shad[i] = Rast_open_cell_old(shad_filename, mapset);
+ fd_shad[i] = Rast_open_old(shad_filename, mapset);
}
}
/*
@@ -1161,42 +1161,42 @@
if (incidout != NULL) {
cell7 = Rast_allocate_f_buf();
- fd7 = Rast_open_fp_cell_new(incidout);
+ fd7 = Rast_open_fp_new(incidout);
if (fd7 < 0)
G_fatal_error(_("Unable to create raster map <%s>"), incidout);
}
if (beam_rad != NULL) {
cell8 = Rast_allocate_f_buf();
- fd8 = Rast_open_fp_cell_new(beam_rad);
+ fd8 = Rast_open_fp_new(beam_rad);
if (fd8 < 0)
G_fatal_error(_("Unable to create raster map <%s>"), beam_rad);
}
if (insol_time != NULL) {
cell11 = Rast_allocate_f_buf();
- fd11 = Rast_open_fp_cell_new(insol_time);
+ fd11 = Rast_open_fp_new(insol_time);
if (fd11 < 0)
G_fatal_error(_("Unable to create raster map <%s>"), insol_time);
}
if (diff_rad != NULL) {
cell9 = Rast_allocate_f_buf();
- fd9 = Rast_open_fp_cell_new(diff_rad);
+ fd9 = Rast_open_fp_new(diff_rad);
if (fd9 < 0)
G_fatal_error(_("Unable to create raster map <%s>"), diff_rad);
}
if (refl_rad != NULL) {
cell10 = Rast_allocate_f_buf();
- fd10 = Rast_open_fp_cell_new(refl_rad);
+ fd10 = Rast_open_fp_new(refl_rad);
if (fd10 < 0)
G_fatal_error(_("Unable to create raster map <%s>"), refl_rad);
}
if (glob_rad != NULL) {
cell12 = Rast_allocate_f_buf();
- fd12 = Rast_open_fp_cell_new(glob_rad);
+ fd12 = Rast_open_fp_new(glob_rad);
if (fd12 < 0)
G_fatal_error(_("Unable to create raster map <%s>"), glob_rad);
}
Modified: grass/trunk/raster/r.sunmask/main.c
===================================================================
--- grass/trunk/raster/r.sunmask/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.sunmask/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -451,12 +451,12 @@
exit(EXIT_SUCCESS);
}
- if ((elev_fd = Rast_open_cell_old(name, "")) < 0)
+ if ((elev_fd = Rast_open_old(name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
- if ((output_fd = Rast_open_cell_new(outname)) < 0)
+ if ((output_fd = Rast_open_c_new(outname)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), outname);
- data_type = Rast_get_raster_map_type(elev_fd);
+ data_type = Rast_get_map_type(elev_fd);
elevbuf.v = Rast_allocate_buf(data_type);
tmpbuf.v = Rast_allocate_buf(data_type);
outbuf.v = Rast_allocate_buf(CELL_TYPE); /* binary map */
Modified: grass/trunk/raster/r.support/check.c
===================================================================
--- grass/trunk/raster/r.support/check.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.support/check.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -21,7 +21,7 @@
int cats_ok;
int max;
- data_type = Rast_raster_map_type(name, "");
+ data_type = Rast_map_type(name, "");
G_message(_("\n Updating statistics for [%s]"), name);
if (do_histogram(name) < 0)
Modified: grass/trunk/raster/r.support/histo.c
===================================================================
--- grass/trunk/raster/r.support/histo.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.support/histo.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -22,7 +22,7 @@
G_fatal_error(_("Unable to read header for <%s>"), name);
Rast_set_window(&cellhd);
- if ((fd = Rast_open_cell_old(name, "")) < 0)
+ if ((fd = Rast_open_old(name, "")) < 0)
G_fatal_error(_("Unable to open <%s>"), name);
nrows = G_window_rows();
Modified: grass/trunk/raster/r.support/main.c
===================================================================
--- grass/trunk/raster/r.support/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.support/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -282,7 +282,7 @@
int fd;
struct Categories cats;
- if ((fd = Rast_open_cell_old(infile, "")) < 0)
+ if ((fd = Rast_open_old(infile, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), infile);
Rast_init_cats("", &cats);
if (Rast_read_cats(map_opt->answer, "", &cats) < 0)
Modified: grass/trunk/raster/r.support.stats/check.c
===================================================================
--- grass/trunk/raster/r.support.stats/check.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.support.stats/check.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -38,7 +38,7 @@
int cats_ok;
int max;
- data_type = Rast_raster_map_type(name, "");
+ data_type = Rast_map_type(name, "");
G_message(_("Updating statistics for [%s]..."), name);
Modified: grass/trunk/raster/r.support.stats/histo.c
===================================================================
--- grass/trunk/raster/r.support.stats/histo.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.support.stats/histo.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -38,7 +38,7 @@
return 1;
Rast_set_window(&cellhd);
- if ((fd = Rast_open_cell_old(name, "")) < 0)
+ if ((fd = Rast_open_old(name, "")) < 0)
return 1;
nrows = G_window_rows();
Modified: grass/trunk/raster/r.surf.area/main.c
===================================================================
--- grass/trunk/raster/r.surf.area/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.surf.area/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -115,7 +115,7 @@
/* open raster map for reading */
{
- if ((cellfile = Rast_open_cell_old(surf->answer, "")) == -1)
+ if ((cellfile = Rast_open_old(surf->answer, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), surf->answer);
}
Modified: grass/trunk/raster/r.surf.contour/main.c
===================================================================
--- grass/trunk/raster/r.surf.contour/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.surf.contour/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -95,7 +95,7 @@
seen = flag_create(nrows, ncols);
mask = flag_create(nrows, ncols);
if (NULL != G_find_file("cell", "MASK", G_mapset())) {
- if ((file_fd = Rast_open_cell_old("MASK", G_mapset())) < 0)
+ if ((file_fd = Rast_open_old("MASK", G_mapset())) < 0)
G_fatal_error("Unable to open MASK");
for (r = 0; r < nrows; r++) {
Rast_get_c_row_nomask(file_fd, alt_row, r);
@@ -110,7 +110,7 @@
maxc = ncols - 1;
maxr = nrows - 1;
array_size = INIT_AR;
- file_fd = Rast_open_cell_new(alt_name);
+ file_fd = Rast_open_c_new(alt_name);
if (!file_fd)
G_fatal_error("Unable to open output map");
for (r = 0; r < nrows; r++) {
Modified: grass/trunk/raster/r.surf.contour/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.contour/read_cell.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.surf.contour/read_cell.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -10,7 +10,7 @@
int fd;
int row;
- fd = Rast_open_cell_old(name, mapset);
+ fd = Rast_open_old(name, mapset);
if (fd < 0)
G_fatal_error(_("unable to open map <%s> in <%s>"),
name, mapset);
Modified: grass/trunk/raster/r.surf.fractal/write_rast.c
===================================================================
--- grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -55,7 +55,7 @@
else
strcpy(file_name, rast_out_name);
- if ((fd_out = Rast_open_raster_new(file_name, DCELL_TYPE)) < 0) {
+ if ((fd_out = Rast_open_new(file_name, DCELL_TYPE)) < 0) {
G_fatal_error(_("Unable to create raster map <%s>"),
file_name);
}
Modified: grass/trunk/raster/r.surf.gauss/gaussurf.c
===================================================================
--- grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -36,7 +36,7 @@
/****** OPEN CELL FILES AND GET CELL DETAILS ******/
- fd_out = Rast_open_raster_new(out, DCELL_TYPE);
+ fd_out = Rast_open_new(out, DCELL_TYPE);
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/raster/r.surf.idw/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.surf.idw/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -147,14 +147,14 @@
cell = Rast_allocate_c_buf();
if ((maskfd = Rast_maskfd()) >= 0 || error_flag) { /* apply mask to output */
if (error_flag) /* use input as mask when -e option chosen */
- maskfd = Rast_open_cell_old(input, "");
+ maskfd = Rast_open_old(input, "");
mask = Rast_allocate_c_buf();
}
else
mask = NULL;
/* Open input cell layer for reading */
- fd = Rast_open_cell_old(input, "");
+ fd = Rast_open_old(input, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), input);
@@ -166,7 +166,7 @@
/* open cell layer for writing output */
- fd = Rast_open_cell_new(output);
+ fd = Rast_open_c_new(output);
if (fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), output);
Modified: grass/trunk/raster/r.surf.idw2/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.surf.idw2/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -104,7 +104,7 @@
else
mask = NULL;
- fd = Rast_open_cell_new(parm.output->answer);
+ fd = Rast_open_c_new(parm.output->answer);
if (fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
parm.output->answer);
Modified: grass/trunk/raster/r.surf.idw2/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -22,7 +22,7 @@
cell = Rast_allocate_c_buf();
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0) {
G_fatal_error(_("Unable to open raster map <%s>"), name);
exit(EXIT_FAILURE);
Modified: grass/trunk/raster/r.surf.random/randsurf.c
===================================================================
--- grass/trunk/raster/r.surf.random/randsurf.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.surf.random/randsurf.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -25,11 +25,11 @@
/****** OPEN CELL FILES AND GET CELL DETAILS ******/
if (int_map) {
- if ((fd_out = Rast_open_raster_new(out, CELL_TYPE)) < 0)
+ if ((fd_out = Rast_open_new(out, CELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), out);
}
else {
- if ((fd_out = Rast_open_raster_new(out, DCELL_TYPE)) < 0)
+ if ((fd_out = Rast_open_new(out, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), out);
}
Modified: grass/trunk/raster/r.terraflow/grass2str.h
===================================================================
--- grass/trunk/raster/r.terraflow/grass2str.h 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.terraflow/grass2str.h 2009-06-29 21:09:01 UTC (rev 38120)
@@ -61,12 +61,12 @@
/* open map */
int infd;
- if ( (infd = Rast_open_cell_old (cellname, mapset)) < 0)
+ if ( (infd = Rast_open_old (cellname, mapset)) < 0)
G_fatal_error (_("Unable to open raster map <%s>"), cellname);
/* determine map type (CELL/FCELL/DCELL) */
RASTER_MAP_TYPE data_type;
- data_type = Rast_raster_map_type(cellname, mapset);
+ data_type = Rast_map_type(cellname, mapset);
/* Allocate input buffer */
void *inrast;
@@ -174,7 +174,7 @@
/* open output raster map */
int outfd;
- if ( (outfd = Rast_open_raster_new (cellname, mtype)) < 0) {
+ if ( (outfd = Rast_open_new (cellname, mtype)) < 0) {
G_fatal_error (_("Unable to create raster map <%s>"), cellname);
}
@@ -259,7 +259,7 @@
/* open output raster map */
int outfd;
- if ( (outfd = Rast_open_raster_new (cellname, CELL_TYPE)) < 0) {
+ if ( (outfd = Rast_open_new (cellname, CELL_TYPE)) < 0) {
G_fatal_error ("Could not open <%s>", cellname);
}
@@ -333,7 +333,7 @@
/* open output raster map */
int outfd;
- if ( (outfd = Rast_open_raster_new (cellname, FCELL_TYPE)) < 0) {
+ if ( (outfd = Rast_open_new (cellname, FCELL_TYPE)) < 0) {
G_fatal_error ("Could not open <%s>", cellname);
}
@@ -425,11 +425,11 @@
/* open raster maps */
int fd1;
- if ( (fd1 = Rast_open_raster_new (cellname1, FCELL_TYPE)) < 0) {
+ if ( (fd1 = Rast_open_new (cellname1, FCELL_TYPE)) < 0) {
G_fatal_error ("Could not open <%s>", cellname1);
}
int fd2;
- if ( (fd2 = Rast_open_raster_new (cellname2, FCELL_TYPE)) < 0) {
+ if ( (fd2 = Rast_open_new (cellname2, FCELL_TYPE)) < 0) {
G_fatal_error ("Could not open <%s>", cellname2);
}
Modified: grass/trunk/raster/r.terraflow/main.cc
===================================================================
--- grass/trunk/raster/r.terraflow/main.cc 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.terraflow/main.cc 2009-06-29 21:09:01 UTC (rev 38120)
@@ -208,7 +208,7 @@
/* check type of input elevation raster and check if precision is lost */
RASTER_MAP_TYPE data_type;
- data_type = Rast_raster_map_type(opt->elev_grid, mapset);
+ data_type = Rast_map_type(opt->elev_grid, mapset);
#ifdef ELEV_SHORT
G_verbose_message(_("Elevation stored as SHORT (%dB)"),
sizeof(elevation_type));
Modified: grass/trunk/raster/r.texture/main.c
===================================================================
--- grass/trunk/raster/r.texture/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.texture/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -211,11 +211,11 @@
&& moc2 && mcc)
G_fatal_error(_("Nothing to compute. Use at least one of the flags."));
- if ((infd = Rast_open_cell_old(name, "")) < 0)
+ if ((infd = Rast_open_old(name, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
/* determine the inputmap type (CELL/FCELL/DCELL) */
- data_type = Rast_get_raster_map_type(infd);
+ data_type = Rast_get_map_type(infd);
if (Rast_get_cellhd(name, "", &cellhd) < 0)
G_fatal_error(_("Unable to read header of raster map <%s>"), name);
@@ -285,7 +285,7 @@
t_measure += 3;
else {
if ((outfd =
- Rast_open_raster_new(strcat(filename, suffixes[t_measure]),
+ Rast_open_new(strcat(filename, suffixes[t_measure]),
out_data_type)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
*result = '\0';
Modified: grass/trunk/raster/r.thin/io.c
===================================================================
--- grass/trunk/raster/r.thin/io.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.thin/io.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -91,7 +91,7 @@
/* open raster map */
strcpy(cell, name);
- if ((cell_file = Rast_open_cell_old(cell, "")) < 0) {
+ if ((cell_file = Rast_open_old(cell, "")) < 0) {
unlink(work_file_name);
G_fatal_error(_("Unable to open raster map <%s>"), cell);
}
@@ -159,7 +159,7 @@
int row_count, col_count, col;
CELL *buf;
- if ((cell_file = Rast_open_cell_new(name)) < 0) {
+ if ((cell_file = Rast_open_c_new(name)) < 0) {
unlink(work_file_name);
G_fatal_error(_("Unable to create raster map <%s>"), name);
}
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.to.rast3/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -258,7 +258,7 @@
fd[i] = open_input_raster_map(name);
opencells++;
- maptype_tmp = Rast_get_raster_map_type(fd[i]);
+ maptype_tmp = Rast_get_map_type(fd[i]);
/*maptype */
if (i == 0)
@@ -348,7 +348,7 @@
/* open raster map */
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -113,7 +113,7 @@
G_debug(3, "Open Raster file %s", name);
/* open raster map */
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
@@ -464,14 +464,14 @@
/*Open input map */
name = param.input->answers[i];
db.input = open_input_raster_map(name);
- db.inputmaptype = Rast_raster_map_type(name, "");
+ db.inputmaptype = Rast_map_type(name, "");
G_debug(2, "Open elev raster map %s", param.elev->answers[i]);
/*Open elev map */
name = param.elev->answers[i];
db.elev = open_input_raster_map(name);
- db.elevmaptype = Rast_raster_map_type(name, "");
+ db.elevmaptype = Rast_map_type(name, "");
/****************************************/
/*Write the data into the G3D Rastermap */
Modified: grass/trunk/raster/r.to.vect/main.c
===================================================================
--- grass/trunk/raster/r.to.vect/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.to.vect/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -115,10 +115,10 @@
G_fatal_error(_("z flag is supported only for points"));
/* Open files */
- if ((input_fd = Rast_open_cell_old(in_opt->answer, "")) < 0)
+ if ((input_fd = Rast_open_old(in_opt->answer, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), in_opt->answer);
- data_type = Rast_get_raster_map_type(input_fd);
+ data_type = Rast_get_map_type(input_fd);
data_size = Rast_cell_size(data_type);
G_get_window(&cell_head);
Modified: grass/trunk/raster/r.topidx/file_io.c
===================================================================
--- grass/trunk/raster/r.topidx/file_io.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.topidx/file_io.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -12,10 +12,10 @@
FCELL *fcell = NULL;
struct Cell_head inhead;
- if ((fd = Rast_open_cell_old(iname, "")) < 0)
+ if ((fd = Rast_open_old(iname, "")) < 0)
G_fatal_error(_("Cannot open raster map <%s>"), iname);
- data_type = Rast_get_raster_map_type(fd);
+ data_type = Rast_get_map_type(fd);
if (Rast_get_cellhd(iname, "", &inhead) < 0 )
G_fatal_error(_("Unable to read header of raster map <%s>"), iname);
@@ -82,7 +82,7 @@
int fd, i;
struct History history;
- if ((fd = Rast_open_raster_new(oname, DCELL_TYPE)) < 0)
+ if ((fd = Rast_open_new(oname, DCELL_TYPE)) < 0)
G_fatal_error(_("Cannot create raster map <%s>"), oname);
G_important_message(_("Writing topographic index map..."));
Modified: grass/trunk/raster/r.univar/r.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r.univar_main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.univar/r.univar_main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -108,7 +108,7 @@
if (map_type != -1) {
/* NB: map_type must match when doing extended stats */
- int this_type = Rast_get_raster_map_type(fd);
+ int this_type = Rast_get_map_type(fd);
assert(this_type > -1);
if (map_type < -1) {
@@ -141,7 +141,7 @@
{
int fd;
- fd = Rast_open_cell_old(infile, "");
+ fd = Rast_open_old(infile, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), infile);
@@ -173,7 +173,7 @@
const int cols = region->cols;
int first = (stats->n < 1);
- const RASTER_MAP_TYPE map_type = Rast_get_raster_map_type(fd);
+ const RASTER_MAP_TYPE map_type = Rast_get_map_type(fd);
void *nextp
= ((!param.extended->answer) ? 0
: (map_type == DCELL_TYPE) ? (void *)stats->dcell_array
Modified: grass/trunk/raster/r.uslek/main.c
===================================================================
--- grass/trunk/raster/r.uslek/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.uslek/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -88,19 +88,19 @@
result = output1->answer;
/***************************************************/
- if ((infd_psand = Rast_open_cell_old(psand, "")) < 0)
+ if ((infd_psand = Rast_open_old(psand, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), psand);
inrast_psand = Rast_allocate_d_buf();
- if ((infd_psilt = Rast_open_cell_old(psilt, "")) < 0)
+ if ((infd_psilt = Rast_open_old(psilt, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), psilt);
inrast_psilt = Rast_allocate_d_buf();
- if ((infd_pclay = Rast_open_cell_old(pclay, "")) < 0)
+ if ((infd_pclay = Rast_open_old(pclay, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), pclay);
inrast_pclay = Rast_allocate_d_buf();
- if ((infd_pomat = Rast_open_cell_old(pomat, "")) < 0)
+ if ((infd_pomat = Rast_open_old(pomat, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), pomat);
inrast_pomat = Rast_allocate_d_buf();
/***************************************************/
@@ -109,7 +109,7 @@
outrast = Rast_allocate_d_buf();
/* Create New raster files */
- if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
+ if ((outfd = Rast_open_new(result, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
/* Process pixels */
Modified: grass/trunk/raster/r.usler/main.c
===================================================================
--- grass/trunk/raster/r.usler/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.usler/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -82,7 +82,7 @@
result = output->answer;
/***************************************************/
- if ((infd_annual_pmm = Rast_open_cell_old(annual_pmm, "")) < 0)
+ if ((infd_annual_pmm = Rast_open_old(annual_pmm, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), annual_pmm);
inrast_annual_pmm = Rast_allocate_d_buf();
@@ -92,7 +92,7 @@
outrast = Rast_allocate_d_buf();
/* Create New raster files */
- if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
+ if ((outfd = Rast_open_new(result, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
/* Process pixels */
Modified: grass/trunk/raster/r.volume/main.c
===================================================================
--- grass/trunk/raster/r.volume/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.volume/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -117,13 +117,13 @@
clumpmap = "MASK";
use_MASK = 1;
}
- fd_data = Rast_open_cell_old(datamap, "");
+ fd_data = Rast_open_old(datamap, "");
if (use_MASK)
clump_mapset = G_mapset();
else
clump_mapset = "";
- fd_clump = Rast_open_cell_old(clumpmap, clump_mapset);
+ fd_clump = Rast_open_old(clumpmap, clump_mapset);
/* initialize sites file (for centroids) if needed */
if (*site_list) {
Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.walk/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -541,8 +541,8 @@
/* Open cost cell layer for reading */
- dtm_fd = Rast_open_cell_old(dtm_layer, "");
- cost_fd = Rast_open_cell_old(cost_layer, "");
+ dtm_fd = Rast_open_old(dtm_layer, "");
+ cost_fd = Rast_open_old(cost_layer, "");
if (dtm_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), dtm_layer);
@@ -565,8 +565,8 @@
if (dtm_cellhd.proj != cost_cellhd.proj)
G_fatal_error(_("Map with different projection"));
- dtm_data_type = Rast_get_raster_map_type(dtm_fd);
- cost_data_type = Rast_get_raster_map_type(cost_fd);
+ dtm_data_type = Rast_get_map_type(dtm_fd);
+ cost_data_type = Rast_get_map_type(cost_fd);
dtm_cell = Rast_allocate_buf(dtm_data_type);
cost_cell = Rast_allocate_buf(cost_data_type);
@@ -884,12 +884,12 @@
int dsize2;
- cum_fd = Rast_open_cell_old(start_layer, "");
+ cum_fd = Rast_open_old(start_layer, "");
if (cum_fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
start_layer);
- data_type2 = Rast_get_raster_map_type(cum_fd);
+ data_type2 = Rast_get_map_type(cum_fd);
dsize2 = Rast_cell_size(data_type2);
@@ -1445,10 +1445,10 @@
OUT:
/* Open cumulative cost layer for writing */
- cum_fd = Rast_open_raster_new(cum_cost_layer, cum_data_type);
+ cum_fd = Rast_open_new(cum_cost_layer, cum_data_type);
cum_cell = Rast_allocate_buf(cum_data_type);
if (dir == 1) {
- dir_fd = Rast_open_raster_new(move_dir_layer, dir_data_type);
+ dir_fd = Rast_open_new(move_dir_layer, dir_data_type);
dir_cell = Rast_allocate_buf(dir_data_type);
}
Modified: grass/trunk/raster/r.water.outlet/main.c
===================================================================
--- grass/trunk/raster/r.water.outlet/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.water.outlet/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -127,7 +127,7 @@
total = nrows * ncols;
nrows_less_one = nrows - 1;
ncols_less_one = ncols - 1;
- drain_fd = Rast_open_cell_old(drain_name, "");
+ drain_fd = Rast_open_old(drain_name, "");
if (drain_fd < 0)
G_fatal_error(_("Unable to open drainage pointer map"));
@@ -152,7 +152,7 @@
overland_cells(row, col);
G_free(drain_ptrs);
cell_buf = Rast_allocate_c_buf();
- basin_fd = Rast_open_cell_new(basin_name);
+ basin_fd = Rast_open_c_new(basin_name);
if (basin_fd < 0)
G_fatal_error(_("Unable to open new basin map"));
Modified: grass/trunk/raster/r.watershed/ram/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -26,7 +26,7 @@
sum = sum_sqr = stddev = 0.0;
if (wat_flag) {
- fd = Rast_open_raster_new(wat_name, DCELL_TYPE);
+ fd = Rast_open_new(wat_name, DCELL_TYPE);
if (fd < 0) {
G_warning(_("unable to open new accum map layer."));
}
@@ -138,7 +138,7 @@
/* TODO: elevation == NULL -> drainage direction == NULL (wat == 0 where ele == NULL) */
/* keep drainage direction == 0 for real depressions */
if (asp_flag) {
- fd = Rast_open_cell_new(asp_name);
+ fd = Rast_open_c_new(asp_name);
if (fd < 0) {
G_warning(_("unable to open new aspect map layer."));
}
@@ -161,7 +161,7 @@
/* visual output no longer needed */
if (dis_flag) {
- fd = Rast_open_cell_new(dis_name);
+ fd = Rast_open_c_new(dis_name);
if (fd < 0) {
G_warning(_("unable to open new accum map layer."));
}
@@ -197,7 +197,7 @@
G_free(wat);
if (ls_flag) {
- fd = Rast_open_raster_new(ls_name, DCELL_TYPE);
+ fd = Rast_open_new(ls_name, DCELL_TYPE);
if (fd < 0) {
G_warning(_("unable to open new LS factor map layer."));
}
@@ -215,7 +215,7 @@
}
if (sl_flag) {
- fd = Rast_open_raster_new(sl_name, DCELL_TYPE);
+ fd = Rast_open_new(sl_name, DCELL_TYPE);
if (fd < 0) {
G_warning(_("unable to open new slope length map layer."));
}
@@ -237,7 +237,7 @@
G_free(s_l);
if (sg_flag) {
- fd = Rast_open_raster_new(sg_name, DCELL_TYPE);
+ fd = Rast_open_new(sg_name, DCELL_TYPE);
if (fd < 0) {
G_warning(_("unable to open new S factor map layer."));
}
Modified: grass/trunk/raster/r.watershed/ram/close_maps2.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps2.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/ram/close_maps2.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -83,7 +83,7 @@
/* stream segments map */
if (seg_flag) {
- map_fd = Rast_open_cell_new(seg_name);
+ map_fd = Rast_open_c_new(seg_name);
for (r = 0; r < nrows; r++) {
Rast_set_c_null_value(cellrow, ncols); /* reset row to all NULL */
for (c = 0; c < ncols; c++) {
@@ -99,7 +99,7 @@
/* basins map */
if (bas_flag) {
- map_fd = Rast_open_cell_new(bas_name);
+ map_fd = Rast_open_c_new(bas_name);
for (r = 0; r < nrows; r++) {
for (c = 0; c < ncols; c++) {
cellrow[c] = bas[SEG_INDEX(bas_seg, r, c)];
@@ -114,7 +114,7 @@
/* half_basins map */
if (haf_flag) {
- map_fd = Rast_open_cell_new(haf_name);
+ map_fd = Rast_open_c_new(haf_name);
for (r = 0; r < nrows; r++) {
for (c = 0; c < ncols; c++) {
cellrow[c] = haf[SEG_INDEX(haf_seg, r, c)];
Modified: grass/trunk/raster/r.watershed/ram/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/init_vars.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/ram/init_vars.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -140,12 +140,12 @@
worked = flag_create(nrows, ncols);
/* open elevation input */
- fd = Rast_open_cell_old(ele_name, "");
+ fd = Rast_open_old(ele_name, "");
if (fd < 0) {
G_fatal_error(_("unable to open elevation map layer"));
}
- ele_map_type = Rast_get_raster_map_type(fd);
+ ele_map_type = Rast_get_map_type(fd);
ele_size = Rast_cell_size(ele_map_type);
elebuf = Rast_allocate_buf(ele_map_type);
@@ -208,7 +208,7 @@
buf = Rast_allocate_c_buf();
if (run_flag) {
/* ... with input map flow: amount of overland flow per cell */
- fd = Rast_open_cell_old(run_name, "");
+ fd = Rast_open_old(run_name, "");
if (fd < 0) {
G_fatal_error(_("unable to open runoff map layer"));
}
@@ -247,7 +247,7 @@
/* depression: drainage direction will be set to zero later */
if (pit_flag) {
- fd = Rast_open_cell_old(pit_name, "");
+ fd = Rast_open_old(pit_name, "");
if (fd < 0) {
G_fatal_error(_("unable to open depression map layer"));
}
@@ -264,7 +264,7 @@
/* this is also creating streams... */
if (ob_flag) {
- fd = Rast_open_cell_old(ob_name, "");
+ fd = Rast_open_old(ob_name, "");
if (fd < 0) {
G_fatal_error(_("unable to open blocking map layer"));
}
@@ -281,7 +281,7 @@
G_free(buf);
if (ril_flag) {
- ril_fd = Rast_open_cell_old(ril_name, "");
+ ril_fd = Rast_open_old(ril_name, "");
if (ril_fd < 0) {
G_fatal_error(_("unable to open rill map layer"));
}
Modified: grass/trunk/raster/r.watershed/seg/bseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_read.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/seg/bseg_read.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -16,7 +16,7 @@
bseg->name = NULL;
bseg->mapset = NULL;
- map_fd = Rast_open_cell_old(map_name, mapset);
+ map_fd = Rast_open_old(map_name, mapset);
if (map_fd < 0) {
sprintf(msg, "%s(): unable to open file [%s] in [%s], %d",
me, map_name, mapset, map_fd);
Modified: grass/trunk/raster/r.watershed/seg/bseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_write.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/seg/bseg_write.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -12,7 +12,7 @@
CELL *buffer;
CELL value;
- map_fd = Rast_open_cell_new(map_name);
+ map_fd = Rast_open_c_new(map_name);
if (map_fd < 0) {
G_warning("%s(): unable to open new map layer [%s]", me, map_name);
return -1;
Modified: grass/trunk/raster/r.watershed/seg/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -23,7 +23,7 @@
G_warning("Writing out only positive flow accumulation values.");
G_warning("Cells with a likely underestimate for flow accumulation can no longer be identified.");
- fd = Rast_open_raster_new(wat_name, DCELL_TYPE);
+ fd = Rast_open_new(wat_name, DCELL_TYPE);
if (fd < 0) {
G_warning(_("unable to open new accum map layer."));
}
@@ -47,7 +47,7 @@
dseg_write_cellfile(&wat, wat_name);
/* get standard deviation */
- fd = Rast_open_cell_old(wat_name, "");
+ fd = Rast_open_old(wat_name, "");
if (fd < 0) {
G_fatal_error(_("unable to open flow accumulation map layer"));
}
Modified: grass/trunk/raster/r.watershed/seg/close_maps2.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/close_maps2.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/seg/close_maps2.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -73,7 +73,7 @@
/* stream segments map */
if (seg_flag) {
cellrow = (CELL *) G_malloc(ncols * sizeof(CELL));
- map_fd = Rast_open_cell_new(seg_name);
+ map_fd = Rast_open_c_new(seg_name);
for (r = 0; r < nrows; r++) {
Rast_set_c_null_value(cellrow, ncols); /* reset row to all NULL */
for (c = 0; c < ncols; c++) {
Modified: grass/trunk/raster/r.watershed/seg/cseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_read.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/seg/cseg_read.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -15,7 +15,7 @@
cseg->name = NULL;
cseg->mapset = NULL;
- map_fd = Rast_open_cell_old(map_name, mapset);
+ map_fd = Rast_open_old(map_name, mapset);
if (map_fd < 0) {
sprintf(msg, "%s(): unable to open file [%s] in [%s], %d",
me, map_name, mapset, map_fd);
Modified: grass/trunk/raster/r.watershed/seg/cseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_write.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/seg/cseg_write.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -11,7 +11,7 @@
int row, nrows;
CELL *buffer;
- map_fd = Rast_open_cell_new(map_name);
+ map_fd = Rast_open_c_new(map_name);
if (map_fd < 0) {
G_warning("%s(): unable to open new map layer [%s]", me, map_name);
return -1;
Modified: grass/trunk/raster/r.watershed/seg/dseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -15,7 +15,7 @@
dseg->name = NULL;
dseg->mapset = NULL;
- map_fd = Rast_open_cell_old(map_name, mapset);
+ map_fd = Rast_open_old(map_name, mapset);
if (map_fd < 0) {
sprintf(msg, "%s(): unable to open file [%s] in [%s], %d",
me, map_name, mapset, map_fd);
Modified: grass/trunk/raster/r.watershed/seg/dseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -11,7 +11,7 @@
int row, nrows, ncols;
double *dbuffer;
- map_fd = Rast_open_raster_new(map_name, DCELL_TYPE);
+ map_fd = Rast_open_new(map_name, DCELL_TYPE);
if (map_fd < 0) {
G_warning("%s(): unable to open new map layer [%s]", me, map_name);
return -1;
Modified: grass/trunk/raster/r.watershed/seg/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/init_vars.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/seg/init_vars.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -187,12 +187,12 @@
G_verbose_message("Checking for masked and NULL cells in input elevation <%s>", ele_name);
/* open elevation input */
- fd = Rast_open_cell_old(ele_name, "");
+ fd = Rast_open_old(ele_name, "");
if (fd < 0) {
G_fatal_error(_("unable to open elevation map layer"));
}
- ele_map_type = Rast_get_raster_map_type(fd);
+ ele_map_type = Rast_get_map_type(fd);
ele_size = Rast_cell_size(ele_map_type);
elebuf = Rast_allocate_buf(ele_map_type);
@@ -274,7 +274,7 @@
cseg_open(&asp, seg_rows, seg_cols, num_open_segs);
/* depression: drainage direction will be set to zero later */
if (pit_flag) {
- fd = Rast_open_cell_old(pit_name, "");
+ fd = Rast_open_old(pit_name, "");
if (fd < 0) {
G_fatal_error(_("unable to open depression map layer"));
}
@@ -303,7 +303,7 @@
}
bseg_open(&swale, seg_rows, seg_cols, num_open_segs);
if (ob_flag) {
- fd = Rast_open_cell_old(ob_name, "");
+ fd = Rast_open_old(ob_name, "");
if (fd < 0) {
G_fatal_error(_("unable to open blocking map layer"));
}
Modified: grass/trunk/raster/r.watershed/shed/read.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/read.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/shed/read.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -23,7 +23,7 @@
G_fatal_error(_("unable to open basin/half basin map"));
}
- bas_fd = Rast_open_cell_old(haf_name, mapset);
+ bas_fd = Rast_open_old(haf_name, mapset);
facts = output->basin_facts;
for (r = nrows - 1; r >= 0; r--) {
Rast_get_c_row(bas_fd, bas_buf, r);
@@ -45,7 +45,7 @@
map->basins[r].first_cat.nxt = NULL;
map->basins[r].sum_values = 0.0;
}
- fd = Rast_open_cell_old(map->name, map->mapset);
+ fd = Rast_open_old(map->name, map->mapset);
if (fd >= 0) {
for (r = 0; r < nrows; r++) {
Rast_get_c_row(fd, buf, r);
Modified: grass/trunk/raster/r.watershed/shed/valid.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/valid.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.watershed/shed/valid.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -23,7 +23,7 @@
free_output(output);
G_fatal_error(_("accum file missing in valid_basins()"));
}
- if (-1 == (fd = Rast_open_cell_old(accum_name, mapset))) {
+ if (-1 == (fd = Rast_open_old(accum_name, mapset))) {
free_output(output);
G_fatal_error(_("unable to open accum file in valid_basins()"));
}
Modified: grass/trunk/raster/r.what/main.c
===================================================================
--- grass/trunk/raster/r.what/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.what/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -192,10 +192,10 @@
NFILES);
strcpy(name, *ptr);
- if ((fd[nfiles] = Rast_open_cell_old(name, "")) < 0)
+ if ((fd[nfiles] = Rast_open_old(name, "")) < 0)
G_fatal_error(_("Unable to open <%s>"), name);
- out_type[nfiles] = Rast_get_raster_map_type(fd[nfiles]);
+ out_type[nfiles] = Rast_get_map_type(fd[nfiles]);
if (flag3->answer)
out_type[nfiles] = CELL_TYPE;
Modified: grass/trunk/raster/r.what.color/main.c
===================================================================
--- grass/trunk/raster/r.what.color/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/r.what.color/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -122,7 +122,7 @@
name = opt.input->answer;
- type = Rast_raster_map_type(name, "");
+ type = Rast_map_type(name, "");
if (type < 0)
G_fatal_error("Unable to determine type of input map %s", name);
Modified: grass/trunk/raster/simwe/simlib/input.c
===================================================================
--- grass/trunk/raster/simwe/simlib/input.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/simwe/simlib/input.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -177,18 +177,18 @@
if ((mapset = G_find_cell(elevin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), elevin);
- fd1 = Rast_open_cell_old(elevin, mapset);
+ fd1 = Rast_open_old(elevin, mapset);
/* TO REPLACE BY INTERNAL PROCESSING of dx, dy from Elevin */
if ((mapset = G_find_cell(dxin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), dxin);
- fd2 = Rast_open_cell_old(dxin, mapset);
+ fd2 = Rast_open_old(dxin, mapset);
if ((mapset = G_find_cell(dyin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), dyin);
- fd3 = Rast_open_cell_old(dyin, mapset);
+ fd3 = Rast_open_old(dyin, mapset);
/* END OF REPLACEMENT */
/* Rendered Mannings n input map optional to run! */
@@ -196,7 +196,7 @@
if (manin != NULL) {
if ((mapset = G_find_cell(manin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), manin);
- fd5 = Rast_open_cell_old(manin, mapset);
+ fd5 = Rast_open_old(manin, mapset);
}
/* Rendered Rainfall input map optional to run! */
@@ -204,48 +204,48 @@
if (rain != NULL) {
if ((mapset = G_find_cell(rain, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), rain);
- fd4 = Rast_open_cell_old(rain, mapset);
+ fd4 = Rast_open_old(rain, mapset);
}
if (infil != NULL) {
if ((mapset = G_find_cell(infil, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), infil);
- fd4a = Rast_open_cell_old(infil, mapset);
+ fd4a = Rast_open_old(infil, mapset);
}
if (traps != NULL) {
if ((mapset = G_find_cell(traps, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), traps);
- fd4b = Rast_open_cell_old(traps, mapset);
+ fd4b = Rast_open_old(traps, mapset);
}
if (detin != NULL) {
if ((mapset = G_find_cell(detin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), detin);
- fd9 = Rast_open_cell_old(detin, mapset);
+ fd9 = Rast_open_old(detin, mapset);
}
if (tranin != NULL) {
if ((mapset = G_find_cell(tranin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), tranin);
- fd10 = Rast_open_cell_old(tranin, mapset);
+ fd10 = Rast_open_old(tranin, mapset);
}
if (tauin != NULL) {
if ((mapset = G_find_cell(tauin, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), tauin);
- fd11 = Rast_open_cell_old(tauin, mapset);
+ fd11 = Rast_open_old(tauin, mapset);
}
if (wdepth != NULL) {
if ((mapset = G_find_cell(wdepth, "")) == NULL)
G_fatal_error(_("Raster map <%s> not found"), wdepth);
- fd12 = Rast_open_cell_old(wdepth, mapset);
+ fd12 = Rast_open_old(wdepth, mapset);
}
for (row = 0; row < my; row++) {
Modified: grass/trunk/raster/simwe/simlib/output.c
===================================================================
--- grass/trunk/raster/simwe/simlib/output.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster/simwe/simlib/output.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -93,10 +93,10 @@
if (ts == 1) {
sprintf(buf, "%s.%.*d", depth, ndigit, tt);
depth0 = G_store(buf);
- fd6 = Rast_open_fp_cell_new(depth0);
+ fd6 = Rast_open_fp_new(depth0);
}
else
- fd6 = Rast_open_fp_cell_new(depth);
+ fd6 = Rast_open_fp_new(depth);
if (fd6 < 0)
G_fatal_error("unable to create raster map %s", depth);
}
@@ -106,10 +106,10 @@
if (ts == 1) {
sprintf(buf, "%s.%.*d", disch, ndigit, tt);
disch0 = G_store(buf);
- fd7 = Rast_open_fp_cell_new(disch0);
+ fd7 = Rast_open_fp_new(disch0);
}
else
- fd7 = Rast_open_fp_cell_new(disch);
+ fd7 = Rast_open_fp_new(disch);
if (fd7 < 0)
G_fatal_error("unable to create raster map %s", disch);
}
@@ -119,10 +119,10 @@
if (ts == 1) {
sprintf(buf, "%s.%.*d", err, ndigit, tt);
err0 = G_store(buf);
- fd8 = Rast_open_fp_cell_new(err0);
+ fd8 = Rast_open_fp_new(err0);
}
else
- fd8 = Rast_open_fp_cell_new(err);
+ fd8 = Rast_open_fp_new(err);
if (fd8 < 0)
G_fatal_error("unable to create raster map %s", err);
@@ -134,10 +134,10 @@
if (ts == 1) {
sprintf(buf, "%s.%.*d", conc, ndigit, tt);
conc0 = G_store(buf);
- fd14 = Rast_open_fp_cell_new(conc0);
+ fd14 = Rast_open_fp_new(conc0);
}
else
- fd14 = Rast_open_fp_cell_new(conc);
+ fd14 = Rast_open_fp_new(conc);
if (fd14 < 0)
G_fatal_error("unable to create raster map %s", conc);
@@ -148,10 +148,10 @@
if (ts == 1) {
sprintf(buf, "%s.%.*d", flux, ndigit, tt);
flux0 = G_store(buf);
- fd15 = Rast_open_fp_cell_new(flux0);
+ fd15 = Rast_open_fp_new(flux0);
}
else
- fd15 = Rast_open_fp_cell_new(flux);
+ fd15 = Rast_open_fp_new(flux);
if (fd15 < 0)
G_fatal_error("unable to create raster map %s", flux);
@@ -162,10 +162,10 @@
if (ts == 1) {
sprintf(buf, "%s.%.*d", erdep, ndigit, tt);
erdep0 = G_store(buf);
- fd16 = Rast_open_fp_cell_new(erdep0);
+ fd16 = Rast_open_fp_new(erdep0);
}
else
- fd16 = Rast_open_fp_cell_new(erdep);
+ fd16 = Rast_open_fp_new(erdep);
if (fd16 < 0)
G_fatal_error("unable to create raster map %s", erdep);
@@ -623,10 +623,10 @@
/* if (ts == 1) {
sprintf(buf,"%s.%.*d",et,ndigit,tt);
et0 = G_store(buf);
- fd17 = Rast_open_fp_cell_new (et0);
+ fd17 = Rast_open_fp_new (et0);
}
else */
- fd17 = Rast_open_fp_cell_new(et);
+ fd17 = Rast_open_fp_new(et);
if (fd17 < 0)
G_fatal_error("unable to create raster map %s", et);
@@ -637,10 +637,10 @@
/* if (ts == 1) {
sprintf(buf,"%s.%.*d",tc,ndigit,tt);
tc0 = G_store(buf);
- fd13 = Rast_open_fp_cell_new (tc0);
+ fd13 = Rast_open_fp_new (tc0);
}
else */
- fd13 = Rast_open_fp_cell_new(tc);
+ fd13 = Rast_open_fp_new(tc);
if (fd13 < 0)
G_fatal_error("unable to create raster map %s", tc);
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -329,11 +329,11 @@
/********************************/
- elevfd = Rast_open_cell_old(param.elevation->answer, "");
+ elevfd = Rast_open_old(param.elevation->answer, "");
if (elevfd <= 0)
fatal_error(map, -1, -1, _("Unable to open elevation map"));
- globalElevMapType = Rast_get_raster_map_type(elevfd);
+ globalElevMapType = Rast_get_map_type(elevfd);
/**********************/
/*Open the Outputmap */
@@ -344,13 +344,13 @@
G_message(_("Output map already exists. Will be overwritten!"));
if (output_type == FCELL_TYPE) {
- outfd = Rast_open_raster_new(param.output->answer, FCELL_TYPE);
+ outfd = Rast_open_new(param.output->answer, FCELL_TYPE);
if (outfd < 0)
fatal_error(map, elevfd, -1,
_("Unable to create raster map"));
}
else if (output_type == DCELL_TYPE) {
- outfd = Rast_open_raster_new(param.output->answer, DCELL_TYPE);
+ outfd = Rast_open_new(param.output->answer, DCELL_TYPE);
if (outfd < 0)
fatal_error(map, elevfd, -1,
_("Unable to create raster map"));
Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster3d/r3.out.vtk/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -98,7 +98,7 @@
/* open raster map */
- fd = Rast_open_cell_old(name, mapset);
+ fd = Rast_open_old(name, mapset);
if (fd < 0)
G_fatal_error(_("Could not open map %s"), name);
@@ -469,7 +469,7 @@
name = param.top->answer;
mapset = G_find_cell2(name, "");
in->top = open_input_map(name, mapset);
- in->topMapType = Rast_get_raster_map_type(in->top);
+ in->topMapType = Rast_get_map_type(in->top);
/*open bottom */
mapset = NULL;
@@ -477,7 +477,7 @@
name = param.bottom->answer;
mapset = G_find_cell2(name, "");
in->bottom = open_input_map(name, mapset);
- in->bottomMapType = Rast_get_raster_map_type(in->bottom);
+ in->bottomMapType = Rast_get_map_type(in->bottom);
/* Write the vtk-header and the points */
if (param.point->answer) {
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -179,7 +179,7 @@
{
int fd;
- fd = Rast_open_raster_new((char *)name, res_type);
+ fd = Rast_open_new((char *)name, res_type);
if (fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), name);
Modified: grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/opennew.c
===================================================================
--- grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/opennew.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/opennew.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -8,9 +8,9 @@
int fd;
if (wr_type < 0) /* default fp type */
- fd = Rast_open_fp_cell_new(name);
+ fd = Rast_open_fp_new(name);
else
- fd = Rast_open_raster_new(name, wr_type);
+ fd = Rast_open_new(name, wr_type);
if (fd < 0)
G_fatal_error(_("Failed in attempt to open %s"), name);
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-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -468,7 +468,7 @@
*/
/* open the elevation file for reading */
- elevation_fd = Rast_open_cell_old(elev_name, mapset);
+ elevation_fd = Rast_open_old(elev_name, mapset);
if (elevation_fd < 0)
exit(EXIT_FAILURE);
elev_cell[0] = (DCELL *) G_calloc(ncols + 1, sizeof(DCELL));
Modified: grass/trunk/vector/lidar/v.surf.bspline/main.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/lidar/v.surf.bspline/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -292,7 +292,7 @@
G_fatal_error (_("Raster <%s> already exist."), out_map_opt->answer);
*/
- if ((raster = Rast_open_fp_cell_new(out_map_opt->answer)) < 0)
+ if ((raster = Rast_open_fp_new(out_map_opt->answer)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
out_map_opt->answer);
}
Modified: grass/trunk/vector/v.drape/main.c
===================================================================
--- grass/trunk/vector/v.drape/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.drape/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -226,7 +226,7 @@
otype = Vect_option_to_types(type_opt);
/* open the elev raster, and check for error condition */
- if ((fdrast = Rast_open_cell_old(rast_opt->answer, "")) < 0) {
+ if ((fdrast = Rast_open_old(rast_opt->answer, "")) < 0) {
G_fatal_error(_("Unable to open raster map <%s>"), rast_opt->answer);
}
Modified: grass/trunk/vector/v.extrude/main.c
===================================================================
--- grass/trunk/vector/v.extrude/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.extrude/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -175,7 +175,7 @@
G_get_window(&window);
/* open the elev raster, and check for error condition */
- if ((fdrast = Rast_open_cell_old(elevation->answer, "")) < 0)
+ if ((fdrast = Rast_open_old(elevation->answer, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
elevation->answer);
}
Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.kernel/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -240,7 +240,7 @@
/* check and open the name of output map */
if (!flag_q->answer) {
Rast_set_fp_type(DCELL_TYPE);
- if ((fdout = Rast_open_raster_new(out_opt->answer, DCELL_TYPE)) < 0)
+ if ((fdout = Rast_open_new(out_opt->answer, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
out_opt->answer);
Modified: grass/trunk/vector/v.neighbors/main.c
===================================================================
--- grass/trunk/vector/v.neighbors/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.neighbors/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -88,7 +88,7 @@
List = Vect_new_list();
/*open the new cellfile */
- out_fd = Rast_open_raster_new(out_opt->answer, CELL_TYPE);
+ out_fd = Rast_open_new(out_opt->answer, CELL_TYPE);
if (out_fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), out_opt->answer);
Modified: grass/trunk/vector/v.sample/main.c
===================================================================
--- grass/trunk/vector/v.sample/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.sample/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -146,7 +146,7 @@
Vect_set_open_level(2);
Vect_open_old(&In, parm.input->answer, "");
- if ((fdrast = Rast_open_cell_old(parm.rast->answer, "")) < 0)
+ if ((fdrast = Rast_open_old(parm.rast->answer, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), parm.rast->answer);
/* Read attributes */
Modified: grass/trunk/vector/v.surf.idw/main.c
===================================================================
--- grass/trunk/vector/v.surf.idw/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.surf.idw/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -248,7 +248,7 @@
mask = NULL;
- fd = Rast_open_raster_new(parm.output->answer, DCELL_TYPE);
+ fd = Rast_open_new(parm.output->answer, DCELL_TYPE);
if (fd < 0)
G_fatal_error(_("Unable to create raster map <%s>"),
parm.output->answer);
Modified: grass/trunk/vector/v.to.rast/support.c
===================================================================
--- grass/trunk/vector/v.to.rast/support.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.to.rast/support.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -259,14 +259,14 @@
/* init raster categories */
Rast_init_cats("Categories", &rast_cats);
- if (!(fd = Rast_open_cell_old(rast_name, G_mapset())))
+ if (!(fd = Rast_open_old(rast_name, G_mapset())))
G_fatal_error(_("Unable to open raster map <%s>"), rast_name);
switch (use) {
case USE_ATTR:
{
Rast_set_cats_title("Labels", &rast_cats);
- int is_fp = Rast_raster_map_is_fp(rast_name, G_mapset());
+ int is_fp = Rast_map_is_fp(rast_name, G_mapset());
/* open vector map and database driver */
Vect_open_old(&Map, vector_map, G_find_vector2(vector_map, ""));
@@ -383,7 +383,7 @@
struct FPRange fprange;
struct Range range;
- map_type = Rast_raster_map_type(rast_name, G_mapset());
+ map_type = Rast_map_type(rast_name, G_mapset());
Rast_set_cats_title("Values", &rast_cats);
if (map_type == CELL_TYPE) {
@@ -416,10 +416,10 @@
RASTER_MAP_TYPE map_type;
long count;
- if (!(fd = Rast_open_cell_old(rast_name, G_mapset())))
+ if (!(fd = Rast_open_old(rast_name, G_mapset())))
G_fatal_error(_("Unable to open raster map <%s>"), rast_name);
- map_type = Rast_raster_map_type(rast_name, G_mapset());
+ map_type = Rast_map_type(rast_name, G_mapset());
if (!(rowbuf = Rast_allocate_buf(map_type)))
G_fatal_error(_("Cannot allocate memory for row buffer"));
@@ -456,7 +456,7 @@
int i;
char msg[64];
- map_type = Rast_raster_map_type(rast_name, G_mapset());
+ map_type = Rast_map_type(rast_name, G_mapset());
Rast_set_cats_title("Degrees", &rast_cats);
for (i = 1; i <= 360; i++) {
Modified: grass/trunk/vector/v.to.rast/vect2rast.c
===================================================================
--- grass/trunk/vector/v.to.rast/vect2rast.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.to.rast/vect2rast.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -119,11 +119,11 @@
switch (format) {
case USE_CELL:
- if ((fd = Rast_open_cell_new(raster_map)) < 0)
+ if ((fd = Rast_open_c_new(raster_map)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), raster_map);
break;
case USE_DCELL:
- if ((fd = Rast_open_raster_new(raster_map, DCELL_TYPE)) < 0)
+ if ((fd = Rast_open_new(raster_map, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), raster_map);
break;
default:
Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.vol.rst/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -643,10 +643,10 @@
mapset = G_find_cell2(cellinp, "");
if (mapset == NULL)
G_fatal_error(_("Raster map <%s> not found"), cellinp);
- fdcell = Rast_open_cell_old(cellinp, mapset);
+ fdcell = Rast_open_old(cellinp, mapset);
if (fdcell < 0)
G_fatal_error(_("Unable to open raster map <%s>"), cellinp);
- fdcout = Rast_open_fp_cell_new(cellout);
+ fdcout = Rast_open_fp_new(cellout);
if (fdcout < 0)
G_fatal_error(_("Cannot open %s"), cellout);
zero_array_cell = (FCELL *) G_malloc(sizeof(FCELL) * n_cols);
Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.vol.rst/user1.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -365,7 +365,7 @@
}
bitmask = BM_create(nsizc, nsizr);
cellmask = Rast_allocate_c_buf();
- cfmask = Rast_open_cell_old(maskmap, mapsetm);
+ cfmask = Rast_open_old(maskmap, mapsetm);
for (i = 0; i < nsizr; i++) {
irev = nsizr - i - 1;
Rast_get_c_row(cfmask, cellmask, i);
Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/vector/v.what.rast/main.c 2009-06-29 21:09:01 UTC (rev 38120)
@@ -133,10 +133,10 @@
}
/* Open raster */
- if ((fd = Rast_open_cell_old(rast_opt->answer, "")) < 0)
+ if ((fd = Rast_open_old(rast_opt->answer, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), rast_opt->answer);
- out_type = Rast_get_raster_map_type(fd);
+ out_type = Rast_get_map_type(fd);
/* TODO: Later possibly category labels */
/*
Modified: grass/trunk/visualization/xganim/main.cc
===================================================================
--- grass/trunk/visualization/xganim/main.cc 2009-06-29 19:59:00 UTC (rev 38119)
+++ grass/trunk/visualization/xganim/main.cc 2009-06-29 21:09:01 UTC (rev 38120)
@@ -232,7 +232,7 @@
name = vfiles[vnum][cnt];
G_message(_("Reading file [%s]..."), name);
- fd = Rast_open_cell_old(name, "");
+ fd = Rast_open_old(name, "");
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), name);
/*
More information about the grass-commit
mailing list