[GRASS-SVN] r38082 - in grass/trunk: display/d.his 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.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/display lib/gis
lib/gpde lib/ogsf lib/raster lib/rst/interp_float ps/ps.map
raster/r.bitpattern raster/r.buffer raster/r.carve
raster/r.category raster/r.colors raster/r.composite
raster/r.compress 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.mat raster/r.in.poly
raster/r.in.xyz 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.cwed
raster/r.li/r.li.daemon raster/r.li/r.li.edgedensity
raster/r.li/r.li.mps raster/r.li/r.li.padcv
raster/r.li/r.li.padrange raster/r.li/r.li.padsd
raster/r.li/r.li.patchdensity raster/r.li/r.li.patchnum
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.vtk
raster/r.param.scale raster/r.patch raster/r.profile
raster/r.proj raster/r.quantile raster/r.random
raster/r.random.cells raster/r.random.surface raster/r.recode
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.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.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.to.rast3 raster/r.to.rast3elev
raster/r.to.vect 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/simwe/simlib raster3d/r3.cross.rast
raster3d/r3.out.vtk raster3d/r3.to.rast
swig/perl/R_slope_aspect/r_slope_aspect vector/lidar/lidarlib
vector/v.kernel vector/v.neighbors 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
Thu Jun 25 17:10:29 EDT 2009
Author: martinl
Date: 2009-06-25 17:10:29 -0400 (Thu, 25 Jun 2009)
New Revision: 38082
Modified:
grass/trunk/display/d.his/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.rgb/main.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.biomass/main.c
grass/trunk/imagery/i.cca/transform.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.points/drawcell.c
grass/trunk/imagery/i.rectify/exec.c
grass/trunk/imagery/i.rectify/perform.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/openfiles.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/display/raster.c
grass/trunk/lib/gis/alloc.c
grass/trunk/lib/gpde/N_arrays_io.c
grass/trunk/lib/ogsf/Gs3.c
grass/trunk/lib/raster/alloc_cell.c
grass/trunk/lib/raster/auto_mask.c
grass/trunk/lib/raster/cats.c
grass/trunk/lib/raster/color_look.c
grass/trunk/lib/raster/get_row.c
grass/trunk/lib/raster/get_row_colr.c
grass/trunk/lib/raster/null_val.c
grass/trunk/lib/raster/opencell.c
grass/trunk/lib/raster/put_row.c
grass/trunk/lib/raster/range.c
grass/trunk/lib/raster/raster.c
grass/trunk/lib/raster/sample.c
grass/trunk/lib/raster/set_window.c
grass/trunk/lib/raster/zero_cell.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/lib/rst/interp_float/ressegm2d.c
grass/trunk/ps/ps.map/outl_io.c
grass/trunk/ps/ps.map/ps_outline.c
grass/trunk/ps/ps.map/ps_raster.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/enforce_ds.c
grass/trunk/raster/r.carve/raster.c
grass/trunk/raster/r.category/cats.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.cost/main.c
grass/trunk/raster/r.covar/main.c
grass/trunk/raster/r.cross/cross.c
grass/trunk/raster/r.cross/renumber.c
grass/trunk/raster/r.describe/describe.c
grass/trunk/raster/r.distance/distance.c
grass/trunk/raster/r.drain/main.c
grass/trunk/raster/r.drain/tinf.c
grass/trunk/raster/r.fill.dir/main.c
grass/trunk/raster/r.fill.dir/tinf.c
grass/trunk/raster/r.flow/io.c
grass/trunk/raster/r.flow/main.c
grass/trunk/raster/r.flow/mem.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.mat/main.c
grass/trunk/raster/r.in.poly/raster.c
grass/trunk/raster/r.in.xyz/main.c
grass/trunk/raster/r.in.xyz/support.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/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.cwed/cwed.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.li/r.li.edgedensity/edgedensity.c
grass/trunk/raster/r.li/r.li.mps/mps.c
grass/trunk/raster/r.li/r.li.padcv/padcv.c
grass/trunk/raster/r.li/r.li.padrange/padrange.c
grass/trunk/raster/r.li/r.li.padsd/padsd.c
grass/trunk/raster/r.li/r.li.patchdensity/main.c
grass/trunk/raster/r.li/r.li.patchnum/main.c
grass/trunk/raster/r.los/main.c
grass/trunk/raster/r.mapcalc/evaluate.c
grass/trunk/raster/r.mapcalc/map.c
grass/trunk/raster/r.mapcalc/xmedian.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.null/mask.c
grass/trunk/raster/r.out.arc/main.c
grass/trunk/raster/r.out.ascii/formspecific.c
grass/trunk/raster/r.out.bin/main.c
grass/trunk/raster/r.out.gdal/export_band.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.vtk/writeascii.c
grass/trunk/raster/r.param.scale/process.c
grass/trunk/raster/r.patch/do_patch.c
grass/trunk/raster/r.patch/main.c
grass/trunk/raster/r.profile/read_rast.c
grass/trunk/raster/r.proj/main.c
grass/trunk/raster/r.quantile/main.c
grass/trunk/raster/r.random.cells/init.c
grass/trunk/raster/r.random.surface/init.c
grass/trunk/raster/r.random/count.c
grass/trunk/raster/r.recode/recode.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.spread/main.c
grass/trunk/raster/r.spreadpath/main.c
grass/trunk/raster/r.statistics2/main.c
grass/trunk/raster/r.statistics3/main.c
grass/trunk/raster/r.stats/cell_stats.c
grass/trunk/raster/r.stats/raw_stats.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/histo.c
grass/trunk/raster/r.support/histo.c
grass/trunk/raster/r.surf.area/main.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.texture/main.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.to.vect/points.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/centroids.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/ram/sg_factor.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/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/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/writeVTKData.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
grass/trunk/vector/lidar/lidarlib/zones.c
grass/trunk/vector/v.kernel/main.c
grass/trunk/vector/v.neighbors/main.c
grass/trunk/vector/v.surf.idw/main.c
grass/trunk/vector/v.to.rast/support.c
grass/trunk/vector/v.vol.rst/user1.c
grass/trunk/vector/v.vol.rst/user3.c
grass/trunk/vector/v.what.rast/main.c
grass/trunk/visualization/xganim/main.cc
Log:
alloc_cell.c updated, see http://trac.osgeo.org/grass/wiki/Grass7/RasterLib
* Rast_raster_size -> Rast_cell_size
* Rast_allocate_cell_buf removed
* Rast_allocate_c_raster_buf -> Rast_allocate_c_buf
* Rast_allocate_f_raster_buf -> Rast_allocare_f_buf
* Rast_allocate_d_raster_buf -> Rast_allocate_d_buf
Modules updated
Modified: grass/trunk/display/d.his/main.c
===================================================================
--- grass/trunk/display/d.his/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/display/d.his/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -173,9 +173,9 @@
G_fatal_error(_("Color file for <%s> not available"), name_s);
}
- r_array = Rast_allocate_cell_buf();
- g_array = Rast_allocate_cell_buf();
- b_array = Rast_allocate_cell_buf();
+ r_array = Rast_allocate_c_buf();
+ g_array = Rast_allocate_c_buf();
+ b_array = Rast_allocate_c_buf();
/* Make color table */
make_gray_scale(&gray_colors);
Modified: grass/trunk/display/d.nviz/main.c
===================================================================
--- grass/trunk/display/d.nviz/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/display/d.nviz/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -442,7 +442,7 @@
if (data_type == CELL_TYPE) {
- cell = Rast_allocate_c_raster_buf();
+ cell = Rast_allocate_c_buf();
if (Rast_get_c_raster_row(fd, cell, row) < 0)
exit(1);
@@ -453,7 +453,7 @@
}
if (data_type == FCELL_TYPE) {
- fcell = Rast_allocate_f_raster_buf();
+ fcell = Rast_allocate_f_buf();
if (Rast_get_f_raster_row(fd, fcell, row) < 0)
exit(1);
if (Rast_is_f_null_value(&fcell[col]))
@@ -463,7 +463,7 @@
}
if (data_type == DCELL_TYPE) {
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
if (Rast_get_d_raster_row(fd, dcell, row) < 0)
exit(1);
if (Rast_is_d_null_value(&dcell[col]))
Modified: grass/trunk/display/d.profile/main.c
===================================================================
--- grass/trunk/display/d.profile/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/display/d.profile/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -38,7 +38,7 @@
static void get_region_range(int fd)
{
- DCELL *buf = Rast_allocate_d_raster_buf();
+ DCELL *buf = Rast_allocate_c_buf();
int nrows = G_window_rows();
int ncols = G_window_cols();
int row, col;
@@ -123,8 +123,8 @@
DCELL *tmp;
if (!row1) {
- row1 = Rast_allocate_d_raster_buf();
- row2 = Rast_allocate_d_raster_buf();
+ row1 = Rast_allocate_c_buf();
+ row2 = Rast_allocate_c_buf();
}
col = (int)floor(x - 0.5);
Modified: grass/trunk/display/d.rast/display.c
===================================================================
--- grass/trunk/display/d.rast/display.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/display/d.rast/display.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -61,7 +61,7 @@
G_fatal_error(_("Unable to open raster map <%s>"), name);
/* Allocate space for cell buffer */
- xarray = Rast_allocate_raster_buf(data_type);
+ xarray = Rast_allocate_buf(data_type);
D_cell_draw_begin();
Modified: grass/trunk/display/d.rast.arrow/main.c
===================================================================
--- grass/trunk/display/d.rast.arrow/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/display/d.rast.arrow/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -297,7 +297,7 @@
raster_type = Rast_get_raster_map_type(layer_fd);
/* allocate the cell array */
- raster_row = Rast_allocate_raster_buf(raster_type);
+ raster_row = Rast_allocate_buf(raster_type);
if (opt7->answer) {
@@ -309,7 +309,7 @@
mag_raster_type = Rast_get_raster_map_type(mag_fd);
/* allocate the cell array */
- mag_raster_row = Rast_allocate_raster_buf(mag_raster_type);
+ mag_raster_row = Rast_allocate_buf(mag_raster_type);
}
@@ -367,11 +367,11 @@
}
if (no_arrow) {
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(raster_type));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(raster_type));
if (opt7->answer)
mag_ptr =
G_incr_void_ptr(mag_ptr,
- Rast_raster_size(mag_raster_type));
+ Rast_cell_size(mag_raster_type));
no_arrow = FALSE;
continue;
}
@@ -494,10 +494,10 @@
}
}
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(raster_type));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(raster_type));
if (opt7->answer)
mag_ptr =
- G_incr_void_ptr(mag_ptr, Rast_raster_size(mag_raster_type));
+ G_incr_void_ptr(mag_ptr, Rast_cell_size(mag_raster_type));
}
}
Modified: grass/trunk/display/d.rast.num/main.c
===================================================================
--- grass/trunk/display/d.rast.num/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/display/d.rast.num/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -216,7 +216,7 @@
}
/* allocate the cell array */
- cell = Rast_allocate_raster_buf(map_type);
+ cell = Rast_allocate_buf(map_type);
/* read the color table in the color structures of the displayed map */
if (Rast_read_colors(map_name, "", &colors) == -1)
Modified: grass/trunk/display/d.rgb/main.c
===================================================================
--- grass/trunk/display/d.rgb/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/display/d.rgb/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -98,7 +98,7 @@
if (Rast_read_colors(name, "", &B[i].colors) == -1)
G_fatal_error(_("Color file for <%s> not available"), name);
- B[i].array = Rast_allocate_raster_buf(B[i].type);
+ B[i].array = Rast_allocate_buf(B[i].type);
}
/* read in current window */
Modified: grass/trunk/display/d.what.rast/what.c
===================================================================
--- grass/trunk/display/d.what.rast/what.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/display/d.what.rast/what.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -22,8 +22,8 @@
G_get_set_window(&window);
nrows = window.rows;
ncols = window.cols;
- buf = Rast_allocate_c_raster_buf();
- dbuf = Rast_allocate_d_raster_buf();
+ buf = Rast_allocate_c_buf();
+ dbuf = Rast_allocate_c_buf();
screen_x = ((int)D_get_d_west() + (int)D_get_d_east()) / 2;
screen_y = ((int)D_get_d_north() + (int)D_get_d_south()) / 2;
Modified: grass/trunk/doc/raster/r.example/main.c
===================================================================
--- grass/trunk/doc/raster/r.example/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/doc/raster/r.example/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -127,12 +127,12 @@
G_debug(3, "number of rows %d", cellhd.rows);
/* Allocate input buffer */
- inrast = Rast_allocate_raster_buf(data_type);
+ inrast = Rast_allocate_buf(data_type);
/* Allocate output buffer, use input map data_type */
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_raster_buf(data_type);
+ outrast = Rast_allocate_buf(data_type);
/* controlling, if we can write the raster */
if ((outfd = Rast_open_raster_new(result, data_type)) < 0)
Modified: grass/trunk/general/g.region/zoom.c
===================================================================
--- grass/trunk/general/g.region/zoom.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/general/g.region/zoom.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -24,7 +24,7 @@
G_fatal_error(_("Unable to open raster map <%s> in <%s>"),
name, mapset);
map_type = Rast_get_raster_map_type(fd);
- raster = Rast_allocate_raster_buf(map_type);
+ raster = Rast_allocate_buf(map_type);
/* find first non-null row */
top = nrows;
@@ -37,7 +37,7 @@
for (col = 0; col < ncols; col++) {
if (!Rast_is_null_value(rast_ptr, map_type))
break;
- rast_ptr = G_incr_void_ptr(rast_ptr, Rast_raster_size(map_type));
+ rast_ptr = G_incr_void_ptr(rast_ptr, Rast_cell_size(map_type));
}
if (col == ncols)
continue;
@@ -50,7 +50,7 @@
for (mark = col; col < ncols; col++) {
if (!Rast_is_null_value(rast_ptr, map_type))
mark = col;
- rast_ptr = G_incr_void_ptr(rast_ptr, Rast_raster_size(map_type));
+ rast_ptr = G_incr_void_ptr(rast_ptr, Rast_cell_size(map_type));
}
if (mark > right)
right = mark;
Modified: grass/trunk/imagery/i.albedo/main.c
===================================================================
--- grass/trunk/imagery/i.albedo/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.albedo/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -161,7 +161,7 @@
if ((Rast_get_cellhd(name, "", &cellhd)) < 0)
G_fatal_error(_("Unable to read header of raster map <%s>"), name);
- inrast[nfiles] = Rast_allocate_raster_buf(in_data_type[nfiles]);
+ inrast[nfiles] = Rast_allocate_buf(in_data_type[nfiles]);
nfiles++;
}
nfiles--;
@@ -171,7 +171,7 @@
/* Allocate output buffer, use input map data_type */
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_raster_buf(out_data_type);
+ outrast = Rast_allocate_buf(out_data_type);
/* Create New raster files */
if ((outfd = Rast_open_raster_new(result, 1)) < 0)
Modified: grass/trunk/imagery/i.biomass/main.c
===================================================================
--- grass/trunk/imagery/i.biomass/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.biomass/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -99,31 +99,31 @@
/***************************************************/
if ((infd_fpar = Rast_open_cell_old(fpar, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), fpar);
- inrast_fpar = Rast_allocate_d_raster_buf();
+ inrast_fpar = Rast_allocate_c_buf();
if ((infd_luf = Rast_open_cell_old(luf, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), luf);
- inrast_luf = Rast_allocate_d_raster_buf();
+ inrast_luf = Rast_allocate_c_buf();
if ((infd_lat = Rast_open_cell_old(lat, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), lat);
- inrast_lat = Rast_allocate_d_raster_buf();
+ inrast_lat = Rast_allocate_c_buf();
if ((infd_doy = Rast_open_cell_old(doy, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), doy);
- inrast_doy = Rast_allocate_d_raster_buf();
+ inrast_doy = Rast_allocate_c_buf();
if ((infd_tsw = Rast_open_cell_old(tsw, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), tsw);
- inrast_tsw = Rast_allocate_d_raster_buf();
+ inrast_tsw = Rast_allocate_c_buf();
if ((infd_wa = Rast_open_cell_old(wa, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), wa);
- inrast_wa = Rast_allocate_d_raster_buf();
+ inrast_wa = Rast_allocate_c_buf();
nrows = G_window_rows();
ncols = G_window_cols();
- outrast1 = Rast_allocate_d_raster_buf();
+ outrast1 = Rast_allocate_c_buf();
/* Create New raster files */
if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
Modified: grass/trunk/imagery/i.cca/transform.c
===================================================================
--- grass/trunk/imagery/i.cca/transform.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.cca/transform.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -15,7 +15,7 @@
/* allocate row buffers for each band */
for (i = 1; i <= bands; i++)
- if ((rowbufs[i] = Rast_allocate_cell_buf()) == NULL)
+ if ((rowbufs[i] = Rast_allocate_c_buf()) == NULL)
G_fatal_error(_("Unable to allocate cell buffers."));
for (i = 0; i < rows; i++) {
Modified: grass/trunk/imagery/i.class/band_files.c
===================================================================
--- grass/trunk/imagery/i.class/band_files.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.class/band_files.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -15,7 +15,7 @@
Bandbuf = (CELL **) G_malloc(nbands * sizeof(CELL *));
Bandfd = (int *)G_malloc(nbands * sizeof(int));
for (n = 0; n < nbands; n++) {
- Bandbuf[n] = Rast_allocate_cell_buf();
+ 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)
Modified: grass/trunk/imagery/i.class/draw_cell.c
===================================================================
--- grass/trunk/imagery/i.class/draw_cell.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.class/draw_cell.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -43,7 +43,7 @@
Rast_free_colors(&colr);
return 0;
}
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
sprintf(msg, "Plotting %s ...", view->cell.name);
Modified: grass/trunk/imagery/i.class/signature.c
===================================================================
--- grass/trunk/imagery/i.class/signature.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.class/signature.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -274,7 +274,7 @@
if ((fd = Rast_open_cell_new(MASK)) < 0)
G_fatal_error(_("Unable to open the cell map MASK."));
- if ((buffer = Rast_allocate_cell_buf()) == NULL)
+ if ((buffer = Rast_allocate_c_buf()) == NULL)
G_fatal_error(_("Unable to allocate the cell buffer in display_signature()."));
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/imagery/i.cluster/open_files.c
===================================================================
--- grass/trunk/imagery/i.cluster/open_files.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.cluster/open_files.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -50,7 +50,7 @@
cell = (DCELL **) G_malloc(ref.nfiles * sizeof(DCELL *));
cellfd = (int *)G_malloc(ref.nfiles * sizeof(int));
for (n = 0; n < ref.nfiles; n++) {
- cell[n] = Rast_allocate_d_raster_buf();
+ cell[n] = Rast_allocate_c_buf();
name = ref.file[n].name;
mapset = ref.file[n].mapset;
if ((cellfd[n] = Rast_open_cell_old(name, mapset)) < 0)
Modified: grass/trunk/imagery/i.eb.eta/main.c
===================================================================
--- grass/trunk/imagery/i.eb.eta/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.eb.eta/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -78,19 +78,19 @@
if ((infd_rnetday = Rast_open_cell_old(rnetday, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), rnetday);
- inrast_rnetday = Rast_allocate_d_raster_buf();
+ inrast_rnetday = Rast_allocate_c_buf();
if ((infd_evapfr = Rast_open_cell_old(evapfr, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), evapfr);
- inrast_evapfr = Rast_allocate_d_raster_buf();
+ inrast_evapfr = Rast_allocate_c_buf();
if ((infd_tempk = Rast_open_cell_old(tempk, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), tempk);
- inrast_tempk = Rast_allocate_d_raster_buf();
+ inrast_tempk = Rast_allocate_c_buf();
nrows = G_window_rows();
ncols = G_window_cols();
- outrast1 = Rast_allocate_d_raster_buf();
+ outrast1 = Rast_allocate_c_buf();
if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result1);
Modified: grass/trunk/imagery/i.eb.evapfr/main.c
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -97,24 +97,24 @@
/***************************************************/
if ((infd_rnet = Rast_open_cell_old(rnet, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), rnet);
- inrast_rnet = Rast_allocate_d_raster_buf();
+ inrast_rnet = Rast_allocate_c_buf();
/***************************************************/
if ((infd_g0 = Rast_open_cell_old(g0, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), g0);
- inrast_g0 = Rast_allocate_d_raster_buf();
+ inrast_g0 = Rast_allocate_c_buf();
/***************************************************/
if ((infd_h0 = Rast_open_cell_old(h0, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), h0);
- inrast_h0 = Rast_allocate_d_raster_buf();
+ inrast_h0 = Rast_allocate_c_buf();
/***************************************************/
nrows = G_window_rows();
ncols = G_window_cols();
- outrast1 = Rast_allocate_d_raster_buf();
+ outrast1 = Rast_allocate_c_buf();
if (makin)
- outrast2 = Rast_allocate_d_raster_buf();
+ outrast2 = Rast_allocate_c_buf();
/* Create New raster files */
if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
Modified: grass/trunk/imagery/i.eb.h_SEBAL01/main.c
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -223,10 +223,10 @@
G_fatal_error(_("Unable to read header of raster map <%s>"), t0dem);
/* Allocate input buffer */
- inrast_Rn = Rast_allocate_d_raster_buf();
- inrast_g0 = Rast_allocate_d_raster_buf();
- inrast_z0m = Rast_allocate_d_raster_buf();
- inrast_t0dem = Rast_allocate_d_raster_buf();
+ inrast_Rn = Rast_allocate_c_buf();
+ inrast_g0 = Rast_allocate_c_buf();
+ inrast_z0m = Rast_allocate_c_buf();
+ inrast_t0dem = Rast_allocate_c_buf();
/***************************************************/
/* Setup pixel location variables */
@@ -245,7 +245,7 @@
/***************************************************/
/* Allocate output buffer */
/***************************************************/
- outrast = Rast_allocate_d_raster_buf();
+ outrast = Rast_allocate_c_buf();
if ((outfd = Rast_open_raster_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-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.eb.soilheatflux/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -95,27 +95,27 @@
if ((infd_albedo = Rast_open_cell_old(albedo, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), albedo);
- inrast_albedo = Rast_allocate_d_raster_buf();
+ inrast_albedo = Rast_allocate_c_buf();
if ((infd_ndvi = Rast_open_cell_old(ndvi, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), ndvi);
- inrast_ndvi = Rast_allocate_d_raster_buf();
+ inrast_ndvi = Rast_allocate_c_buf();
if ((infd_tempk = Rast_open_cell_old(tempk, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), tempk);
- inrast_tempk = Rast_allocate_d_raster_buf();
+ inrast_tempk = Rast_allocate_c_buf();
if ((infd_rnet = Rast_open_cell_old(rnet, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), rnet);
- inrast_rnet = Rast_allocate_d_raster_buf();
+ inrast_rnet = Rast_allocate_c_buf();
if ((infd_time = Rast_open_cell_old(time, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), time);
- inrast_time = Rast_allocate_d_raster_buf();
+ inrast_time = Rast_allocate_c_buf();
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_d_raster_buf();
+ outrast = Rast_allocate_c_buf();
/* Create New raster files */
if ((outfd = Rast_open_raster_new(result,DCELL_TYPE)) < 0)
Modified: grass/trunk/imagery/i.emissivity/main.c
===================================================================
--- grass/trunk/imagery/i.emissivity/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.emissivity/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -64,12 +64,12 @@
/***************************************************/
if ((infd = Rast_open_cell_old(ndvi, "")) < 0)
G_fatal_error(_("Cannot open cell file [%s]"), ndvi);
- inr = Rast_allocate_d_raster_buf();
+ inr = Rast_allocate_c_buf();
/***************************************************/
nrows = G_window_rows();
ncols = G_window_cols();
- outr = Rast_allocate_d_raster_buf();
+ outr = Rast_allocate_c_buf();
/* Create New raster files */
if ((outfd = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
Modified: grass/trunk/imagery/i.evapo.time_integration/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -175,7 +175,7 @@
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);
- inrast[nfiles] = Rast_allocate_raster_buf(in_data_type[nfiles]);
+ inrast[nfiles] = Rast_allocate_buf(in_data_type[nfiles]);
nfiles++;
}
nfiles--;
@@ -208,7 +208,7 @@
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);
- inrast1[nfiles1] = Rast_allocate_raster_buf(in_data_type1[nfiles1]);
+ inrast1[nfiles1] = Rast_allocate_buf(in_data_type1[nfiles1]);
nfiles1++;
}
nfiles1--;
@@ -249,7 +249,7 @@
if ((Rast_get_cellhd(name2, mapset, &cellhd)) < 0) {
G_fatal_error(_("Unable to read file header of raster map <%s>"), name2);
}
- inrast2[nfiles2] = Rast_allocate_d_raster_buf();
+ inrast2[nfiles2] = Rast_allocate_c_buf();
nfiles2++;
}
nfiles2--;
@@ -259,7 +259,7 @@
/* Allocate output buffer, use input map data_type */
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_raster_buf(out_data_type);
+ outrast = Rast_allocate_buf(out_data_type);
/* Create New raster files */
Modified: grass/trunk/imagery/i.fft/main.c
===================================================================
--- grass/trunk/imagery/i.fft/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.fft/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -122,8 +122,8 @@
data = G_malloc(rows * cols * 2 * sizeof(double));
/* allocate the space for one row of cell map data */
- cell_real = Rast_allocate_d_raster_buf();
- cell_imag = Rast_allocate_d_raster_buf();
+ cell_real = Rast_allocate_c_buf();
+ cell_imag = Rast_allocate_c_buf();
#define C(i, j) ((i) * cols + (j))
Modified: grass/trunk/imagery/i.gensig/openfiles.c
===================================================================
--- grass/trunk/imagery/i.gensig/openfiles.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.gensig/openfiles.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -34,7 +34,7 @@
if (files->train_fd < 0)
G_fatal_error(_("Unable to open training map <%s>"),
parms->training_map);
- files->train_cell = Rast_allocate_c_raster_buf();
+ files->train_cell = Rast_allocate_c_buf();
/* open all maps for reading */
for (n = 0; n < Ref.nfiles; n++) {
@@ -43,7 +43,7 @@
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);
- files->band_cell[n] = Rast_allocate_d_raster_buf();
+ files->band_cell[n] = Rast_allocate_c_buf();
}
return 0;
Modified: grass/trunk/imagery/i.gensigset/openfiles.c
===================================================================
--- grass/trunk/imagery/i.gensigset/openfiles.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.gensigset/openfiles.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -34,7 +34,7 @@
if (files->train_fd < 0)
G_fatal_error(_("Unable to open training map <%s>"),
parms->training_map);
- files->train_cell = Rast_allocate_c_raster_buf();
+ files->train_cell = Rast_allocate_c_buf();
/* open all maps for reading */
for (n = 0; n < Ref.nfiles; n++) {
@@ -43,7 +43,7 @@
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);
- files->band_cell[n] = Rast_allocate_d_raster_buf();
+ files->band_cell[n] = Rast_allocate_c_buf();
}
return 0;
Modified: grass/trunk/imagery/i.his.rgb/openfiles.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/openfiles.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.his.rgb/openfiles.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -18,11 +18,11 @@
G_fatal_error(_("Unable to create raster map <%s>"), b_name);
/* allocate the cell row buffer */
- if ((rowbuf[0] = Rast_allocate_cell_buf()) == NULL)
+ if ((rowbuf[0] = Rast_allocate_c_buf()) == NULL)
G_fatal_error(_("Unable to allocate the input row buffer"));
- if ((rowbuf[1] = Rast_allocate_cell_buf()) == NULL)
+ if ((rowbuf[1] = Rast_allocate_c_buf()) == NULL)
G_fatal_error(_("Unable to allocate the input row buffer"));
- if ((rowbuf[2] = Rast_allocate_cell_buf()) == NULL)
+ if ((rowbuf[2] = Rast_allocate_c_buf()) == NULL)
G_fatal_error(_("Unable to allocate the input row buffer"));
/* open input files (maps can be in different mapsets) */
Modified: grass/trunk/imagery/i.ifft/main.c
===================================================================
--- grass/trunk/imagery/i.ifft/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.ifft/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -139,8 +139,8 @@
data = G_malloc(rows * cols * 2 * sizeof(double));
/* allocate the space for one row of cell map data */
- cell_real = Rast_allocate_d_raster_buf();
- cell_imag = Rast_allocate_d_raster_buf();
+ cell_real = Rast_allocate_c_buf();
+ cell_imag = Rast_allocate_c_buf();
#define C(i, j) ((i) * cols + (j))
@@ -168,7 +168,7 @@
G_message(_("Masking raster maps..."));
maskfd = Rast_maskfd();
if (maskfd >= 0) {
- maskbuf = Rast_allocate_cell_buf();
+ maskbuf = Rast_allocate_c_buf();
for (i = 0; i < rows; i++) {
Rast_get_map_row(maskfd, maskbuf, i);
Modified: grass/trunk/imagery/i.latlong/main.c
===================================================================
--- grass/trunk/imagery/i.latlong/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.latlong/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -82,7 +82,7 @@
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);
- inrast = Rast_allocate_d_raster_buf();
+ inrast = Rast_allocate_c_buf();
/***************************************************/
stepx = cellhd.ew_res;
@@ -117,7 +117,7 @@
G_fatal_error(_("Unable to set up lat/long projection parameters"));
} /* End of stolen from r.sun */
- outrast1 = Rast_allocate_d_raster_buf();
+ outrast1 = Rast_allocate_c_buf();
if ((outfd1 = Rast_open_raster_new(result1,DCELL_TYPE)) < 0)
G_fatal_error(_("Could not open <%s>"), result1);
Modified: grass/trunk/imagery/i.maxlik/open.c
===================================================================
--- grass/trunk/imagery/i.maxlik/open.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.maxlik/open.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -35,7 +35,7 @@
cellfd = (int *)G_malloc(Ref.nfiles * sizeof(int));
P = (double *)G_malloc(Ref.nfiles * sizeof(double));
for (n = 0; n < Ref.nfiles; n++) {
- cell[n] = Rast_allocate_d_raster_buf();
+ cell[n] = Rast_allocate_c_buf();
name = Ref.file[n].name;
mapset = Ref.file[n].mapset;
if ((cellfd[n] = Rast_open_cell_old(name, mapset)) < 0)
@@ -66,7 +66,7 @@
if (class_fd < 0)
exit(EXIT_FAILURE);
- class_cell = Rast_allocate_cell_buf();
+ class_cell = Rast_allocate_c_buf();
reject_cell = NULL;
if (reject_name) {
@@ -75,7 +75,7 @@
G_fatal_error(_("Unable to create raster map <%s>"),
reject_name);
else
- reject_cell = Rast_allocate_cell_buf();
+ reject_cell = Rast_allocate_c_buf();
}
return 0;
Modified: grass/trunk/imagery/i.modis.qc/main.c
===================================================================
--- grass/trunk/imagery/i.modis.qc/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.modis.qc/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -202,12 +202,12 @@
if (Rast_get_cellhd(qcchan, "", &cellhd) < 0)
G_fatal_error(_("Unable to read header of raster map <%s> "), qcchan);
- inrast = Rast_allocate_c_raster_buf();
+ inrast = Rast_allocate_c_buf();
G_debug(3, "number of rows %d", cellhd.rows);
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_c_raster_buf();
+ outrast = Rast_allocate_c_buf();
/* Create New raster files */
if ((outfd = Rast_open_raster_new(result, data_type_output)) < 0)
Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.pca/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -244,7 +244,7 @@
/* don't assume each image is of the same type */
if (rowbuf)
G_free(rowbuf);
- if ((rowbuf = Rast_allocate_raster_buf(maptype)) == NULL)
+ if ((rowbuf = Rast_allocate_buf(maptype)) == NULL)
G_fatal_error(_("Unable allocate memory for row buffer"));
G_verbose_message(_("Computing means for band %d..."), i + 1);
@@ -260,12 +260,12 @@
for (col = 0; col < cols; col++) {
/* skip null cells */
if (Rast_is_null_value(rowbuf, maptype)) {
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(maptype));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(maptype));
continue;
}
sum += Rast_get_raster_value_d(rowbuf, maptype);
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(maptype));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(maptype));
}
}
@@ -294,7 +294,7 @@
/* don't assume each image is of the same type */
if (rowbuf1)
G_free(rowbuf1);
- if ((rowbuf1 = Rast_allocate_raster_buf(maptype)) == NULL)
+ if ((rowbuf1 = Rast_allocate_buf(maptype)) == NULL)
G_fatal_error(_("Unable allocate memory for row buffer"));
G_verbose_message(_("Computing row %d of covariance matrix..."),
@@ -314,7 +314,7 @@
/* don't assume each image is of the same type */
if (rowbuf2)
G_free(rowbuf2);
- if ((rowbuf2 = Rast_allocate_raster_buf(maptype2)) == NULL)
+ if ((rowbuf2 = Rast_allocate_buf(maptype2)) == NULL)
G_fatal_error(_("Unable to allocate memory for row buffer"));
if (Rast_get_raster_row(fds[k], rowbuf2, row, maptype2) < 0)
@@ -327,8 +327,8 @@
/* skip null cells */
if (Rast_is_null_value(ptr1, maptype) ||
Rast_is_null_value(ptr2, maptype2)) {
- ptr1 = G_incr_void_ptr(ptr1, Rast_raster_size(maptype));
- ptr2 = G_incr_void_ptr(ptr2, Rast_raster_size(maptype2));
+ ptr1 = G_incr_void_ptr(ptr1, Rast_cell_size(maptype));
+ ptr2 = G_incr_void_ptr(ptr2, Rast_cell_size(maptype2));
continue;
}
@@ -337,8 +337,8 @@
mu[j]) * ((double)Rast_get_raster_value_d(ptr2,
maptype2) - mu[k]);
- ptr1 = G_incr_void_ptr(ptr1, Rast_raster_size(maptype));
- ptr2 = G_incr_void_ptr(ptr2, Rast_raster_size(maptype2));
+ ptr1 = G_incr_void_ptr(ptr1, Rast_cell_size(maptype));
+ ptr2 = G_incr_void_ptr(ptr2, Rast_cell_size(maptype2));
}
covar[k][j] = covar[j][k];
@@ -362,8 +362,8 @@
double new_range = 0.;
int rows = G_window_rows();
int cols = G_window_cols();
- int cell_mapsiz = Rast_raster_size(CELL_TYPE);
- int dcell_mapsiz = Rast_raster_size(DCELL_TYPE);
+ int cell_mapsiz = Rast_cell_size(CELL_TYPE);
+ int dcell_mapsiz = Rast_cell_size(DCELL_TYPE);
DCELL *d_buf;
/* 2 passes for rescale. 1 pass for no rescale */
@@ -373,8 +373,8 @@
d_buf = (DCELL *) G_malloc(cols * sizeof(double));
/* allocate memory for output row buffer */
- outbuf = (scale) ? Rast_allocate_raster_buf(CELL_TYPE) :
- Rast_allocate_raster_buf(DCELL_TYPE);
+ outbuf = (scale) ? Rast_allocate_buf(CELL_TYPE) :
+ Rast_allocate_buf(DCELL_TYPE);
if (!outbuf)
G_fatal_error(_("Unable to allocate memory for raster row"));
@@ -429,7 +429,7 @@
/* don't assume each image is of the same type */
if (rowbuf)
G_free(rowbuf);
- if (!(rowbuf = Rast_allocate_raster_buf(maptype)))
+ if (!(rowbuf = Rast_allocate_buf(maptype)))
G_fatal_error(_("Unable allocate memory for row buffer"));
if (Rast_get_raster_row(inp_fd[j], rowbuf, row, maptype) < 0)
@@ -455,7 +455,7 @@
rowptr =
G_incr_void_ptr(rowptr,
- Rast_raster_size(maptype));
+ Rast_cell_size(maptype));
continue;
}
@@ -506,7 +506,7 @@
G_incr_void_ptr(outptr, dcell_mapsiz);
rowptr =
- G_incr_void_ptr(rowptr, Rast_raster_size(maptype));
+ G_incr_void_ptr(rowptr, Rast_cell_size(maptype));
}
} /* for j = 0 to bands */
Modified: grass/trunk/imagery/i.points/drawcell.c
===================================================================
--- grass/trunk/imagery/i.points/drawcell.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.points/drawcell.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -52,7 +52,7 @@
fd = Rast_open_cell_old(view->cell.name, view->cell.mapset);
if (fd < 0)
return 0;
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
sprintf(msg, "Plotting %s ...", view->cell.name);
Menu_msg(msg);
Modified: grass/trunk/imagery/i.rectify/exec.c
===================================================================
--- grass/trunk/imagery/i.rectify/exec.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.rectify/exec.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -36,7 +36,7 @@
/* allocate the output cell matrix */
cell_buf = (void **)G_calloc(NROWS, sizeof(void *));
- n = NCOLS * Rast_raster_size(map_type);
+ n = NCOLS * Rast_cell_size(map_type);
for (i = 0; i < NROWS; i++) {
cell_buf[i] = (void *)G_malloc(n);
Rast_set_null_value(cell_buf[i], NCOLS, map_type);
Modified: grass/trunk/imagery/i.rectify/perform.c
===================================================================
--- grass/trunk/imagery/i.rectify/perform.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.rectify/perform.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -15,7 +15,7 @@
int idx;
int i;
- rast_size = Rast_raster_size(map_type);
+ rast_size = Rast_cell_size(map_type);
for (row = 0; row < matrix_rows; row++)
Rast_set_null_value(cell_buf[row], matrix_cols, map_type);
Modified: grass/trunk/imagery/i.rectify/rectify.c
===================================================================
--- grass/trunk/imagery/i.rectify/rectify.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.rectify/rectify.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -48,7 +48,7 @@
return 0;
}
map_type = Rast_get_raster_map_type(infd);
- rast = (void *)G_calloc(G_window_cols() + 1, Rast_raster_size(map_type));
+ rast = (void *)G_calloc(G_window_cols() + 1, Rast_cell_size(map_type));
Rast_set_null_value(rast, G_window_cols() + 1, map_type);
G_copy(&win, &target_window, sizeof(win));
Modified: grass/trunk/imagery/i.rectify/write.c
===================================================================
--- grass/trunk/imagery/i.rectify/write.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.rectify/write.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -21,11 +21,11 @@
for (n = 0; n < matrix_rows; n++) {
offset =
((off_t) row++ * target_window.cols +
- col) * Rast_raster_size(map_type);
+ col) * Rast_cell_size(map_type);
lseek(temp_fd, offset, SEEK_SET);
- if (write(temp_fd, cell_buf[n], Rast_raster_size(map_type) * matrix_cols)
- != Rast_raster_size(map_type) * matrix_cols) {
+ if (write(temp_fd, cell_buf[n], Rast_cell_size(map_type) * matrix_cols)
+ != Rast_cell_size(map_type) * matrix_cols) {
unlink(temp_name);
G_fatal_error(_("Error while writing to temp file"));
}
@@ -43,7 +43,7 @@
Rast_set_window(&target_window);
- rast = Rast_allocate_raster_buf(map_type);
+ rast = Rast_allocate_buf(map_type);
close(temp_fd);
temp_fd = open(temp_name, 0);
fd = Rast_open_raster_new(name, map_type);
@@ -52,8 +52,8 @@
G_fatal_error(_("Unable to create raster map <%s>"), name);
for (row = 0; row < target_window.rows; row++) {
- if (read(temp_fd, rast, target_window.cols * Rast_raster_size(map_type))
- != target_window.cols * Rast_raster_size(map_type))
+ if (read(temp_fd, rast, target_window.cols * Rast_cell_size(map_type))
+ != target_window.cols * Rast_cell_size(map_type))
G_fatal_error(_("Error writing row %d"), row);
if (Rast_put_raster_row(fd, rast, map_type) < 0) {
G_fatal_error(_("Failed writing raster map <%s> row %d"),
Modified: grass/trunk/imagery/i.rgb.his/openfiles.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/openfiles.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.rgb.his/openfiles.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -25,10 +25,10 @@
G_fatal_error(_("Unable to create raster map <%s>"), s_name);
/* allocate the cell row buffer */
- if ((rowbuf[0] = Rast_allocate_cell_buf()) == NULL)
+ if ((rowbuf[0] = Rast_allocate_c_buf()) == NULL)
G_fatal_error(_("Unable to allocate the input row buffer"));
- if ((rowbuf[1] = Rast_allocate_cell_buf()) == NULL)
+ if ((rowbuf[1] = Rast_allocate_c_buf()) == NULL)
G_fatal_error(_("Unable to allocate the input row buffer"));
- if ((rowbuf[2] = Rast_allocate_cell_buf()) == NULL)
+ if ((rowbuf[2] = Rast_allocate_c_buf()) == NULL)
G_fatal_error(_("Unable to allocate the input row buffer"));
}
Modified: grass/trunk/imagery/i.smap/openfiles.c
===================================================================
--- grass/trunk/imagery/i.smap/openfiles.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.smap/openfiles.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -23,8 +23,8 @@
parms->subgroup, parms->group);
/* allocate file descriptors, and io buffer */
- files->cellbuf = Rast_allocate_d_raster_buf();
- files->outbuf = Rast_allocate_c_raster_buf();
+ files->cellbuf = Rast_allocate_c_buf();
+ files->outbuf = Rast_allocate_c_buf();
files->isdata = G_malloc(G_window_cols());
files->nbands = Ref.nfiles;
Modified: grass/trunk/imagery/i.sunhours/main.c
===================================================================
--- grass/trunk/imagery/i.sunhours/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.sunhours/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -72,18 +72,18 @@
/***************************************************/
if ((infd_doy = Rast_open_cell_old(doy, "")) < 0)
G_fatal_error(_("Cannot open cell file [%s]"), doy);
- inrast_doy = Rast_allocate_d_raster_buf();
+ inrast_doy = Rast_allocate_c_buf();
/***************************************************/
if ((infd_lat = Rast_open_cell_old(lat, "")) < 0)
G_fatal_error(_("Cannot open cell file [%s]"), lat);
- inrast_lat = Rast_allocate_d_raster_buf();
+ inrast_lat = Rast_allocate_c_buf();
/***************************************************/
nrows = G_window_rows();
ncols = G_window_cols();
- outrast1 = Rast_allocate_d_raster_buf();
+ outrast1 = Rast_allocate_c_buf();
if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
G_fatal_error(_("Could not open <%s>"), result1);
Modified: grass/trunk/imagery/i.vi/main.c
===================================================================
--- grass/trunk/imagery/i.vi/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.vi/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -211,41 +211,41 @@
if ((infd_redchan = Rast_open_cell_old(redchan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), redchan);
- inrast_redchan = Rast_allocate_d_raster_buf();
+ inrast_redchan = Rast_allocate_c_buf();
if (nirchan) {
if ((infd_nirchan = Rast_open_cell_old(nirchan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), nirchan);
- inrast_nirchan = Rast_allocate_d_raster_buf();
+ inrast_nirchan = Rast_allocate_c_buf();
}
if (greenchan) {
if ((infd_greenchan = Rast_open_cell_old(greenchan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), greenchan);
- inrast_greenchan = Rast_allocate_d_raster_buf();
+ inrast_greenchan = Rast_allocate_c_buf();
}
if (bluechan) {
if ((infd_bluechan = Rast_open_cell_old(bluechan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), bluechan);
- inrast_bluechan = Rast_allocate_d_raster_buf();
+ inrast_bluechan = Rast_allocate_c_buf();
}
if (chan5chan) {
if ((infd_chan5chan = Rast_open_cell_old(chan5chan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), chan5chan);
- inrast_chan5chan = Rast_allocate_d_raster_buf();
+ inrast_chan5chan = Rast_allocate_c_buf();
}
if (chan7chan) {
if ((infd_chan7chan = Rast_open_cell_old(chan7chan, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), chan7chan);
- inrast_chan7chan = Rast_allocate_d_raster_buf();
+ inrast_chan7chan = Rast_allocate_c_buf();
}
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_d_raster_buf();
+ outrast = Rast_allocate_c_buf();
/* Create New raster files */
if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
Modified: grass/trunk/imagery/i.vpoints/drawcell.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -62,7 +62,7 @@
fd = Rast_open_cell_old(view->cell.name, view->cell.mapset);
if (fd < 0)
return 0;
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
sprintf(msg, "Displaying %s ...", view->cell.name);
Menu_msg(msg);
Modified: grass/trunk/imagery/i.zc/main.c
===================================================================
--- grass/trunk/imagery/i.zc/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/imagery/i.zc/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -147,7 +147,7 @@
}
/* allocate the space for one row of cell map data */
- cell_row = Rast_allocate_cell_buf();
+ cell_row = Rast_allocate_c_buf();
/* Read in cell map values */
G_message(_("Reading raster map..."));
@@ -175,7 +175,7 @@
if ((zcfd = Rast_open_cell_new(output_map->answer)) < 0)
exit(EXIT_FAILURE);
- cell_row = Rast_allocate_cell_buf();
+ cell_row = Rast_allocate_c_buf();
/* Write out result to a new cell map */
for (i = 0; i < or; i++) {
Modified: grass/trunk/include/raster.h
===================================================================
--- grass/trunk/include/raster.h 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/include/raster.h 2009-06-25 21:10:29 UTC (rev 38082)
@@ -5,12 +5,11 @@
/* --- ANSI prototypes for the lib/raster functions --- */
/* alloc_cell.c */
-size_t Rast_raster_size(RASTER_MAP_TYPE);
-CELL *Rast_allocate_cell_buf(void);
-void *Rast_allocate_raster_buf(RASTER_MAP_TYPE);
-CELL *Rast_allocate_c_raster_buf(void);
-FCELL *Rast_allocate_f_raster_buf(void);
-DCELL *Rast_allocate_d_raster_buf(void);
+size_t Rast_cell_size(RASTER_MAP_TYPE);
+void *Rast_allocate_buf(RASTER_MAP_TYPE);
+CELL *Rast_allocate_c_buf(void);
+FCELL *Rast_allocate_f_buf(void);
+DCELL *Rast_allocate_d_buf(void);
char *Rast_allocate_null_buf(void);
unsigned char *Rast__allocate_null_bits(int);
int Rast__null_bitstream_size(int);
Modified: grass/trunk/lib/display/raster.c
===================================================================
--- grass/trunk/lib/display/raster.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/display/raster.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -106,7 +106,7 @@
if (D__overlay_mode)
for (i = 0; i < ncols; i++) {
set[i] = Rast_is_null_value(array, data_type);
- array = G_incr_void_ptr(array, Rast_raster_size(data_type));
+ array = G_incr_void_ptr(array, Rast_cell_size(data_type));
}
A_row =
@@ -149,9 +149,9 @@
static unsigned char *r_buf, *g_buf, *b_buf, *n_buf;
static int nalloc;
- int r_size = Rast_raster_size(r_type);
- int g_size = Rast_raster_size(g_type);
- int b_size = Rast_raster_size(b_type);
+ int r_size = Rast_cell_size(r_type);
+ int g_size = Rast_cell_size(g_type);
+ int b_size = Rast_cell_size(b_type);
int ncols = src[0][1] - src[0][0];
int i;
Modified: grass/trunk/lib/gis/alloc.c
===================================================================
--- grass/trunk/lib/gis/alloc.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/gis/alloc.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -145,7 +145,7 @@
*
* Now
\code
- rast = G_incr_void_ptr(rast, Rast_raster_size(data_type))
+ rast = G_incr_void_ptr(rast, Rast_cell_size(data_type))
\endcode
*
* (where rast is void* and <i>data_type</i> is RASTER_MAP_TYPE can be
@@ -153,7 +153,7 @@
*
* Very useful to generalize the row processing - loop i.e.
* \code
- * void * buf_ptr += Rast_raster_size(data_type)
+ * void * buf_ptr += Rast_cell_size(data_type)
* \endcode
*
* \param ptr pointer
Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/gpde/N_arrays_io.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -93,7 +93,7 @@
("N_read_rast_to_array_2d: the data array size is different from the current region settings");
}
- rast = Rast_allocate_raster_buf(type);
+ rast = Rast_allocate_buf(type);
G_message(_("Reading raster map <%s> into memory"), name);
@@ -106,7 +106,7 @@
}
for (x = 0, ptr = rast; x < cols;
- x++, ptr = G_incr_void_ptr(ptr, Rast_raster_size(type))) {
+ x++, ptr = G_incr_void_ptr(ptr, Rast_cell_size(type))) {
if (type == CELL_TYPE) {
if (Rast_is_c_null_value(ptr)) {
N_put_array_2d_value_null(data, x, y);
@@ -204,11 +204,11 @@
G_fatal_error(_("Unable to create raster map <%s>"), name);
if (type == CELL_TYPE)
- rast = Rast_allocate_raster_buf(type);
+ rast = Rast_allocate_buf(type);
if (type == FCELL_TYPE)
- frast = Rast_allocate_raster_buf(type);
+ frast = Rast_allocate_buf(type);
if (type == DCELL_TYPE)
- drast = Rast_allocate_raster_buf(type);
+ drast = Rast_allocate_buf(type);
G_message(_("Write 2d array to raster map <%s>"), name);
Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/ogsf/Gs3.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -842,7 +842,7 @@
map_type = Rast_get_raster_map_type(fd);
if (map_type == CELL_TYPE) {
- buf = Rast_allocate_c_raster_buf();
+ buf = Rast_allocate_c_buf();
if (Rast_get_c_raster_row(fd, buf, drow) < 0) {
sprintf(catstr, "error");
@@ -861,7 +861,7 @@
else {
/* fp map */
- dbuf = Rast_allocate_d_raster_buf();
+ dbuf = Rast_allocate_c_buf();
if (Rast_get_d_raster_row(fd, dbuf, drow) < 0) {
sprintf(catstr, "error");
Modified: grass/trunk/lib/raster/alloc_cell.c
===================================================================
--- grass/trunk/lib/raster/alloc_cell.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/alloc_cell.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -23,7 +23,7 @@
static const int type_size[3] = { sizeof(CELL), sizeof(FCELL), sizeof(DCELL) };
/*!
- * \brief Returns size of a raster CELL in bytes.
+ * \brief Returns size of a raster cell in bytes.
*
* - If <i>data_type</i> is CELL_TYPE, returns sizeof(CELL)
* - If <i>data_type</i> is FCELL_TYPE, returns sizeof(FCELL)
@@ -34,39 +34,12 @@
* \return raster type size
*/
-size_t Rast_raster_size(RASTER_MAP_TYPE data_type)
+size_t Rast_cell_size(RASTER_MAP_TYPE data_type)
{
return (type_size[F2I(data_type)]);
}
/*!
- * \brief Allocate memory for a CELL type raster map.
- *
- * This routine allocates a buffer of type CELL just large enough to
- * hold one row of raster data based on the number of columns in the
- * active region.
- *
- \code
- CELL *cell;
- cell = Rast_allocate_cell_buf();
- \endcode
- *
- * If larger buffers are required, the routine G_malloc() can be used.
- * The routine is generally used with each open cell file.
- *
- * <b>Note:</b> Rast_allocate_raster_buf() or G_alloc_c_raster_buf() is
- * preferred over Rast_allocate_cell_buf().
- *
- * Prints error message and calls exit() on error.
- *
- * \return CELL * pointer to allocated buffer
- */
-CELL *Rast_allocate_cell_buf(void)
-{
- return (CELL *) G_calloc(G_window_cols() + 1, sizeof(CELL));
-}
-
-/*!
* \brief Allocate memory for a raster map of given type
*
* Allocate an array of CELL, FCELL, or DCELL (depending on
@@ -77,20 +50,37 @@
*
* \return pointer to allocated buffer
*/
-void *Rast_allocate_raster_buf(RASTER_MAP_TYPE data_type)
+void *Rast_allocate_buf(RASTER_MAP_TYPE data_type)
{
- return (void *)G_calloc(G_window_cols() + 1, Rast_raster_size(data_type));
+ return (void *)G_calloc(G_window_cols() + 1, Rast_cell_size(data_type));
}
/*!
* \brief Allocates memory for a raster map of type CELL.
*
+/*!
+ * \brief Allocate memory for a CELL type raster map.
+ *
* Allocate an array of CELL based on the number of columns in the
* current region.
*
+ * This routine allocates a buffer of type CELL just large enough to
+ * hold one row of raster data based on the number of columns in the
+ * active region.
+ *
+ \code
+ CELL *cell;
+ cell = Rast_allocate_c_buf();
+ \endcode
+ *
+ * If larger buffers are required, the routine G_malloc() can be used.
+ * The routine is generally used with each open cell file.
+ *
+ * Prints error message and calls exit() on error.
+ *
* \return pointer to allocated buffer
*/
-CELL *Rast_allocate_c_raster_buf(void)
+CELL *Rast_allocate_c_buf(void)
{
return (CELL *) G_calloc(G_window_cols() + 1, sizeof(CELL));
}
@@ -103,7 +93,7 @@
*
* \return pointer to allocated buffer
*/
-FCELL *Rast_allocate_f_raster_buf(void)
+FCELL *Rast_allocate_f_buf(void)
{
return (FCELL *) G_calloc(G_window_cols() + 1, sizeof(FCELL));
}
@@ -116,7 +106,7 @@
*
* \return pointer to allocated buffer
*/
-DCELL *Rast_allocate_d_raster_buf(void)
+DCELL *Rast_allocate_d_buf(void)
{
return (DCELL *) G_calloc(G_window_cols() + 1, sizeof(DCELL));
}
Modified: grass/trunk/lib/raster/auto_mask.c
===================================================================
--- grass/trunk/lib/raster/auto_mask.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/auto_mask.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -68,7 +68,7 @@
return 0;
}
- /* R__.mask_buf = Rast_allocate_cell_buf(); */
+ /* R__.mask_buf = Rast_allocate_c_buf(); */
R__.auto_mask = 1;
Modified: grass/trunk/lib/raster/cats.c
===================================================================
--- grass/trunk/lib/raster/cats.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/cats.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -634,7 +634,7 @@
if (i > pcats->ncats)
return -1;
pcats->marks[i]++;
- rast_row = G_incr_void_ptr(rast_row, Rast_raster_size(data_type));
+ rast_row = G_incr_void_ptr(rast_row, Rast_cell_size(data_type));
}
return 1;
}
Modified: grass/trunk/lib/raster/color_look.c
===================================================================
--- grass/trunk/lib/raster/color_look.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/color_look.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -280,7 +280,7 @@
for (; n-- > 0;
ptr =
- G_incr_void_ptr(ptr, Rast_raster_size(data_type)), red++, grn++, blu++,
+ G_incr_void_ptr(ptr, Rast_cell_size(data_type)), red++, grn++, blu++,
*set++ = found) {
/* if the cell is the same as last one, use the prev color values */
if (ptr != raster && Rast_raster_cmp(ptr, last_ptr, data_type) == 0) {
Modified: grass/trunk/lib/raster/get_row.c
===================================================================
--- grass/trunk/lib/raster/get_row.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/get_row.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -639,7 +639,7 @@
int null_is_zero, int with_mask)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
- int size = Rast_raster_size(data_type);
+ int size = Rast_cell_size(data_type);
CELL *temp_buf = NULL;
void *buf;
int type;
@@ -1099,7 +1099,7 @@
static void get_null_value_row_gdal(int fd, char *flags, int row)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
- DCELL *tmp_buf = Rast_allocate_d_raster_buf();
+ DCELL *tmp_buf = Rast_allocate_c_buf();
int i;
if (get_map_row_nomask(fd, tmp_buf, row, DCELL_TYPE) <= 0) {
@@ -1183,7 +1183,7 @@
is not set and calls G_set_[f/d]_null_value() otherwise */
Rast__set_null_value(buf, 1, null_is_zero, map_type);
}
- buf = G_incr_void_ptr(buf, Rast_raster_size(map_type));
+ buf = G_incr_void_ptr(buf, Rast_cell_size(map_type));
}
G__freea(null_buf);
Modified: grass/trunk/lib/raster/get_row_colr.c
===================================================================
--- grass/trunk/lib/raster/get_row_colr.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/get_row_colr.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -43,7 +43,7 @@
{
int cols = G_window_cols();
int type = Rast_get_raster_map_type(fd);
- int size = Rast_raster_size(type);
+ int size = Rast_cell_size(type);
void *array;
unsigned char *set;
void *p;
Modified: grass/trunk/lib/raster/null_val.c
===================================================================
--- grass/trunk/lib/raster/null_val.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/null_val.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -81,7 +81,7 @@
RASTER_MAP_TYPE data_type)
{
if (null_is_zero) {
- G_zero((char *)rast, numVals * Rast_raster_size(data_type));
+ G_zero((char *)rast, numVals * Rast_cell_size(data_type));
return;
}
Modified: grass/trunk/lib/raster/opencell.c
===================================================================
--- grass/trunk/lib/raster/opencell.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/opencell.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -118,7 +118,7 @@
Rast__check_for_auto_masking();
/*
if(R__.auto_mask <= 0)
- R__.mask_buf = Rast_allocate_cell_buf();
+ R__.mask_buf = Rast_allocate_c_buf();
now we don't ever free it!, so no need to allocate it (Olga)
*/
/* mask_buf is used for reading MASK file when mask is set and
@@ -511,7 +511,7 @@
fcb->cellhd = R__.window;
fcb->cellhd.compressed = 0;
- fcb->nbytes = Rast_raster_size(fcb->map_type);
+ fcb->nbytes = Rast_cell_size(fcb->map_type);
/* for writing fcb->data is allocated to be R__.window.cols *
sizeof(CELL or DCELL or FCELL) */
fcb->data = G_calloc(R__.window.cols, fcb->nbytes);
@@ -627,7 +627,7 @@
/* for writing fcb->data is allocated to be R__.window.cols *
sizeof(CELL or DCELL or FCELL) */
fcb->data = (unsigned char *)G_calloc(R__.window.cols,
- Rast_raster_size(fcb->map_type));
+ Rast_cell_size(fcb->map_type));
/*
* copy current window into cell header
Modified: grass/trunk/lib/raster/put_row.c
===================================================================
--- grass/trunk/lib/raster/put_row.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/put_row.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -571,7 +571,7 @@
{
#ifdef HAVE_GDAL
struct fileinfo *fcb = &R__.fileinfo[fd];
- int size = Rast_raster_size(map_type);
+ int size = Rast_cell_size(map_type);
DCELL null_val = fcb->gdal->null_val;
const void *src;
void *work_buf, *dst;
Modified: grass/trunk/lib/raster/range.c
===================================================================
--- grass/trunk/lib/raster/range.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/range.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -483,7 +483,7 @@
}
if (Rast_is_null_value(rast, data_type)) {
- rast = G_incr_void_ptr(rast, Rast_raster_size(data_type));
+ rast = G_incr_void_ptr(rast, Rast_cell_size(data_type));
continue;
}
if (range->first_time) {
@@ -498,7 +498,7 @@
range->max = val;
}
- rast = G_incr_void_ptr(rast, Rast_raster_size(data_type));
+ rast = G_incr_void_ptr(rast, Rast_cell_size(data_type));
}
}
Modified: grass/trunk/lib/raster/raster.c
===================================================================
--- grass/trunk/lib/raster/raster.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/raster.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -74,7 +74,7 @@
*/
void Rast_raster_cpy(void *v1, const void *v2, int n, RASTER_MAP_TYPE data_type)
{
- G_copy(v1, v2, n * Rast_raster_size(data_type));
+ G_copy(v1, v2, n * Rast_cell_size(data_type));
}
/*!
Modified: grass/trunk/lib/raster/sample.c
===================================================================
--- grass/trunk/lib/raster/sample.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/sample.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -95,7 +95,7 @@
{
int row, col;
DCELL result;
- DCELL *maprow = Rast_allocate_d_raster_buf();
+ DCELL *maprow = Rast_allocate_c_buf();
/* convert northing and easting to row and col, resp */
row = (int)floor(G_northing_to_row(north, window));
@@ -153,8 +153,8 @@
{
int row, col;
double grid[2][2];
- DCELL *arow = Rast_allocate_d_raster_buf();
- DCELL *brow = Rast_allocate_d_raster_buf();
+ DCELL *arow = Rast_allocate_c_buf();
+ DCELL *brow = Rast_allocate_c_buf();
double frow, fcol, trow, tcol;
DCELL result;
@@ -247,7 +247,7 @@
DCELL result;
for (i = 0; i < 4; i++)
- rows[i] = Rast_allocate_d_raster_buf();
+ rows[i] = Rast_allocate_c_buf();
frow = G_northing_to_row(north, window);
fcol = G_easting_to_col(east, window);
Modified: grass/trunk/lib/raster/set_window.c
===================================================================
--- grass/trunk/lib/raster/set_window.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/set_window.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -97,7 +97,7 @@
/* opened for writing */
G_free (fcb->data);
fcb->data = (unsigned char *) G_calloc (R__.window.cols,
- Rast_raster_size(fcb->map_type));
+ Rast_cell_size(fcb->map_type));
}
/* allocate null bitstream buffers for reading/writing null rows */
Modified: grass/trunk/lib/raster/zero_cell.c
===================================================================
--- grass/trunk/lib/raster/zero_cell.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/raster/zero_cell.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -19,7 +19,7 @@
*
* This routines assigns each member of the raster buffer array
* <i>buf</i> to zero. It assumes that <i>buf</i> has been allocated
- * using Rast_allocate_cell_buf().
+ * using Rast_allocate_c_buf().
*
* \param buf data buffer
*/
@@ -37,7 +37,7 @@
*
* This routines assigns each member of the raster buffer array
* <i>rast</i> to zero. It assumes that <i>rast</i> has been allocated
- * using Rast_allocate_cell_buf().
+ * using Rast_allocate_c_buf().
*
* \param rast data buffer
* \param data_type raster type (CELL, FCELL, DCELL)
@@ -48,7 +48,7 @@
unsigned char *ptr;
/* assuming that the size of unsigned char is 1 byte */
- i = G_window_cols() * Rast_raster_size(data_type);
+ i = G_window_cols() * Rast_cell_size(data_type);
ptr = (unsigned char *)rast;
while (i--)
Modified: grass/trunk/lib/rst/interp_float/input2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/input2d.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/rst/interp_float/input2d.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -36,7 +36,7 @@
struct BM *bitmask;
if ((MASKfd = Rast_maskfd()) >= 0)
- MASK = Rast_allocate_cell_buf();
+ MASK = Rast_allocate_c_buf();
else
MASK = NULL;
@@ -49,7 +49,7 @@
G_fatal_error(_("Mask raster map <%s> not found"),
params->maskmap);
- cellmask = Rast_allocate_cell_buf();
+ cellmask = Rast_allocate_c_buf();
cfmask = Rast_open_cell_old(params->maskmap, mapsetm);
}
else
Modified: grass/trunk/lib/rst/interp_float/output2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/output2d.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/rst/interp_float/output2d.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -56,7 +56,7 @@
|| (params->mcurv != NULL));
cond1 = ((params->slope != NULL) || (params->aspect != NULL) || cond2);
- cell1 = Rast_allocate_f_raster_buf();
+ cell1 = Rast_allocate_f_buf();
/*
* G_set_embedded_null_value_mode(1);
Modified: grass/trunk/lib/rst/interp_float/resout2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -64,7 +64,7 @@
}
mapset = G_mapset();
- cell1 = Rast_allocate_f_raster_buf();
+ cell1 = Rast_allocate_f_buf();
if (params->elev != NULL) {
cf1 = Rast_open_fp_cell_new(params->elev);
Modified: grass/trunk/lib/rst/interp_float/ressegm2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/ressegm2d.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/lib/rst/interp_float/ressegm2d.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -499,9 +499,9 @@
if (!cellinp)
- cellinp = Rast_allocate_f_raster_buf();
+ cellinp = Rast_allocate_f_buf();
if (!cellsmooth)
- cellsmooth = Rast_allocate_f_raster_buf();
+ cellsmooth = Rast_allocate_f_buf();
for (m1 = 0; m1 <= last_row - first_row; m1++) {
ret_val =
Modified: grass/trunk/ps/ps.map/outl_io.c
===================================================================
--- grass/trunk/ps/ps.map/outl_io.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/ps/ps.map/outl_io.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -68,7 +68,7 @@
G_fatal_error(_("Unable to open raster map <%s>"), cell_name);
map_type = Rast_get_raster_map_type(in_file_d);
- raster_size = Rast_raster_size(map_type);
+ raster_size = Rast_cell_size(map_type);
first_read = 1;
last_read = 0;
row_count = 0;
Modified: grass/trunk/ps/ps.map/ps_outline.c
===================================================================
--- grass/trunk/ps/ps.map/ps_outline.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/ps/ps.map/ps_outline.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -114,7 +114,7 @@
bottom = 1; /* line from raster map */
scan_length = read_next();
k = 0;
- raster_size = Rast_raster_size(map_type);
+ raster_size = Rast_cell_size(map_type);
while (read_next()) { /* read rest of file, one row at *//* a time */
n1 = G_row_to_northing((double)row - 1., &(PS.w));
n2 = G_row_to_northing((double)row, &(PS.w));
Modified: grass/trunk/ps/ps.map/ps_raster.c
===================================================================
--- grass/trunk/ps/ps.map/ps_raster.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/ps/ps.map/ps_raster.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -36,7 +36,7 @@
return 0;
}
if (maskfd >= 0)
- maskbuf = Rast_allocate_cell_buf();
+ maskbuf = Rast_allocate_c_buf();
/* if masked, open a file to hold the PostScript mask data */
if (maskfd >= 0 && PS.mask_needed) {
@@ -109,7 +109,7 @@
/* build the image RGB string */
if (PS.do_raster) {
map_type = Rast_get_raster_map_type(PS.cell_fd);
- cellbuf = Rast_allocate_raster_buf(map_type);
+ cellbuf = Rast_allocate_buf(map_type);
n = 0;
for (row = 0; row < PS.w.rows; row++) {
Rast_get_raster_row(PS.cell_fd, cellbuf, row, map_type);
@@ -139,7 +139,7 @@
}
ptr =
G_incr_void_ptr(ptr,
- Rast_raster_size(map_type) *
+ Rast_cell_size(map_type) *
PS.col_delta);
}
}
@@ -150,7 +150,7 @@
for (i = 0; i < 3; i++) {
grp_map_type[i] = Rast_get_raster_map_type(grp.fd[i]);
- cbuf[i] = Rast_allocate_raster_buf(grp_map_type[i]);
+ cbuf[i] = Rast_allocate_buf(grp_map_type[i]);
}
n = 0;
for (row = 0; row < PS.w.rows; row++) {
@@ -171,7 +171,7 @@
if (i == 2)
b = bb;
cptr[i] = G_incr_void_ptr(cptr[i],
- Rast_raster_size(grp_map_type
+ Rast_cell_size(grp_map_type
[0]) *
PS.col_delta);
}
Modified: grass/trunk/raster/r.bitpattern/main.c
===================================================================
--- grass/trunk/raster/r.bitpattern/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.bitpattern/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -107,12 +107,12 @@
G_fatal_error(_("Unable to read header of raster map <%s>"), name);
/* Allocate input buffer */
- inrast = Rast_allocate_raster_buf(data_type);
+ inrast = Rast_allocate_buf(data_type);
/* Allocate output buffer, use input map data_type */
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_raster_buf(data_type);
+ outrast = Rast_allocate_buf(data_type);
if ((outfd = Rast_open_raster_new(result, data_type)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), result);
Modified: grass/trunk/raster/r.buffer/read_map.c
===================================================================
--- grass/trunk/raster/r.buffer/read_map.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.buffer/read_map.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -42,7 +42,7 @@
if (fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"), input);
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
ptr = map;
Modified: grass/trunk/raster/r.buffer/write_map.c
===================================================================
--- grass/trunk/raster/r.buffer/write_map.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.buffer/write_map.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -45,7 +45,7 @@
if (fd_in < 0)
G_fatal_error(_("Unable to open raster map <%s>"), output);
}
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
G_message(_("Writing output raster map <%s>..."), output);
ptr = map;
Modified: grass/trunk/raster/r.carve/enforce_ds.c
===================================================================
--- grass/trunk/raster/r.carve/enforce_ds.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.carve/enforce_ds.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -74,7 +74,7 @@
/* allocate and clear memory for entire raster */
rbuf =
G_calloc(G_window_rows() * G_window_cols(),
- Rast_raster_size(parm->raster_type));
+ Rast_cell_size(parm->raster_type));
/* first read whole elevation file into buf */
read_raster(rbuf, infd, parm->raster_type);
Modified: grass/trunk/raster/r.carve/raster.c
===================================================================
--- grass/trunk/raster/r.carve/raster.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.carve/raster.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -17,7 +17,7 @@
Rast_get_raster_row(fd, tmpbuf, i, rtype);
tmpbuf =
- G_incr_void_ptr(tmpbuf, Rast_raster_size(rtype) * G_window_cols());
+ G_incr_void_ptr(tmpbuf, Rast_cell_size(rtype) * G_window_cols());
}
return tmpbuf;
@@ -37,7 +37,7 @@
Rast_put_raster_row(fd, tmpbuf, rtype);
tmpbuf =
- G_incr_void_ptr(tmpbuf, Rast_raster_size(rtype) * G_window_cols());
+ G_incr_void_ptr(tmpbuf, Rast_cell_size(rtype) * G_window_cols());
}
return tmpbuf;
Modified: grass/trunk/raster/r.category/cats.c
===================================================================
--- grass/trunk/raster/r.category/cats.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.category/cats.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -45,7 +45,7 @@
name, mapset);
nrows = G_window_rows();
ncols = G_window_cols();
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
Rast_init_cell_stats(&statf);
/* read the raster map */
Modified: grass/trunk/raster/r.colors/stats.c
===================================================================
--- grass/trunk/raster/r.colors/stats.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.colors/stats.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -34,7 +34,7 @@
G_fatal_error(_("Unable to open raster map <%s>"),
G_fully_qualified_name(name, mapset));
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
nrows = G_window_rows();
ncols = G_window_cols();
@@ -67,7 +67,7 @@
G_fatal_error("Unable to open raster map <%s>",
G_fully_qualified_name(name, mapset));
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/raster/r.composite/main.c
===================================================================
--- grass/trunk/raster/r.composite/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.composite/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -157,7 +157,7 @@
b->type = Rast_get_raster_map_type(b->file);
- b->size = Rast_raster_size(b->type);
+ b->size = Rast_cell_size(b->type);
/* Reading color lookup table */
if (Rast_read_colors(b->name, "", &b->colors) == -1)
@@ -184,7 +184,7 @@
if ((out_file = Rast_open_cell_new(out_name)) < 0)
G_fatal_error(_("Unable to create raster map <%s>"), out_name);
- out_array = Rast_allocate_cell_buf();
+ out_array = Rast_allocate_c_buf();
/* Make color table */
make_color_cube(&out_colors);
Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.compress/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -211,7 +211,7 @@
if (new < 0)
return 1;
nrows = G_window_rows();
- rast = Rast_allocate_raster_buf(map_type);
+ rast = Rast_allocate_buf(map_type);
oldsize = lseek(old, (off_t) 0, SEEK_END);
Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.cost/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -356,7 +356,7 @@
G_fatal_error(_("Unable to open raster map <%s>"), cost_layer);
data_type = Rast_get_raster_map_type(cost_fd);
- cell = Rast_allocate_raster_buf(data_type);
+ cell = Rast_allocate_buf(data_type);
/* Parameters for map submatrices */
@@ -422,7 +422,7 @@
int i;
double p;
- dsize = Rast_raster_size(data_type);
+ dsize = Rast_cell_size(data_type);
p = 0.0;
for (row = 0; row < nrows; row++) {
@@ -639,9 +639,9 @@
data_type2 = Rast_get_raster_map_type(fd);
- dsize2 = Rast_raster_size(data_type2);
+ dsize2 = Rast_cell_size(data_type2);
- cell2 = Rast_allocate_raster_buf(data_type2);
+ cell2 = Rast_allocate_buf(data_type2);
if (!cell2)
G_fatal_error(_("Unable to allocate memory"));
@@ -981,7 +981,7 @@
if (dir == 1) {
dir_fd = Rast_open_raster_new(move_dir_layer, dir_data_type);
- dir_cell = Rast_allocate_raster_buf(dir_data_type);
+ dir_cell = Rast_allocate_buf(dir_data_type);
}
/* Write pending updates by segment_put() to output map */
@@ -995,7 +995,7 @@
G_message(_("Writing raster map <%s>..."), cum_cost_layer);
if (keep_nulls) {
- cell2 = Rast_allocate_raster_buf(data_type);
+ cell2 = Rast_allocate_buf(data_type);
}
if (data_type == CELL_TYPE) {
Modified: grass/trunk/raster/r.covar/main.c
===================================================================
--- grass/trunk/raster/r.covar/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.covar/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -74,7 +74,7 @@
sum2 = (double **)G_malloc(nfiles * sizeof(double *));
for (i = 0; i < nfiles; i++) {
sum2[i] = (double *)G_calloc(nfiles, sizeof(double));
- dcell[i] = Rast_allocate_d_raster_buf();
+ dcell[i] = Rast_allocate_c_buf();
name = maps->answers[i];
fd[i] = Rast_open_cell_old(name, "");
if (fd[i] < 0)
Modified: grass/trunk/raster/r.cross/cross.c
===================================================================
--- grass/trunk/raster/r.cross/cross.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.cross/cross.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -39,7 +39,7 @@
/* allocate i/o buffers for each raster map */
for (i = 0; i < nfiles; i++)
- cell[i] = Rast_allocate_cell_buf();
+ cell[i] = Rast_allocate_c_buf();
result_cell = cell[0];
/* initialize the reclass table */
Modified: grass/trunk/raster/r.cross/renumber.c
===================================================================
--- grass/trunk/raster/r.cross/renumber.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.cross/renumber.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -28,7 +28,7 @@
CELL *cell, *c;
int row, col;
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
G_message(_("%s: STEP 3 ... "), G_program_name());
for (row = 0; row < nrows; row++) {
Modified: grass/trunk/raster/r.describe/describe.c
===================================================================
--- grass/trunk/raster/r.describe/describe.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.describe/describe.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -58,7 +58,7 @@
map_type = CELL_TYPE; /* read as int */
/* allocate the cell buffer */
- buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
if (map_type != CELL_TYPE && range)
/* this will make it report fp range */
Modified: grass/trunk/raster/r.distance/distance.c
===================================================================
--- grass/trunk/raster/r.distance/distance.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.distance/distance.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -90,12 +90,12 @@
mapset = G_find_cell2(name1, "");
maptype1 = Rast_raster_map_type(name1, mapset);
mapd1 = Rast_open_cell_old(name1, mapset);
- inrast1 = Rast_allocate_raster_buf(maptype1);
+ inrast1 = Rast_allocate_buf(maptype1);
mapset = G_find_cell2(name2, "");
maptype2 = Rast_raster_map_type(name2, mapset);
mapd2 = Rast_open_cell_old(name2, mapset);
- inrast2 = Rast_allocate_raster_buf(maptype2);
+ inrast2 = Rast_allocate_buf(maptype2);
G_message(_("Reading maps <%s,%s> while finding 0 distance ..."), name1,
name2);
Modified: grass/trunk/raster/r.drain/main.c
===================================================================
--- grass/trunk/raster/r.drain/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.drain/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -360,7 +360,7 @@
Rast_close_cell(map_id);
if (costmode == 1) {
- dir_buf = Rast_allocate_d_raster_buf();
+ dir_buf = Rast_allocate_c_buf();
dir_id = Rast_open_cell_old(dir_name, "");
tempfile3 = G_tempfile();
dir_fd = open(tempfile3, O_RDWR | O_CREAT, 0666);
@@ -417,7 +417,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);
- out_buf = Rast_allocate_c_raster_buf();
+ out_buf = Rast_allocate_c_buf();
/* mark each cell */
thispoint = list;
@@ -578,7 +578,7 @@
CELL direction;
CELL *dir;
- dir = Rast_allocate_c_raster_buf();
+ dir = Rast_allocate_c_buf();
next_row = list->row;
next_col = list->col;
@@ -644,7 +644,7 @@
DCELL direction;
DCELL *dir_buf;
- dir_buf = Rast_allocate_d_raster_buf();
+ dir_buf = Rast_allocate_c_buf();
next_row = list->row;
next_col = list->col;
Modified: grass/trunk/raster/r.drain/tinf.c
===================================================================
--- grass/trunk/raster/r.drain/tinf.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.drain/tinf.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -231,17 +231,17 @@
/* Allocate memory for one line of data */
void *get_buf_c(void)
{
- return (void *)Rast_allocate_c_raster_buf();
+ return (void *)Rast_allocate_c_buf();
}
void *get_buf_f(void)
{
- return (void *)Rast_allocate_f_raster_buf();
+ return (void *)Rast_allocate_f_buf();
}
void *get_buf_d(void)
{
- return (void *)Rast_allocate_d_raster_buf();
+ return (void *)Rast_allocate_c_buf();
}
/* initialize memory to a minimum value */
Modified: grass/trunk/raster/r.fill.dir/main.c
===================================================================
--- grass/trunk/raster/r.fill.dir/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.fill.dir/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -250,7 +250,7 @@
G_free(bnd.b[1]);
G_free(bnd.b[2]);
- out_buf = Rast_allocate_c_raster_buf();
+ out_buf = Rast_allocate_c_buf();
bufsz = ncols * sizeof(CELL);
lseek(fe, 0, SEEK_SET);
Modified: grass/trunk/raster/r.fill.dir/tinf.c
===================================================================
--- grass/trunk/raster/r.fill.dir/tinf.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.fill.dir/tinf.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -212,17 +212,17 @@
/* Allocate memory for one line of data */
void *get_buf_c()
{
- return (void *)Rast_allocate_c_raster_buf();
+ return (void *)Rast_allocate_c_buf();
}
void *get_buf_f()
{
- return (void *)Rast_allocate_f_raster_buf();
+ return (void *)Rast_allocate_f_buf();
}
void *get_buf_d()
{
- return (void *)Rast_allocate_d_raster_buf();
+ return (void *)Rast_allocate_c_buf();
}
/* initialize memory to a minimum value */
Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.flow/io.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -111,7 +111,7 @@
if (parm.barin) {
G_message(_("Reading input files: barrier"));
- barc = Rast_allocate_d_raster_buf();
+ barc = Rast_allocate_c_buf();
fd = open_existing_cell_file(parm.barin, &hd);
for (row = 0; row < region.rows; row++) {
Modified: grass/trunk/raster/r.flow/main.c
===================================================================
--- grass/trunk/raster/r.flow/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.flow/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -308,7 +308,7 @@
/* double x, y, length, xstep, ystep, roffset, coffset; */
double x, y, length, xstep, ystep;
- FCELL *lg = Rast_allocate_f_raster_buf();
+ FCELL *lg = Rast_allocate_f_buf();
struct line_pnts *points = Vect_new_line_struct();
struct line_cats *cats = Vect_new_cats_struct();
int loopstep = (!parm.dsout && !parm.lgout && parm.flout) ? parm.skip : 1;
Modified: grass/trunk/raster/r.flow/mem.c
===================================================================
--- grass/trunk/raster/r.flow/mem.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.flow/mem.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -76,10 +76,10 @@
if (!parm.mem) {
G_debug(1, "Allocating memory: aspect");
as.buf = (DCELL **) G_calloc(region.rows, sizeof(DCELL *));
- as.buf[0] = (DCELL *) Rast_allocate_raster_buf(DCELL_TYPE);
+ as.buf[0] = (DCELL *) Rast_allocate_buf(DCELL_TYPE);
for (row = 0; row < region.rows; row++)
as.buf[row] = parm.seg ?
- as.buf[0] : (DCELL *) Rast_allocate_raster_buf(DCELL_TYPE);
+ as.buf[0] : (DCELL *) Rast_allocate_buf(DCELL_TYPE);
}
if (parm.barin) {
@@ -90,10 +90,10 @@
if (parm.dsout) {
G_debug(1, "Allocating memory: density");
ds.buf = (DCELL **) G_calloc(region.rows, sizeof(DCELL *));
- ds.buf[0] = (DCELL *) Rast_allocate_raster_buf(DCELL_TYPE);
+ ds.buf[0] = (DCELL *) Rast_allocate_buf(DCELL_TYPE);
for (row = 0; row < region.rows; row++)
ds.buf[row] = parm.seg ?
- ds.buf[0] : (DCELL *) Rast_allocate_raster_buf(DCELL_TYPE);
+ ds.buf[0] : (DCELL *) Rast_allocate_buf(DCELL_TYPE);
}
if (parm.flout) {
Modified: grass/trunk/raster/r.grow/main.c
===================================================================
--- grass/trunk/raster/r.grow/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.grow/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -213,9 +213,9 @@
in_rows = G_malloc((size * 2 + 1) * sizeof(DCELL *));
for (row = 0; row <= size * 2; row++)
- in_rows[row] = Rast_allocate_d_raster_buf();
+ in_rows[row] = Rast_allocate_c_buf();
- out_row = Rast_allocate_d_raster_buf();
+ out_row = Rast_allocate_c_buf();
for (row = 0; row < size; row++)
Rast_get_d_raster_row(in_fd, in_rows[size + row], row);
Modified: grass/trunk/raster/r.grow.distance/main.c
===================================================================
--- grass/trunk/raster/r.grow.distance/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.grow.distance/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -234,20 +234,20 @@
xres = window.ew_res;
yres = window.ns_res;
- in_row = Rast_allocate_d_raster_buf();
+ in_row = Rast_allocate_c_buf();
- old_val_row = Rast_allocate_d_raster_buf();
- new_val_row = Rast_allocate_d_raster_buf();
+ old_val_row = Rast_allocate_c_buf();
+ new_val_row = Rast_allocate_c_buf();
- old_x_row = Rast_allocate_c_raster_buf();
- old_y_row = Rast_allocate_c_raster_buf();
- new_x_row = Rast_allocate_c_raster_buf();
- new_y_row = Rast_allocate_c_raster_buf();
+ old_x_row = Rast_allocate_c_buf();
+ old_y_row = Rast_allocate_c_buf();
+ new_x_row = Rast_allocate_c_buf();
+ new_y_row = Rast_allocate_c_buf();
- dist_row = Rast_allocate_d_raster_buf();
+ dist_row = Rast_allocate_c_buf();
if (dist_name && strcmp(opt.met->answer, "euclidean") == 0)
- out_row = Rast_allocate_d_raster_buf();
+ out_row = Rast_allocate_c_buf();
else
out_row = dist_row;
Modified: grass/trunk/raster/r.his/main.c
===================================================================
--- grass/trunk/raster/r.his/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.his/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -206,9 +206,9 @@
b_used = 1;
}
- r_array = Rast_allocate_cell_buf();
- g_array = Rast_allocate_cell_buf();
- b_array = Rast_allocate_cell_buf();
+ r_array = Rast_allocate_c_buf();
+ g_array = Rast_allocate_c_buf();
+ b_array = Rast_allocate_c_buf();
/* Make color table */
make_gray_scale(&gray_colors);
Modified: grass/trunk/raster/r.horizon/main.c
===================================================================
--- grass/trunk/raster/r.horizon/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.horizon/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -537,7 +537,7 @@
int l, i, j, k;
int lmax, kmax;
- cell1 = Rast_allocate_f_raster_buf();
+ cell1 = Rast_allocate_f_buf();
z = (float **)G_malloc(sizeof(float *) * (m));
z100 = (float **)G_malloc(sizeof(float *) * (m100));
@@ -617,7 +617,7 @@
exit(EXIT_FAILURE);
if (horizon != NULL) {
- cell1 = Rast_allocate_f_raster_buf();
+ cell1 = Rast_allocate_f_buf();
fd1 = Rast_open_fp_cell_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-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.in.arc/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -141,13 +141,13 @@
switch (rtype) {
case CELL_TYPE:
- cell = Rast_allocate_c_raster_buf();
+ cell = Rast_allocate_c_buf();
break;
case FCELL_TYPE:
- fcell = Rast_allocate_f_raster_buf();
+ fcell = Rast_allocate_f_buf();
break;
case DCELL_TYPE:
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
break;
}
cf = Rast_open_raster_new(output, rtype);
Modified: grass/trunk/raster/r.in.ascii/main.c
===================================================================
--- grass/trunk/raster/r.in.ascii/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.in.ascii/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -200,7 +200,7 @@
G_window_cols());
- rast_ptr = Rast_allocate_raster_buf(data_type);
+ rast_ptr = Rast_allocate_buf(data_type);
rast = rast_ptr;
cf = Rast_open_raster_new(output, data_type);
if (cf < 0)
@@ -226,9 +226,9 @@
else {
Rast_set_null_value(rast_ptr, 1, data_type);
}
- rast_ptr = G_incr_void_ptr(rast_ptr, Rast_raster_size(data_type));
+ rast_ptr = G_incr_void_ptr(rast_ptr, Rast_cell_size(data_type));
}
- fwrite(rast, Rast_raster_size(data_type), ncols, ft);
+ fwrite(rast, Rast_cell_size(data_type), ncols, ft);
rast_ptr = rast;
}
G_percent(nrows, nrows, 2);
@@ -236,7 +236,7 @@
sz = 0;
if (direction < 0) {
- sz = -ncols * Rast_raster_size(data_type);
+ sz = -ncols * Rast_cell_size(data_type);
fseek(ft, sz, SEEK_END);
sz *= 2;
}
@@ -245,7 +245,7 @@
}
for (row = 0; row < nrows; row += 1) {
- fread(rast, Rast_raster_size(data_type), ncols, ft);
+ fread(rast, Rast_cell_size(data_type), ncols, ft);
Rast_put_raster_row(cf, rast, data_type);
fseek(ft, sz, SEEK_CUR);
}
Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.in.bin/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -482,14 +482,14 @@
if (flag.f->answer) {
map_type = FCELL_TYPE;
- fcell = Rast_allocate_f_raster_buf();
+ fcell = Rast_allocate_f_buf();
}
else if (flag.d->answer) {
map_type = DCELL_TYPE;
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
}
else {
- cell = Rast_allocate_c_raster_buf();
+ cell = Rast_allocate_c_buf();
map_type = CELL_TYPE;
}
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.in.gdal/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -738,8 +738,8 @@
if (cfI < 0)
G_fatal_error(_("Unable to create raster map <%s>"), outputImg);
- cellReal = Rast_allocate_raster_buf(data_type);
- cellImg = Rast_allocate_raster_buf(data_type);
+ cellReal = Rast_allocate_buf(data_type);
+ cellImg = Rast_allocate_buf(data_type);
bufComplex = (float *)G_malloc(sizeof(float) * ncols * 2);
if (group_ref != NULL) {
@@ -755,7 +755,7 @@
if (group_ref != NULL)
I_add_file_to_group_ref((char *)output, G_mapset(), group_ref);
- cell = Rast_allocate_raster_buf(data_type);
+ cell = Rast_allocate_buf(data_type);
}
/* -------------------------------------------------------------------- */
Modified: grass/trunk/raster/r.in.mat/main.c
===================================================================
--- grass/trunk/raster/r.in.mat/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.in.mat/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -295,21 +295,21 @@
G_debug(1, " double map");
map_type = DCELL_TYPE;
array_data =
- G_calloc(mrows * (ncols + 1), Rast_raster_size(map_type));
+ G_calloc(mrows * (ncols + 1), Rast_cell_size(map_type));
fread(array_data, sizeof(double), mrows * ncols, fp1);
break;
case 1:
G_debug(1, " float map");
map_type = FCELL_TYPE;
array_data =
- G_calloc(mrows * (ncols + 1), Rast_raster_size(map_type));
+ G_calloc(mrows * (ncols + 1), Rast_cell_size(map_type));
fread(array_data, sizeof(float), mrows * ncols, fp1);
break;
case 2:
G_debug(1, " int map");
map_type = CELL_TYPE;
array_data =
- G_calloc(mrows * (ncols + 1), Rast_raster_size(map_type));
+ G_calloc(mrows * (ncols + 1), Rast_cell_size(map_type));
fread(array_data, sizeof(int), mrows * ncols, fp1);
break;
default:
@@ -407,7 +407,7 @@
G_verbose_message("");
/* prep memory */
- raster = Rast_allocate_raster_buf(map_type);
+ raster = Rast_allocate_buf(map_type);
cf = Rast_open_raster_new(map_name, map_type);
if (cf < 0)
@@ -426,7 +426,7 @@
array_ptr =
G_incr_void_ptr(array_ptr,
(row +
- col * mrows) * Rast_raster_size(map_type));
+ col * mrows) * Rast_cell_size(map_type));
if (is_nan(array_ptr, map_type))
Rast_set_null_value(rastline_ptr, 1, map_type);
@@ -453,7 +453,7 @@
}
}
rastline_ptr =
- G_incr_void_ptr(rastline_ptr, Rast_raster_size(map_type));
+ G_incr_void_ptr(rastline_ptr, Rast_cell_size(map_type));
}
#ifdef DEBUG
@@ -465,7 +465,7 @@
else
fprintf(stderr, "+");
rastline_ptr =
- G_incr_void_ptr(rastline_ptr, Rast_raster_size(map_type));
+ G_incr_void_ptr(rastline_ptr, Rast_cell_size(map_type));
}
fprintf(stderr, "]\n");
#endif
Modified: grass/trunk/raster/r.in.poly/raster.c
===================================================================
--- grass/trunk/raster/r.in.poly/raster.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.in.poly/raster.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -82,7 +82,7 @@
break;
}
if (format != USE_CELL)
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
at_row = 0;
configure_plot();
Modified: grass/trunk/raster/r.in.xyz/main.c
===================================================================
--- grass/trunk/raster/r.in.xyz/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.in.xyz/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -430,18 +430,18 @@
if (!scan_flag->answer) {
/* allocate memory (test for enough before we start) */
if (bin_n)
- n_array = G_calloc(rows * (cols + 1), Rast_raster_size(CELL_TYPE));
+ n_array = G_calloc(rows * (cols + 1), Rast_cell_size(CELL_TYPE));
if (bin_min)
- min_array = G_calloc(rows * (cols + 1), Rast_raster_size(rtype));
+ min_array = G_calloc(rows * (cols + 1), Rast_cell_size(rtype));
if (bin_max)
- max_array = G_calloc(rows * (cols + 1), Rast_raster_size(rtype));
+ max_array = G_calloc(rows * (cols + 1), Rast_cell_size(rtype));
if (bin_sum)
- sum_array = G_calloc(rows * (cols + 1), Rast_raster_size(rtype));
+ sum_array = G_calloc(rows * (cols + 1), Rast_cell_size(rtype));
if (bin_sumsq)
- sumsq_array = G_calloc(rows * (cols + 1), Rast_raster_size(rtype));
+ sumsq_array = G_calloc(rows * (cols + 1), Rast_cell_size(rtype));
if (bin_index)
index_array =
- G_calloc(rows * (cols + 1), Rast_raster_size(CELL_TYPE));
+ G_calloc(rows * (cols + 1), Rast_cell_size(CELL_TYPE));
/* and then free it again */
if (bin_n)
@@ -518,7 +518,7 @@
estimated_lines = -1;
/* allocate memory for a single row of output data */
- raster_row = Rast_allocate_raster_buf(rtype);
+ raster_row = Rast_allocate_buf(rtype);
G_message(_("Scanning data ..."));
@@ -544,33 +544,33 @@
if (bin_n) {
G_debug(2, "allocating n_array");
- n_array = G_calloc(rows * (cols + 1), Rast_raster_size(CELL_TYPE));
+ n_array = G_calloc(rows * (cols + 1), Rast_cell_size(CELL_TYPE));
blank_array(n_array, rows, cols, CELL_TYPE, 0);
}
if (bin_min) {
G_debug(2, "allocating min_array");
- min_array = G_calloc(rows * (cols + 1), Rast_raster_size(rtype));
+ min_array = G_calloc(rows * (cols + 1), Rast_cell_size(rtype));
blank_array(min_array, rows, cols, rtype, -1); /* fill with NULLs */
}
if (bin_max) {
G_debug(2, "allocating max_array");
- max_array = G_calloc(rows * (cols + 1), Rast_raster_size(rtype));
+ max_array = G_calloc(rows * (cols + 1), Rast_cell_size(rtype));
blank_array(max_array, rows, cols, rtype, -1); /* fill with NULLs */
}
if (bin_sum) {
G_debug(2, "allocating sum_array");
- sum_array = G_calloc(rows * (cols + 1), Rast_raster_size(rtype));
+ sum_array = G_calloc(rows * (cols + 1), Rast_cell_size(rtype));
blank_array(sum_array, rows, cols, rtype, 0);
}
if (bin_sumsq) {
G_debug(2, "allocating sumsq_array");
- sumsq_array = G_calloc(rows * (cols + 1), Rast_raster_size(rtype));
+ sumsq_array = G_calloc(rows * (cols + 1), Rast_cell_size(rtype));
blank_array(sumsq_array, rows, cols, rtype, 0);
}
if (bin_index) {
G_debug(2, "allocating index_array");
index_array =
- G_calloc(rows * (cols + 1), Rast_raster_size(CELL_TYPE));
+ G_calloc(rows * (cols + 1), Rast_cell_size(CELL_TYPE));
blank_array(index_array, rows, cols, CELL_TYPE, -1); /* fill with NULLs */
}
@@ -693,7 +693,7 @@
ptr =
G_incr_void_ptr(ptr,
((arr_row * cols) +
- arr_col) * Rast_raster_size(CELL_TYPE));
+ arr_col) * Rast_cell_size(CELL_TYPE));
if (Rast_is_null_value(ptr, CELL_TYPE)) { /* first node */
head_id = new_node();
@@ -724,44 +724,44 @@
case METHOD_N: /* n is a straight copy */
Rast_raster_cpy(raster_row,
n_array +
- (row * cols * Rast_raster_size(CELL_TYPE)), cols,
+ (row * cols * Rast_cell_size(CELL_TYPE)), cols,
CELL_TYPE);
break;
case METHOD_MIN:
Rast_raster_cpy(raster_row,
- min_array + (row * cols * Rast_raster_size(rtype)),
+ min_array + (row * cols * Rast_cell_size(rtype)),
cols, rtype);
break;
case METHOD_MAX:
Rast_raster_cpy(raster_row,
- max_array + (row * cols * Rast_raster_size(rtype)),
+ max_array + (row * cols * Rast_cell_size(rtype)),
cols, rtype);
break;
case METHOD_SUM:
Rast_raster_cpy(raster_row,
- sum_array + (row * cols * Rast_raster_size(rtype)),
+ sum_array + (row * cols * Rast_cell_size(rtype)),
cols, rtype);
break;
case METHOD_RANGE: /* (max-min) */
ptr = raster_row;
for (col = 0; col < cols; col++) {
- offset = (row * cols + col) * Rast_raster_size(rtype);
+ offset = (row * cols + col) * Rast_cell_size(rtype);
min = Rast_get_raster_value_d(min_array + offset, rtype);
max = Rast_get_raster_value_d(max_array + offset, rtype);
Rast_set_raster_value_d(ptr, max - min, rtype);
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(rtype));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(rtype));
}
break;
case METHOD_MEAN: /* (sum / n) */
ptr = raster_row;
for (col = 0; col < cols; col++) {
- offset = (row * cols + col) * Rast_raster_size(rtype);
- n_offset = (row * cols + col) * Rast_raster_size(CELL_TYPE);
+ offset = (row * cols + col) * Rast_cell_size(rtype);
+ n_offset = (row * cols + col) * Rast_cell_size(CELL_TYPE);
n = Rast_get_raster_value_c(n_array + n_offset, CELL_TYPE);
sum = Rast_get_raster_value_d(sum_array + offset, rtype);
@@ -770,7 +770,7 @@
else
Rast_set_raster_value_d(ptr, (sum / n), rtype);
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(rtype));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(rtype));
}
break;
@@ -779,8 +779,8 @@
case METHOD_COEFF_VAR: /* 100 * stdev / mean */
ptr = raster_row;
for (col = 0; col < cols; col++) {
- offset = (row * cols + col) * Rast_raster_size(rtype);
- n_offset = (row * cols + col) * Rast_raster_size(CELL_TYPE);
+ offset = (row * cols + col) * Rast_cell_size(rtype);
+ n_offset = (row * cols + col) * Rast_cell_size(CELL_TYPE);
n = Rast_get_raster_value_c(n_array + n_offset, CELL_TYPE);
sum = Rast_get_raster_value_d(sum_array + offset, rtype);
sumsq = Rast_get_raster_value_d(sumsq_array + offset, rtype);
@@ -805,13 +805,13 @@
rtype);
}
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(rtype));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(rtype));
}
break;
case METHOD_MEDIAN: /* median, if only one point in cell we will use that */
ptr = raster_row;
for (col = 0; col < cols; col++) {
- n_offset = (row * cols + col) * Rast_raster_size(CELL_TYPE);
+ n_offset = (row * cols + col) * Rast_cell_size(CELL_TYPE);
if (Rast_is_null_value(index_array + n_offset, CELL_TYPE)) /* no points in cell */
Rast_set_null_value(ptr, 1, rtype);
else { /* one or more points in cell */
@@ -853,13 +853,13 @@
Rast_set_raster_value_d(ptr, z, rtype);
}
}
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(rtype));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(rtype));
}
break;
case METHOD_PERCENTILE: /* rank = (pth*(n+1))/100; interpolate linearly */
ptr = raster_row;
for (col = 0; col < cols; col++) {
- n_offset = (row * cols + col) * Rast_raster_size(CELL_TYPE);
+ n_offset = (row * cols + col) * Rast_cell_size(CELL_TYPE);
if (Rast_is_null_value(index_array + n_offset, CELL_TYPE)) /* no points in cell */
Rast_set_null_value(ptr, 1, rtype);
else {
@@ -897,13 +897,13 @@
z = (z + nodes[node_id].z) / 2;
Rast_set_raster_value_d(ptr, z, rtype);
}
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(rtype));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(rtype));
}
break;
case METHOD_SKEWNESS: /* skewness = sum(xi-mean)^3/(N-1)*s^3 */
ptr = raster_row;
for (col = 0; col < cols; col++) {
- n_offset = (row * cols + col) * Rast_raster_size(CELL_TYPE);
+ n_offset = (row * cols + col) * Rast_cell_size(CELL_TYPE);
if (Rast_is_null_value(index_array + n_offset, CELL_TYPE)) /* no points in cell */
Rast_set_null_value(ptr, 1, rtype);
else {
@@ -945,13 +945,13 @@
}
Rast_set_raster_value_d(ptr, skew, rtype);
}
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(rtype));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(rtype));
}
break;
case METHOD_TRIMMEAN:
ptr = raster_row;
for (col = 0; col < cols; col++) {
- n_offset = (row * cols + col) * Rast_raster_size(CELL_TYPE);
+ n_offset = (row * cols + col) * Rast_cell_size(CELL_TYPE);
if (Rast_is_null_value(index_array + n_offset, CELL_TYPE)) /* no points in cell */
Rast_set_null_value(ptr, 1, rtype);
else {
@@ -1002,7 +1002,7 @@
}
Rast_set_raster_value_d(ptr, mean, rtype);
}
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(rtype));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(rtype));
}
break;
Modified: grass/trunk/raster/r.in.xyz/support.c
===================================================================
--- grass/trunk/raster/r.in.xyz/support.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.in.xyz/support.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -17,7 +17,7 @@
{
return G_incr_void_ptr(array,
((row * (size_t) cols) +
- col) * Rast_raster_size(map_type));
+ col) * Rast_cell_size(map_type));
}
int blank_array(void *array, int nrows, int ncols, RASTER_MAP_TYPE map_type,
@@ -38,7 +38,7 @@
for (row = 0; row < nrows; row++) {
for (col = 0; col < ncols; col++) {
Rast_set_raster_value_c(ptr, 0, map_type);
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(map_type));
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(map_type));
}
}
break;
Modified: grass/trunk/raster/r.le/r.le.patch/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -933,7 +933,7 @@
a row of the MASK, if there is a MASK */
if (fmask > 0)
- row_buf = Rast_allocate_raster_buf(CELL_TYPE);
+ row_buf = Rast_allocate_buf(CELL_TYPE);
/* main loop for clipping & measuring
using the moving-window */
@@ -1006,7 +1006,7 @@
maps; the map location is adjusted to the center
of the moving window */
- tmp_buf = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf = Rast_allocate_buf(DCELL_TYPE);
nulltmp = Rast_allocate_null_buf();
if (choice->att[1]) {
@@ -1024,7 +1024,7 @@
Rast_put_d_raster_row(a1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(a1, tmp_buf2);
@@ -1047,7 +1047,7 @@
Rast_put_d_raster_row(a2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(a2, tmp_buf2);
@@ -1069,7 +1069,7 @@
Rast_put_d_raster_row(a3, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(a3, tmp_buf2);
@@ -1091,7 +1091,7 @@
Rast_put_d_raster_row(a4, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(a4, tmp_buf2);
@@ -1113,7 +1113,7 @@
Rast_put_d_raster_row(a5, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(a5, tmp_buf2);
@@ -1135,7 +1135,7 @@
Rast_put_d_raster_row(a6, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(a6, tmp_buf2);
@@ -1157,7 +1157,7 @@
Rast_put_d_raster_row(a7, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(a7, tmp_buf2);
@@ -1179,7 +1179,7 @@
Rast_put_d_raster_row(s1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(s1, tmp_buf2);
@@ -1201,7 +1201,7 @@
Rast_put_d_raster_row(s2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(s2, tmp_buf2);
@@ -1223,7 +1223,7 @@
Rast_put_d_raster_row(s3, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(s3, tmp_buf2);
@@ -1245,7 +1245,7 @@
Rast_put_d_raster_row(s4, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(s4, tmp_buf2);
@@ -1267,7 +1267,7 @@
Rast_put_d_raster_row(s5, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(s5, tmp_buf2);
@@ -1289,7 +1289,7 @@
Rast_put_d_raster_row(s6, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(s6, tmp_buf2);
@@ -1311,7 +1311,7 @@
Rast_put_d_raster_row(c1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c1, tmp_buf2);
@@ -1333,7 +1333,7 @@
Rast_put_d_raster_row(c2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c2, tmp_buf2);
@@ -1355,7 +1355,7 @@
Rast_put_d_raster_row(c3, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c3, tmp_buf2);
@@ -1377,7 +1377,7 @@
Rast_put_d_raster_row(c4, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c4, tmp_buf2);
@@ -1399,7 +1399,7 @@
Rast_put_d_raster_row(c5, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c5, tmp_buf2);
@@ -1421,7 +1421,7 @@
Rast_put_d_raster_row(c6, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c6, tmp_buf2);
@@ -1443,7 +1443,7 @@
Rast_put_d_raster_row(c7, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c7, tmp_buf2);
@@ -1465,7 +1465,7 @@
Rast_put_d_raster_row(c8, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c8, tmp_buf2);
@@ -1487,7 +1487,7 @@
Rast_put_d_raster_row(c9, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c9, tmp_buf2);
@@ -1509,7 +1509,7 @@
Rast_put_d_raster_row(c10, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(c10, tmp_buf2);
@@ -1531,7 +1531,7 @@
Rast_put_d_raster_row(h1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(h1, tmp_buf2);
@@ -1553,7 +1553,7 @@
Rast_put_d_raster_row(h2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(h2, tmp_buf2);
@@ -1575,7 +1575,7 @@
Rast_put_d_raster_row(h3, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(h3, tmp_buf2);
@@ -1597,7 +1597,7 @@
Rast_put_d_raster_row(h4, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(h4, tmp_buf2);
@@ -1619,7 +1619,7 @@
Rast_put_d_raster_row(h5, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(h5, tmp_buf2);
@@ -1641,7 +1641,7 @@
Rast_put_d_raster_row(h6, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(h6, tmp_buf2);
@@ -1663,7 +1663,7 @@
Rast_put_d_raster_row(n1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(n1, tmp_buf2);
@@ -1685,7 +1685,7 @@
Rast_put_d_raster_row(p1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(p1, tmp_buf2);
@@ -1707,7 +1707,7 @@
Rast_put_d_raster_row(p2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(p2, tmp_buf2);
@@ -1729,7 +1729,7 @@
Rast_put_d_raster_row(p3, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(p3, tmp_buf2);
@@ -1751,7 +1751,7 @@
Rast_put_d_raster_row(p4, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(p4, tmp_buf2);
@@ -1773,7 +1773,7 @@
Rast_put_d_raster_row(p5, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(p5, tmp_buf2);
@@ -1795,7 +1795,7 @@
Rast_put_d_raster_row(p6, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(p6, tmp_buf2);
@@ -1818,7 +1818,7 @@
Rast_put_d_raster_row(a8, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(a8, tmp_buf2);
@@ -1841,7 +1841,7 @@
Rast_put_d_raster_row(s7, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(s7, tmp_buf2);
@@ -1864,7 +1864,7 @@
Rast_put_d_raster_row(s8, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(s8, tmp_buf2);
@@ -1887,7 +1887,7 @@
Rast_put_d_raster_row(n2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(n2, tmp_buf2);
@@ -1910,7 +1910,7 @@
Rast_put_d_raster_row(n3, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(n3, tmp_buf2);
@@ -1933,7 +1933,7 @@
Rast_put_d_raster_row(n4, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(n4, tmp_buf2);
@@ -2703,7 +2703,7 @@
strcpy(unitname, "units_");
strcat(unitname, istr);
fd = Rast_open_raster_new(unitname, CELL_TYPE);
- unit_buf = Rast_allocate_raster_buf(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);
Rast_set_null_value(unit_buf, wind.cols + 1, CELL_TYPE);
@@ -2818,7 +2818,7 @@
else {
regcnt = 0;
fr = Rast_open_cell_old(choice->reg, G_mapset());
- row_buf = Rast_allocate_raster_buf(CELL_TYPE);
+ row_buf = Rast_allocate_buf(CELL_TYPE);
for (i = 0; i < nrows; i++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
Rast_get_raster_row(fr, row_buf, i, 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-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.le/r.le.patch/trace.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -113,7 +113,7 @@
buf = (DCELL **) G_calloc(nrows + 3, sizeof(DCELL *));
for (i = 0; i < nrows + 3; i++) {
- buf[i] = (DCELL *) Rast_allocate_raster_buf(DCELL_TYPE);
+ buf[i] = (DCELL *) Rast_allocate_buf(DCELL_TYPE);
}
@@ -123,7 +123,7 @@
null_buf = (DCELL **) G_calloc(nrows + 3, sizeof(DCELL *));
for (i = 0; i < nrows + 3; i++)
- null_buf[i] = (DCELL *) Rast_allocate_raster_buf(DCELL_TYPE);
+ null_buf[i] = (DCELL *) Rast_allocate_buf(DCELL_TYPE);
/* if a map of patch cores was requested,
@@ -134,7 +134,7 @@
if (choice->coremap) {
cor = (DCELL **) G_calloc(nrows + 3, sizeof(DCELL *));
for (i = 0; i < nrows + 3; i++) {
- cor[i] = (DCELL *) Rast_allocate_raster_buf(DCELL_TYPE);
+ cor[i] = (DCELL *) Rast_allocate_buf(DCELL_TYPE);
}
for (i = 0; i < nrows + 3; i++) {
Rast_set_null_value(cor[i], ncols + 3, DCELL_TYPE);
@@ -148,7 +148,7 @@
if (choice->patchmap) {
pat = (CELL **) G_calloc(nrows + 3, sizeof(CELL *));
for (i = 0; i < nrows + 3; i++)
- pat[i] = (CELL *) Rast_allocate_raster_buf(CELL_TYPE);
+ pat[i] = (CELL *) Rast_allocate_buf(CELL_TYPE);
}
/* clip out the sampling area */
@@ -209,7 +209,7 @@
switch (data_type) {
case CELL_TYPE:
- cor_cell_buf = Rast_allocate_raster_buf(CELL_TYPE);
+ cor_cell_buf = Rast_allocate_buf(CELL_TYPE);
fe = Rast_open_raster_new("interior", CELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(cor_cell_buf, CELL_TYPE);
@@ -223,7 +223,7 @@
}
break;
case FCELL_TYPE:
- cor_fcell_buf = Rast_allocate_raster_buf(FCELL_TYPE);
+ cor_fcell_buf = Rast_allocate_buf(FCELL_TYPE);
fe = Rast_open_raster_new("interior", FCELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(cor_fcell_buf, FCELL_TYPE);
@@ -236,7 +236,7 @@
}
break;
case DCELL_TYPE:
- cor_dcell_buf = Rast_allocate_raster_buf(DCELL_TYPE);
+ cor_dcell_buf = Rast_allocate_buf(DCELL_TYPE);
fe = Rast_open_raster_new("interior", DCELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(cor_dcell_buf, DCELL_TYPE);
@@ -257,7 +257,7 @@
if (choice->patchmap) {
fd = Rast_open_raster_new("num", CELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
- pat_buf = Rast_allocate_raster_buf(CELL_TYPE);
+ pat_buf = Rast_allocate_buf(CELL_TYPE);
Rast_zero_raster_buf(pat_buf, CELL_TYPE);
for (j = 1; j < ncols + 1; j++)
*(pat_buf + j - 1) = *(*(pat + i) + j);
@@ -376,7 +376,7 @@
void *rast1, *rast2;
rast1 = cor_cell_buf;
- rast2 = G_incr_void_ptr(rast1, Rast_raster_size(CELL_TYPE));
+ rast2 = G_incr_void_ptr(rast1, Rast_cell_size(CELL_TYPE));
while (Rast_next_cell_stat(rast1, &count, &stats))
Rast_set_raster_cat(rast1, rast2, Rast_get_raster_cat(rast1, &cats,
CELL_TYPE),
@@ -540,7 +540,7 @@
" *******************************************************\n");
exit(EXIT_FAILURE);
}
- tmp1 = Rast_allocate_raster_buf(CELL_TYPE);
+ tmp1 = Rast_allocate_buf(CELL_TYPE);
Rast_zero_raster_buf(tmp1, CELL_TYPE);
fprintf(stderr, "Analyzing region number %d...\n", index);
}
@@ -555,15 +555,15 @@
switch (data_type) {
case CELL_TYPE:
- tmp = Rast_allocate_raster_buf(CELL_TYPE);
+ tmp = Rast_allocate_buf(CELL_TYPE);
tmpname = "tmp";
break;
case FCELL_TYPE:
- ftmp = Rast_allocate_raster_buf(FCELL_TYPE);
+ ftmp = Rast_allocate_buf(FCELL_TYPE);
tmpname = "ftmp";
break;
case DCELL_TYPE:
- dtmp = Rast_allocate_raster_buf(DCELL_TYPE);
+ dtmp = Rast_allocate_buf(DCELL_TYPE);
tmpname = "dtmp";
break;
}
@@ -629,17 +629,17 @@
case CELL_TYPE:
rastptr = tmp;
for (x = 0; x < col0; x++)
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(CELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(CELL_TYPE));
break;
case FCELL_TYPE:
rastptr = ftmp;
for (x = 0; x < col0; x++)
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(FCELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(FCELL_TYPE));
break;
case DCELL_TYPE:
rastptr = dtmp;
for (x = 0; x < col0; x++)
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(DCELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(DCELL_TYPE));
break;
}
@@ -667,7 +667,7 @@
else
*(*(null_buf + i + 1 - row0) + j + 1 - col0) = 1.0;
}
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(CELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(CELL_TYPE));
break;
case FCELL_TYPE:
@@ -683,7 +683,7 @@
else
*(*(null_buf + i + 1 - row0) + j + 1 - col0) = 1.0;
}
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(FCELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(FCELL_TYPE));
break;
case DCELL_TYPE:
@@ -699,7 +699,7 @@
else
*(*(null_buf + i + 1 - row0) + j + 1 - col0) = 1.0;
}
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(CELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(CELL_TYPE));
break;
}
@@ -996,7 +996,7 @@
patchmap = (CELL **) G_calloc(nrows + 3, sizeof(CELL *));
for (m = 0; m < nrows + 3; m++)
- patchmap[m] = (CELL *) Rast_allocate_raster_buf(CELL_TYPE);
+ patchmap[m] = (CELL *) Rast_allocate_buf(CELL_TYPE);
/* print on the screen a message indicating
that tracing has reached a certain patch */
Modified: grass/trunk/raster/r.le/r.le.pixel/cellclip.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/cellclip.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.le/r.le.pixel/cellclip.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -290,7 +290,7 @@
" *******************************************************\n");
exit(1);
}
- tmp1 = Rast_allocate_raster_buf(CELL_TYPE);
+ tmp1 = Rast_allocate_buf(CELL_TYPE);
Rast_zero_raster_buf(tmp1, CELL_TYPE);
fprintf(stderr, "Analyzing region number %d...\n", index);
}
@@ -302,15 +302,15 @@
switch (data_type) {
case CELL_TYPE:
- tmp = Rast_allocate_raster_buf(CELL_TYPE);
+ tmp = Rast_allocate_buf(CELL_TYPE);
tmpname = "tmp";
break;
case FCELL_TYPE:
- ftmp = Rast_allocate_raster_buf(FCELL_TYPE);
+ ftmp = Rast_allocate_buf(FCELL_TYPE);
tmpname = "ftmp";
break;
case DCELL_TYPE:
- dtmp = Rast_allocate_raster_buf(DCELL_TYPE);
+ dtmp = Rast_allocate_buf(DCELL_TYPE);
tmpname = "dtmp";
break;
}
Modified: grass/trunk/raster/r.le/r.le.pixel/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -400,7 +400,7 @@
there is a mask */
if (fmask > 0)
- row_buf = Rast_allocate_raster_buf(CELL_TYPE);
+ row_buf = Rast_allocate_buf(CELL_TYPE);
if (choice->edg[2] || choice->jux[0]) {
@@ -423,13 +423,13 @@
switch (data_type) {
case CELL_TYPE:
- tmp = Rast_allocate_raster_buf(CELL_TYPE);
+ tmp = Rast_allocate_buf(CELL_TYPE);
break;
case FCELL_TYPE:
- ftmp = Rast_allocate_raster_buf(FCELL_TYPE);
+ ftmp = Rast_allocate_buf(FCELL_TYPE);
break;
case DCELL_TYPE:
- dtmp = Rast_allocate_raster_buf(DCELL_TYPE);
+ dtmp = Rast_allocate_buf(DCELL_TYPE);
break;
}
@@ -578,7 +578,7 @@
maps; the map location is adjusted to the center
of the moving window */
- tmp_buf = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf = Rast_allocate_buf(DCELL_TYPE);
nulltmp = Rast_allocate_null_buf();
if (choice->att[1]) {
@@ -596,7 +596,7 @@
Rast_put_d_raster_row(b1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(b1, tmp_buf2);
@@ -618,7 +618,7 @@
Rast_put_d_raster_row(b2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(b2, tmp_buf2);
@@ -640,7 +640,7 @@
Rast_put_d_raster_row(b3, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(b3, tmp_buf2);
@@ -662,7 +662,7 @@
Rast_put_d_raster_row(b4, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(b4, tmp_buf2);
@@ -684,7 +684,7 @@
Rast_put_d_raster_row(d1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(d1, tmp_buf2);
@@ -706,7 +706,7 @@
Rast_put_d_raster_row(d2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(d2, tmp_buf2);
@@ -728,7 +728,7 @@
Rast_put_d_raster_row(d3, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(d3, tmp_buf2);
@@ -750,7 +750,7 @@
Rast_put_d_raster_row(d4, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(d4, tmp_buf2);
@@ -772,7 +772,7 @@
Rast_put_d_raster_row(t1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(t1, tmp_buf2);
@@ -794,7 +794,7 @@
Rast_put_d_raster_row(t2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(t2, tmp_buf2);
@@ -816,7 +816,7 @@
Rast_put_d_raster_row(t3, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(t3, tmp_buf2);
@@ -838,7 +838,7 @@
Rast_put_d_raster_row(t4, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(t4, tmp_buf2);
@@ -860,7 +860,7 @@
Rast_put_d_raster_row(t5, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(t5, tmp_buf2);
@@ -882,7 +882,7 @@
Rast_put_d_raster_row(j1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(j1, tmp_buf2);
@@ -904,7 +904,7 @@
Rast_put_d_raster_row(j2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(j2, tmp_buf2);
@@ -926,7 +926,7 @@
Rast_put_d_raster_row(e1, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(e1, tmp_buf2);
@@ -948,7 +948,7 @@
Rast_put_d_raster_row(e2, tmp_buf);
}
if (i == nr - 1) {
- tmp_buf2 = Rast_allocate_raster_buf(DCELL_TYPE);
+ tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
Rast_put_d_raster_row(e2, tmp_buf2);
@@ -1346,13 +1346,13 @@
switch (data_type) {
case CELL_TYPE:
- tmp = Rast_allocate_raster_buf(CELL_TYPE);
+ tmp = Rast_allocate_buf(CELL_TYPE);
break;
case FCELL_TYPE:
- ftmp = Rast_allocate_raster_buf(FCELL_TYPE);
+ ftmp = Rast_allocate_buf(FCELL_TYPE);
break;
case DCELL_TYPE:
- dtmp = Rast_allocate_raster_buf(DCELL_TYPE);
+ dtmp = Rast_allocate_buf(DCELL_TYPE);
break;
}
@@ -1525,7 +1525,7 @@
strcpy(unitname, "units_");
strcat(unitname, istr);
fd = Rast_open_raster_new(unitname, CELL_TYPE);
- unit_buf = Rast_allocate_raster_buf(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);
Rast_set_null_value(unit_buf, wind.cols + 1, CELL_TYPE);
@@ -1665,13 +1665,13 @@
switch (data_type) {
case CELL_TYPE:
- tmp = Rast_allocate_raster_buf(CELL_TYPE);
+ tmp = Rast_allocate_buf(CELL_TYPE);
break;
case FCELL_TYPE:
- ftmp = Rast_allocate_raster_buf(FCELL_TYPE);
+ ftmp = Rast_allocate_buf(FCELL_TYPE);
break;
case DCELL_TYPE:
- dtmp = Rast_allocate_raster_buf(DCELL_TYPE);
+ dtmp = Rast_allocate_buf(DCELL_TYPE);
break;
}
@@ -1751,7 +1751,7 @@
else {
regcnt = 0;
fr = Rast_open_cell_old(choice->reg, G_mapset());
- row_buf = Rast_allocate_raster_buf(CELL_TYPE);
+ row_buf = Rast_allocate_buf(CELL_TYPE);
for (i = 0; i < nrows; i++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
Rast_get_raster_row(fr, row_buf, i, 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-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.le/r.le.pixel/texture.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -467,7 +467,7 @@
fc = Rast_open_raster_new("edge", data_type);
switch (data_type) {
case (CELL_TYPE):
- edge_buf_c = Rast_allocate_raster_buf(CELL_TYPE);
+ edge_buf_c = Rast_allocate_buf(CELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(edge_buf_c, CELL_TYPE);
Rast_set_null_value(edge_buf_c, ncols + 1, CELL_TYPE);
@@ -479,7 +479,7 @@
}
break;
case (FCELL_TYPE):
- edge_buf_f = Rast_allocate_raster_buf(FCELL_TYPE);
+ edge_buf_f = Rast_allocate_buf(FCELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(edge_buf_f, FCELL_TYPE);
Rast_set_null_value(edge_buf_f, ncols + 1, FCELL_TYPE);
@@ -491,7 +491,7 @@
}
break;
case (DCELL_TYPE):
- edge_buf_d = Rast_allocate_raster_buf(DCELL_TYPE);
+ edge_buf_d = Rast_allocate_buf(DCELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(edge_buf_d, DCELL_TYPE);
Rast_set_null_value(edge_buf_d, ncols + 1, DCELL_TYPE);
@@ -533,7 +533,7 @@
if (choice->z) {
fd = Rast_open_raster_new("zscores", DCELL_TYPE);
- zscor_buf = Rast_allocate_raster_buf(DCELL_TYPE);
+ zscor_buf = Rast_allocate_buf(DCELL_TYPE);
for (i = 1; i < nrows + 1; i++) {
Rast_zero_raster_buf(zscor_buf, DCELL_TYPE);
Rast_set_null_value(zscor_buf, ncols + 1, DCELL_TYPE);
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-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -66,7 +66,7 @@
Rast_set_window(&wind);
- record = Rast_allocate_cell_buf();
+ record = Rast_allocate_c_buf();
if ((newmap = Rast_open_cell_new(argv[1])) == -1) {
fprintf(stderr, "ERROR bmif_to_cell: can't open raster map %s\n",
Modified: grass/trunk/raster/r.le/r.le.setup/sample.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -352,7 +352,7 @@
if (fmask > 0) {
count = 0;
- row_buf = Rast_allocate_raster_buf(CELL_TYPE);
+ row_buf = Rast_allocate_buf(CELL_TYPE);
fr = Rast_open_cell_old(n1, G_mapset());
for (j = t; j < b; j++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
@@ -409,7 +409,7 @@
if (fmask > 0) {
count = 0;
- row_buf = Rast_allocate_raster_buf(CELL_TYPE);
+ row_buf = Rast_allocate_buf(CELL_TYPE);
fr = Rast_open_cell_old(n1, G_mapset());
for (j = t; j < b; j++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
@@ -955,7 +955,7 @@
the unit will be within the mask area */
if (fmask > 0) {
- row_buf = Rast_allocate_cell_buf();
+ row_buf = Rast_allocate_c_buf();
Rast_get_map_row_nomask(fmask, row_buf, t + top1);
if (!
(*(row_buf + l + left1) &&
@@ -1406,7 +1406,7 @@
corners of the unit are in the mask */
if (fmask > 0) {
- row_buf = Rast_allocate_cell_buf();
+ row_buf = Rast_allocate_c_buf();
Rast_get_map_row_nomask(fmask, row_buf, at);
if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
fprintf(stderr,
@@ -1528,7 +1528,7 @@
the unit will be within the mask area */
if (fmask > 0) {
- row_buf = Rast_allocate_cell_buf();
+ row_buf = Rast_allocate_c_buf();
Rast_get_map_row_nomask(fmask, row_buf, at);
if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
fprintf(stderr,
Modified: grass/trunk/raster/r.le/r.le.trace/main.c
===================================================================
--- grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -442,7 +442,7 @@
buf = (DCELL **) G_calloc(nrows + 3, sizeof(DCELL *));
for (i = 0; i < nrows + 3; i++) {
- buf[i] = (DCELL *) Rast_allocate_raster_buf(DCELL_TYPE);
+ buf[i] = (DCELL *) Rast_allocate_buf(DCELL_TYPE);
}
@@ -452,7 +452,7 @@
null_buf = (DCELL **) G_calloc(nrows + 3, sizeof(DCELL *));
for (i = 0; i < nrows + 3; i++)
- null_buf[i] = (DCELL *) Rast_allocate_raster_buf(DCELL_TYPE);
+ null_buf[i] = (DCELL *) Rast_allocate_buf(DCELL_TYPE);
/* clip out the sampling area */
@@ -575,15 +575,15 @@
switch (data_type) {
case CELL_TYPE:
- tmp = Rast_allocate_raster_buf(CELL_TYPE);
+ tmp = Rast_allocate_buf(CELL_TYPE);
tmpname = "tmp";
break;
case FCELL_TYPE:
- ftmp = Rast_allocate_raster_buf(FCELL_TYPE);
+ ftmp = Rast_allocate_buf(FCELL_TYPE);
tmpname = "ftmp";
break;
case DCELL_TYPE:
- dtmp = Rast_allocate_raster_buf(DCELL_TYPE);
+ dtmp = Rast_allocate_buf(DCELL_TYPE);
tmpname = "dtmp";
break;
}
@@ -631,17 +631,17 @@
case CELL_TYPE:
rastptr = tmp;
for (x = 0; x < col0; x++)
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(CELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(CELL_TYPE));
break;
case FCELL_TYPE:
rastptr = ftmp;
for (x = 0; x < col0; x++)
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(FCELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(FCELL_TYPE));
break;
case DCELL_TYPE:
rastptr = dtmp;
for (x = 0; x < col0; x++)
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(DCELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(DCELL_TYPE));
break;
}
@@ -664,7 +664,7 @@
else {
*(*(null_buf + i + 1 - row0) + j + 1 - col0) = 0.0;
}
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(CELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(CELL_TYPE));
break;
case FCELL_TYPE:
@@ -676,7 +676,7 @@
else {
*(*(null_buf + i + 1 - row0) + j + 1 - col0) = 0.0;
}
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(FCELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(FCELL_TYPE));
break;
case DCELL_TYPE:
@@ -688,7 +688,7 @@
else {
*(*(null_buf + i + 1 - row0) + j + 1 - col0) = 0.0;
}
- rastptr = G_incr_void_ptr(rastptr, Rast_raster_size(CELL_TYPE));
+ rastptr = G_incr_void_ptr(rastptr, Rast_cell_size(CELL_TYPE));
break;
}
@@ -931,7 +931,7 @@
patchmap = (CELL **) G_calloc(nrows + 3, sizeof(CELL *));
for (m = 0; m < nrows + 3; m++)
- patchmap[m] = (CELL *) Rast_allocate_raster_buf(CELL_TYPE);
+ patchmap[m] = (CELL *) Rast_allocate_buf(CELL_TYPE);
/* if this is the first patch to be traced,
then set the next patch on the patch list
Modified: grass/trunk/raster/r.li/r.li.cwed/cwed.c
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/cwed.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.cwed/cwed.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -343,7 +343,7 @@
}
- buf_sup = Rast_allocate_cell_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
@@ -352,7 +352,7 @@
c1.t = CELL_TYPE;
c2.t = CELL_TYPE;
- buf_corr = Rast_allocate_cell_buf();
+ buf_corr = Rast_allocate_c_buf();
if (buf_corr == NULL) {
G_fatal_error("error malloc buf_corr");
return RLI_ERRORE;
@@ -484,7 +484,7 @@
}
- buf_sup = Rast_allocate_d_raster_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
@@ -493,7 +493,7 @@
c1.t = DCELL_TYPE;
c2.t = DCELL_TYPE;
- buf_corr = Rast_allocate_d_raster_buf();
+ buf_corr = Rast_allocate_c_buf();
Rast_set_d_null_value(buf_sup + ad->x, ad->cl); /*the first time buf_sup is all null */
@@ -620,14 +620,14 @@
}
/* allocate and inizialize buffers */
- buf_sup = Rast_allocate_f_raster_buf();
+ buf_sup = Rast_allocate_f_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
Rast_set_f_null_value(buf_sup + ad->x, ad->cl); /*the first time buf_sup is all null */
- buf_corr = Rast_allocate_f_raster_buf();
+ buf_corr = Rast_allocate_f_buf();
if (buf_corr == NULL) {
G_fatal_error("malloc buf_corr failed");
return RLI_ERRORE;
Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -687,7 +687,7 @@
file_buf = malloc(cols * sizeof(double));
lseek(random_access, 0, SEEK_SET);
- cell_buf = Rast_allocate_d_raster_buf();
+ cell_buf = Rast_allocate_c_buf();
Rast_set_d_null_value(cell_buf, G_window_cols() + 1);
for (i = 0; i < g->sf_y + ((int)g->rl / 2); i++) {
Rast_put_raster_row(mv_fd, cell_buf, DCELL_TYPE);
Modified: grass/trunk/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -161,19 +161,19 @@
switch (data_type) {
case CELL_TYPE:{
for (i = 0; i < (ad->rl - used); i++) {
- cm->cache[used + i] = Rast_allocate_cell_buf();
+ cm->cache[used + i] = Rast_allocate_c_buf();
}
}
break;
case DCELL_TYPE:{
for (i = 0; i < ad->rl - used; i++) {
- dm->cache[used + i] = Rast_allocate_d_raster_buf();
+ dm->cache[used + i] = Rast_allocate_c_buf();
}
}
break;
case FCELL_TYPE:{
for (i = 0; i < ad->rl - used; i++) {
- fm->cache[used + i] = Rast_allocate_f_raster_buf();
+ fm->cache[used + i] = Rast_allocate_f_buf();
}
}
break;
@@ -241,7 +241,7 @@
tmp_file = G_tempfile();
mask_fd = open(tmp_file, O_RDWR | O_CREAT, 0755);
old_fd = Rast_open_cell_old(mask, "");
- old = Rast_allocate_cell_buf();
+ old = Rast_allocate_c_buf();
for (i = 0; i < rl; i++) {
int riga;
Modified: grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -170,7 +170,7 @@
masked = TRUE;
}
- buf_sup = Rast_allocate_cell_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
@@ -191,7 +191,7 @@
buf_inf = RLI_get_cell_raster_row(fd, 1 + j + ad->y, ad);
}
else {
- buf_inf = Rast_allocate_cell_buf();
+ buf_inf = Rast_allocate_c_buf();
if (buf_inf == NULL) {
G_fatal_error("malloc buf_inf failed");
return RLI_ERRORE;
@@ -431,7 +431,7 @@
masked = TRUE;
}
- buf_sup = Rast_allocate_d_raster_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
@@ -453,7 +453,7 @@
buf_inf = RLI_get_dcell_raster_row(fd, 1 + j + ad->y, ad);
}
else {
- buf_inf = Rast_allocate_d_raster_buf();
+ buf_inf = Rast_allocate_c_buf();
if (buf_inf == NULL) {
G_fatal_error("malloc buf_inf failed");
return RLI_ERRORE;
@@ -696,7 +696,7 @@
masked = TRUE;
}
- buf_sup = Rast_allocate_f_raster_buf();
+ buf_sup = Rast_allocate_f_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
@@ -718,7 +718,7 @@
buf_inf = RLI_get_fcell_raster_row(fd, 1 + j + ad->y, ad);
}
else {
- buf_inf = Rast_allocate_f_raster_buf();
+ buf_inf = Rast_allocate_f_buf();
if (mask_inf == NULL) {
G_fatal_error("malloc mask_inf failed");
return RLI_ERRORE;
Modified: grass/trunk/raster/r.li/r.li.mps/mps.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/mps.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.mps/mps.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -167,13 +167,13 @@
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_cell_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
if (buf == NULL) {
G_fatal_error("malloc buf failed");
return RLI_ERRORE;
@@ -537,13 +537,13 @@
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_d_raster_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_d_raster_buf();
+ buf = Rast_allocate_c_buf();
if (buf == NULL) {
G_fatal_error("malloc buf failed");
return RLI_ERRORE;
@@ -907,14 +907,14 @@
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_f_raster_buf();
+ buf_sup = Rast_allocate_f_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_f_raster_buf();
+ buf = Rast_allocate_f_buf();
if (buf == NULL) {
G_fatal_error("malloc buf failed");
return RLI_ERRORE;
Modified: grass/trunk/raster/r.li/r.li.padcv/padcv.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/padcv.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.padcv/padcv.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -156,13 +156,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_cell_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
@@ -578,13 +578,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_d_raster_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_d_raster_buf();
+ buf = Rast_allocate_c_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
@@ -999,13 +999,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_f_raster_buf();
+ buf_sup = Rast_allocate_f_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_f_raster_buf();
+ buf = Rast_allocate_f_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
Modified: grass/trunk/raster/r.li/r.li.padrange/padrange.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/padrange.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.padrange/padrange.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -164,13 +164,13 @@
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_cell_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
if (buf == NULL) {
G_fatal_error("malloc buf failed");
return RLI_ERRORE;
@@ -564,13 +564,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_d_raster_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_d_raster_buf();
+ buf = Rast_allocate_c_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
@@ -956,13 +956,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_f_raster_buf();
+ buf_sup = Rast_allocate_f_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_f_raster_buf();
+ buf = Rast_allocate_f_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
Modified: grass/trunk/raster/r.li/r.li.padsd/padsd.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/padsd.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.padsd/padsd.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -155,13 +155,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_cell_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
@@ -577,13 +577,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_d_raster_buf();
+ buf_sup = Rast_allocate_c_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_d_raster_buf();
+ buf = Rast_allocate_c_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
@@ -995,13 +995,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_f_raster_buf();
+ buf_sup = Rast_allocate_f_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_f_raster_buf();
+ buf = Rast_allocate_f_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
Modified: grass/trunk/raster/r.li/r.li.patchdensity/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchdensity/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.patchdensity/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -72,7 +72,7 @@
Rast_set_c_null_value(&complete_value, 1);
if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
return 0;
- sup = Rast_allocate_cell_buf();
+ sup = Rast_allocate_c_buf();
/* open mask if needed */
if (ad->mask == 1) {
Modified: grass/trunk/raster/r.li/r.li.patchnum/main.c
===================================================================
--- grass/trunk/raster/r.li/r.li.patchnum/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.li/r.li.patchnum/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -69,7 +69,7 @@
Rast_set_c_null_value(&complete_value, 1);
if (Rast_get_cellhd(ad->raster, "", &hd) == -1)
return 0;
- sup = Rast_allocate_cell_buf();
+ sup = Rast_allocate_c_buf();
/* open mask if needed */
if (ad->mask == 1) {
Modified: grass/trunk/raster/r.los/main.c
===================================================================
--- grass/trunk/raster/r.los/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.los/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -189,11 +189,11 @@
G_fatal_error(_("[%s]: Cannot read map header"), patt_layer);
/* allocate buffer space for row-io to layer */
- cell = Rast_allocate_raster_buf(CELL_TYPE);
+ cell = Rast_allocate_buf(CELL_TYPE);
}
/* allocate buffer space for row-io to layer */
- fcell = Rast_allocate_raster_buf(FCELL_TYPE);
+ fcell = Rast_allocate_buf(FCELL_TYPE);
/* find number of rows and columns in elevation map */
nrows = G_window_rows();
Modified: grass/trunk/raster/r.mapcalc/evaluate.c
===================================================================
--- grass/trunk/raster/r.mapcalc/evaluate.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.mapcalc/evaluate.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -24,7 +24,7 @@
static void allocate_buf(expression * e)
{
- e->buf = G_malloc(columns * Rast_raster_size(e->res_type));
+ e->buf = G_malloc(columns * Rast_cell_size(e->res_type));
}
static void set_buf(expression * e, void *buf)
Modified: grass/trunk/raster/r.mapcalc/map.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.mapcalc/map.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -94,7 +94,7 @@
sub->valid = G_calloc(cache->nrows, 1);
sub->buf = G_malloc(cache->nrows * sizeof(void *));
for (i = 0; i < cache->nrows; i++)
- sub->buf[i] = Rast_allocate_raster_buf(data_type);
+ sub->buf[i] = Rast_allocate_buf(data_type);
cache->sub[data_type] = sub;
}
@@ -191,7 +191,7 @@
static void cache_get(struct row_cache *cache, void *buf, int row, int res_type)
{
void *p = cache_get_raw(cache, row, res_type);
- memcpy(buf, p, columns * Rast_raster_size(res_type));
+ memcpy(buf, p, columns * Rast_cell_size(res_type));
};
/****************************************************************************/
Modified: grass/trunk/raster/r.mapcalc/xmedian.c
===================================================================
--- grass/trunk/raster/r.mapcalc/xmedian.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.mapcalc/xmedian.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -49,7 +49,7 @@
{
static void *array;
static int alloc;
- int size = argc * Rast_raster_size(argt[0]);
+ int size = argc * Rast_cell_size(argt[0]);
int i, j;
if (argc < 1)
Modified: grass/trunk/raster/r.mfilter/perform.c
===================================================================
--- grass/trunk/raster/r.mfilter/perform.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.mfilter/perform.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -21,7 +21,7 @@
DCELL *cell;
- cell = Rast_allocate_d_raster_buf();
+ cell = Rast_allocate_c_buf();
count = 0;
for (pass = 0; pass < repeat; pass++) {
Modified: grass/trunk/raster/r.neighbors/main.c
===================================================================
--- grass/trunk/raster/r.neighbors/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.neighbors/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -268,7 +268,7 @@
/* allocate the cell buffers */
allocate_bufs();
- result = Rast_allocate_d_raster_buf();
+ result = Rast_allocate_c_buf();
/* get title, initialize the category and stat info */
if (parm.title->answer)
Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.null/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -323,7 +323,7 @@
if (new < 0)
G_fatal_error(_("Unable to create raster map <%s>"), name);
- rast = Rast_allocate_raster_buf(map_type);
+ rast = Rast_allocate_buf(map_type);
G_verbose_message(_("Writing new data for raster map <%s>..."), name);
Modified: grass/trunk/raster/r.null/mask.c
===================================================================
--- grass/trunk/raster/r.null/mask.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.null/mask.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -35,7 +35,7 @@
Rast_set_raster_value_d(rast, new_null, data_type);
if (mask_d_select(&x, &d_mask))
Rast_set_null_value(rast, 1, data_type);
- rast = G_incr_void_ptr(rast, Rast_raster_size(data_type));
+ rast = G_incr_void_ptr(rast, Rast_cell_size(data_type));
}
return 0;
Modified: grass/trunk/raster/r.out.arc/main.c
===================================================================
--- grass/trunk/raster/r.out.arc/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.arc/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -126,7 +126,7 @@
/*
null_row = Rast_allocate_null_buf();
*/
- raster = Rast_allocate_raster_buf(out_type);
+ raster = Rast_allocate_buf(out_type);
nrows = G_window_rows();
ncols = G_window_cols();
@@ -178,7 +178,7 @@
exit(EXIT_FAILURE);
*/
for (col = 0, ptr = raster; col < ncols; col++,
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(out_type))) {
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
if (!Rast_is_null_value(ptr, out_type)) {
if (out_type == CELL_TYPE)
fprintf(fp, "%d", *((CELL *) ptr));
Modified: grass/trunk/raster/r.out.ascii/formspecific.c
===================================================================
--- grass/trunk/raster/r.out.ascii/formspecific.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.ascii/formspecific.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -33,7 +33,7 @@
void *ptr, *raster;
char cell_buf[300];
- raster = Rast_allocate_raster_buf(out_type);
+ raster = Rast_allocate_buf(out_type);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
@@ -42,7 +42,7 @@
return (row);
for (col = 0, ptr = raster; col < ncols; col++,
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(out_type))) {
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
if (!Rast_is_null_value(ptr, out_type)) {
if (out_type == CELL_TYPE)
fprintf(fp, "%d", *((CELL *) ptr));
@@ -86,7 +86,7 @@
int row, col, colcnt;
void *ptr, *raster;
- raster = Rast_allocate_raster_buf(out_type);
+ raster = Rast_allocate_buf(out_type);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
@@ -96,7 +96,7 @@
colcnt = 0;
for (col = 0, ptr = raster; col < ncols; col++,
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(out_type))) {
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
if (out_type == CELL_TYPE) {
if (Rast_is_null_value(ptr, out_type))
*((CELL *) ptr) = 0;
@@ -172,7 +172,7 @@
void *ptr, *raster;
char cell_buf[300];
- raster = Rast_allocate_raster_buf(out_type);
+ raster = Rast_allocate_buf(out_type);
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 2);
@@ -182,7 +182,7 @@
colcnt = 0;
for (col = 0, ptr = raster; col < ncols; col++,
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(out_type))) {
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
colcnt += 1;
if (!Rast_is_null_value(ptr, out_type)) {
if (out_type == CELL_TYPE)
Modified: grass/trunk/raster/r.out.bin/main.c
===================================================================
--- grass/trunk/raster/r.out.bin/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.bin/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -274,7 +274,7 @@
fclose(fp_2);
}
- raster = Rast_allocate_raster_buf(out_type);
+ raster = Rast_allocate_buf(out_type);
/* Write out GMT Header if required */
if (flag.gmt_hd->answer) {
@@ -337,7 +337,7 @@
G_percent(row, nrows, 2);
for (col = 0, ptr = raster; col < ncols; col++,
- ptr = G_incr_void_ptr(ptr, Rast_raster_size(out_type))) {
+ ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
if (!Rast_is_null_value(ptr, out_type)) {
if (out_type == CELL_TYPE) {
number_i = *((CELL *) ptr);
Modified: grass/trunk/raster/r.out.gdal/export_band.c
===================================================================
--- grass/trunk/raster/r.out.gdal/export_band.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.gdal/export_band.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -176,7 +176,7 @@
}
/* Create GRASS raster buffer */
- void *bufer = Rast_allocate_raster_buf(maptype);
+ void *bufer = Rast_allocate_buf(maptype);
if (bufer == NULL) {
G_warning(_("Unable to allocate buffer for reading raster map"));
Modified: grass/trunk/raster/r.out.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -21,13 +21,13 @@
data_type = Rast_get_raster_map_type(fd);
switch (data_type) {
case CELL_TYPE:
- cell = Rast_allocate_c_raster_buf();
+ cell = Rast_allocate_c_buf();
break;
case FCELL_TYPE:
- fcell = Rast_allocate_f_raster_buf();
+ fcell = Rast_allocate_f_buf();
break;
case DCELL_TYPE:
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
break;
}
Modified: grass/trunk/raster/r.out.mat/main.c
===================================================================
--- grass/trunk/raster/r.out.mat/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.mat/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -296,10 +296,10 @@
/* data array, by increasing column */
raster =
G_calloc((G_window_rows() + 1) * (G_window_cols() + 1),
- Rast_raster_size(map_type));
+ Rast_cell_size(map_type));
G_debug(1, "mem alloc is %d bytes\n", /* I think _cols()+1 is unneeded? */
- Rast_raster_size(map_type) * (G_window_rows() +
+ Rast_cell_size(map_type) * (G_window_rows() +
1) * (G_window_cols() + 1));
G_verbose_message(_("Reading in map ... "));
@@ -308,7 +308,7 @@
for (row = 0, ptr = raster; row < mrows; row++,
ptr =
G_incr_void_ptr(ptr,
- (G_window_cols() + 1) * Rast_raster_size(map_type))) {
+ (G_window_cols() + 1) * Rast_cell_size(map_type))) {
if (Rast_get_raster_row(fd, ptr, row, map_type) < 0)
G_fatal_error("reading map");
G_percent(row, mrows, 2);
@@ -319,7 +319,7 @@
G_verbose_message(_("Writing out map..."));
/* then write it to disk */
- /* NoGood: fwrite(raster, Rast_raster_size(map_type), mrows*ncols, fp1); */
+ /* NoGood: fwrite(raster, Rast_cell_size(map_type), mrows*ncols, fp1); */
for (col = 0; col < ncols; col++) {
for (row = 0; row < mrows; row++) {
@@ -328,7 +328,7 @@
G_incr_void_ptr(ptr,
(col +
row * (ncols +
- 1)) * Rast_raster_size(map_type));
+ 1)) * Rast_cell_size(map_type));
if (!Rast_is_null_value(ptr, map_type)) {
if (map_type == CELL_TYPE) {
Modified: grass/trunk/raster/r.out.mpeg/main.c
===================================================================
--- grass/trunk/raster/r.out.mpeg/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.mpeg/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -290,7 +290,7 @@
G_fatal_error(_("Unable to read color table for <%s>"), name);
rtype = Rast_get_raster_map_type(fd);
- voidc = Rast_allocate_raster_buf(rtype);
+ voidc = Rast_allocate_buf(rtype);
for (row = 0; row < vrows; row++) {
if (Rast_get_raster_row(fd, voidc,
Modified: grass/trunk/raster/r.out.png/main.c
===================================================================
--- grass/trunk/raster/r.out.png/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.png/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -155,9 +155,9 @@
if ((cellfile = Rast_open_cell_old(rast->answer, "")) == -1)
G_fatal_error(_("Unable to open cellfile for <%s>"), rastermap);
- cell_buf = Rast_allocate_c_raster_buf();
- fcell_buf = Rast_allocate_f_raster_buf();
- dcell_buf = Rast_allocate_d_raster_buf();
+ cell_buf = Rast_allocate_c_buf();
+ fcell_buf = Rast_allocate_f_buf();
+ dcell_buf = Rast_allocate_c_buf();
ored = G_malloc(w.cols);
ogrn = G_malloc(w.cols);
Modified: grass/trunk/raster/r.out.pov/main.c
===================================================================
--- grass/trunk/raster/r.out.pov/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.pov/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -174,7 +174,7 @@
if (NULL == (outf = fopen(outfilename, "wb")))
G_fatal_error(_("Unable to open output file <%s>"), outfilename);
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
nrows = G_window_rows();
ncols = G_window_cols();
@@ -260,7 +260,7 @@
int c, r;
double tempFloat;
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
for (r = 0; r < rowCount; r++) {
if (Rast_get_map_row(inputFile, cell, r) < 0)
exit(1);
Modified: grass/trunk/raster/r.out.ppm/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.ppm/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -100,9 +100,9 @@
if ((cellfile = Rast_open_cell_old(rast->answer, "")) == -1)
G_fatal_error(_("Unable to open raster map <%s>"), rast->answer);
- cell_buf = Rast_allocate_c_raster_buf();
- fcell_buf = Rast_allocate_f_raster_buf();
- dcell_buf = Rast_allocate_d_raster_buf();
+ cell_buf = Rast_allocate_c_buf();
+ fcell_buf = Rast_allocate_f_buf();
+ dcell_buf = Rast_allocate_c_buf();
ored = G_malloc(w.cols);
ogrn = G_malloc(w.cols);
Modified: grass/trunk/raster/r.out.ppm3/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm3/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.ppm3/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -111,7 +111,7 @@
G_fatal_error(_("Color file for <%s> not available"), name);
/* Allocate input buffer */
- B[i].array = Rast_allocate_raster_buf(B[i].type);
+ B[i].array = Rast_allocate_buf(B[i].type);
/* Allocate output buffers */
B[i].buf = (unsigned char *)G_malloc(w.cols);
Modified: grass/trunk/raster/r.out.tiff/main.c
===================================================================
--- grass/trunk/raster/r.out.tiff/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.tiff/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -157,7 +157,7 @@
G_fatal_error(_("Color map for palette must have less "
"than 256 colors for the available range of data"));
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
if ((in = Rast_open_cell_old(inopt->answer, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), inopt->answer);
@@ -243,7 +243,7 @@
/* allocate cell buffers */
for (i = 0; i < tilelength; i++)
- cells[i] = Rast_allocate_cell_buf();
+ cells[i] = Rast_allocate_c_buf();
/* build tiff tiles from grass buffer */
for (row = 0; row < imagelength; row += tilelength) {
Modified: grass/trunk/raster/r.out.vtk/writeascii.c
===================================================================
--- grass/trunk/raster/r.out.vtk/writeascii.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.out.vtk/writeascii.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -174,7 +174,7 @@
nullvalue = 0;
}
- raster = Rast_allocate_raster_buf(out_type);
+ raster = Rast_allocate_buf(out_type);
rowcount = 0;
for (row = nrows - 1; row >= 0; row--) {
@@ -190,7 +190,7 @@
nspos -= y_extent;
for (col = 0, ptr = raster; col < ncols;
- col++, ptr = G_incr_void_ptr(ptr, Rast_raster_size(out_type))) {
+ col++, ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
ewpos =
region.ew_res / 2 + region.west + colcount * region.ew_res;
ewpos -= x_extent;
@@ -235,7 +235,7 @@
/*First we are writing the coordinate points, the elevation cell is only used for the z coordinate */
- raster = Rast_allocate_raster_buf(out_type);
+ raster = Rast_allocate_buf(out_type);
rowcount = 0;
for (row = nrows - 1; row >= 0; row--) {
@@ -251,7 +251,7 @@
nspos -= y_extent;
for (col = 0, ptr = raster; col < ncols;
- col++, ptr = G_incr_void_ptr(ptr, Rast_raster_size(out_type))) {
+ col++, ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
ewpos =
region.ew_res / 2 + region.west + colcount * region.ew_res;
ewpos -= x_extent;
@@ -349,7 +349,7 @@
fprintf(fp, "LOOKUP_TABLE default\n");
- raster = Rast_allocate_raster_buf(out_type);
+ raster = Rast_allocate_buf(out_type);
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 10);
@@ -360,7 +360,7 @@
}
for (col = 0, ptr = raster; col < ncols;
- col++, ptr = G_incr_void_ptr(ptr, Rast_raster_size(out_type))) {
+ col++, ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
value = get_raster_value_as_double(out_type, ptr, nullvalue);
fprintf(fp, "%.*f ", dp, value);
@@ -394,9 +394,9 @@
fprintf(fp, "COLOR_SCALARS %s 3\n", varname);
- redraster = Rast_allocate_raster_buf(out_type);
- greenraster = Rast_allocate_raster_buf(out_type);
- blueraster = Rast_allocate_raster_buf(out_type);
+ redraster = Rast_allocate_buf(out_type);
+ greenraster = Rast_allocate_buf(out_type);
+ blueraster = Rast_allocate_buf(out_type);
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 10);
@@ -417,9 +417,9 @@
for (col = 0, redptr = redraster, greenptr = greenraster, blueptr =
blueraster; col < ncols;
col++, redptr =
- G_incr_void_ptr(redptr, Rast_raster_size(out_type)), greenptr =
- G_incr_void_ptr(greenptr, Rast_raster_size(out_type)), blueptr =
- G_incr_void_ptr(blueptr, Rast_raster_size(out_type))) {
+ G_incr_void_ptr(redptr, Rast_cell_size(out_type)), greenptr =
+ G_incr_void_ptr(greenptr, Rast_cell_size(out_type)), blueptr =
+ G_incr_void_ptr(blueptr, Rast_cell_size(out_type))) {
r = get_raster_value_as_double(out_type, redptr, 0.0);
g = get_raster_value_as_double(out_type, greenptr, 0.0);
@@ -461,9 +461,9 @@
fprintf(fp, "VECTORS %s float\n", varname);
- xraster = Rast_allocate_raster_buf(out_type);
- yraster = Rast_allocate_raster_buf(out_type);
- zraster = Rast_allocate_raster_buf(out_type);
+ xraster = Rast_allocate_buf(out_type);
+ yraster = Rast_allocate_buf(out_type);
+ zraster = Rast_allocate_buf(out_type);
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 10);
@@ -484,9 +484,9 @@
for (col = 0, xptr = xraster, yptr = yraster, zptr =
zraster; col < ncols;
col++, xptr =
- G_incr_void_ptr(xptr, Rast_raster_size(out_type)), yptr =
- G_incr_void_ptr(yptr, Rast_raster_size(out_type)), zptr =
- G_incr_void_ptr(zptr, Rast_raster_size(out_type))) {
+ G_incr_void_ptr(xptr, Rast_cell_size(out_type)), yptr =
+ G_incr_void_ptr(yptr, Rast_cell_size(out_type)), zptr =
+ G_incr_void_ptr(zptr, Rast_cell_size(out_type))) {
x = get_raster_value_as_double(out_type, xptr, 0.0);
y = get_raster_value_as_double(out_type, yptr, 0.0);
Modified: grass/trunk/raster/r.param.scale/process.c
===================================================================
--- grass/trunk/raster/r.param.scale/process.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.param.scale/process.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -87,9 +87,9 @@
/* Reserve `wsize' rows of memory. */
if (mparam != FEATURE)
- row_out = Rast_allocate_raster_buf(DCELL_TYPE); /* Initialise output row buffer. */
+ row_out = Rast_allocate_buf(DCELL_TYPE); /* Initialise output row buffer. */
else
- featrow_out = Rast_allocate_raster_buf(CELL_TYPE); /* Initialise output row buffer. */
+ featrow_out = Rast_allocate_buf(CELL_TYPE); /* Initialise output row buffer. */
window_ptr = (DCELL *) G_malloc(SQR(wsize) * sizeof(DCELL));
/* Reserve enough memory for local wind. */
Modified: grass/trunk/raster/r.patch/do_patch.c
===================================================================
--- grass/trunk/raster/r.patch/do_patch.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.patch/do_patch.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -56,8 +56,8 @@
}
} /* NULL support */
}
- result = G_incr_void_ptr(result, Rast_raster_size(out_type));
- patch = G_incr_void_ptr(patch, Rast_raster_size(out_type));
+ result = G_incr_void_ptr(result, Rast_cell_size(out_type));
+ patch = G_incr_void_ptr(patch, Rast_cell_size(out_type));
}
return more;
}
Modified: grass/trunk/raster/r.patch/main.c
===================================================================
--- grass/trunk/raster/r.patch/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.patch/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -124,8 +124,8 @@
if (outfd < 0)
G_fatal_error(_("Unable to create raster map <%s>"), new_name);
- presult = Rast_allocate_raster_buf(out_type);
- patch = Rast_allocate_raster_buf(out_type);
+ presult = Rast_allocate_buf(out_type);
+ patch = Rast_allocate_buf(out_type);
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/raster/r.profile/read_rast.c
===================================================================
--- grass/trunk/raster/r.profile/read_rast.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.profile/read_rast.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -25,7 +25,7 @@
if (!dcell) {
Rast_set_c_null_value(&nullcell, 1);
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
G_get_window(&window);
nrows = window.rows;
ncols = window.cols;
Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.proj/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -399,15 +399,15 @@
if (strcmp(interpol->answer, "nearest") == 0) {
fdo = Rast_open_raster_new(mapname, cell_type);
- obuffer = (CELL *) Rast_allocate_raster_buf(cell_type);
+ obuffer = (CELL *) Rast_allocate_buf(cell_type);
}
else {
fdo = Rast_open_fp_cell_new(mapname);
cell_type = FCELL_TYPE;
- obuffer = (FCELL *) Rast_allocate_raster_buf(cell_type);
+ obuffer = (FCELL *) Rast_allocate_buf(cell_type);
}
- cell_size = Rast_raster_size(cell_type);
+ cell_size = Rast_cell_size(cell_type);
xcoord1 = xcoord2 = outcellhd.west + (outcellhd.ew_res / 2);
/**/ ycoord1 = ycoord2 = outcellhd.north - (outcellhd.ns_res / 2);
Modified: grass/trunk/raster/r.quantile/main.c
===================================================================
--- grass/trunk/raster/r.quantile/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.quantile/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -57,7 +57,7 @@
static void get_slot_counts(int infile)
{
- DCELL *inbuf = Rast_allocate_d_raster_buf();
+ DCELL *inbuf = Rast_allocate_c_buf();
int row, col;
G_message(_("Computing histogram"));
@@ -128,7 +128,7 @@
static void fill_bins(int infile)
{
- DCELL *inbuf = Rast_allocate_d_raster_buf();
+ DCELL *inbuf = Rast_allocate_c_buf();
int row, col;
G_message(_("Binning data"));
Modified: grass/trunk/raster/r.random/count.c
===================================================================
--- grass/trunk/raster/r.random/count.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.random/count.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -31,32 +31,32 @@
theState->inrcover);
}
theState->buf.type = Rast_get_raster_map_type(theState->fd_old);
- theState->buf.data.v = Rast_allocate_raster_buf(theState->buf.type);
+ 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.data.v = Rast_allocate_raster_buf(theState->cover.type);
+ theState->cover.data.v = Rast_allocate_buf(theState->cover.type);
}
theState->nulls.type = theState->buf.type;
theState->min.type = theState->buf.type;
theState->max.type = theState->buf.type;
theState->nulls.data.v =
- (void *)G_malloc(Rast_raster_size(theState->nulls.type));
+ (void *)G_malloc(Rast_cell_size(theState->nulls.type));
theState->min.data.v =
- (void *)G_malloc(Rast_raster_size(theState->min.type));
+ (void *)G_malloc(Rast_cell_size(theState->min.type));
theState->max.data.v =
- (void *)G_malloc(Rast_raster_size(theState->max.type));
+ (void *)G_malloc(Rast_cell_size(theState->max.type));
if (theState->docover == 1) {
theState->cnulls.type = theState->cover.type;
theState->cmin.type = theState->cover.type;
theState->cmax.type = theState->cover.type;
theState->cnulls.data.v =
- (void *)G_malloc(Rast_raster_size(theState->cnulls.type));
+ (void *)G_malloc(Rast_cell_size(theState->cnulls.type));
theState->cmin.data.v =
- (void *)G_malloc(Rast_raster_size(theState->cmin.type));
+ (void *)G_malloc(Rast_cell_size(theState->cmin.type));
theState->cmax.data.v =
- (void *)G_malloc(Rast_raster_size(theState->cmax.type));
+ (void *)G_malloc(Rast_cell_size(theState->cmax.type));
}
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/raster/r.random.cells/init.c
===================================================================
--- grass/trunk/raster/r.random.cells/init.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.random.cells/init.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -30,12 +30,12 @@
MinRes = EW;
else
MinRes = NS;
- CellBuffer = Rast_allocate_cell_buf();
+ CellBuffer = Rast_allocate_c_buf();
/* Out = FlagCreate( Rs, Cs); */
Out = (CELL **) G_malloc(sizeof(CELL *) * Rs);
for (row = 0; row < Rs; row++) {
- Out[row] = Rast_allocate_cell_buf();
+ Out[row] = Rast_allocate_c_buf();
Rast_zero_cell_buf(Out[row]);
}
Modified: grass/trunk/raster/r.random.surface/init.c
===================================================================
--- grass/trunk/raster/r.random.surface/init.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.random.surface/init.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -47,7 +47,7 @@
}
else {
MapCount = 0;
- CellBuffer = Rast_allocate_cell_buf();
+ CellBuffer = Rast_allocate_c_buf();
for (row = 0; row < Rs; row++) {
Rast_get_map_row_nomask(FDM, CellBuffer, row);
for (col = 0; col < Cs; col++) {
@@ -126,7 +126,7 @@
} /* /for */
} /* /else */
- CellBuffer = Rast_allocate_cell_buf();
+ CellBuffer = Rast_allocate_c_buf();
CatInfo.NumValue = (int *)G_malloc(CatInfo.NumCat * sizeof(int));
CatInfo.Average = (double *)G_malloc(CatInfo.NumCat * sizeof(double));
CatInfo.Min = (double *)G_malloc(CatInfo.NumCat * sizeof(double));
Modified: grass/trunk/raster/r.recode/recode.c
===================================================================
--- grass/trunk/raster/r.recode/recode.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.recode/recode.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -47,8 +47,8 @@
out_fd = Rast_open_raster_new(result, out_type);
- out_rast = Rast_allocate_raster_buf(out_type);
- in_rast = Rast_allocate_raster_buf(in_type);
+ out_rast = Rast_allocate_buf(out_type);
+ in_rast = Rast_allocate_buf(in_type);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
Modified: grass/trunk/raster/r.resamp.interp/main.c
===================================================================
--- grass/trunk/raster/r.resamp.interp/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.resamp.interp/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -125,7 +125,7 @@
/* allocate buffers for input rows */
for (row = 0; row < neighbors; row++)
- bufs[row] = Rast_allocate_d_raster_buf();
+ bufs[row] = Rast_allocate_c_buf();
cur_row = -100;
@@ -137,7 +137,7 @@
/* reset window to current region */
Rast_set_window(&dst_w);
- outbuf = Rast_allocate_d_raster_buf();
+ outbuf = Rast_allocate_c_buf();
/* open new map */
outfile = Rast_open_raster_new(rastout->answer, DCELL_TYPE);
Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.resamp.rst/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -430,7 +430,7 @@
Rast_get_fp_range_min_max(&range, &cellmin, &cellmax);
}
else {
- cellrow = Rast_allocate_f_raster_buf();
+ cellrow = Rast_allocate_f_buf();
for (m1 = 0; m1 < inp_rows; m1++) {
ret_val = Rast_get_f_raster_row(fdinp, cellrow, m1);
if (ret_val < 0)
Modified: grass/trunk/raster/r.resamp.stats/main.c
===================================================================
--- grass/trunk/raster/r.resamp.stats/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.resamp.stats/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -334,7 +334,7 @@
/* allocate buffers for input rows */
bufs = G_malloc(row_scale * sizeof(DCELL *));
for (row = 0; row < row_scale; row++)
- bufs[row] = Rast_allocate_d_raster_buf();
+ bufs[row] = Rast_allocate_c_buf();
/* open old map */
infile = Rast_open_cell_old(parm.rastin->answer, "");
@@ -346,7 +346,7 @@
Rast_set_window(&dst_w);
/* allocate output buffer */
- outbuf = Rast_allocate_d_raster_buf();
+ outbuf = Rast_allocate_c_buf();
/* open new map */
outfile = Rast_open_raster_new(parm.rastout->answer, DCELL_TYPE);
Modified: grass/trunk/raster/r.resample/main.c
===================================================================
--- grass/trunk/raster/r.resample/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.resample/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -101,11 +101,11 @@
G_fatal_error(_("Unable to read header for <%s>"), name);
/* raster buffer is big enough to hold data */
- rast = Rast_allocate_raster_buf(data_type);
+ rast = Rast_allocate_buf(data_type);
nrows = G_window_rows();
ncols = G_window_cols();
if (ncols <= 1)
- rast = G_realloc(rast, 2 * Rast_raster_size(data_type));
+ 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);
@@ -140,7 +140,7 @@
void *rast1, *rast2;
rast1 = rast;
- rast2 = G_incr_void_ptr(rast, Rast_raster_size(data_type));
+ rast2 = G_incr_void_ptr(rast, Rast_cell_size(data_type));
G_message(_("Creating new cats file..."));
while (Rast_get_next_marked_raster_cat(&cats,
Modified: grass/trunk/raster/r.rescale/get_range.c
===================================================================
--- grass/trunk/raster/r.rescale/get_range.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.rescale/get_range.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -17,7 +17,7 @@
Rast_init_range(&range); /* read the file to get the range */
Rast_get_cellhd(name, "", &cellhd);
Rast_set_window(&cellhd);
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
fd = Rast_open_cell_old(name, "");
if (fd < 0)
exit(1);
Modified: grass/trunk/raster/r.rescale.eq/get_stats.c
===================================================================
--- grass/trunk/raster/r.rescale.eq/get_stats.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.rescale.eq/get_stats.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -15,7 +15,7 @@
exit(1);
nrows = G_window_rows();
ncols = G_window_cols();
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
Rast_init_cell_stats(statf);
G_message(_("Reading %s ..."), name);
Modified: grass/trunk/raster/r.ros/main.c
===================================================================
--- grass/trunk/raster/r.ros/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.ros/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -444,21 +444,21 @@
nrows = G_window_rows();
ncols = G_window_cols();
- fuel = Rast_allocate_cell_buf();
- mois_1h = Rast_allocate_cell_buf();
- mois_10h = Rast_allocate_cell_buf();
- mois_100h = Rast_allocate_cell_buf();
- mois_live = Rast_allocate_cell_buf();
- vel = Rast_allocate_cell_buf();
- dir = Rast_allocate_cell_buf();
- slope = Rast_allocate_cell_buf();
- aspect = Rast_allocate_cell_buf();
- base = Rast_allocate_cell_buf();
- max = Rast_allocate_cell_buf();
- maxdir = Rast_allocate_cell_buf();
+ fuel = Rast_allocate_c_buf();
+ mois_1h = Rast_allocate_c_buf();
+ mois_10h = Rast_allocate_c_buf();
+ mois_100h = Rast_allocate_c_buf();
+ mois_live = Rast_allocate_c_buf();
+ vel = Rast_allocate_c_buf();
+ dir = Rast_allocate_c_buf();
+ slope = Rast_allocate_c_buf();
+ aspect = Rast_allocate_c_buf();
+ base = Rast_allocate_c_buf();
+ max = Rast_allocate_c_buf();
+ maxdir = Rast_allocate_c_buf();
if (spotting) {
- spotdist = Rast_allocate_cell_buf();
- elev = Rast_allocate_cell_buf();
+ spotdist = Rast_allocate_c_buf();
+ elev = Rast_allocate_c_buf();
map_elev = (CELL *) G_calloc(nrows * ncols, sizeof(CELL));
}
Modified: grass/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.series/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -192,7 +192,7 @@
if (p->fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
p->name);
- p->buf = Rast_allocate_d_raster_buf();
+ p->buf = Rast_allocate_c_buf();
}
/* process the output maps */
@@ -218,7 +218,7 @@
out->quantile = (parm.quantile->answer && parm.quantile->answers[i])
? atof(parm.quantile->answers[i])
: 0;
- out->buf = Rast_allocate_d_raster_buf();
+ out->buf = Rast_allocate_c_buf();
out->fd = Rast_open_raster_new(
output_name, menu[method].is_int ? CELL_TYPE : DCELL_TYPE);
if (out->fd < 0)
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.slope.aspect/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -452,7 +452,7 @@
if (slope_name != NULL) {
slope_fd = opennew(slope_name, out_type);
- slp_raster = Rast_allocate_raster_buf(data_type);
+ slp_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(slp_raster, G_window_cols(), data_type);
Rast_put_raster_row(slope_fd, slp_raster, data_type);
}
@@ -463,7 +463,7 @@
if (aspect_name != NULL) {
aspect_fd = opennew(aspect_name, out_type);
- asp_raster = Rast_allocate_raster_buf(data_type);
+ asp_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(asp_raster, G_window_cols(), data_type);
Rast_put_raster_row(aspect_fd, asp_raster, data_type);
}
@@ -474,7 +474,7 @@
if (pcurv_name != NULL) {
pcurv_fd = opennew(pcurv_name, out_type);
- pcurv_raster = Rast_allocate_raster_buf(data_type);
+ pcurv_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(pcurv_raster, G_window_cols(), data_type);
Rast_put_raster_row(pcurv_fd, pcurv_raster, data_type);
}
@@ -485,7 +485,7 @@
if (tcurv_name != NULL) {
tcurv_fd = opennew(tcurv_name, out_type);
- tcurv_raster = Rast_allocate_raster_buf(data_type);
+ tcurv_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(tcurv_raster, G_window_cols(), data_type);
Rast_put_raster_row(tcurv_fd, tcurv_raster, data_type);
}
@@ -496,7 +496,7 @@
if (dx_name != NULL) {
dx_fd = opennew(dx_name, out_type);
- dx_raster = Rast_allocate_raster_buf(data_type);
+ dx_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dx_raster, G_window_cols(), data_type);
Rast_put_raster_row(dx_fd, dx_raster, data_type);
}
@@ -507,7 +507,7 @@
if (dy_name != NULL) {
dy_fd = opennew(dy_name, out_type);
- dy_raster = Rast_allocate_raster_buf(data_type);
+ dy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dy_raster, G_window_cols(), data_type);
Rast_put_raster_row(dy_fd, dy_raster, data_type);
}
@@ -518,7 +518,7 @@
if (dxx_name != NULL) {
dxx_fd = opennew(dxx_name, out_type);
- dxx_raster = Rast_allocate_raster_buf(data_type);
+ dxx_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dxx_raster, G_window_cols(), data_type);
Rast_put_raster_row(dxx_fd, dxx_raster, data_type);
}
@@ -529,7 +529,7 @@
if (dyy_name != NULL) {
dyy_fd = opennew(dyy_name, out_type);
- dyy_raster = Rast_allocate_raster_buf(data_type);
+ dyy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dyy_raster, G_window_cols(), data_type);
Rast_put_raster_row(dyy_fd, dyy_raster, data_type);
}
@@ -540,7 +540,7 @@
if (dxy_name != NULL) {
dxy_fd = opennew(dxy_name, out_type);
- dxy_raster = Rast_allocate_raster_buf(data_type);
+ dxy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dxy_raster, G_window_cols(), data_type);
Rast_put_raster_row(dxy_fd, dxy_raster, data_type);
}
@@ -629,14 +629,14 @@
asp_ptr = asp_raster;
else
asp_ptr =
- G_incr_void_ptr(asp_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(asp_raster, Rast_cell_size(data_type));
}
if (slope_fd >= 0) {
if (Wrap)
slp_ptr = slp_raster;
else
slp_ptr =
- G_incr_void_ptr(slp_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(slp_raster, Rast_cell_size(data_type));
}
if (pcurv_fd >= 0) {
@@ -644,7 +644,7 @@
pcurv_ptr = pcurv_raster;
else
pcurv_ptr =
- G_incr_void_ptr(pcurv_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(pcurv_raster, Rast_cell_size(data_type));
}
if (tcurv_fd >= 0) {
@@ -652,21 +652,21 @@
tcurv_ptr = tcurv_raster;
else
tcurv_ptr =
- G_incr_void_ptr(tcurv_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(tcurv_raster, Rast_cell_size(data_type));
}
if (dx_fd >= 0) {
if (Wrap)
dx_ptr = dx_raster;
else
- dx_ptr = G_incr_void_ptr(dx_raster, Rast_raster_size(data_type));
+ dx_ptr = G_incr_void_ptr(dx_raster, Rast_cell_size(data_type));
}
if (dy_fd >= 0) {
if (Wrap)
dy_ptr = dy_raster;
else
- dy_ptr = G_incr_void_ptr(dy_raster, Rast_raster_size(data_type));
+ dy_ptr = G_incr_void_ptr(dy_raster, Rast_cell_size(data_type));
}
if (dxx_fd >= 0) {
@@ -674,7 +674,7 @@
dxx_ptr = dxx_raster;
else
dxx_ptr =
- G_incr_void_ptr(dxx_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(dxx_raster, Rast_cell_size(data_type));
}
if (dyy_fd >= 0) {
@@ -682,7 +682,7 @@
dyy_ptr = dyy_raster;
else
dyy_ptr =
- G_incr_void_ptr(dyy_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(dyy_raster, Rast_cell_size(data_type));
}
if (dxy_fd >= 0) {
@@ -690,7 +690,7 @@
dxy_ptr = dxy_raster;
else
dxy_ptr =
- G_incr_void_ptr(dxy_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(dxy_raster, Rast_cell_size(data_type));
}
@@ -711,47 +711,47 @@
if (slope_fd > 0) {
Rast_set_null_value(slp_ptr, 1, data_type);
slp_ptr =
- G_incr_void_ptr(slp_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(slp_ptr, Rast_cell_size(data_type));
}
if (aspect_fd > 0) {
Rast_set_null_value(asp_ptr, 1, data_type);
asp_ptr =
- G_incr_void_ptr(asp_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(asp_ptr, Rast_cell_size(data_type));
}
if (pcurv_fd > 0) {
Rast_set_null_value(pcurv_ptr, 1, data_type);
pcurv_ptr =
- G_incr_void_ptr(pcurv_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(pcurv_ptr, Rast_cell_size(data_type));
}
if (tcurv_fd > 0) {
Rast_set_null_value(tcurv_ptr, 1, data_type);
tcurv_ptr =
- G_incr_void_ptr(tcurv_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(tcurv_ptr, Rast_cell_size(data_type));
}
if (dx_fd > 0) {
Rast_set_null_value(dx_ptr, 1, data_type);
dx_ptr =
- G_incr_void_ptr(dx_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dx_ptr, Rast_cell_size(data_type));
}
if (dy_fd > 0) {
Rast_set_null_value(dy_ptr, 1, data_type);
dy_ptr =
- G_incr_void_ptr(dy_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dy_ptr, Rast_cell_size(data_type));
}
if (dxx_fd > 0) {
Rast_set_null_value(dxx_ptr, 1, data_type);
dxx_ptr =
- G_incr_void_ptr(dxx_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dxx_ptr, Rast_cell_size(data_type));
}
if (dyy_fd > 0) {
Rast_set_null_value(dyy_ptr, 1, data_type);
dyy_ptr =
- G_incr_void_ptr(dyy_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dyy_ptr, Rast_cell_size(data_type));
}
if (dxy_fd > 0) {
Rast_set_null_value(dxy_ptr, 1, data_type);
dxy_ptr =
- G_incr_void_ptr(dxy_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dxy_ptr, Rast_cell_size(data_type));
}
continue;
} /* no data */
@@ -816,7 +816,7 @@
Rast_set_raster_value_d(slp_ptr,
(DCELL) slp_in_perc, data_type);
}
- slp_ptr = G_incr_void_ptr(slp_ptr, Rast_raster_size(data_type));
+ slp_ptr = G_incr_void_ptr(slp_ptr, Rast_cell_size(data_type));
} /* computing slope */
if (aspect_fd > 0) {
@@ -848,7 +848,7 @@
}
else
Rast_set_null_value(asp_ptr, 1, data_type);
- asp_ptr = G_incr_void_ptr(asp_ptr, Rast_raster_size(data_type));
+ asp_ptr = G_incr_void_ptr(asp_ptr, Rast_cell_size(data_type));
/* now update min and max */
if (min_asp > aspect)
@@ -862,7 +862,7 @@
*((CELL *) dx_ptr) = (CELL) (scik1 * dx);
else
Rast_set_raster_value_d(dx_ptr, (DCELL) dx, data_type);
- dx_ptr = G_incr_void_ptr(dx_ptr, Rast_raster_size(data_type));
+ dx_ptr = G_incr_void_ptr(dx_ptr, Rast_cell_size(data_type));
}
if (dy_fd > 0) {
@@ -870,7 +870,7 @@
*((CELL *) dy_ptr) = (CELL) (scik1 * dy);
else
Rast_set_raster_value_d(dy_ptr, (DCELL) dy, data_type);
- dy_ptr = G_incr_void_ptr(dy_ptr, Rast_raster_size(data_type));
+ dy_ptr = G_incr_void_ptr(dy_ptr, Rast_cell_size(data_type));
}
if (dxx_fd <= 0 && dxy_fd <= 0 && dyy_fd <= 0 &&
@@ -892,7 +892,7 @@
*((CELL *) dxx_ptr) = (CELL) (scik1 * dxx);
else
Rast_set_raster_value_d(dxx_ptr, (DCELL) dxx, data_type);
- dxx_ptr = G_incr_void_ptr(dxx_ptr, Rast_raster_size(data_type));
+ dxx_ptr = G_incr_void_ptr(dxx_ptr, Rast_cell_size(data_type));
}
if (dyy_fd > 0) {
@@ -900,7 +900,7 @@
*((CELL *) dyy_ptr) = (CELL) (scik1 * dyy);
else
Rast_set_raster_value_d(dyy_ptr, (DCELL) dyy, data_type);
- dyy_ptr = G_incr_void_ptr(dyy_ptr, Rast_raster_size(data_type));
+ dyy_ptr = G_incr_void_ptr(dyy_ptr, Rast_cell_size(data_type));
}
if (dxy_fd > 0) {
@@ -908,7 +908,7 @@
*((CELL *) dxy_ptr) = (CELL) (scik1 * dxy);
else
Rast_set_raster_value_d(dxy_ptr, (DCELL) dxy, data_type);
- dxy_ptr = G_incr_void_ptr(dxy_ptr, Rast_raster_size(data_type));
+ dxy_ptr = G_incr_void_ptr(dxy_ptr, Rast_cell_size(data_type));
}
/* compute curvature */
@@ -945,7 +945,7 @@
else
Rast_set_raster_value_d(pcurv_ptr, (DCELL) pcurv, data_type);
pcurv_ptr =
- G_incr_void_ptr(pcurv_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(pcurv_ptr, Rast_cell_size(data_type));
}
if (tcurv_fd > 0) {
@@ -954,7 +954,7 @@
else
Rast_set_raster_value_d(tcurv_ptr, (DCELL) tcurv, data_type);
tcurv_ptr =
- G_incr_void_ptr(tcurv_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(tcurv_ptr, Rast_cell_size(data_type));
}
} /* column for loop */
Modified: grass/trunk/raster/r.spread/main.c
===================================================================
--- grass/trunk/raster/r.spread/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.spread/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -404,11 +404,11 @@
}
/* Allocate memories for a row */
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
if (x_out)
- x_cell = Rast_allocate_cell_buf();
+ x_cell = Rast_allocate_c_buf();
if (y_out)
- y_cell = Rast_allocate_cell_buf();
+ y_cell = Rast_allocate_c_buf();
/* Allocate memories for a map */
map_max = (CELL *) G_calloc(nrows * ncols + 1, sizeof(CELL));
Modified: grass/trunk/raster/r.spreadpath/main.c
===================================================================
--- grass/trunk/raster/r.spreadpath/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.spreadpath/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -165,7 +165,7 @@
nrows = G_window_rows();
ncols = G_window_cols();
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
/* Open back cell layers for reading */
backrow_fd = Rast_open_cell_old(backrow_layer, backrow_mapset);
Modified: grass/trunk/raster/r.statistics2/main.c
===================================================================
--- grass/trunk/raster/r.statistics2/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.statistics2/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -245,8 +245,8 @@
for (i = 0; i < ncats; i++)
max[i] = -1e300;
- base_buf = Rast_allocate_c_raster_buf();
- cover_buf = Rast_allocate_d_raster_buf();
+ base_buf = Rast_allocate_c_buf();
+ cover_buf = Rast_allocate_c_buf();
G_message(_("First pass"));
@@ -501,7 +501,7 @@
if (out_fd < 0)
G_fatal_error(_("Unable to open output map <%s>"), output);
- out_buf = Rast_allocate_d_raster_buf();
+ out_buf = Rast_allocate_c_buf();
for (row = 0; row < rows; row++) {
Rast_get_c_raster_row(base_fd, base_buf, row);
Modified: grass/trunk/raster/r.statistics3/main.c
===================================================================
--- grass/trunk/raster/r.statistics3/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.statistics3/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -69,8 +69,8 @@
static void get_slot_counts(int basefile, int coverfile)
{
- CELL *basebuf = Rast_allocate_c_raster_buf();
- DCELL *coverbuf = Rast_allocate_d_raster_buf();
+ CELL *basebuf = Rast_allocate_c_buf();
+ DCELL *coverbuf = Rast_allocate_c_buf();
int row, col;
G_message(_("Computing histograms"));
@@ -159,8 +159,8 @@
static void fill_bins(int basefile, int coverfile)
{
- CELL *basebuf = Rast_allocate_c_raster_buf();
- DCELL *coverbuf = Rast_allocate_d_raster_buf();
+ CELL *basebuf = Rast_allocate_c_buf();
+ DCELL *coverbuf = Rast_allocate_c_buf();
int row, col;
G_message(_("Binning data"));
@@ -322,8 +322,8 @@
static void do_output(int base_fd, char **outputs, const char *covermap)
{
int *out_fd = G_malloc(num_quants * sizeof(int));
- CELL *base_buf = Rast_allocate_c_raster_buf();
- DCELL *out_buf = Rast_allocate_d_raster_buf();
+ CELL *base_buf = Rast_allocate_c_buf();
+ DCELL *out_buf = Rast_allocate_c_buf();
const char *mapset = G_mapset();
struct Colors colors;
int have_colors;
Modified: grass/trunk/raster/r.stats/cell_stats.c
===================================================================
--- grass/trunk/raster/r.stats/cell_stats.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.stats/cell_stats.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -16,7 +16,7 @@
/* allocate i/o buffers for each raster map */
cell = (CELL **) G_calloc(nfiles, sizeof(CELL *));
for (i = 0; i < nfiles; i++)
- cell[i] = Rast_allocate_cell_buf();
+ cell[i] = Rast_allocate_c_buf();
/* if we want area totals, set this up.
* distinguish projections which are planimetric (all cells same size)
Modified: grass/trunk/raster/r.stats/raw_stats.c
===================================================================
--- grass/trunk/raster/r.stats/raw_stats.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.stats/raw_stats.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -25,7 +25,7 @@
map_type[i] = DCELL_TYPE;
else
map_type[i] = CELL_TYPE;
- rast[i] = Rast_allocate_raster_buf(map_type[i]);
+ rast[i] = Rast_allocate_buf(map_type[i]);
}
/* get window */
@@ -64,7 +64,7 @@
if ((nulls_found == nfiles) || (nulls_found && no_nulls)) {
for (i = 0; i < nfiles; i++)
rastp[i] = G_incr_void_ptr(rastp[i],
- Rast_raster_size(map_type
+ Rast_cell_size(map_type
[i]));
continue;
}
@@ -103,7 +103,7 @@
&labels[i]));
}
rastp[i] =
- G_incr_void_ptr(rastp[i], Rast_raster_size(map_type[i]));
+ G_incr_void_ptr(rastp[i], Rast_cell_size(map_type[i]));
}
fprintf(stdout, "\n");
}
Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.sun/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -500,9 +500,9 @@
int fr1, fr2;
int l, i, j;
- cell1 = Rast_allocate_f_raster_buf();
- cell2 = Rast_allocate_f_raster_buf();
- cell3 = Rast_allocate_f_raster_buf();
+ cell1 = Rast_allocate_f_buf();
+ cell2 = Rast_allocate_f_buf();
+ cell3 = Rast_allocate_f_buf();
z = (float **)G_malloc(sizeof(float *) * (m));
o = (float **)G_malloc(sizeof(float *) * (m));
@@ -520,7 +520,7 @@
fd3 = Rast_open_cell_old(slopein, "");
if (linkein != NULL) {
- cell4 = Rast_allocate_f_raster_buf();
+ cell4 = Rast_allocate_f_buf();
li = (float **)G_malloc(sizeof(float *) * (m));
for (l = 0; l < m; l++)
li[l] = (float *)G_malloc(sizeof(float) * (n));
@@ -529,7 +529,7 @@
}
if (albedo != NULL) {
- cell5 = Rast_allocate_f_raster_buf();
+ cell5 = Rast_allocate_f_buf();
a = (float **)G_malloc(sizeof(float *) * (m));
for (l = 0; l < m; l++)
a[l] = (float *)G_malloc(sizeof(float) * (n));
@@ -538,7 +538,7 @@
}
if (latin != NULL) {
- cell6 = Rast_allocate_f_raster_buf();
+ cell6 = Rast_allocate_f_buf();
la = (float **)G_malloc(sizeof(float *) * (m));
for (l = 0; l < m; l++)
la[l] = (float *)G_malloc(sizeof(float) * (n));
@@ -547,7 +547,7 @@
}
if (coefbh != NULL) {
- rast1 = Rast_allocate_f_raster_buf();
+ rast1 = Rast_allocate_f_buf();
cbhr = (float **)G_malloc(sizeof(float *) * (m));
for (l = 0; l < m; l++)
cbhr[l] = (float *)G_malloc(sizeof(float) * (n));
@@ -556,7 +556,7 @@
}
if (coefdh != NULL) {
- rast2 = Rast_allocate_f_raster_buf();
+ rast2 = Rast_allocate_f_buf();
cdhr = (float **)G_malloc(sizeof(float *) * (m));
for (l = 0; l < m; l++)
cdhr[l] = (float *)G_malloc(sizeof(float) * (n));
@@ -696,35 +696,35 @@
int i, iarc, j;
if (incidout != NULL) {
- cell7 = Rast_allocate_f_raster_buf();
+ cell7 = Rast_allocate_f_buf();
fd7 = Rast_open_fp_cell_new(incidout);
if (fd7 < 0)
G_fatal_error(_("Unable to create raster map %s"), incidout);
}
if (beam_rad != NULL) {
- cell8 = Rast_allocate_f_raster_buf();
+ cell8 = Rast_allocate_f_buf();
fd8 = Rast_open_fp_cell_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_raster_buf();
+ cell11 = Rast_allocate_f_buf();
fd11 = Rast_open_fp_cell_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_raster_buf();
+ cell9 = Rast_allocate_f_buf();
fd9 = Rast_open_fp_cell_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_raster_buf();
+ cell10 = Rast_allocate_f_buf();
fd10 = Rast_open_fp_cell_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-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.sun2/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -797,7 +797,7 @@
numRows = m / numPartitions;
- cell1 = Rast_allocate_f_raster_buf();
+ cell1 = Rast_allocate_f_buf();
if (z == NULL) {
z = (float **)G_malloc(sizeof(float *) * (numRows));
@@ -816,7 +816,7 @@
fd1 = Rast_open_cell_old(elevin, mapset);
if (slopein != NULL) {
- cell3 = Rast_allocate_f_raster_buf();
+ cell3 = Rast_allocate_f_buf();
if (s == NULL) {
s = (float **)G_malloc(sizeof(float *) * (numRows));
@@ -831,7 +831,7 @@
}
if (aspin != NULL) {
- cell2 = Rast_allocate_f_raster_buf();
+ cell2 = Rast_allocate_f_buf();
if (o == NULL) {
o = (float **)G_malloc(sizeof(float *) * (numRows));
@@ -848,7 +848,7 @@
}
if (linkein != NULL) {
- cell4 = Rast_allocate_f_raster_buf();
+ cell4 = Rast_allocate_f_buf();
if (li == NULL) {
li = (float **)G_malloc(sizeof(float *) * (numRows));
for (l = 0; l < numRows; l++)
@@ -861,7 +861,7 @@
}
if (albedo != NULL) {
- cell5 = Rast_allocate_f_raster_buf();
+ cell5 = Rast_allocate_f_buf();
if (a == NULL) {
a = (float **)G_malloc(sizeof(float *) * (numRows));
for (l = 0; l < numRows; l++)
@@ -873,7 +873,7 @@
}
if (latin != NULL) {
- cell6 = Rast_allocate_f_raster_buf();
+ cell6 = Rast_allocate_f_buf();
if (la == NULL) {
la = (float **)G_malloc(sizeof(float *) * (numRows));
for (l = 0; l < numRows; l++)
@@ -885,7 +885,7 @@
}
if (longin != NULL) {
- cell7 = Rast_allocate_f_raster_buf();
+ cell7 = Rast_allocate_f_buf();
longitArray = (float **)G_malloc(sizeof(float *) * (numRows));
for (l = 0; l < numRows; l++)
longitArray[l] = (float *)G_malloc(sizeof(float) * (n));
@@ -896,7 +896,7 @@
}
if (coefbh != NULL) {
- rast1 = Rast_allocate_f_raster_buf();
+ rast1 = Rast_allocate_f_buf();
if (cbhr == NULL) {
cbhr = (float **)G_malloc(sizeof(float *) * (numRows));
for (l = 0; l < numRows; l++)
@@ -908,7 +908,7 @@
}
if (coefdh != NULL) {
- rast2 = Rast_allocate_f_raster_buf();
+ rast2 = Rast_allocate_f_buf();
if (cdhr == NULL) {
cdhr = (float **)G_malloc(sizeof(float *) * (numRows));
for (l = 0; l < numRows; l++)
@@ -932,7 +932,7 @@
* if(tt != NULL)
* {
*
- * horizonbuf[0]=Rast_allocate_f_raster_buf();
+ * horizonbuf[0]=Rast_allocate_f_buf();
* sprintf(shad_filename, "%s_%02d", horizon, arrayNumInt);
* if((mapset=G_find_cell2(shad_filename,""))==NULL)
* G_message("Horizon file no. %d not found\n", arrayNumInt);
@@ -945,7 +945,7 @@
numDigits = (int)(log10(1. * arrayNumInt)) + 1;
sprintf(formatString, "%%s_%%0%dd", numDigits);
for (i = 0; i < arrayNumInt; i++) {
- horizonbuf[i] = Rast_allocate_f_raster_buf();
+ horizonbuf[i] = Rast_allocate_f_buf();
sprintf(shad_filename, formatString, horizon, i);
if ((mapset = G_find_cell2(shad_filename, "")) == NULL)
G_fatal_error(_("Horizon file no. %d <%s> not found"), i,
@@ -1160,42 +1160,42 @@
int i, iarc, j;
if (incidout != NULL) {
- cell7 = Rast_allocate_f_raster_buf();
+ cell7 = Rast_allocate_f_buf();
fd7 = Rast_open_fp_cell_new(incidout);
if (fd7 < 0)
G_fatal_error(_("Unable to create raster map <%s>"), incidout);
}
if (beam_rad != NULL) {
- cell8 = Rast_allocate_f_raster_buf();
+ cell8 = Rast_allocate_f_buf();
fd8 = Rast_open_fp_cell_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_raster_buf();
+ cell11 = Rast_allocate_f_buf();
fd11 = Rast_open_fp_cell_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_raster_buf();
+ cell9 = Rast_allocate_f_buf();
fd9 = Rast_open_fp_cell_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_raster_buf();
+ cell10 = Rast_allocate_f_buf();
fd10 = Rast_open_fp_cell_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_raster_buf();
+ cell12 = Rast_allocate_f_buf();
fd12 = Rast_open_fp_cell_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-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.sunmask/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -457,9 +457,9 @@
G_fatal_error(_("Unable to create raster map <%s>"), outname);
data_type = Rast_get_raster_map_type(elev_fd);
- elevbuf.v = Rast_allocate_raster_buf(data_type);
- tmpbuf.v = Rast_allocate_raster_buf(data_type);
- outbuf.v = Rast_allocate_raster_buf(CELL_TYPE); /* binary map */
+ elevbuf.v = Rast_allocate_buf(data_type);
+ tmpbuf.v = Rast_allocate_buf(data_type);
+ outbuf.v = Rast_allocate_buf(CELL_TYPE); /* binary map */
if (data_type == CELL_TYPE) {
if ((Rast_read_range(name, "", &range)) < 0)
Modified: grass/trunk/raster/r.support/histo.c
===================================================================
--- grass/trunk/raster/r.support/histo.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.support/histo.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -27,7 +27,7 @@
nrows = G_window_rows();
ncols = G_window_cols();
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
Rast_init_cell_stats(&statf);
for (row = 0; row < nrows; row++) {
Modified: grass/trunk/raster/r.support.stats/histo.c
===================================================================
--- grass/trunk/raster/r.support.stats/histo.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.support.stats/histo.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -43,7 +43,7 @@
nrows = G_window_rows();
ncols = G_window_cols();
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
Rast_init_cell_stats(&statf);
Modified: grass/trunk/raster/r.surf.area/main.c
===================================================================
--- grass/trunk/raster/r.surf.area/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.surf.area/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -119,8 +119,8 @@
G_fatal_error(_("Unable to open raster map <%s>"), surf->answer);
}
- cell_buf[0] = (DCELL *) G_malloc(w.cols * Rast_raster_size(DCELL_TYPE));
- cell_buf[1] = (DCELL *) G_malloc(w.cols * Rast_raster_size(DCELL_TYPE));
+ cell_buf[0] = (DCELL *) G_malloc(w.cols * Rast_cell_size(DCELL_TYPE));
+ cell_buf[1] = (DCELL *) G_malloc(w.cols * Rast_cell_size(DCELL_TYPE));
fprintf(stdout, "\n");
{
Modified: grass/trunk/raster/r.surf.fractal/write_rast.c
===================================================================
--- grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -43,7 +43,7 @@
nrows = G_window_rows(); /* Find out the number of rows and */
ncols = G_window_cols(); /* columns of the raster view. */
- row_out = Rast_allocate_d_raster_buf();
+ row_out = Rast_allocate_c_buf();
/*------------------------------------------------------------------*/
/* Open new file and set the output file descriptor. */
Modified: grass/trunk/raster/r.surf.gauss/gaussurf.c
===================================================================
--- grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -41,7 +41,7 @@
nrows = G_window_rows();
ncols = G_window_cols();
- row_out = Rast_allocate_d_raster_buf();
+ row_out = Rast_allocate_c_buf();
/****** PASS THROUGH EACH CELL ASSIGNING RANDOM VALUE ******/
Modified: grass/trunk/raster/r.surf.idw/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.surf.idw/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -144,11 +144,11 @@
lookup_and_function_ptrs(nrows, ncols);
/* allocate buffers for row i/o */
- cell = Rast_allocate_cell_buf();
+ 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, "");
- mask = Rast_allocate_cell_buf();
+ mask = Rast_allocate_c_buf();
}
else
mask = NULL;
Modified: grass/trunk/raster/r.surf.idw2/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.surf.idw2/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -97,10 +97,10 @@
/* get the window, allocate buffers, etc. */
G_get_set_window(&window);
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
if ((maskfd = Rast_maskfd()) >= 0)
- mask = Rast_allocate_cell_buf();
+ mask = Rast_allocate_c_buf();
else
mask = NULL;
Modified: grass/trunk/raster/r.surf.idw2/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -21,7 +21,7 @@
G_align_window(&window, &cellhd);
Rast_set_window(&window);
- cell = Rast_allocate_cell_buf();
+ cell = Rast_allocate_c_buf();
fd = Rast_open_cell_old(name, "");
if (fd < 0) {
Modified: grass/trunk/raster/r.surf.random/randsurf.c
===================================================================
--- grass/trunk/raster/r.surf.random/randsurf.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.surf.random/randsurf.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -37,9 +37,9 @@
ncols = G_window_cols();
if (int_map)
- row_out_C = Rast_allocate_c_raster_buf();
+ row_out_C = Rast_allocate_c_buf();
else
- row_out_D = Rast_allocate_d_raster_buf();
+ row_out_D = Rast_allocate_c_buf();
/****** PASS THROUGH EACH CELL ASSIGNING RANDOM VALUE ******/
for (row_count = 0; row_count < nrows; row_count++) {
Modified: grass/trunk/raster/r.terraflow/grass2str.h
===================================================================
--- grass/trunk/raster/r.terraflow/grass2str.h 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.terraflow/grass2str.h 2009-06-25 21:10:29 UTC (rev 38082)
@@ -70,7 +70,7 @@
/* Allocate input buffer */
void *inrast;
- inrast = Rast_allocate_raster_buf(data_type);
+ inrast = Rast_allocate_buf(data_type);
CELL c;
FCELL f;
@@ -180,7 +180,7 @@
/* Allocate output buffer */
unsigned char *outrast;
- outrast = (unsigned char *)Rast_allocate_raster_buf(mtype);
+ outrast = (unsigned char *)Rast_allocate_buf(mtype);
assert(outrast);
T* elt;
@@ -265,7 +265,7 @@
/* Allocate output buffer */
unsigned char *outrast;
- outrast = (unsigned char *)Rast_allocate_raster_buf(CELL_TYPE);
+ outrast = (unsigned char *)Rast_allocate_buf(CELL_TYPE);
assert(outrast);
T* elt;
@@ -339,7 +339,7 @@
/* Allocate output buffer */
unsigned char *outrast;
- outrast = (unsigned char *)Rast_allocate_raster_buf(FCELL_TYPE);
+ outrast = (unsigned char *)Rast_allocate_buf(FCELL_TYPE);
assert(outrast);
T* elt;
@@ -436,10 +436,10 @@
/* Allocate output buffers */
FCELL *rast1;
- rast1 = (FCELL*)Rast_allocate_raster_buf(FCELL_TYPE);
+ rast1 = (FCELL*)Rast_allocate_buf(FCELL_TYPE);
assert(rast1);
FCELL *rast2;
- rast2 = (FCELL*)Rast_allocate_raster_buf(FCELL_TYPE);
+ rast2 = (FCELL*)Rast_allocate_buf(FCELL_TYPE);
assert(rast2);
T* elt;
Modified: grass/trunk/raster/r.texture/main.c
===================================================================
--- grass/trunk/raster/r.texture/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.texture/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -222,7 +222,7 @@
out_data_type = FCELL_TYPE;
/* Allocate output buffer, use FCELL data_type */
- outrast = Rast_allocate_raster_buf(out_data_type);
+ outrast = Rast_allocate_buf(out_data_type);
nrows = G_window_rows();
ncols = G_window_cols();
@@ -230,7 +230,7 @@
/* Load raster map. */
/* allocate the space for one row of cell map data *A* */
- cell_row = Rast_allocate_cell_buf();
+ cell_row = Rast_allocate_c_buf();
/* Allocate appropriate memory for the structure containing the image */
data = (int **)G_malloc(nrows * sizeof(int *));
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.to.rast3/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -103,7 +103,7 @@
cols = region.cols;
depths = region.depths;
- rast = Rast_allocate_raster_buf(globalRastMapType);
+ rast = Rast_allocate_buf(globalRastMapType);
G_debug(3, "raster_to_g3d: Writing %i raster maps with %i rows %i cols.",
depths, rows, cols);
@@ -119,7 +119,7 @@
for (x = 0, ptr = rast; x < cols; x++,
ptr =
- G_incr_void_ptr(ptr, Rast_raster_size(globalRastMapType))) {
+ G_incr_void_ptr(ptr, Rast_cell_size(globalRastMapType))) {
if (globalRastMapType == CELL_TYPE) {
if (Rast_is_null_value(ptr, globalRastMapType)) {
G3d_setNullValue(&dvalue, 1, DCELL_TYPE);
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -217,8 +217,8 @@
tbres = (top - bottom) / depths;
/*memory */
- input_rast = Rast_allocate_raster_buf(db.inputmaptype);
- elev_rast = Rast_allocate_raster_buf(db.elevmaptype);
+ input_rast = Rast_allocate_buf(db.inputmaptype);
+ elev_rast = Rast_allocate_buf(db.elevmaptype);
G3d_setNullValue(&null, 1, DCELL_TYPE);
@@ -238,9 +238,9 @@
for (x = 0, input_ptr = input_rast, elev_ptr = elev_rast; x < cols;
x++, input_ptr =
- G_incr_void_ptr(input_ptr, Rast_raster_size(db.inputmaptype)),
+ G_incr_void_ptr(input_ptr, Rast_cell_size(db.inputmaptype)),
elev_ptr =
- G_incr_void_ptr(elev_ptr, Rast_raster_size(db.elevmaptype))) {
+ G_incr_void_ptr(elev_ptr, Rast_cell_size(db.elevmaptype))) {
/*Get the elevation and the input map value */
inval =
Modified: grass/trunk/raster/r.to.vect/main.c
===================================================================
--- grass/trunk/raster/r.to.vect/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.to.vect/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -119,7 +119,7 @@
G_fatal_error(_("Unable to open raster map <%s>"), in_opt->answer);
data_type = Rast_get_raster_map_type(input_fd);
- data_size = Rast_raster_size(data_type);
+ data_size = Rast_cell_size(data_type);
G_get_window(&cell_head);
if (value_flag && data_type != CELL_TYPE) {
Modified: grass/trunk/raster/r.to.vect/points.c
===================================================================
--- grass/trunk/raster/r.to.vect/points.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.to.vect/points.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -23,13 +23,13 @@
switch (data_type) {
case CELL_TYPE:
- cellbuf = Rast_allocate_c_raster_buf();
+ cellbuf = Rast_allocate_c_buf();
break;
case FCELL_TYPE:
- fcellbuf = Rast_allocate_f_raster_buf();
+ fcellbuf = Rast_allocate_f_buf();
break;
case DCELL_TYPE:
- dcellbuf = Rast_allocate_d_raster_buf();
+ dcellbuf = Rast_allocate_c_buf();
break;
}
Modified: grass/trunk/raster/r.univar/r.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r.univar_main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.univar/r.univar_main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -179,7 +179,7 @@
: (map_type == DCELL_TYPE) ? (void *)stats->dcell_array
: (map_type == FCELL_TYPE) ? (void *)stats->fcell_array
: (void *)stats->cell_array);
- const size_t value_sz = Rast_raster_size(map_type);
+ const size_t value_sz = Rast_cell_size(map_type);
unsigned int row;
void *raster_row;
Modified: grass/trunk/raster/r.uslek/main.c
===================================================================
--- grass/trunk/raster/r.uslek/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.uslek/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -90,23 +90,23 @@
/***************************************************/
if ((infd_psand = Rast_open_cell_old(psand, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), psand);
- inrast_psand = Rast_allocate_d_raster_buf();
+ inrast_psand = Rast_allocate_c_buf();
if ((infd_psilt = Rast_open_cell_old(psilt, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), psilt);
- inrast_psilt = Rast_allocate_d_raster_buf();
+ inrast_psilt = Rast_allocate_c_buf();
if ((infd_pclay = Rast_open_cell_old(pclay, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), pclay);
- inrast_pclay = Rast_allocate_d_raster_buf();
+ inrast_pclay = Rast_allocate_c_buf();
if ((infd_pomat = Rast_open_cell_old(pomat, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), pomat);
- inrast_pomat = Rast_allocate_d_raster_buf();
+ inrast_pomat = Rast_allocate_c_buf();
/***************************************************/
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_d_raster_buf();
+ outrast = Rast_allocate_c_buf();
/* Create New raster files */
if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
Modified: grass/trunk/raster/r.usler/main.c
===================================================================
--- grass/trunk/raster/r.usler/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.usler/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -84,12 +84,12 @@
/***************************************************/
if ((infd_annual_pmm = Rast_open_cell_old(annual_pmm, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), annual_pmm);
- inrast_annual_pmm = Rast_allocate_d_raster_buf();
+ inrast_annual_pmm = Rast_allocate_c_buf();
/***************************************************/
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_d_raster_buf();
+ outrast = Rast_allocate_c_buf();
/* Create New raster files */
if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
Modified: grass/trunk/raster/r.volume/centroids.c
===================================================================
--- grass/trunk/raster/r.volume/centroids.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.volume/centroids.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -33,7 +33,7 @@
adjusted = 0;
- cell_buf = Rast_allocate_cell_buf();
+ cell_buf = Rast_allocate_c_buf();
/* space to accumulate counts */
count = (int *)G_malloc((max + 1) * sizeof(int));
Modified: grass/trunk/raster/r.volume/main.c
===================================================================
--- grass/trunk/raster/r.volume/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.volume/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -143,8 +143,8 @@
count[i] = 0;
}
- data_buf = Rast_allocate_cell_buf();
- clump_buf = Rast_allocate_cell_buf();
+ data_buf = Rast_allocate_c_buf();
+ clump_buf = Rast_allocate_c_buf();
/* get window size */
rows = window.rows;
Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.walk/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -567,8 +567,8 @@
dtm_data_type = Rast_get_raster_map_type(dtm_fd);
cost_data_type = Rast_get_raster_map_type(cost_fd);
- dtm_cell = Rast_allocate_raster_buf(dtm_data_type);
- cost_cell = Rast_allocate_raster_buf(cost_data_type);
+ dtm_cell = Rast_allocate_buf(dtm_data_type);
+ cost_cell = Rast_allocate_buf(cost_data_type);
/* Parameters for map submatrices */
@@ -701,7 +701,7 @@
int i;
double p;
- dtm_dsize = Rast_raster_size(dtm_data_type);
+ dtm_dsize = Rast_cell_size(dtm_data_type);
p = 0.0;
for (row = 0; row < nrows; row++) {
@@ -761,7 +761,7 @@
int i;
double p;
- cost_dsize = Rast_raster_size(cost_data_type);
+ cost_dsize = Rast_cell_size(cost_data_type);
p = 0.0;
for (row = 0; row < nrows; row++) {
@@ -891,9 +891,9 @@
data_type2 = Rast_get_raster_map_type(cum_fd);
- dsize2 = Rast_raster_size(data_type2);
+ dsize2 = Rast_cell_size(data_type2);
- cell2 = Rast_allocate_raster_buf(data_type2);
+ cell2 = Rast_allocate_buf(data_type2);
G_message(_("Reading %s... "), cum_cost_layer);
for (row = 0; row < nrows; row++) {
@@ -1446,10 +1446,10 @@
/* Open cumulative cost layer for writing */
cum_fd = Rast_open_raster_new(cum_cost_layer, cum_data_type);
- cum_cell = Rast_allocate_raster_buf(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_cell = Rast_allocate_raster_buf(dir_data_type);
+ dir_cell = Rast_allocate_buf(dir_data_type);
}
/* Write pending updates by segment_put() to output map */
@@ -1466,7 +1466,7 @@
if (keep_nulls) {
G_message(_("Will copy input map null values into output map"));
- cell2 = Rast_allocate_raster_buf(dtm_data_type);
+ cell2 = Rast_allocate_buf(dtm_data_type);
}
if (cum_data_type == CELL_TYPE) {
int *p;
Modified: grass/trunk/raster/r.water.outlet/main.c
===================================================================
--- grass/trunk/raster/r.water.outlet/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.water.outlet/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -135,7 +135,7 @@
drain_ptrs =
(char *)G_malloc(sizeof(char) * size_array(&pt_seg, nrows, ncols));
bas = (CELL *) G_calloc(size_array(&ba_seg, nrows, ncols), sizeof(CELL));
- cell_buf = Rast_allocate_cell_buf();
+ cell_buf = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
Rast_get_map_row(drain_fd, cell_buf, row);
@@ -151,7 +151,7 @@
if (row >= 0 && col >= 0 && row < nrows && col < ncols)
overland_cells(row, col);
G_free(drain_ptrs);
- cell_buf = Rast_allocate_cell_buf();
+ cell_buf = Rast_allocate_c_buf();
basin_fd = Rast_open_cell_new(basin_name);
if (basin_fd < 0)
Modified: grass/trunk/raster/r.watershed/ram/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -17,9 +17,9 @@
DCELL sum, sum_sqr, stddev, lstddev, dvalue;
if (asp_flag || dis_flag)
- buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
if (wat_flag || ls_flag || sl_flag || sg_flag)
- dbuf = Rast_allocate_d_raster_buf();
+ dbuf = Rast_allocate_c_buf();
G_free(alt);
if (ls_flag || sg_flag)
G_free(r_h);
Modified: grass/trunk/raster/r.watershed/ram/close_maps2.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps2.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/ram/close_maps2.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -10,7 +10,7 @@
CELL *theseg;
RAMSEG thesegseg;
- cellrow = Rast_allocate_cell_buf();
+ cellrow = Rast_allocate_c_buf();
if (seg_flag || bas_flag || haf_flag) {
if (seg_flag) {
theseg = bas;
Modified: grass/trunk/raster/r.watershed/ram/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/init_vars.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/ram/init_vars.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -146,8 +146,8 @@
}
ele_map_type = Rast_get_raster_map_type(fd);
- ele_size = Rast_raster_size(ele_map_type);
- elebuf = Rast_allocate_raster_buf(ele_map_type);
+ ele_size = Rast_cell_size(ele_map_type);
+ elebuf = Rast_allocate_buf(ele_map_type);
if (ele_map_type == FCELL_TYPE || ele_map_type == DCELL_TYPE)
ele_scale = 1000; /* should be enough to do the trick */
@@ -205,7 +205,7 @@
(DCELL *) G_malloc(sizeof(DCELL) *
size_array(&wat_seg, nrows, ncols));
- buf = Rast_allocate_cell_buf();
+ 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, "");
Modified: grass/trunk/raster/r.watershed/ram/sg_factor.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/sg_factor.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/ram/sg_factor.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -14,7 +14,7 @@
G_message(_("SECTION 4: RUSLE LS and/or S factor determination."));
if (ril_flag)
- ril_buf = Rast_allocate_cell_buf();
+ ril_buf = Rast_allocate_c_buf();
for (r = 0; r < nrows; r++) {
G_percent(r, nrows, 3);
Modified: grass/trunk/raster/r.watershed/seg/bseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_read.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/seg/bseg_read.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -25,7 +25,7 @@
}
nrows = G_window_rows();
ncols = G_window_cols();
- buffer = Rast_allocate_cell_buf();
+ buffer = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
if (Rast_get_c_raster_row(map_fd, buffer, row) < 0) {
G_free(buffer);
Modified: grass/trunk/raster/r.watershed/seg/bseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_write.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/seg/bseg_write.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -19,7 +19,7 @@
}
nrows = G_window_rows();
ncols = G_window_cols();
- buffer = Rast_allocate_cell_buf();
+ buffer = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
for (col = 0; col < ncols; col++) {
bseg_get(bseg, &value, row, col);
Modified: grass/trunk/raster/r.watershed/seg/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -18,7 +18,7 @@
cseg_close(&alt);
if (wat_flag) {
sum = sum_sqr = stddev = 0.0;
- dbuf = Rast_allocate_d_raster_buf();
+ dbuf = Rast_allocate_c_buf();
if (abs_acc) {
G_warning("Writing out only positive flow accumulation values.");
G_warning("Cells with a likely underestimate for flow accumulation can no longer be identified.");
Modified: grass/trunk/raster/r.watershed/seg/cseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_read.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/seg/cseg_read.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -23,7 +23,7 @@
return -3;
}
nrows = G_window_rows();
- buffer = Rast_allocate_cell_buf();
+ buffer = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
if (Rast_get_c_raster_row(map_fd, buffer, row) < 0) {
G_free(buffer);
Modified: grass/trunk/raster/r.watershed/seg/cseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_write.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/seg/cseg_write.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -17,7 +17,7 @@
return -1;
}
nrows = G_window_rows();
- buffer = Rast_allocate_cell_buf();
+ buffer = Rast_allocate_c_buf();
segment_flush(&(cseg->seg));
for (row = 0; row < nrows; row++) {
segment_get_row(&(cseg->seg), buffer, row);
Modified: grass/trunk/raster/r.watershed/seg/dseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -24,7 +24,7 @@
}
nrows = G_window_rows();
ncols = G_window_cols();
- dbuffer = Rast_allocate_d_raster_buf();
+ dbuffer = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
if (Rast_get_d_raster_row(map_fd, dbuffer, row) < 0) {
G_free(dbuffer);
Modified: grass/trunk/raster/r.watershed/seg/dseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -18,7 +18,7 @@
}
nrows = G_window_rows();
ncols = G_window_cols();
- dbuffer = Rast_allocate_d_raster_buf();
+ dbuffer = Rast_allocate_c_buf();
segment_flush(&(dseg->seg));
for (row = 0; row < nrows; row++) {
segment_get_row(&(dseg->seg), (DCELL *) dbuffer, row);
Modified: grass/trunk/raster/r.watershed/seg/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/init_vars.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/seg/init_vars.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -193,8 +193,8 @@
}
ele_map_type = Rast_get_raster_map_type(fd);
- ele_size = Rast_raster_size(ele_map_type);
- elebuf = Rast_allocate_raster_buf(ele_map_type);
+ ele_size = Rast_cell_size(ele_map_type);
+ elebuf = Rast_allocate_buf(ele_map_type);
if (ele_map_type == FCELL_TYPE || ele_map_type == DCELL_TYPE)
ele_scale = 1000; /* should be enough to do the trick */
@@ -278,7 +278,7 @@
if (fd < 0) {
G_fatal_error(_("unable to open depression map layer"));
}
- buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
for (r = 0; r < nrows; r++) {
Rast_get_c_raster_row(fd, buf, r);
for (c = 0; c < ncols; c++) {
@@ -307,7 +307,7 @@
if (fd < 0) {
G_fatal_error(_("unable to open blocking map layer"));
}
- buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
for (r = 0; r < nrows; r++) {
Rast_get_c_raster_row(fd, buf, r);
for (c = 0; c < ncols; c++) {
Modified: grass/trunk/raster/r.watershed/shed/read.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/read.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/shed/read.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -16,8 +16,8 @@
nrows = G_window_rows();
ncols = G_window_cols();
- buf = Rast_allocate_cell_buf();
- bas_buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
+ bas_buf = Rast_allocate_c_buf();
mapset = G_find_cell(haf_name, "");
if (!mapset) {
G_fatal_error(_("unable to open basin/half basin map"));
Modified: grass/trunk/raster/r.watershed/shed/valid.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/valid.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.watershed/shed/valid.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -28,7 +28,7 @@
G_fatal_error(_("unable to open accum file in valid_basins()"));
}
- buf = Rast_allocate_cell_buf();
+ buf = Rast_allocate_c_buf();
basin_facts = output->basin_facts;
for (i = output->num_basins - 1; i >= 0; i--) {
basin = &(basin_facts[i]);
Modified: grass/trunk/raster/r.what/main.c
===================================================================
--- grass/trunk/raster/r.what/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/r.what/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -213,9 +213,9 @@
if (flag3->answer)
out_type[i] = CELL_TYPE;
- cell[i] = Rast_allocate_c_raster_buf();
+ cell[i] = Rast_allocate_c_buf();
if (out_type[i] != CELL_TYPE)
- dcell[i] = Rast_allocate_d_raster_buf();
+ dcell[i] = Rast_allocate_c_buf();
}
G_get_window(&window);
Modified: grass/trunk/raster/simwe/simlib/input.c
===================================================================
--- grass/trunk/raster/simwe/simlib/input.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/simwe/simlib/input.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -86,31 +86,31 @@
*/
/* Allocate raster buffers */
- cell1 = Rast_allocate_f_raster_buf();
- cell2 = Rast_allocate_d_raster_buf();
- cell3 = Rast_allocate_d_raster_buf();
+ cell1 = Rast_allocate_f_buf();
+ cell2 = Rast_allocate_c_buf();
+ cell3 = Rast_allocate_c_buf();
if (rain != NULL)
- cell4 = Rast_allocate_d_raster_buf();
+ cell4 = Rast_allocate_c_buf();
if (infil != NULL)
- cell4a = Rast_allocate_d_raster_buf();
+ cell4a = Rast_allocate_c_buf();
if (traps != NULL)
- cell4b = Rast_allocate_f_raster_buf();
- cell5 = Rast_allocate_f_raster_buf();
+ cell4b = Rast_allocate_f_buf();
+ cell5 = Rast_allocate_f_buf();
if (detin != NULL)
- cell9 = Rast_allocate_f_raster_buf();
+ cell9 = Rast_allocate_f_buf();
if (tranin != NULL)
- cell10 = Rast_allocate_f_raster_buf();
+ cell10 = Rast_allocate_f_buf();
if (tauin != NULL)
- cell11 = Rast_allocate_f_raster_buf();
+ cell11 = Rast_allocate_f_buf();
if (wdepth != NULL)
- cell12 = Rast_allocate_d_raster_buf();
+ cell12 = Rast_allocate_c_buf();
/* Allocate some double dimension arrays for each input */
/* with length of matrix Y */
Modified: grass/trunk/raster/simwe/simlib/output.c
===================================================================
--- grass/trunk/raster/simwe/simlib/output.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster/simwe/simlib/output.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -89,7 +89,7 @@
}
*/
if (depth != NULL) {
- cell6 = Rast_allocate_f_raster_buf();
+ cell6 = Rast_allocate_f_buf();
if (ts == 1) {
sprintf(buf, "%s.%.*d", depth, ndigit, tt);
depth0 = G_store(buf);
@@ -102,7 +102,7 @@
}
if (disch != NULL) {
- cell7 = Rast_allocate_f_raster_buf();
+ cell7 = Rast_allocate_f_buf();
if (ts == 1) {
sprintf(buf, "%s.%.*d", disch, ndigit, tt);
disch0 = G_store(buf);
@@ -115,7 +115,7 @@
}
if (err != NULL) {
- cell8 = Rast_allocate_f_raster_buf();
+ cell8 = Rast_allocate_f_buf();
if (ts == 1) {
sprintf(buf, "%s.%.*d", err, ndigit, tt);
err0 = G_store(buf);
@@ -130,7 +130,7 @@
if (conc != NULL) {
- cell14 = Rast_allocate_f_raster_buf();
+ cell14 = Rast_allocate_f_buf();
if (ts == 1) {
sprintf(buf, "%s.%.*d", conc, ndigit, tt);
conc0 = G_store(buf);
@@ -144,7 +144,7 @@
}
if (flux != NULL) {
- cell15 = Rast_allocate_f_raster_buf();
+ cell15 = Rast_allocate_f_buf();
if (ts == 1) {
sprintf(buf, "%s.%.*d", flux, ndigit, tt);
flux0 = G_store(buf);
@@ -158,7 +158,7 @@
}
if (erdep != NULL) {
- cell16 = Rast_allocate_f_raster_buf();
+ cell16 = Rast_allocate_f_buf();
if (ts == 1) {
sprintf(buf, "%s.%.*d", erdep, ndigit, tt);
erdep0 = G_store(buf);
@@ -619,7 +619,7 @@
if (et != NULL) {
- cell17 = Rast_allocate_f_raster_buf();
+ cell17 = Rast_allocate_f_buf();
/* if (ts == 1) {
sprintf(buf,"%s.%.*d",et,ndigit,tt);
et0 = G_store(buf);
@@ -633,7 +633,7 @@
}
if (tc != NULL) {
- cell13 = Rast_allocate_f_raster_buf();
+ cell13 = Rast_allocate_f_buf();
/* if (ts == 1) {
sprintf(buf,"%s.%.*d",tc,ndigit,tt);
tc0 = G_store(buf);
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -147,12 +147,12 @@
/*Allocate mem for the output maps row */
if (typeIntern == FCELL_TYPE)
- fcell = Rast_allocate_f_raster_buf();
+ fcell = Rast_allocate_f_buf();
else if (typeIntern == DCELL_TYPE)
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
/*Mem for the input map row */
- elevrast = Rast_allocate_raster_buf(globalElevMapType);
+ elevrast = Rast_allocate_buf(globalElevMapType);
for (y = 0; y < rows; y++) {
G_percent(y, rows - 1, 10);
@@ -163,7 +163,7 @@
_("Unable to get elevation raster row"));
for (x = 0, ptr = elevrast; x < cols; x++, ptr =
- G_incr_void_ptr(ptr, Rast_raster_size(globalElevMapType))) {
+ G_incr_void_ptr(ptr, Rast_cell_size(globalElevMapType))) {
/*we guess the elevation input map has no null values */
isnull = 0;
Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -117,8 +117,8 @@
cols = region.cols;
depths = region.depths;
- rast_top = Rast_allocate_raster_buf(in->topMapType);
- rast_bottom = Rast_allocate_raster_buf(in->bottomMapType);
+ rast_top = Rast_allocate_buf(in->topMapType);
+ rast_bottom = Rast_allocate_buf(in->bottomMapType);
G_debug(3, _("write_vtk_points: Writing point coordinates"));
@@ -138,10 +138,10 @@
for (x = 0, ptr_top = rast_top, ptr_bottom = rast_bottom;
x < cols;
x++, ptr_top =
- G_incr_void_ptr(ptr_top, Rast_raster_size(in->topMapType)),
+ G_incr_void_ptr(ptr_top, Rast_cell_size(in->topMapType)),
ptr_bottom =
G_incr_void_ptr(ptr_bottom,
- Rast_raster_size(in->bottomMapType))) {
+ Rast_cell_size(in->bottomMapType))) {
/*Get the values */
topval =
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -119,9 +119,9 @@
typeIntern = G3d_tileTypeMap(map);
if (typeIntern == FCELL_TYPE)
- fcell = Rast_allocate_f_raster_buf();
+ fcell = Rast_allocate_f_buf();
else if (typeIntern == DCELL_TYPE)
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
pos = 0;
/*Every Rastermap */
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-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -480,7 +480,7 @@
if (slope_name != NULL) {
slope_fd = opennew(slope_name, out_type);
- slp_raster = Rast_allocate_raster_buf(data_type);
+ slp_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(slp_raster, G_window_cols(), data_type);
Rast_put_raster_row(slope_fd, slp_raster, data_type);
}
@@ -491,7 +491,7 @@
if (aspect_name != NULL) {
aspect_fd = opennew(aspect_name, out_type);
- asp_raster = Rast_allocate_raster_buf(data_type);
+ asp_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(asp_raster, G_window_cols(), data_type);
Rast_put_raster_row(aspect_fd, asp_raster, data_type);
}
@@ -502,7 +502,7 @@
if (pcurv_name != NULL) {
pcurv_fd = opennew(pcurv_name, out_type);
- pcurv_raster = Rast_allocate_raster_buf(data_type);
+ pcurv_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(pcurv_raster, G_window_cols(), data_type);
Rast_put_raster_row(pcurv_fd, pcurv_raster, data_type);
}
@@ -513,7 +513,7 @@
if (tcurv_name != NULL) {
tcurv_fd = opennew(tcurv_name, out_type);
- tcurv_raster = Rast_allocate_raster_buf(data_type);
+ tcurv_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(tcurv_raster, G_window_cols(), data_type);
Rast_put_raster_row(tcurv_fd, tcurv_raster, data_type);
}
@@ -524,7 +524,7 @@
if (dx_name != NULL) {
dx_fd = opennew(dx_name, out_type);
- dx_raster = Rast_allocate_raster_buf(data_type);
+ dx_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dx_raster, G_window_cols(), data_type);
Rast_put_raster_row(dx_fd, dx_raster, data_type);
}
@@ -535,7 +535,7 @@
if (dy_name != NULL) {
dy_fd = opennew(dy_name, out_type);
- dy_raster = Rast_allocate_raster_buf(data_type);
+ dy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dy_raster, G_window_cols(), data_type);
Rast_put_raster_row(dy_fd, dy_raster, data_type);
}
@@ -546,7 +546,7 @@
if (dxx_name != NULL) {
dxx_fd = opennew(dxx_name, out_type);
- dxx_raster = Rast_allocate_raster_buf(data_type);
+ dxx_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dxx_raster, G_window_cols(), data_type);
Rast_put_raster_row(dxx_fd, dxx_raster, data_type);
}
@@ -557,7 +557,7 @@
if (dyy_name != NULL) {
dyy_fd = opennew(dyy_name, out_type);
- dyy_raster = Rast_allocate_raster_buf(data_type);
+ dyy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dyy_raster, G_window_cols(), data_type);
Rast_put_raster_row(dyy_fd, dyy_raster, data_type);
}
@@ -568,7 +568,7 @@
if (dxy_name != NULL) {
dxy_fd = opennew(dxy_name, out_type);
- dxy_raster = Rast_allocate_raster_buf(data_type);
+ dxy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dxy_raster, G_window_cols(), data_type);
Rast_put_raster_row(dxy_fd, dxy_raster, data_type);
}
@@ -656,14 +656,14 @@
asp_ptr = asp_raster;
else
asp_ptr =
- G_incr_void_ptr(asp_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(asp_raster, Rast_cell_size(data_type));
}
if (slope_fd >= 0) {
if (Wrap)
slp_ptr = slp_raster;
else
slp_ptr =
- G_incr_void_ptr(slp_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(slp_raster, Rast_cell_size(data_type));
}
if (pcurv_fd >= 0) {
@@ -671,7 +671,7 @@
pcurv_ptr = pcurv_raster;
else
pcurv_ptr =
- G_incr_void_ptr(pcurv_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(pcurv_raster, Rast_cell_size(data_type));
}
if (tcurv_fd >= 0) {
@@ -679,21 +679,21 @@
tcurv_ptr = tcurv_raster;
else
tcurv_ptr =
- G_incr_void_ptr(tcurv_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(tcurv_raster, Rast_cell_size(data_type));
}
if (dx_fd >= 0) {
if (Wrap)
dx_ptr = dx_raster;
else
- dx_ptr = G_incr_void_ptr(dx_raster, Rast_raster_size(data_type));
+ dx_ptr = G_incr_void_ptr(dx_raster, Rast_cell_size(data_type));
}
if (dy_fd >= 0) {
if (Wrap)
dy_ptr = dy_raster;
else
- dy_ptr = G_incr_void_ptr(dy_raster, Rast_raster_size(data_type));
+ dy_ptr = G_incr_void_ptr(dy_raster, Rast_cell_size(data_type));
}
if (dxx_fd >= 0) {
@@ -701,7 +701,7 @@
dxx_ptr = dxx_raster;
else
dxx_ptr =
- G_incr_void_ptr(dxx_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(dxx_raster, Rast_cell_size(data_type));
}
if (dyy_fd >= 0) {
@@ -709,7 +709,7 @@
dyy_ptr = dyy_raster;
else
dyy_ptr =
- G_incr_void_ptr(dyy_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(dyy_raster, Rast_cell_size(data_type));
}
if (dxy_fd >= 0) {
@@ -717,7 +717,7 @@
dxy_ptr = dxy_raster;
else
dxy_ptr =
- G_incr_void_ptr(dxy_raster, Rast_raster_size(data_type));
+ G_incr_void_ptr(dxy_raster, Rast_cell_size(data_type));
}
@@ -738,47 +738,47 @@
if (slope_fd > 0) {
Rast_set_null_value(slp_ptr, 1, data_type);
slp_ptr =
- G_incr_void_ptr(slp_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(slp_ptr, Rast_cell_size(data_type));
}
if (aspect_fd > 0) {
Rast_set_null_value(asp_ptr, 1, data_type);
asp_ptr =
- G_incr_void_ptr(asp_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(asp_ptr, Rast_cell_size(data_type));
}
if (pcurv_fd > 0) {
Rast_set_null_value(pcurv_ptr, 1, data_type);
pcurv_ptr =
- G_incr_void_ptr(pcurv_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(pcurv_ptr, Rast_cell_size(data_type));
}
if (tcurv_fd > 0) {
Rast_set_null_value(tcurv_ptr, 1, data_type);
tcurv_ptr =
- G_incr_void_ptr(tcurv_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(tcurv_ptr, Rast_cell_size(data_type));
}
if (dx_fd > 0) {
Rast_set_null_value(dx_ptr, 1, data_type);
dx_ptr =
- G_incr_void_ptr(dx_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dx_ptr, Rast_cell_size(data_type));
}
if (dy_fd > 0) {
Rast_set_null_value(dy_ptr, 1, data_type);
dy_ptr =
- G_incr_void_ptr(dy_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dy_ptr, Rast_cell_size(data_type));
}
if (dxx_fd > 0) {
Rast_set_null_value(dxx_ptr, 1, data_type);
dxx_ptr =
- G_incr_void_ptr(dxx_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dxx_ptr, Rast_cell_size(data_type));
}
if (dyy_fd > 0) {
Rast_set_null_value(dyy_ptr, 1, data_type);
dyy_ptr =
- G_incr_void_ptr(dyy_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dyy_ptr, Rast_cell_size(data_type));
}
if (dxy_fd > 0) {
Rast_set_null_value(dxy_ptr, 1, data_type);
dxy_ptr =
- G_incr_void_ptr(dxy_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(dxy_ptr, Rast_cell_size(data_type));
}
continue;
} /* no data */
@@ -843,7 +843,7 @@
Rast_set_raster_value_d(slp_ptr,
(DCELL) slp_in_perc, data_type);
}
- slp_ptr = G_incr_void_ptr(slp_ptr, Rast_raster_size(data_type));
+ slp_ptr = G_incr_void_ptr(slp_ptr, Rast_cell_size(data_type));
} /* computing slope */
if (aspect_fd > 0) {
@@ -875,7 +875,7 @@
}
else
Rast_set_null_value(asp_ptr, 1, data_type);
- asp_ptr = G_incr_void_ptr(asp_ptr, Rast_raster_size(data_type));
+ asp_ptr = G_incr_void_ptr(asp_ptr, Rast_cell_size(data_type));
/* now update min and max */
if (min_asp > aspect)
@@ -889,7 +889,7 @@
*((CELL *) dx_ptr) = (CELL) (scik1 * dx);
else
Rast_set_raster_value_d(dx_ptr, (DCELL) dx, data_type);
- dx_ptr = G_incr_void_ptr(dx_ptr, Rast_raster_size(data_type));
+ dx_ptr = G_incr_void_ptr(dx_ptr, Rast_cell_size(data_type));
}
if (dy_fd > 0) {
@@ -897,7 +897,7 @@
*((CELL *) dy_ptr) = (CELL) (scik1 * dy);
else
Rast_set_raster_value_d(dy_ptr, (DCELL) dy, data_type);
- dy_ptr = G_incr_void_ptr(dy_ptr, Rast_raster_size(data_type));
+ dy_ptr = G_incr_void_ptr(dy_ptr, Rast_cell_size(data_type));
}
if (dxx_fd <= 0 && dxy_fd <= 0 && dyy_fd <= 0 &&
@@ -919,7 +919,7 @@
*((CELL *) dxx_ptr) = (CELL) (scik1 * dxx);
else
Rast_set_raster_value_d(dxx_ptr, (DCELL) dxx, data_type);
- dxx_ptr = G_incr_void_ptr(dxx_ptr, Rast_raster_size(data_type));
+ dxx_ptr = G_incr_void_ptr(dxx_ptr, Rast_cell_size(data_type));
}
if (dyy_fd > 0) {
@@ -927,7 +927,7 @@
*((CELL *) dyy_ptr) = (CELL) (scik1 * dyy);
else
Rast_set_raster_value_d(dyy_ptr, (DCELL) dyy, data_type);
- dyy_ptr = G_incr_void_ptr(dyy_ptr, Rast_raster_size(data_type));
+ dyy_ptr = G_incr_void_ptr(dyy_ptr, Rast_cell_size(data_type));
}
if (dxy_fd > 0) {
@@ -935,7 +935,7 @@
*((CELL *) dxy_ptr) = (CELL) (scik1 * dxy);
else
Rast_set_raster_value_d(dxy_ptr, (DCELL) dxy, data_type);
- dxy_ptr = G_incr_void_ptr(dxy_ptr, Rast_raster_size(data_type));
+ dxy_ptr = G_incr_void_ptr(dxy_ptr, Rast_cell_size(data_type));
}
/* compute curvature */
@@ -972,7 +972,7 @@
else
Rast_set_raster_value_d(pcurv_ptr, (DCELL) pcurv, data_type);
pcurv_ptr =
- G_incr_void_ptr(pcurv_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(pcurv_ptr, Rast_cell_size(data_type));
}
if (tcurv_fd > 0) {
@@ -981,7 +981,7 @@
else
Rast_set_raster_value_d(tcurv_ptr, (DCELL) tcurv, data_type);
tcurv_ptr =
- G_incr_void_ptr(tcurv_ptr, Rast_raster_size(data_type));
+ G_incr_void_ptr(tcurv_ptr, Rast_cell_size(data_type));
}
} /* column for loop */
Modified: grass/trunk/vector/lidar/lidarlib/zones.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/zones.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/vector/lidar/lidarlib/zones.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -274,7 +274,7 @@
nrows = G_window_rows();
ncols = G_window_cols();
- raster = Rast_allocate_raster_buf(DCELL_TYPE);
+ raster = Rast_allocate_buf(DCELL_TYPE);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
@@ -282,7 +282,7 @@
Rast_set_d_null_value(raster, ncols);
for (col = 0, ptr = raster; col < ncols;
- col++, ptr = G_incr_void_ptr(ptr, Rast_raster_size(DCELL_TYPE))) {
+ col++, ptr = G_incr_void_ptr(ptr, Rast_cell_size(DCELL_TYPE))) {
Rast_set_raster_value_d(ptr, (DCELL) (matrix[row][col]), DCELL_TYPE);
}
Rast_put_d_raster_row(fd, raster);
Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/vector/v.kernel/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -246,12 +246,12 @@
/* open mask file */
if ((maskfd = Rast_maskfd()) >= 0)
- mask = Rast_allocate_cell_buf();
+ mask = Rast_allocate_c_buf();
else
mask = NULL;
/* allocate output raster */
- output_cell = Rast_allocate_raster_buf(DCELL_TYPE);
+ output_cell = Rast_allocate_buf(DCELL_TYPE);
}
}
Modified: grass/trunk/vector/v.neighbors/main.c
===================================================================
--- grass/trunk/vector/v.neighbors/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/vector/v.neighbors/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -82,7 +82,7 @@
nrows = G_window_rows();
ncols = G_window_cols();
- result = Rast_allocate_raster_buf(CELL_TYPE);
+ result = Rast_allocate_buf(CELL_TYPE);
Points = Vect_new_line_struct();
Cats = Vect_new_cats_struct();
List = Vect_new_list();
@@ -138,7 +138,7 @@
value = count;
Rast_set_raster_value_d(rp, value, CELL_TYPE);
}
- rp = G_incr_void_ptr(rp, Rast_raster_size(CELL_TYPE));
+ rp = G_incr_void_ptr(rp, Rast_cell_size(CELL_TYPE));
}
Rast_put_raster_row(out_fd, result, CELL_TYPE);
Modified: grass/trunk/vector/v.surf.idw/main.c
===================================================================
--- grass/trunk/vector/v.surf.idw/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/vector/v.surf.idw/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -240,10 +240,10 @@
/* allocate buffers, etc. */
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
if ((maskfd = Rast_maskfd()) >= 0)
- mask = Rast_allocate_cell_buf();
+ mask = Rast_allocate_c_buf();
else
mask = NULL;
Modified: grass/trunk/vector/v.to.rast/support.c
===================================================================
--- grass/trunk/vector/v.to.rast/support.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/vector/v.to.rast/support.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -420,7 +420,7 @@
map_type = Rast_raster_map_type(rast_name, G_mapset());
- if (!(rowbuf = Rast_allocate_raster_buf(map_type)))
+ if (!(rowbuf = Rast_allocate_buf(map_type)))
G_fatal_error(_("Cannot allocate memory for row buffer"));
Rast_init_cell_stats(&stats);
Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/vector/v.vol.rst/user1.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -364,7 +364,7 @@
clean_fatal_error(buf);
}
bitmask = BM_create(nsizc, nsizr);
- cellmask = Rast_allocate_cell_buf();
+ cellmask = Rast_allocate_c_buf();
cfmask = Rast_open_cell_old(maskmap, mapsetm);
for (i = 0; i < nsizr; i++) {
irev = nsizr - i - 1;
@@ -399,7 +399,7 @@
float value;
if ((cellinp != NULL) && (cellout != NULL)) {
- cell = Rast_allocate_f_raster_buf();
+ cell = Rast_allocate_f_buf();
for (i = 0; i < nsizr; i++) {
/* seek to the right row */
Modified: grass/trunk/vector/v.vol.rst/user3.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user3.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/vector/v.vol.rst/user3.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -276,7 +276,7 @@
}
if (cell == NULL)
- cell = Rast_allocate_f_raster_buf();
+ cell = Rast_allocate_f_buf();
for (i = 1; i <= n_points; i++) {
points[i - 1].x = (points[i - 1].x - x_or) / dnorm;
Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/vector/v.what.rast/main.c 2009-06-25 21:10:29 UTC (rev 38082)
@@ -248,9 +248,9 @@
/* Allocate space for raster row */
if (out_type == CELL_TYPE)
- cell = Rast_allocate_c_raster_buf();
+ cell = Rast_allocate_c_buf();
else
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_c_buf();
/* Extract raster values from file and store in cache */
G_debug(1, "Extracting raster values");
Modified: grass/trunk/visualization/xganim/main.cc
===================================================================
--- grass/trunk/visualization/xganim/main.cc 2009-06-25 20:10:08 UTC (rev 38081)
+++ grass/trunk/visualization/xganim/main.cc 2009-06-25 21:10:29 UTC (rev 38082)
@@ -186,7 +186,7 @@
const char *name;
struct Colors colors;
- dcell = Rast_allocate_d_raster_buf();
+ dcell = Rast_allocate_d_buf();
tsiz = G_window_cols();
More information about the grass-commit
mailing list