[GRASS-SVN] r38119 - 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.atcorr imagery/i.biomass imagery/i.cca
imagery/i.class imagery/i.cluster imagery/i.eb.eta
imagery/i.eb.evapfr imagery/i.eb.h_SEBAL01
imagery/i.eb.soilheatflux imagery/i.emissivity
imagery/i.evapo.time_integration imagery/i.fft
imagery/i.gensig imagery/i.gensigset imagery/i.his.rgb
imagery/i.ifft imagery/i.latlong imagery/i.maxlik
imagery/i.modis.qc imagery/i.pca imagery/i.points
imagery/i.rectify imagery/i.rgb.his imagery/i.smap
imagery/i.sunhours imagery/i.vi imagery/i.vpoints
imagery/i.zc include lib/gpde lib/ogsf lib/raster
lib/rst/interp_float ps/ps.map raster/r.basins.fill
raster/r.bitpattern raster/r.buffer raster/r.carve
raster/r.category raster/r.clump raster/r.colors
raster/r.composite raster/r.compress raster/r.contour
raster/r.cost raster/r.covar raster/r.cross raster/r.describe
raster/r.distance raster/r.drain raster/r.fill.dir
raster/r.flow raster/r.grow raster/r.grow.distance
raster/r.his raster/r.horizon raster/r.lake
raster/r.le/r.le.patch raster/r.le/r.le.pixel
raster/r.le/r.le.setup raster/r.le/r.le.trace
raster/r.li/r.li.daemon raster/r.los raster/r.mapcalc
raster/r.mfilter raster/r.neighbors raster/r.null
raster/r.out.arc raster/r.out.ascii raster/r.out.bin
raster/r.out.gdal raster/r.out.gridatb raster/r.out.mat
raster/r.out.mpeg raster/r.out.png raster/r.out.pov
raster/r.out.ppm raster/r.out.ppm3 raster/r.out.tiff
raster/r.out.vrml raster/r.out.vtk raster/r.param.scale
raster/r.patch raster/r.profile raster/r.proj
raster/r.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.contour raster/r.surf.idw raster/r.surf.idw2
raster/r.terraflow raster/r.texture raster/r.thin
raster/r.to.rast3 raster/r.to.rast3elev raster/r.to.vect
raster/r.topidx raster/r.univar raster/r.uslek raster/r.usler
raster/r.volume raster/r.walk raster/r.water.outlet
raster/r.watershed/ram raster/r.watershed/seg
raster/r.watershed/shed raster/r.what raster/simwe/simlib
raster3d/r3.cross.rast raster3d/r3.out.vtk
swig/perl/R_slope_aspect/r_slope_aspect vector/v.kernel
vector/v.surf.idw vector/v.to.rast vector/v.vol.rst
vector/v.what.rast visualization/xganim
svn_grass at osgeo.org
svn_grass at osgeo.org
Mon Jun 29 15:59:06 EDT 2009
Author: martinl
Date: 2009-06-29 15:59:00 -0400 (Mon, 29 Jun 2009)
New Revision: 38119
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.atcorr/main.cpp
grass/trunk/imagery/i.biomass/main.c
grass/trunk/imagery/i.cca/transform.c
grass/trunk/imagery/i.class/draw_cell.c
grass/trunk/imagery/i.class/readbands.c
grass/trunk/imagery/i.cluster/main.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/covariance.c
grass/trunk/imagery/i.gensig/get_train.c
grass/trunk/imagery/i.gensig/means.c
grass/trunk/imagery/i.gensig/read_train.c
grass/trunk/imagery/i.gensigset/get_train.c
grass/trunk/imagery/i.gensigset/read_data.c
grass/trunk/imagery/i.gensigset/read_train.c
grass/trunk/imagery/i.his.rgb/main.c
grass/trunk/imagery/i.ifft/main.c
grass/trunk/imagery/i.latlong/main.c
grass/trunk/imagery/i.maxlik/main.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/perform.c
grass/trunk/imagery/i.rgb.his/main.c
grass/trunk/imagery/i.smap/read_block.c
grass/trunk/imagery/i.sunhours/main.c
grass/trunk/imagery/i.vi/main.c
grass/trunk/imagery/i.vpoints/drawcell.c
grass/trunk/imagery/i.zc/main.c
grass/trunk/include/raster.h
grass/trunk/lib/gpde/N_arrays_io.c
grass/trunk/lib/ogsf/Gs3.c
grass/trunk/lib/raster/get_row.c
grass/trunk/lib/raster/get_row_colr.c
grass/trunk/lib/raster/opencell.c
grass/trunk/lib/raster/put_row.c
grass/trunk/lib/raster/sample.c
grass/trunk/lib/rst/interp_float/input2d.c
grass/trunk/lib/rst/interp_float/ressegm2d.c
grass/trunk/ps/ps.map/outl_io.c
grass/trunk/ps/ps.map/ps_raster.c
grass/trunk/raster/r.basins.fill/read_map.c
grass/trunk/raster/r.bitpattern/main.c
grass/trunk/raster/r.buffer/read_map.c
grass/trunk/raster/r.buffer/write_map.c
grass/trunk/raster/r.carve/raster.c
grass/trunk/raster/r.category/cats.c
grass/trunk/raster/r.clump/clump.c
grass/trunk/raster/r.colors/stats.c
grass/trunk/raster/r.composite/main.c
grass/trunk/raster/r.compress/main.c
grass/trunk/raster/r.contour/main.c
grass/trunk/raster/r.cost/main.c
grass/trunk/raster/r.covar/main.c
grass/trunk/raster/r.cross/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.distance/edges.c
grass/trunk/raster/r.drain/main.c
grass/trunk/raster/r.drain/tinf.c
grass/trunk/raster/r.fill.dir/tinf.c
grass/trunk/raster/r.flow/io.c
grass/trunk/raster/r.grow.distance/main.c
grass/trunk/raster/r.grow/main.c
grass/trunk/raster/r.his/main.c
grass/trunk/raster/r.horizon/main.c
grass/trunk/raster/r.lake/main.c
grass/trunk/raster/r.le/r.le.patch/driver.c
grass/trunk/raster/r.le/r.le.patch/trace.c
grass/trunk/raster/r.le/r.le.pixel/cellclip.c
grass/trunk/raster/r.le/r.le.pixel/driver.c
grass/trunk/raster/r.le/r.le.setup/sample.c
grass/trunk/raster/r.le/r.le.trace/main.c
grass/trunk/raster/r.li/r.li.daemon/worker.c
grass/trunk/raster/r.los/main.c
grass/trunk/raster/r.mapcalc/map.c
grass/trunk/raster/r.mfilter/getrow.c
grass/trunk/raster/r.neighbors/readcell.c
grass/trunk/raster/r.null/main.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.vrml/put_grid.c
grass/trunk/raster/r.out.vtk/writeascii.c
grass/trunk/raster/r.param.scale/process.c
grass/trunk/raster/r.patch/main.c
grass/trunk/raster/r.profile/read_rast.c
grass/trunk/raster/r.proj/readcell.c
grass/trunk/raster/r.quantile/main.c
grass/trunk/raster/r.random.cells/init.c
grass/trunk/raster/r.random.surface/calcsurf.c
grass/trunk/raster/r.random.surface/init.c
grass/trunk/raster/r.random.surface/save.c
grass/trunk/raster/r.random/count.c
grass/trunk/raster/r.random/random.c
grass/trunk/raster/r.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/collect_ori.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.contour/main.c
grass/trunk/raster/r.surf.contour/read_cell.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.terraflow/grass2str.h
grass/trunk/raster/r.texture/main.c
grass/trunk/raster/r.thin/io.c
grass/trunk/raster/r.to.rast3/main.c
grass/trunk/raster/r.to.rast3elev/main.c
grass/trunk/raster/r.to.vect/points.c
grass/trunk/raster/r.to.vect/util.c
grass/trunk/raster/r.topidx/file_io.c
grass/trunk/raster/r.univar/r.univar_main.c
grass/trunk/raster/r.uslek/main.c
grass/trunk/raster/r.usler/main.c
grass/trunk/raster/r.volume/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/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/close_maps.c
grass/trunk/raster/r.watershed/seg/cseg_read.c
grass/trunk/raster/r.watershed/seg/dseg_read.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/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
grass/trunk/vector/v.kernel/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:
rasterlib: fns from get_row.c renamed, see
http://trac.osgeo.org/grass/wiki/Grass7/RasterLib
Modified: grass/trunk/display/d.his/main.c
===================================================================
--- grass/trunk/display/d.his/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/display/d.his/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -190,17 +190,17 @@
for (atrow = 0; atrow < window.rows;) {
G_percent(atrow, window.rows, 2);
- if (Rast_get_raster_row_colors
+ if (Rast_get_row_colors
(hue_file, atrow, &hue_colors, hue_r, hue_g, hue_b, hue_n) < 0)
G_fatal_error(_("Error reading hue data"));
if (int_used &&
- (Rast_get_raster_row_colors
+ (Rast_get_row_colors
(int_file, atrow, &int_colors, int_r, dummy, dummy, int_n) < 0))
G_fatal_error(_("Error reading intensity data"));
if (sat_used &&
- (Rast_get_raster_row_colors
+ (Rast_get_row_colors
(sat_file, atrow, &sat_colors, sat_r, dummy, dummy, sat_n) < 0))
G_fatal_error(_("Error reading saturation data"));
Modified: grass/trunk/display/d.nviz/main.c
===================================================================
--- grass/trunk/display/d.nviz/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/display/d.nviz/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -443,7 +443,7 @@
if (data_type == CELL_TYPE) {
cell = Rast_allocate_c_buf();
- if (Rast_get_c_raster_row(fd, cell, row) < 0)
+ if (Rast_get_c_row(fd, cell, row) < 0)
exit(1);
if (Rast_is_c_null_value(&cell[col]))
@@ -454,7 +454,7 @@
if (data_type == FCELL_TYPE) {
fcell = Rast_allocate_f_buf();
- if (Rast_get_f_raster_row(fd, fcell, row) < 0)
+ if (Rast_get_f_row(fd, fcell, row) < 0)
exit(1);
if (Rast_is_f_null_value(&fcell[col]))
camera_height = (double)9999.;
@@ -464,7 +464,7 @@
if (data_type == DCELL_TYPE) {
dcell = Rast_allocate_d_buf();
- if (Rast_get_d_raster_row(fd, dcell, row) < 0)
+ if (Rast_get_d_row(fd, dcell, row) < 0)
exit(1);
if (Rast_is_d_null_value(&dcell[col]))
camera_height = (double)9999.;
Modified: grass/trunk/display/d.profile/main.c
===================================================================
--- grass/trunk/display/d.profile/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/display/d.profile/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -48,7 +48,7 @@
max = -1e300;
for (row = 0; row < nrows; row++) {
- Rast_get_d_raster_row(fd, buf, row);
+ Rast_get_d_row(fd, buf, row);
for (col = 0; col < ncols; col++) {
if (min > buf[col])
min = buf[col];
@@ -142,15 +142,15 @@
if (cur_row != row) {
if (cur_row == row + 1) {
tmp = row1; row1 = row2; row2 = tmp;
- Rast_get_d_raster_row(fd, row1, row);
+ Rast_get_d_row(fd, row1, row);
}
else if (cur_row == row - 1) {
tmp = row1; row1 = row2; row2 = tmp;
- Rast_get_d_raster_row(fd, row2, row + 1);
+ Rast_get_d_row(fd, row2, row + 1);
}
else {
- Rast_get_d_raster_row(fd, row1, row);
- Rast_get_d_raster_row(fd, row2, row + 1);
+ Rast_get_d_row(fd, row1, row);
+ Rast_get_d_row(fd, row2, row + 1);
}
cur_row = row;
}
Modified: grass/trunk/display/d.rast/display.c
===================================================================
--- grass/trunk/display/d.rast/display.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/display/d.rast/display.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -69,7 +69,7 @@
for (cur_A_row = 0; cur_A_row != -1;) {
G_percent(cur_A_row, nrows, 2);
/* Get window (array) row currently required */
- Rast_get_raster_row(cellfile, xarray, cur_A_row, data_type);
+ Rast_get_row(cellfile, xarray, cur_A_row, data_type);
mask_raster_array(xarray, ncols, invert, data_type);
/* Draw the cell row, and get the next row number */
Modified: grass/trunk/display/d.rast.arrow/main.c
===================================================================
--- grass/trunk/display/d.rast.arrow/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/display/d.rast.arrow/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -317,11 +317,11 @@
and call appropriate function to draw an arrow on the cell */
for (row = 0; row < nrows; row++) {
- Rast_get_raster_row(layer_fd, raster_row, row, raster_type);
+ Rast_get_row(layer_fd, raster_row, row, raster_type);
ptr = raster_row;
if (opt7->answer) {
- Rast_get_raster_row(mag_fd, mag_raster_row, row, mag_raster_type);
+ Rast_get_row(mag_fd, mag_raster_row, row, mag_raster_type);
mag_ptr = mag_raster_row;
}
Modified: grass/trunk/display/d.rast.num/main.c
===================================================================
--- grass/trunk/display/d.rast.num/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/display/d.rast.num/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -228,7 +228,7 @@
/* loop through cells, find value, and draw text for value */
for (row = 0; row < nrows; row++) {
- Rast_get_raster_row(layer_fd, cell, row, map_type);
+ Rast_get_row(layer_fd, cell, row, map_type);
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/display/d.rgb/main.c
===================================================================
--- grass/trunk/display/d.rgb/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/display/d.rgb/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -111,7 +111,7 @@
G_percent(row, window.rows, 5);
for (i = 0; i < 3; i++)
- if (Rast_get_raster_row(B[i].file, B[i].array, row, B[i].type) < 0)
+ if (Rast_get_row(B[i].file, B[i].array, row, B[i].type) < 0)
G_fatal_error(_("Error reading row of data"));
if (row == next_row)
Modified: grass/trunk/display/d.what.rast/what.c
===================================================================
--- grass/trunk/display/d.what.rast/what.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/display/d.what.rast/what.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -56,7 +56,7 @@
G_message(_("You are clicking outside the map"));
continue;
}
- if (Rast_get_c_raster_row(fd[i], buf, row) < 0)
+ if (Rast_get_c_row(fd[i], buf, row) < 0)
show_cat(width, mwidth, name[i], mapset[i], null_cell,
"ERROR reading raster map", terse, fs, map_type[i]);
else if (map_type[i] == CELL_TYPE) {
@@ -74,7 +74,7 @@
if (map_type[i] == CELL_TYPE)
continue;
- if (Rast_get_d_raster_row(fd[i], dbuf, row) < 0)
+ if (Rast_get_d_row(fd[i], dbuf, row) < 0)
show_dval(width, mwidth, name[i], mapset[i], null_dcell,
"ERROR reading fcell file", terse, fs);
else
Modified: grass/trunk/doc/raster/r.example/main.c
===================================================================
--- grass/trunk/doc/raster/r.example/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/doc/raster/r.example/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -148,7 +148,7 @@
G_percent(row, nrows, 2);
/* read input map */
- if (Rast_get_raster_row(infd, inrast, row, data_type) < 0)
+ if (Rast_get_row(infd, inrast, row, data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), name,
row);
Modified: grass/trunk/general/g.region/zoom.c
===================================================================
--- grass/trunk/general/g.region/zoom.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/general/g.region/zoom.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -32,7 +32,7 @@
left = ncols;
right = -1;
for (row = 0; row < nrows; row++) {
- if (Rast_get_raster_row(fd, rast_ptr = raster, row, map_type) < 0)
+ if (Rast_get_row(fd, rast_ptr = raster, row, map_type) < 0)
G_fatal_error(_("Could not read from <%s>"), name);
for (col = 0; col < ncols; col++) {
if (!Rast_is_null_value(rast_ptr, map_type))
Modified: grass/trunk/imagery/i.albedo/main.c
===================================================================
--- grass/trunk/imagery/i.albedo/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.albedo/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -193,7 +193,7 @@
G_percent(row, nrows, 2);
/* read input map */
for (i = 1; i <= nfiles; i++) {
- if ((Rast_get_raster_row(
+ if ((Rast_get_row(
infd[i], inrast[i], row, in_data_type[i])) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d >"),
name, row);
@@ -351,7 +351,7 @@
G_percent(row, nrows, 2);
/* read input map */
for (i = 1; i <= nfiles; i++) {
- if ((Rast_get_raster_row(
+ if ((Rast_get_row(
infd[i], inrast[i], row, in_data_type[i])) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
name, row);
Modified: grass/trunk/imagery/i.atcorr/main.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/main.cpp 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.atcorr/main.cpp 2009-06-29 19:59:00 UTC (rev 38119)
@@ -306,19 +306,19 @@
G_percent(row, nrows, 1); /* keep the user informed of our progress */
/* read the next row */
- if(Rast_get_raster_row(ifd, buf, row, FCELL_TYPE) < 0)
+ if(Rast_get_row(ifd, buf, row, FCELL_TYPE) < 0)
G_fatal_error (_("Unable to read input raster map row %d"),
row);
/* read the next row of elevation values */
if(ialt_fd >= 0)
- if(Rast_get_raster_row(ialt_fd, alt, row, FCELL_TYPE) < 0)
+ if(Rast_get_row(ialt_fd, alt, row, FCELL_TYPE) < 0)
G_fatal_error (_("Unable to read elevation raster map row %d"),
row);
/* read the next row of elevation values */
if(ivis_fd >= 0)
- if(Rast_get_raster_row(ivis_fd, vis, row, FCELL_TYPE) < 0)
+ if(Rast_get_row(ivis_fd, vis, row, FCELL_TYPE) < 0)
G_fatal_error (_("Unable to read visibility raster map row %d"),
row);
Modified: grass/trunk/imagery/i.biomass/main.c
===================================================================
--- grass/trunk/imagery/i.biomass/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.biomass/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -145,17 +145,17 @@
G_percent(row, nrows, 2);
/* read input maps */
- if (Rast_get_d_raster_row(infd_fpar, inrast_fpar, row)< 0)
+ if (Rast_get_d_row(infd_fpar, inrast_fpar, row)< 0)
G_fatal_error(_("Unable to read from <%s> row %d"),fpar,row);
- if (Rast_get_d_raster_row(infd_luf,inrast_luf,row)<0)
+ if (Rast_get_d_row(infd_luf,inrast_luf,row)<0)
G_fatal_error(_("Unable to read from <%s> row %d"),luf,row);
- if (Rast_get_d_raster_row(infd_lat, inrast_lat, row) < 0)
+ if (Rast_get_d_row(infd_lat, inrast_lat, row) < 0)
G_fatal_error(_("Unable to read from <%s> row %d"),lat,row);
- if (Rast_get_d_raster_row(infd_doy, inrast_doy, row) < 0)
+ if (Rast_get_d_row(infd_doy, inrast_doy, row) < 0)
G_fatal_error(_("Unable to read from <%s> row %d"),doy,row);
- if (Rast_get_d_raster_row(infd_tsw, inrast_tsw, row) < 0)
+ if (Rast_get_d_row(infd_tsw, inrast_tsw, row) < 0)
G_fatal_error(_("Unable to read from <%s> row %d"),tsw,row);
- if (Rast_get_d_raster_row(infd_wa,inrast_wa,row)<0)
+ if (Rast_get_d_row(infd_wa,inrast_wa,row)<0)
G_fatal_error(_("Unable to read from <%s> row %d"),wa,row);
/*process the data */
for (col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.cca/transform.c
===================================================================
--- grass/trunk/imagery/i.cca/transform.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.cca/transform.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -21,7 +21,7 @@
for (i = 0; i < rows; i++) {
/* get one row of data */
for (j = 1; j <= bands; j++)
- if (Rast_get_map_row(datafds[j], rowbufs[j], i) < 0)
+ if (Rast_get_c_row(datafds[j], rowbufs[j], i) < 0)
G_fatal_error(_("Error reading cell map during transform."));
/* transform each cell in the row */
Modified: grass/trunk/imagery/i.class/draw_cell.c
===================================================================
--- grass/trunk/imagery/i.class/draw_cell.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.class/draw_cell.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -51,7 +51,7 @@
D_set_overlay_mode(!overlay);
D_cell_draw_setup(top, top + nrows, left, left + ncols);
for (row = 0; row < nrows; row++) {
- if (Rast_get_d_raster_row_nomask(fd, dcell, row) < 0)
+ if (Rast_get_d_row_nomask(fd, dcell, row) < 0)
break;
D_draw_d_raster(row, dcell, &colr);
}
Modified: grass/trunk/imagery/i.class/readbands.c
===================================================================
--- grass/trunk/imagery/i.class/readbands.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.class/readbands.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -8,7 +8,7 @@
register int i;
for (i = 0; i < nbands; i++)
- if (Rast_get_map_row_nomask(Bandfd[i], Bandbuf[i], cur) < 0)
+ if (Rast_get_c_row_nomask(Bandfd[i], Bandbuf[i], cur) < 0)
G_fatal_error(_("Error reading raster map in function readbands."));
return 0;
Modified: grass/trunk/imagery/i.cluster/main.c
===================================================================
--- grass/trunk/imagery/i.cluster/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.cluster/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -277,7 +277,7 @@
for (row = sample_rows - 1; row < nrows; row += sample_rows) {
G_percent(row, nrows, 2);
for (n = 0; n < ref.nfiles; n++)
- if (Rast_get_d_raster_row(cellfd[n], cell[n], row) < 0)
+ if (Rast_get_d_row(cellfd[n], cell[n], row) < 0)
G_fatal_error(_("Unable to read raster map row %d"),
row);
for (col = sample_cols - 1; col < ncols; col += sample_cols) {
Modified: grass/trunk/imagery/i.eb.eta/main.c
===================================================================
--- grass/trunk/imagery/i.eb.eta/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.eb.eta/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -105,11 +105,11 @@
G_percent(row, nrows, 2);
/* read input maps */
- if (Rast_get_d_raster_row(infd_rnetday,inrast_rnetday,row)<0)
+ if (Rast_get_d_row(infd_rnetday,inrast_rnetday,row)<0)
G_fatal_error(_("Unable to read from <%s> row %d"), rnetday, row);
- if (Rast_get_d_raster_row(infd_evapfr,inrast_evapfr,row)<0)
+ if (Rast_get_d_row(infd_evapfr,inrast_evapfr,row)<0)
G_fatal_error(_("Unable to read from <%s> row %d"), evapfr, row);
- if (Rast_get_d_raster_row(infd_tempk,inrast_tempk,row)<0)
+ if (Rast_get_d_row(infd_tempk,inrast_tempk,row)<0)
G_fatal_error(_("Unable to read from <%s> row %d"), tempk, row);
/*process the data */
Modified: grass/trunk/imagery/i.eb.evapfr/main.c
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -134,11 +134,11 @@
G_percent(row, nrows, 2);
/* read input maps */
- if (Rast_get_d_raster_row(infd_rnet, inrast_rnet, row)<0)
+ if (Rast_get_d_row(infd_rnet, inrast_rnet, row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), rnet, row);
- if (Rast_get_d_raster_row(infd_g0, inrast_g0, row) < 0)
+ if (Rast_get_d_row(infd_g0, inrast_g0, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), g0, row);
- if (Rast_get_d_raster_row(infd_h0, inrast_h0, row) < 0)
+ if (Rast_get_d_row(infd_h0, inrast_h0, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), h0, row);
/*process the data */
Modified: grass/trunk/imagery/i.eb.h_SEBAL01/main.c
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -280,11 +280,11 @@
for (row = 0; row < nrows; row++) {
DCELL d_t0dem;
G_percent(row, nrows, 2);
- if (Rast_get_d_raster_row(infd_t0dem,inrast_t0dem,row)<0)
+ if (Rast_get_d_row(infd_t0dem,inrast_t0dem,row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
- if (Rast_get_d_raster_row(infd_Rn,inrast_Rn,row)<0)
+ if (Rast_get_d_row(infd_Rn,inrast_Rn,row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), Rn, row);
- if (Rast_get_d_raster_row(infd_g0,inrast_g0,row)<0)
+ if (Rast_get_d_row(infd_g0,inrast_g0,row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), g0, row);
/*process the data */
for (col = 0; col < ncols; col++) {
@@ -353,11 +353,11 @@
}
rowDry = row;
colDry = col;
- if (Rast_get_d_raster_row(infd_Rn, inrast_Rn, row) < 0)
+ if (Rast_get_d_row(infd_Rn, inrast_Rn, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), Rn, row);
- if (Rast_get_d_raster_row(infd_g0, inrast_g0, row) < 0)
+ if (Rast_get_d_row(infd_g0, inrast_g0, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), g0, row);
- if (Rast_get_d_raster_row(infd_t0dem, inrast_t0dem, row) < 0)
+ if (Rast_get_d_row(infd_t0dem, inrast_t0dem, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
d_Rn_dry = ((DCELL *) inrast_Rn)[col];
d_g0_dry = ((DCELL *) inrast_g0)[col];
@@ -376,7 +376,7 @@
}
rowWet = row;
colWet = col;
- if (Rast_get_d_raster_row(infd_t0dem, inrast_t0dem, row) < 0)
+ if (Rast_get_d_row(infd_t0dem, inrast_t0dem, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
d_t0dem_wet = ((DCELL *) inrast_t0dem)[col];
/* END OF MANUAL WET/DRY PIXELS */
@@ -398,9 +398,9 @@
DCELL d_u5;
G_percent(row, nrows, 2);
/* read a line input maps into buffers */
- if (Rast_get_d_raster_row(infd_z0m, inrast_z0m, row) < 0)
+ if (Rast_get_d_row(infd_z0m, inrast_z0m, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), z0m, row);
- if (Rast_get_d_raster_row(infd_t0dem, inrast_t0dem,row)<0)
+ if (Rast_get_d_row(infd_t0dem, inrast_t0dem,row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
/* read every cell in the line buffers */
for (col = 0; col < ncols; col++) {
@@ -461,9 +461,9 @@
DCELL d_u5;
G_percent(row, nrows, 2);
/* read a line input maps into buffers */
- if (Rast_get_d_raster_row(infd_z0m, inrast_z0m, row) < 0)
+ if (Rast_get_d_row(infd_z0m, inrast_z0m, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), z0m, row);
- if (Rast_get_d_raster_row(infd_t0dem, inrast_t0dem,row)<0)
+ if (Rast_get_d_row(infd_t0dem, inrast_t0dem,row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
/* read every cell in the line buffers */
for (col = 0; col < ncols; col++) {
@@ -530,9 +530,9 @@
DCELL d_u5;
G_percent(row, nrows, 2);
/* read a line input maps into buffers */
- if (Rast_get_d_raster_row(infd_z0m,inrast_z0m,row)<0)
+ if (Rast_get_d_row(infd_z0m,inrast_z0m,row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), z0m, row);
- if (Rast_get_d_raster_row(infd_t0dem,inrast_t0dem,row)<0)
+ if (Rast_get_d_row(infd_t0dem,inrast_t0dem,row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
/* read every cell in the line buffers */
for (col = 0; col < ncols; col++) {
@@ -600,9 +600,9 @@
DCELL d; /* Output pixel */
G_percent(row, nrows, 2);
/* read a line input maps into buffers */
- if (Rast_get_d_raster_row(infd_z0m, inrast_z0m, row) < 0)
+ if (Rast_get_d_row(infd_z0m, inrast_z0m, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), z0m, row);
- if (Rast_get_d_raster_row(infd_t0dem,inrast_t0dem,row)<0)
+ if (Rast_get_d_row(infd_t0dem,inrast_t0dem,row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
/* read every cell in the line buffers */
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/imagery/i.eb.soilheatflux/main.c
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.eb.soilheatflux/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -133,19 +133,19 @@
DCELL d_time;
G_percent(row, nrows, 2);
/* read input maps */
- if (Rast_get_d_raster_row(infd_albedo, inrast_albedo, row) < 0)
+ if (Rast_get_d_row(infd_albedo, inrast_albedo, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
albedo, row);
- if (Rast_get_d_raster_row(infd_ndvi, inrast_ndvi, row)<0)
+ if (Rast_get_d_row(infd_ndvi, inrast_ndvi, row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
ndvi, row);
- if (Rast_get_d_raster_row(infd_tempk, inrast_tempk, row)< 0)
+ if (Rast_get_d_row(infd_tempk, inrast_tempk, row)< 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
tempk, row);
- if (Rast_get_d_raster_row(infd_rnet, inrast_rnet, row)<0)
+ if (Rast_get_d_row(infd_rnet, inrast_rnet, row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
rnet, row);
- if (Rast_get_d_raster_row(infd_time, inrast_time, row)<0)
+ if (Rast_get_d_row(infd_time, inrast_time, row)<0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
time, row);
/*process the data */
Modified: grass/trunk/imagery/i.emissivity/main.c
===================================================================
--- grass/trunk/imagery/i.emissivity/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.emissivity/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -83,7 +83,7 @@
G_percent(row, nrows, 2);
/* read input maps */
- if (Rast_get_raster_row(infd,inr,row,DCELL_TYPE)< 0)
+ if (Rast_get_row(infd,inr,row,DCELL_TYPE)< 0)
G_fatal_error(_("Could not read from <%s>"), ndvi);
/*process the data */
Modified: grass/trunk/imagery/i.evapo.time_integration/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -283,15 +283,15 @@
/* read input map */
for (i = 1; i <= nfiles; i++)
- if ((Rast_get_d_raster_row(infd[i], inrast[i], row)) < 0)
+ if ((Rast_get_d_row(infd[i], inrast[i], row)) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), name, row);
for (i = 1; i <= nfiles1; i++)
- if ((Rast_get_d_raster_row(infd1[i], inrast1[i], row)) < 0)
+ if ((Rast_get_d_row(infd1[i], inrast1[i], row)) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), name1, row);
for (i = 1; i <= nfiles2; i++)
- if ((Rast_get_d_raster_row (infd2[i], inrast2[i], row)) < 0)
+ if ((Rast_get_d_row (infd2[i], inrast2[i], row)) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), name2, row);
/*process the data */
Modified: grass/trunk/imagery/i.fft/main.c
===================================================================
--- grass/trunk/imagery/i.fft/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.fft/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -131,7 +131,7 @@
G_message(_("Reading the raster map <%s>..."),
Cellmap_orig);
for (i = 0; i < rows; i++) {
- if (Rast_get_d_raster_row(inputfd, cell_real, i) < 0)
+ if (Rast_get_d_row(inputfd, cell_real, i) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
Cellmap_orig, i);
for (j = 0; j < cols; j++) {
Modified: grass/trunk/imagery/i.gensig/covariance.c
===================================================================
--- grass/trunk/imagery/i.gensig/covariance.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.gensig/covariance.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -33,7 +33,7 @@
G_percent(row, nrows, 2);
read_training_map(class, row, ncols, files);
for (b = 0; b < files->nbands; b++) /* NOTE: files->nbands == S->nbands */
- if (Rast_get_d_raster_row(files->band_fd[b], files->band_cell[b], row) < 0)
+ if (Rast_get_d_row(files->band_fd[b], files->band_cell[b], row) < 0)
G_fatal_error(_("Unable to read raster map row %d"),
row);
for (b1 = 0; b1 < files->nbands; b1++) {
Modified: grass/trunk/imagery/i.gensig/get_train.c
===================================================================
--- grass/trunk/imagery/i.gensig/get_train.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.gensig/get_train.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -32,7 +32,7 @@
G_message(_("Finding training classes..."));
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_raster_row(fd, cell, row) < 0)
+ if (Rast_get_c_row(fd, cell, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), cell,
row);
Rast_update_cell_stats(cell, ncols, &cell_stats);
Modified: grass/trunk/imagery/i.gensig/means.c
===================================================================
--- grass/trunk/imagery/i.gensig/means.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.gensig/means.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -29,7 +29,7 @@
G_percent(row, nrows, 2);
read_training_map(class, row, ncols, files);
for (b = 0; b < files->nbands; b++) { /* NOTE: files->nbands == S->nbands */
- if (Rast_get_d_raster_row(files->band_fd[b], cell = files->band_cell[b], row) < 0)
+ if (Rast_get_d_row(files->band_fd[b], cell = files->band_cell[b], row) < 0)
exit(1);
for (col = 0; col < ncols; col++) {
if (Rast_is_d_null_value(&cell[col])) {
Modified: grass/trunk/imagery/i.gensig/read_train.c
===================================================================
--- grass/trunk/imagery/i.gensig/read_train.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.gensig/read_train.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -9,7 +9,7 @@
int read_training_map(CELL * class, int row, int ncols, struct files *files)
{
- if (Rast_get_c_raster_row(files->train_fd, files->train_cell, row) < 0)
+ if (Rast_get_c_row(files->train_fd, files->train_cell, row) < 0)
G_fatal_error(_("Unable to read raster map row %d"),
row);
lookup_class(files->train_cell, ncols, files->training_cats, files->ncats,
Modified: grass/trunk/imagery/i.gensigset/get_train.c
===================================================================
--- grass/trunk/imagery/i.gensigset/get_train.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.gensigset/get_train.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -35,7 +35,7 @@
G_message(_("Finding training classes..."));
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_raster_row(fd, cell, row) < 0)
+ if (Rast_get_c_row(fd, cell, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), cell,
row);
Rast_update_cell_stats(cell, ncols, &cell_stats);
Modified: grass/trunk/imagery/i.gensigset/read_data.c
===================================================================
--- grass/trunk/imagery/i.gensigset/read_data.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.gensigset/read_data.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -25,7 +25,7 @@
G_percent(row, nrows, 2);
read_training_map(class, row, ncols, files);
for (b = 0; b < files->nbands; b++)
- if (Rast_get_d_raster_row
+ if (Rast_get_d_row
(files->band_fd[b], files->band_cell[b], row) < 0)
G_fatal_error(_("Unable to read raster map row %d"),
row);
Modified: grass/trunk/imagery/i.gensigset/read_train.c
===================================================================
--- grass/trunk/imagery/i.gensigset/read_train.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.gensigset/read_train.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -9,7 +9,7 @@
int read_training_map(CELL * class, int row, int ncols, struct files *files)
{
- if (Rast_get_c_raster_row(files->train_fd, files->train_cell, row) < 0)
+ if (Rast_get_c_row(files->train_fd, files->train_cell, row) < 0)
G_fatal_error(_("Unable to read raster map row %d"),
row);
lookup_class(files->train_cell, ncols, files->training_cats, files->ncats,
Modified: grass/trunk/imagery/i.his.rgb/main.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.his.rgb/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -94,7 +94,7 @@
/* read in a row from each cell map */
for (band = 0; band < 3; band++)
- if (Rast_get_map_row(fd_input[band], rowbuffer[band], i) < 0)
+ if (Rast_get_c_row(fd_input[band], rowbuffer[band], i) < 0)
G_fatal_error(_("Unable to read raster map row %d"), i);
/* process this row of the map */
Modified: grass/trunk/imagery/i.ifft/main.c
===================================================================
--- grass/trunk/imagery/i.ifft/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.ifft/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -147,10 +147,10 @@
/* Read in cell map values */
G_message(_("Reading raster maps..."));
for (i = 0; i < rows; i++) {
- if (Rast_get_d_raster_row(realfd, cell_real, i) < 0)
+ if (Rast_get_d_row(realfd, cell_real, i) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
Cellmap_real, i);
- if (Rast_get_d_raster_row(imagfd, cell_imag, i) < 0)
+ if (Rast_get_d_row(imagfd, cell_imag, i) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
Cellmap_imag, i);
for (j = 0; j < cols; j++) {
@@ -171,7 +171,7 @@
maskbuf = Rast_allocate_c_buf();
for (i = 0; i < rows; i++) {
- Rast_get_map_row(maskfd, maskbuf, i);
+ Rast_get_c_row(maskfd, maskbuf, i);
for (j = 0; j < cols; j++) {
if (maskbuf[j] == 0) {
data[C(i, j)][0] = 0.0;
Modified: grass/trunk/imagery/i.latlong/main.c
===================================================================
--- grass/trunk/imagery/i.latlong/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.latlong/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -126,7 +126,7 @@
{
G_percent(row, nrows, 2);
- if (Rast_get_d_raster_row(infd, inrast, row) < 0)
+ if (Rast_get_d_row(infd, inrast, row) < 0)
G_fatal_error(_("Could not read from <%s>"), in);
for (col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.maxlik/main.c
===================================================================
--- grass/trunk/imagery/i.maxlik/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.maxlik/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -109,7 +109,7 @@
G_percent(row, nrows, 2);
for (band = 0; band < Ref.nfiles; band++)
- if (Rast_get_d_raster_row(cellfd[band], cell[band], row) < 0)
+ if (Rast_get_d_row(cellfd[band], cell[band], row) < 0)
G_fatal_error(_("Unable to read raster map row %d"),
row);
Modified: grass/trunk/imagery/i.modis.qc/main.c
===================================================================
--- grass/trunk/imagery/i.modis.qc/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.modis.qc/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -219,7 +219,7 @@
{
CELL c;
G_percent(row, nrows, 2);
- if (Rast_get_c_raster_row(infd, inrast, row) < 0)
+ if (Rast_get_c_row(infd, inrast, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
qcchan, row);
Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.pca/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -254,7 +254,7 @@
if(G_verbose() > G_verbose_std())
G_percent(row, rows - 1, 2);
- if (Rast_get_raster_row(fds[i], rowbuf, row, maptype) < 0)
+ if (Rast_get_row(fds[i], rowbuf, row, maptype) < 0)
G_fatal_error(_("Unable to read raster map row %d"), row);
for (col = 0; col < cols; col++) {
@@ -305,7 +305,7 @@
if(G_verbose() > G_verbose_std())
G_percent(row, rows - 1, 2);
- if (Rast_get_raster_row(fds[j], rowbuf1, row, maptype) < 0)
+ if (Rast_get_row(fds[j], rowbuf1, row, maptype) < 0)
G_fatal_error(_("Unable to read raster map row %d"), row);
for (k = j; k < bands; k++) {
@@ -317,7 +317,7 @@
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)
+ if (Rast_get_row(fds[k], rowbuf2, row, maptype2) < 0)
G_fatal_error(_("Unable to read raster map row %d"), row);
ptr1 = rowbuf1;
@@ -432,7 +432,7 @@
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)
+ if (Rast_get_row(inp_fd[j], rowbuf, row, maptype) < 0)
G_fatal_error(_("Unable to read raster map row %d"), row);
rowptr = rowbuf;
Modified: grass/trunk/imagery/i.points/drawcell.c
===================================================================
--- grass/trunk/imagery/i.points/drawcell.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.points/drawcell.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -59,7 +59,7 @@
D_cell_draw_setup(top, top + nrows, left, left + ncols);
for (row = 0; row < nrows; row++) {
- if (Rast_get_d_raster_row_nomask(fd, dcell, row) < 0)
+ if (Rast_get_d_row_nomask(fd, dcell, row) < 0)
break;
D_draw_d_raster(row, dcell, colors);
}
Modified: grass/trunk/imagery/i.rectify/perform.c
===================================================================
--- grass/trunk/imagery/i.rectify/perform.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.rectify/perform.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -39,7 +39,7 @@
fprintf (stderr, "read row %d\n", row);
*/
- if (Rast_get_raster_row_nomask
+ if (Rast_get_row_nomask
(infd, G_incr_void_ptr(rast, rast_size), row, map_type) < 0)
return 0;
Modified: grass/trunk/imagery/i.rgb.his/main.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.rgb.his/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -92,7 +92,7 @@
G_percent(i, rows, 2);
for (band = 0; band < 3; band++)
- if (Rast_get_map_row(fd_input[band], rowbuffer[band], i) < 0)
+ if (Rast_get_c_row(fd_input[band], rowbuffer[band], i) < 0)
G_fatal_error(_("Unable to read raster map row %d"), i);
/* process this row of the map */
Modified: grass/trunk/imagery/i.smap/read_block.c
===================================================================
--- grass/trunk/imagery/i.smap/read_block.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.smap/read_block.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -14,7 +14,7 @@
for (band = 0; band < files->nbands; band++) {
for (row = region->ymin; row < region->ymax; row++) {
- if (Rast_get_d_raster_row(files->band_fd[band], files->cellbuf, row)
+ if (Rast_get_d_row(files->band_fd[band], files->cellbuf, row)
< 0)
G_fatal_error(_("Unable to read raster map row %d"),
row);
Modified: grass/trunk/imagery/i.sunhours/main.c
===================================================================
--- grass/trunk/imagery/i.sunhours/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.sunhours/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -99,9 +99,9 @@
DCELL d_doy;
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(infd_doy, inrast_doy, row, DCELL_TYPE) < 0)
+ if (Rast_get_row(infd_doy, inrast_doy, row, DCELL_TYPE) < 0)
G_fatal_error(_("Could not read from <%s>"), doy);
- if (Rast_get_raster_row(infd_lat, inrast_lat, row, DCELL_TYPE) < 0)
+ if (Rast_get_row(infd_lat, inrast_lat, row, DCELL_TYPE) < 0)
G_fatal_error(_("Could not read from <%s>"), lat);
for (col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.vi/main.c
===================================================================
--- grass/trunk/imagery/i.vi/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.vi/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -264,31 +264,31 @@
G_percent(row, nrows, 2);
- if (Rast_get_d_raster_row(infd_redchan, inrast_redchan, row) < 0)
+ if (Rast_get_d_row(infd_redchan, inrast_redchan, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
redchan, row);
if (nirchan) {
- if (Rast_get_d_raster_row(infd_nirchan, inrast_nirchan, row) < 0)
+ if (Rast_get_d_row(infd_nirchan, inrast_nirchan, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
nirchan, row);
}
if (greenchan) {
- if (Rast_get_d_raster_row(infd_greenchan, inrast_greenchan, row) < 0)
+ if (Rast_get_d_row(infd_greenchan, inrast_greenchan, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
greenchan, row);
}
if (bluechan) {
- if (Rast_get_d_raster_row(infd_bluechan, inrast_bluechan, row) < 0)
+ if (Rast_get_d_row(infd_bluechan, inrast_bluechan, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
bluechan, row);
}
if (chan5chan) {
- if (Rast_get_d_raster_row(infd_chan5chan, inrast_chan5chan, row) < 0)
+ if (Rast_get_d_row(infd_chan5chan, inrast_chan5chan, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
chan5chan, row);
}
if (chan7chan) {
- if (Rast_get_d_raster_row(infd_chan7chan, inrast_chan7chan, row) < 0)
+ if (Rast_get_d_row(infd_chan7chan, inrast_chan7chan, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
chan7chan, row);
}
Modified: grass/trunk/imagery/i.vpoints/drawcell.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -69,7 +69,7 @@
D_cell_draw_setup(top, top + nrows, left, left + ncols);
for (row = 0; row < nrows; row++) {
- if (Rast_get_d_raster_row_nomask(fd, dcell, row) < 0)
+ if (Rast_get_d_row_nomask(fd, dcell, row) < 0)
break;
D_draw_d_raster(row, dcell, colors);
}
Modified: grass/trunk/imagery/i.zc/main.c
===================================================================
--- grass/trunk/imagery/i.zc/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/imagery/i.zc/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -152,7 +152,7 @@
/* Read in cell map values */
G_message(_("Reading raster map..."));
for (i = 0; i < or; i++) {
- if (Rast_get_map_row(inputfd, cell_row, i) < 0)
+ if (Rast_get_c_row(inputfd, cell_row, i) < 0)
G_fatal_error(_("Error while reading input raster map."));
for (j = 0; j < oc; j++)
Modified: grass/trunk/include/raster.h
===================================================================
--- grass/trunk/include/raster.h 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/include/raster.h 2009-06-29 19:59:00 UTC (rev 38119)
@@ -296,20 +296,18 @@
int Rast_get_cellhd(const char *, const char *, struct Cell_head *);
/* get_row.c */
-int Rast_get_map_row_nomask(int, CELL *, int);
-int Rast_get_raster_row_nomask(int, void *, int, RASTER_MAP_TYPE);
-int Rast_get_c_raster_row_nomask(int, CELL *, int);
-int Rast_get_f_raster_row_nomask(int, FCELL *, int);
-int Rast_get_d_raster_row_nomask(int, DCELL *, int);
-int Rast_get_map_row(int, CELL *, int);
-int Rast_get_raster_row(int, void *, int, RASTER_MAP_TYPE);
-int Rast_get_c_raster_row(int, CELL *, int);
-int Rast_get_f_raster_row(int, FCELL *, int);
-int Rast_get_d_raster_row(int, DCELL *, int);
+int Rast_get_row_nomask(int, void *, int, RASTER_MAP_TYPE);
+int Rast_get_c_row_nomask(int, CELL *, int);
+int Rast_get_f_row_nomask(int, FCELL *, int);
+int Rast_get_d_row_nomask(int, DCELL *, int);
+int Rast_get_row(int, void *, int, RASTER_MAP_TYPE);
+int Rast_get_c_row(int, CELL *, int);
+int Rast_get_f_row(int, FCELL *, int);
+int Rast_get_d_row(int, DCELL *, int);
int Rast_get_null_value_row(int, char *, int);
/* get_row_colr.c */
-int Rast_get_raster_row_colors(int, int, struct Colors *,
+int Rast_get_row_colors(int, int, struct Colors *,
unsigned char *, unsigned char *, unsigned char *,
unsigned char *);
/* histo_eq.c */
Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/lib/gpde/N_arrays_io.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -100,7 +100,7 @@
for (y = 0; y < rows; y++) {
G_percent(y, rows - 1, 10);
- if (!Rast_get_raster_row(map, rast, y, type)) {
+ if (!Rast_get_row(map, rast, y, type)) {
Rast_close(map);
G_fatal_error(_("Could not get raster row"));
}
Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/lib/ogsf/Gs3.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -143,7 +143,7 @@
for (row = 0; row < wind->rows; row++) {
offset = row * wind->cols;
- Rast_get_f_raster_row(cellfile, &(buff[offset]), row);
+ Rast_get_f_row(cellfile, &(buff[offset]), row);
Rast_get_null_value_row(cellfile, nullflags, row);
G_percent(row, wind->rows, 2);
@@ -218,7 +218,7 @@
for (row = 0; row < wind->rows; row++) {
offset = row * wind->cols;
- Rast_get_c_raster_row(cellfile, &(buff[offset]), row);
+ Rast_get_c_row(cellfile, &(buff[offset]), row);
Rast_get_null_value_row(cellfile, nullflags, row);
G_percent(row, wind->rows, 2);
@@ -381,7 +381,7 @@
for (row = 0; row < wind->rows; row++) {
offset = row * wind->cols;
- Rast_get_c_raster_row(cellfile, tmp_buf, row);
+ Rast_get_c_row(cellfile, tmp_buf, row);
Rast_get_null_value_row(cellfile, nullflags, row);
G_percent(row, wind->rows, 2);
@@ -497,7 +497,7 @@
for (row = 0; row < wind->rows; row++) {
offset = row * wind->cols;
- Rast_get_c_raster_row(cellfile, tmp_buf, row);
+ Rast_get_c_row(cellfile, tmp_buf, row);
Rast_get_null_value_row(cellfile, nullflags, row);
tc = (unsigned char *)&(buff[offset]);
ti = tmp_buf;
@@ -844,7 +844,7 @@
if (map_type == CELL_TYPE) {
buf = Rast_allocate_c_buf();
- if (Rast_get_c_raster_row(fd, buf, drow) < 0) {
+ if (Rast_get_c_row(fd, buf, drow) < 0) {
sprintf(catstr, "error");
}
else if (Rast_is_c_null_value(&buf[dcol])) {
@@ -863,7 +863,7 @@
/* fp map */
dbuf = Rast_allocate_d_buf();
- if (Rast_get_d_raster_row(fd, dbuf, drow) < 0) {
+ if (Rast_get_d_row(fd, dbuf, drow) < 0) {
sprintf(catstr, "error");
}
else if (Rast_is_d_null_value(&dbuf[dcol])) {
Modified: grass/trunk/lib/raster/get_row.c
===================================================================
--- grass/trunk/lib/raster/get_row.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/lib/raster/get_row.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -685,13 +685,13 @@
}
/*!
- * \brief Read raster row without masking (this routine is deprecated)
+ * \brief Read raster row without masking
*
* This routine reads the specified <em>row</em> from the raster map
* open on file descriptor <em>fd</em> into the <em>buf</em> buffer
- * like Rast_get_map_row() does. The difference is that masking is
- * suppressed. If the user has a mask set, Rast_get_map_row() will apply
- * the mask but Rast_get_map_row_nomask() will ignore it. This routine
+ * like Rast_get_c_row() does. The difference is that masking is
+ * suppressed. If the user has a mask set, Rast_get_c_row() will apply
+ * the mask but Rast_get_c_row_nomask() will ignore it. This routine
* prints a diagnostic message and returns -1 if there is an error
* reading the raster map. Otherwise a nonnegative value is returned.
*
@@ -704,38 +704,17 @@
* the region. However, the number of GRASS modules which do this
* should be minimal. See Mask for more information about the mask.
*
- * <b>This routine is deprecated! Use Rast_get_raster_row_nomask()
- * instead.</b>
- *
* \param fd file descriptor for the opened raster map
* \param buf buffer for the row to be placed into
* \param row data row desired
- *
- * \return 1 on success
- * \return 0 row requested not within window
- * \return -1 on error
- */
-int Rast_get_map_row_nomask(int fd, CELL * buf, int row)
-{
- return get_map_row(fd, buf, row, CELL_TYPE, 1, 0);
-}
-
-/*!
- * \brief Read raster row without masking
- *
- * Same as Rast_get_raster_row() except no masking occurs.
- *
- * \param fd file descriptor for the opened raster map
- * \param buf buffer for the row to be placed into
- * \param row data row desired
* \param data_type data type
*
* \return 1 on success
* \return 0 row requested not within window
* \return -1 on error
*/
-int Rast_get_raster_row_nomask(int fd, void *buf, int row,
- RASTER_MAP_TYPE data_type)
+int Rast_get_row_nomask(int fd, void *buf, int row,
+ RASTER_MAP_TYPE data_type)
{
return get_map_row(fd, buf, row, data_type, 0, 0);
}
@@ -743,7 +722,7 @@
/*!
* \brief Read raster row without masking (CELL type)
*
- * Same as Rast_get_c_raster_row() except no masking occurs.
+ * Same as Rast_get_c_row() except no masking occurs.
*
* \param fd file descriptor for the opened raster map
* \param buf buffer for the row to be placed into
@@ -754,15 +733,15 @@
* \return 0 row requested not within window
* \return -1 on error
*/
-int Rast_get_c_raster_row_nomask(int fd, CELL * buf, int row)
+int Rast_get_c_row_nomask(int fd, CELL *buf, int row)
{
- return Rast_get_raster_row_nomask(fd, buf, row, CELL_TYPE);
+ return Rast_get_row_nomask(fd, buf, row, CELL_TYPE);
}
/*!
* \brief Read raster row without masking (FCELL type)
*
- * Same as Rast_get_f_raster_row() except no masking occurs.
+ * Same as Rast_get_f_row() except no masking occurs.
*
* \param fd file descriptor for the opened raster map
* \param buf buffer for the row to be placed into
@@ -773,15 +752,15 @@
* \return 0 row requested not within window
* \return -1 on error
*/
-int Rast_get_f_raster_row_nomask(int fd, FCELL * buf, int row)
+int Rast_get_f_row_nomask(int fd, FCELL * buf, int row)
{
- return Rast_get_raster_row_nomask(fd, buf, row, FCELL_TYPE);
+ return Rast_get_row_nomask(fd, buf, row, FCELL_TYPE);
}
/*!
* \brief Read raster row without masking (DCELL type)
*
- * Same as Rast_get_d_raster_row() except no masking occurs.
+ * Same as Rast_get_d_row() except no masking occurs.
*
* \param fd file descriptor for the opened raster map
* \param buf buffer for the row to be placed into
@@ -792,42 +771,18 @@
* \return 0 row requested not within window
* \return -1 on error
*/
-int Rast_get_d_raster_row_nomask(int fd, DCELL * buf, int row)
+int Rast_get_d_row_nomask(int fd, DCELL * buf, int row)
{
- return Rast_get_raster_row_nomask(fd, buf, row, DCELL_TYPE);
+ return Rast_get_row_nomask(fd, buf, row, DCELL_TYPE);
}
/*!
- * \brief Get raster row (this routine is deprecated!)
- *
- * If the map is floating-point, quantize the floating-point values to
- * integer using the quantization rules established for the map when
- * the map was opened for reading (this quantization is read from
- * cell_misc/name/f_quant file, but can be reset after opening raster
- * map by Rast_set_quant_rules()). NULL values are converted to zeros.
- *
- * <b>This routine is deprecated! Use Rast_get_raster_row() instead.</b>
- *
- * \param fd file descriptor for the opened raster map
- * \param buf buffer for the row to be placed into
- * \param row data row desired
- *
- * \return 1 on success
- * \return 0 row requested not within window
- * \return -1 on error
- */
-int Rast_get_map_row(int fd, CELL * buf, int row)
-{
- return get_map_row(fd, buf, row, CELL_TYPE, 1, 1);
-}
-
-/*!
* \brief Get raster row
*
* If <em>data_type</em> is
- * - CELL_TYPE, calls Rast_get_c_raster_row()
- * - FCELL_TYPE, calls Rast_get_f_raster_row()
- * - DCELL_TYPE, calls Rast_get_d_raster_row()
+ * - CELL_TYPE, calls Rast_get_c_row()
+ * - FCELL_TYPE, calls Rast_get_f_row()
+ * - DCELL_TYPE, calls Rast_get_d_row()
*
* Reads appropriate information into the buffer <em>buf</em> associated
* with the requested row <em>row</em>. <em>buf</em> is associated with the
@@ -849,9 +804,9 @@
* mask exists. (the MASK is taken care of by null values
* (if the null file doesn't exist for this map, then the null row
* is simulated by assuming that all zero are nulls *** in case
- * of Rast_get_raster_row() and assuming that all data is valid
+ * of Rast_get_row() and assuming that all data is valid
* in case of G_get_f/d_raster_row(). In case of deprecated function
- * Rast_get_map_row() all nulls are converted to zeros (so there are
+ * Rast_get_c_row() all nulls are converted to zeros (so there are
* no embedded nulls at all). Also all masked out cells become zeros.
*
* \param fd file descriptor for the opened raster map
@@ -863,7 +818,7 @@
* \return 0 row requested not within window
* \return -1 on error
*/
-int Rast_get_raster_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
+int Rast_get_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
{
return get_map_row(fd, buf, row, data_type, 0, 1);
}
@@ -872,7 +827,7 @@
* \brief Get raster row (CELL type)
*
* Reads a row of raster data and leaves the NULL values intact. (As
- * opposed to the deprecated function Rast_get_map_row() which
+ * opposed to the deprecated function Rast_get_c_row() which
* converts NULL values to zero.)
*
* <b>NOTE.</b> When the raster map is old and null file doesn't
@@ -889,9 +844,9 @@
* \return 0 row requested not within window
* \return -1 on error
*/
-int Rast_get_c_raster_row(int fd, CELL * buf, int row)
+int Rast_get_c_row(int fd, CELL * buf, int row)
{
- return Rast_get_raster_row(fd, buf, row, CELL_TYPE);
+ return Rast_get_row(fd, buf, row, CELL_TYPE);
}
/*!
@@ -911,15 +866,15 @@
* \return 0 row requested not within window
* \return -1 on error
*/
-int Rast_get_f_raster_row(int fd, FCELL * buf, int row)
+int Rast_get_f_row(int fd, FCELL * buf, int row)
{
- return Rast_get_raster_row(fd, buf, row, FCELL_TYPE);
+ return Rast_get_row(fd, buf, row, FCELL_TYPE);
}
/*!
* \brief Get raster row (DCELL type)
*
- * Same as Rast_get_f_raster_row() except that the array <em>dcell</em>
+ * Same as Rast_get_f_row() except that the array <em>dcell</em>
* is <tt>double</tt>.
*
* \param fd file descriptor for the opened raster map
@@ -930,9 +885,9 @@
* \return 0 row requested not within window
* \return -1 on error
*/
-int Rast_get_d_raster_row(int fd, DCELL * buf, int row)
+int Rast_get_d_row(int fd, DCELL * buf, int row)
{
- return Rast_get_raster_row(fd, buf, row, DCELL_TYPE);
+ return Rast_get_row(fd, buf, row, DCELL_TYPE);
}
static int open_null_read(int fd)
@@ -1191,12 +1146,6 @@
return 1;
}
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
/*!
\brief Read or simmulate null value row
Modified: grass/trunk/lib/raster/get_row_colr.c
===================================================================
--- grass/trunk/lib/raster/get_row_colr.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/lib/raster/get_row_colr.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -37,7 +37,7 @@
* \return -1 on error
* \return 0 on success
*/
-int Rast_get_raster_row_colors(int fd, int row, struct Colors *colors,
+int Rast_get_row_colors(int fd, int row, struct Colors *colors,
unsigned char *red, unsigned char *grn,
unsigned char *blu, unsigned char *nul)
{
@@ -51,7 +51,7 @@
array = G__alloca(cols * size);
- if (Rast_get_raster_row(fd, array, row, type) < 0) {
+ if (Rast_get_row(fd, array, row, type) < 0) {
G__freea(array);
return -1;
}
Modified: grass/trunk/lib/raster/opencell.c
===================================================================
--- grass/trunk/lib/raster/opencell.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/lib/raster/opencell.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -62,7 +62,7 @@
* map. If no NULL-value bitmap exists, arrange for the production of
* NULL-values based on zeros in the raster map. If the map is
* floating-point, arrange for quantization to integer for
- * Rast_get_c_raster_row(), et. al., by reading the quantization rules
+ * Rast_get_c_row(), et. al., by reading the quantization rules
* for the map using Rast_read_quant(). If the programmer wants to read
* the floating point map using uing quant rules other than the ones
* stored in map's quant file, he/she should call Rast_set_quant_rules()
@@ -83,7 +83,7 @@
\brief Open an existing integer raster map (cell)
Opens the existing cell file <i>name</i> in the <i>mapset</i> for
- reading by Rast_get_raster_row() with mapping into the current window.
+ reading by Rast_get_row() with mapping into the current window.
This routine opens the raster map <i>name</i> in <i>mapset</i> for
reading. A nonnegative file descriptor is returned if the open is
@@ -933,7 +933,7 @@
reading.
Returned by Rast_open_cell_old(). After calling this function,
- Rast_get_c_raster_row() and Rast_get_map_row() will use rules defined by q
+ Rast_get_c_row() and Rast_get_c_row() will use rules defined by q
(instead of using rules defined in map's quant file) to convert floats to
ints.
Modified: grass/trunk/lib/raster/put_row.c
===================================================================
--- grass/trunk/lib/raster/put_row.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/lib/raster/put_row.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -15,7 +15,7 @@
* file.
*
* *** NOTE ***
- * A map cannot be copied using Rast_get_raster_row() and Rast_put_raster_row().
+ * A map cannot be copied using Rast_get_row() and Rast_put_raster_row().
* The former resamples the data of the original map into a row buffer
* that matches the current window. The later writes out rows associated
* with the window.
@@ -46,7 +46,7 @@
* writing)
*
* *** NOTE ***
- * A map cannot be copied using Rast_get_map_row() and Rast_put_map_row().
+ * A map cannot be copied using Rast_get_c_row() and Rast_put_map_row().
* The former resamples the data of the original map into a row buffer
* that matches the current window. The later writes out rows associated
* with the window.
Modified: grass/trunk/lib/raster/sample.c
===================================================================
--- grass/trunk/lib/raster/sample.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/lib/raster/sample.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -107,7 +107,7 @@
goto done;
}
- if (Rast_get_d_raster_row(fd, maprow, row) < 0)
+ if (Rast_get_d_row(fd, maprow, row) < 0)
raster_row_error(window, north, east);
if (Rast_is_d_null_value(&maprow[col])) {
@@ -174,9 +174,9 @@
goto done;
}
- if (Rast_get_d_raster_row(fd, arow, row) < 0)
+ if (Rast_get_d_row(fd, arow, row) < 0)
raster_row_error(window, north, east);
- if (Rast_get_d_raster_row(fd, brow, row + 1) < 0)
+ if (Rast_get_d_row(fd, brow, row + 1) < 0)
raster_row_error(window, north, east);
if (Rast_is_d_null_value(&arow[col]) || Rast_is_d_null_value(&arow[col + 1]) ||
@@ -266,7 +266,7 @@
}
for (i = 0; i < 4; i++)
- if (Rast_get_d_raster_row(fd, rows[i], row + i) < 0)
+ if (Rast_get_d_row(fd, rows[i], row + i) < 0)
raster_row_error(window, north, east);
for (i = 0; i < 4; i++)
Modified: grass/trunk/lib/rst/interp_float/input2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/input2d.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/lib/rst/interp_float/input2d.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -58,9 +58,9 @@
for (i = 0; i < params->nsizr; i++) {
irev = params->nsizr - i - 1;
if (cellmask)
- Rast_get_map_row(cfmask, cellmask, i);
+ Rast_get_c_row(cfmask, cellmask, i);
if (MASK)
- Rast_get_map_row(MASKfd, MASK, i);
+ Rast_get_c_row(MASKfd, MASK, i);
for (j = 0; j < params->nsizc; j++) {
if ((cellmask && cellmask[j] == 0) || (MASK && MASK[j] == 0))
BM_set(bitmask, j, irev, 0);
Modified: grass/trunk/lib/rst/interp_float/ressegm2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/ressegm2d.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/lib/rst/interp_float/ressegm2d.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -493,7 +493,7 @@
{
double x, y, sm; /* input data and smoothing */
int m1, m2; /* loop counters */
- int ret_val, ret_val1; /* return values of Rast_get_map_row */
+ int ret_val, ret_val1; /* return values of Rast_get_c_row */
static FCELL *cellinp = NULL; /* cell buffer for input data */
static FCELL *cellsmooth = NULL; /* cell buffer for smoothing */
@@ -505,7 +505,7 @@
for (m1 = 0; m1 <= last_row - first_row; m1++) {
ret_val =
- Rast_get_f_raster_row(fdinp, cellinp, inp_rows - m1 - first_row);
+ Rast_get_f_row(fdinp, cellinp, inp_rows - m1 - first_row);
if (ret_val < 0) {
fprintf(stderr, "Cannot get row %d (return value = %d)\n", m1,
ret_val);
@@ -513,7 +513,7 @@
}
if (fdsmooth >= 0) {
ret_val1 =
- Rast_get_f_raster_row(fdsmooth, cellsmooth,
+ Rast_get_f_row(fdsmooth, cellsmooth,
inp_rows - m1 - first_row);
if (ret_val1 < 0) {
fprintf(stderr, "Cannot get smoothing row\n");
Modified: grass/trunk/ps/ps.map/outl_io.c
===================================================================
--- grass/trunk/ps/ps.map/outl_io.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/ps/ps.map/outl_io.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -44,7 +44,7 @@
Rast_set_null_value(ptr, 1, map_type);
ptr = G_incr_void_ptr(ptr, raster_size);
- Rast_get_raster_row(in_file_d, ptr, row_count++, map_type);
+ Rast_get_row(in_file_d, ptr, row_count++, map_type);
ptr = G_incr_void_ptr(ptr, raster_size * (row_length + 1));
Rast_set_null_value(ptr, 1, map_type);
Modified: grass/trunk/ps/ps.map/ps_raster.c
===================================================================
--- grass/trunk/ps/ps.map/ps_raster.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/ps/ps.map/ps_raster.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -2,7 +2,7 @@
**
** Author: Paul W. Carlson 3/92
**
- ** ps_get_map_row is substituted by Rast_get_map_row_nomask
+ ** ps_get_map_row is substituted by Rast_get_c_row_nomask
** writing mask file is done separately by function ps_write_mask_row
** which used code previously in ps_get_map_row. This is done because
** sometimes the raster map is not drawn, but we still need a mask
@@ -50,7 +50,7 @@
PS.b0 = (double)b / 255.0;
for (row = 0; row < PS.w.rows; row++) {
- Rast_get_map_row_nomask(maskfd, maskbuf, row);
+ Rast_get_c_row_nomask(maskfd, maskbuf, row);
ps_write_mask_row(maskbuf);
}
fclose(ps_mask_fp);
@@ -112,7 +112,7 @@
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);
+ Rast_get_row(PS.cell_fd, cellbuf, row, map_type);
if ((row % PS.row_delta) == 0) {
ptr = cellbuf;
for (col = 0; col < PS.w.cols; col += PS.col_delta) {
@@ -155,7 +155,7 @@
n = 0;
for (row = 0; row < PS.w.rows; row++) {
for (i = 0; i < 3; i++) {
- Rast_get_raster_row(grp.fd[i], cbuf[i], row, grp_map_type[i]);
+ Rast_get_row(grp.fd[i], cbuf[i], row, grp_map_type[i]);
cptr[i] = cbuf[i];
}
Modified: grass/trunk/raster/r.basins.fill/read_map.c
===================================================================
--- grass/trunk/raster/r.basins.fill/read_map.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.basins.fill/read_map.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -40,9 +40,9 @@
G_message(_("Reading <%s> ... "), name);
if (nomask)
- get_row = Rast_get_map_row_nomask;
+ get_row = Rast_get_c_row_nomask;
else
- get_row = Rast_get_map_row;
+ get_row = Rast_get_c_row;
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 10);
Modified: grass/trunk/raster/r.bitpattern/main.c
===================================================================
--- grass/trunk/raster/r.bitpattern/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.bitpattern/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -124,7 +124,7 @@
G_percent(row, nrows, 2);
/* read input map */
- if (Rast_get_raster_row(infd, inrast, row, data_type) < 0)
+ if (Rast_get_row(infd, inrast, row, data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"), name,
row);
Modified: grass/trunk/raster/r.buffer/read_map.c
===================================================================
--- grass/trunk/raster/r.buffer/read_map.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.buffer/read_map.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -60,7 +60,7 @@
hit = 0;
G_percent(row, window.rows, 2);
- if (Rast_get_c_raster_row(fd, cell, row) < 0)
+ if (Rast_get_c_row(fd, cell, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
G_fully_qualified_name(input, mapset), row);
Modified: grass/trunk/raster/r.buffer/write_map.c
===================================================================
--- grass/trunk/raster/r.buffer/write_map.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.buffer/write_map.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -58,7 +58,7 @@
*cell++ = (CELL) * ptr++;
}
else {
- if (Rast_get_map_row_nomask(fd_in, cell, row) < 0)
+ if (Rast_get_c_row_nomask(fd_in, cell, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
output, row);
Modified: grass/trunk/raster/r.carve/raster.c
===================================================================
--- grass/trunk/raster/r.carve/raster.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.carve/raster.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -15,7 +15,7 @@
for (i = 0; i < rows; i++) {
G_percent(i + 1, rows, 10);
- Rast_get_raster_row(fd, tmpbuf, i, rtype);
+ Rast_get_row(fd, tmpbuf, i, rtype);
tmpbuf =
G_incr_void_ptr(tmpbuf, Rast_cell_size(rtype) * G_window_cols());
}
Modified: grass/trunk/raster/r.category/cats.c
===================================================================
--- grass/trunk/raster/r.category/cats.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.category/cats.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -53,7 +53,7 @@
for (row = 0; row < nrows; row++) {
if (G_verbose() > G_verbose_std())
G_percent(row, nrows, 2);
- if (Rast_get_c_raster_row_nomask(fd, cell, row) < 0)
+ if (Rast_get_c_row_nomask(fd, cell, row) < 0)
exit(EXIT_SUCCESS);
Rast_update_cell_stats(cell, ncols, &statf);
}
Modified: grass/trunk/raster/r.clump/clump.c
===================================================================
--- grass/trunk/raster/r.clump/clump.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.clump/clump.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -98,7 +98,7 @@
G_message(_("Pass %d..."), pass);
for (row = 0; row < nrows; row++) {
- if (Rast_get_map_row(in_fd, cur_in + 1, row) < 0)
+ if (Rast_get_c_row(in_fd, cur_in + 1, row) < 0)
G_fatal_error(_("Unable to read raster map row %d "),
row);
Modified: grass/trunk/raster/r.colors/stats.c
===================================================================
--- grass/trunk/raster/r.colors/stats.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.colors/stats.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -43,7 +43,7 @@
G_fully_qualified_name(name, mapset));
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_raster_row(fd, cell, row) < 0)
+ if (Rast_get_c_row(fd, cell, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
G_fully_qualified_name(name, mapset), row);
Rast_update_cell_stats(cell, ncols, statf);
@@ -110,7 +110,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_d_raster_row(fd, dcell, row) < 0)
+ if (Rast_get_d_row(fd, dcell, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
G_fully_qualified_name(name, mapset), row);
Modified: grass/trunk/raster/r.composite/main.c
===================================================================
--- grass/trunk/raster/r.composite/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.composite/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -197,7 +197,7 @@
for (i = 0; i < 3; i++) {
struct band *b = &B[i];
- if (Rast_get_raster_row_colors(b->file, atrow, &b->colors,
+ if (Rast_get_row_colors(b->file, atrow, &b->colors,
b->array[0],
b->array[1], b->array[2], nulls) < 0)
G_fatal_error(_("Error reading raster map <%s>"),
Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.compress/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -218,7 +218,7 @@
/* the null file is written automatically */
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row_nomask(old, rast, row, map_type) < 0)
+ if (Rast_get_row_nomask(old, rast, row, map_type) < 0)
break;
if (Rast_put_raster_row(new, rast, map_type) < 0)
break;
Modified: grass/trunk/raster/r.contour/main.c
===================================================================
--- grass/trunk/raster/r.contour/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.contour/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -223,7 +223,7 @@
for (i = 0; i < nrow; i++) {
z_array[i] = (DCELL *) G_malloc(ncol * sizeof(DCELL));
- Rast_get_d_raster_row(fd, z_array[i], i);
+ Rast_get_d_row(fd, z_array[i], i);
G_percent(i + 1, nrow, 2);
}
return z_array;
Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.cost/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -427,7 +427,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(cost_fd, cell, row, data_type) < 0)
+ if (Rast_get_row(cost_fd, cell, row, data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
cost_layer, row);
@@ -649,7 +649,7 @@
G_message(_("Reading raster map <%s>..."), opt9->answer);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(fd, cell2, row, data_type2) < 0)
+ if (Rast_get_row(fd, cell2, row, data_type2) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
opt9->answer, row);
ptr2 = cell2;
@@ -1005,7 +1005,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
if (keep_nulls) {
- if (Rast_get_raster_row(cost_fd, cell2, row, data_type) < 0)
+ if (Rast_get_row(cost_fd, cell2, row, data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
cost_layer, row);
}
@@ -1038,7 +1038,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
if (keep_nulls) {
- if (Rast_get_raster_row(cost_fd, cell2, row, data_type) < 0)
+ if (Rast_get_row(cost_fd, cell2, row, data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
cost_layer, row);
}
@@ -1071,7 +1071,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
if (keep_nulls) {
- if (Rast_get_raster_row(cost_fd, cell2, row, data_type) < 0)
+ if (Rast_get_row(cost_fd, cell2, row, data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
cost_layer, row);
}
Modified: grass/trunk/raster/r.covar/main.c
===================================================================
--- grass/trunk/raster/r.covar/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.covar/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -89,7 +89,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
for (i = 0; i < nfiles; i++) {
- if (Rast_get_d_raster_row(fd[i], dcell[i], row) < 0)
+ if (Rast_get_d_row(fd[i], dcell[i], row) < 0)
exit(1);
}
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/raster/r.cross/cross.c
===================================================================
--- grass/trunk/raster/r.cross/cross.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.cross/cross.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -55,13 +55,13 @@
G_percent(row, nrows, 5);
/* read the primary file first, even if not first in the list */
- if (Rast_get_map_row(fd[primary], cell[0], row) < 0)
+ if (Rast_get_c_row(fd[primary], cell[0], row) < 0)
exit(1);
/* read the others */
col = 1;
for (i = 0; i < nfiles; i++)
- if (i != primary && Rast_get_map_row(fd[i], cell[col++], row) < 0)
+ if (i != primary && Rast_get_c_row(fd[i], cell[col++], row) < 0)
exit(1);
for (col = 0; col < ncols; col++) {
zero = 1;
Modified: grass/trunk/raster/r.cross/renumber.c
===================================================================
--- grass/trunk/raster/r.cross/renumber.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.cross/renumber.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -33,7 +33,7 @@
G_message(_("%s: STEP 3 ... "), G_program_name());
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 5);
- if (Rast_get_map_row(in, c = cell, row) < 0)
+ if (Rast_get_c_row(in, c = cell, row) < 0)
exit(1);
col = ncols;
while (col-- > 0) {
Modified: grass/trunk/raster/r.describe/describe.c
===================================================================
--- grass/trunk/raster/r.describe/describe.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.describe/describe.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -40,14 +40,14 @@
int (*get_row)(int, CELL *, int);
if (windowed) {
- get_row = Rast_get_c_raster_row;
+ get_row = Rast_get_c_row;
}
else {
if (Rast_get_cellhd(name, "", &window) < 0)
G_fatal_error(_("Unable to get cell header for <%s>"), name);
Rast_set_window(&window);
- get_row = Rast_get_c_raster_row_nomask;
+ get_row = Rast_get_c_row_nomask;
}
fd = Rast_open_cell_old(name, "");
if (fd < 0)
Modified: grass/trunk/raster/r.distance/distance.c
===================================================================
--- grass/trunk/raster/r.distance/distance.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.distance/distance.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -107,9 +107,9 @@
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(mapd1, inrast1, row, maptype1) < 0)
+ if (Rast_get_row(mapd1, inrast1, row, maptype1) < 0)
G_fatal_error("Could not read from <%s>", name1);
- if (Rast_get_raster_row(mapd2, inrast2, row, maptype2) < 0)
+ if (Rast_get_row(mapd2, inrast2, row, maptype2) < 0)
G_fatal_error("Could not read from <%s>", name2);
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/raster/r.distance/edges.c
===================================================================
--- grass/trunk/raster/r.distance/edges.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.distance/edges.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -72,7 +72,7 @@
buf2 = tmp;
/* read a row */
- if (Rast_get_map_row(fd, &buf1[1], row) < 0)
+ if (Rast_get_c_row(fd, &buf1[1], row) < 0)
exit(1);
for (col = 1; col <= ncols; col++) {
Modified: grass/trunk/raster/r.drain/main.c
===================================================================
--- grass/trunk/raster/r.drain/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.drain/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -366,7 +366,7 @@
dir_fd = open(tempfile3, O_RDWR | O_CREAT, 0666);
for (i = 0; i < nrows; i++) {
- Rast_get_d_raster_row(dir_id, dir_buf, i);
+ Rast_get_d_row(dir_id, dir_buf, i);
write(dir_fd, dir_buf, ncols * sizeof(DCELL));
}
Rast_close(dir_id);
Modified: grass/trunk/raster/r.drain/tinf.c
===================================================================
--- grass/trunk/raster/r.drain/tinf.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.drain/tinf.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -199,17 +199,17 @@
/* Read one line from a raster map */
int get_row_c(int fd, void *row, int n)
{
- return Rast_get_c_raster_row(fd, (CELL *) row, n);
+ return Rast_get_c_row(fd, (CELL *) row, n);
}
int get_row_f(int fd, void *row, int n)
{
- return Rast_get_f_raster_row(fd, (FCELL *) row, n);
+ return Rast_get_f_row(fd, (FCELL *) row, n);
}
int get_row_d(int fd, void *row, int n)
{
- return Rast_get_d_raster_row(fd, (DCELL *) row, n);
+ return Rast_get_d_row(fd, (DCELL *) row, n);
}
/* Write one row to a raster map */
Modified: grass/trunk/raster/r.fill.dir/tinf.c
===================================================================
--- grass/trunk/raster/r.fill.dir/tinf.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.fill.dir/tinf.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -180,17 +180,17 @@
/* Read one line from a raster map */
int get_row_c(int fd, void *row, int n)
{
- return Rast_get_c_raster_row(fd, (CELL *) row, n);
+ return Rast_get_c_row(fd, (CELL *) row, n);
}
int get_row_f(int fd, void *row, int n)
{
- return Rast_get_f_raster_row(fd, (FCELL *) row, n);
+ return Rast_get_f_row(fd, (FCELL *) row, n);
}
int get_row_d(int fd, void *row, int n)
{
- return Rast_get_d_raster_row(fd, (DCELL *) row, n);
+ return Rast_get_d_row(fd, (DCELL *) row, n);
}
/* Write one row to a raster map */
Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.flow/io.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -83,7 +83,7 @@
G_fatal_error(_("Elevation file's resolution differs from current region resolution"));
for (row = 0; row < region.rows; row++) {
- Rast_get_d_raster_row(fd, el.buf[row], row);
+ Rast_get_d_row(fd, el.buf[row], row);
if (parm.seg)
put_row_seg(el, row);
}
@@ -100,7 +100,7 @@
"current region resolution"));
for (row = 0; row < region.rows; row++) {
- Rast_get_d_raster_row(fd, as.buf[row], row);
+ Rast_get_d_row(fd, as.buf[row], row);
if (parm.seg)
put_row_seg(as, row);
}
@@ -115,7 +115,7 @@
fd = open_existing_cell_file(parm.barin, &hd);
for (row = 0; row < region.rows; row++) {
- Rast_get_d_raster_row(fd, barc, row);
+ Rast_get_d_row(fd, barc, row);
for (col = 0; col < region.cols; col++) {
BM_set(bitbar, col, row, (barc[col] != 0));
if (parm.dsout && barc[col] != 0)
Modified: grass/trunk/raster/r.grow/main.c
===================================================================
--- grass/trunk/raster/r.grow/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.grow/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -218,14 +218,14 @@
out_row = Rast_allocate_d_buf();
for (row = 0; row < size; row++)
- Rast_get_d_raster_row(in_fd, in_rows[size + row], row);
+ Rast_get_d_row(in_fd, in_rows[size + row], row);
for (row = 0; row < nrows; row++) {
DCELL *tmp;
int i;
if (row + size < nrows)
- Rast_get_d_raster_row(in_fd, in_rows[size * 2], row + size);
+ Rast_get_d_row(in_fd, in_rows[size * 2], row + size);
for (col = 0; col < ncols; col++) {
DCELL *c = &in_rows[size][col];
Modified: grass/trunk/raster/r.grow.distance/main.c
===================================================================
--- grass/trunk/raster/r.grow.distance/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.grow.distance/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -264,7 +264,7 @@
Rast_set_d_null_value(dist_row, ncols);
- Rast_get_d_raster_row(in_fd, in_row, irow);
+ Rast_get_d_row(in_fd, in_row, irow);
for (col = 0; col < ncols; col++)
if (!Rast_is_d_null_value(&in_row[col])) {
Modified: grass/trunk/raster/r.his/main.c
===================================================================
--- grass/trunk/raster/r.his/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.his/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -221,15 +221,15 @@
for (atrow = 0; atrow < window.rows; atrow++) {
G_percent(atrow, window.rows, 2);
- if (Rast_get_raster_row_colors
+ if (Rast_get_row_colors
(hue_file, atrow, &hue_colors, hue_r, hue_g, hue_b, hue_n) < 0)
G_fatal_error(_("Error reading 'hue' map"));
if (int_used &&
- (Rast_get_raster_row_colors
+ (Rast_get_row_colors
(int_file, atrow, &int_colors, int_r, dummy, dummy, int_n) < 0))
G_fatal_error(_("Error reading 'intensity' map"));
if (sat_used &&
- (Rast_get_raster_row_colors
+ (Rast_get_row_colors
(sat_file, atrow, &sat_colors, sat_r, dummy, dummy, sat_n) < 0))
G_fatal_error(_("Error reading 'saturation' map"));
Modified: grass/trunk/raster/r.horizon/main.c
===================================================================
--- grass/trunk/raster/r.horizon/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.horizon/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -556,7 +556,7 @@
fd1 = Rast_open_cell_old(elevin, mapset);
for (row = 0; row < m; row++) {
- Rast_get_f_raster_row(fd1, cell1, row);
+ Rast_get_f_row(fd1, cell1, row);
for (j = 0; j < n; j++) {
row_rev = m - row - 1;
Modified: grass/trunk/raster/r.lake/main.c
===================================================================
--- grass/trunk/raster/r.lake/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.lake/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -263,12 +263,12 @@
out_water[row] = (FCELL *) G_calloc(cols, sizeof(FCELL));
/* In newly created space load data from file. */
- if (Rast_get_f_raster_row(in_terran_fd, in_terran[row], row) != 1)
+ if (Rast_get_f_row(in_terran_fd, in_terran[row], row) != 1)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
terrainmap, row);
if (smap_opt->answer)
- if (Rast_get_f_raster_row(out_fd, out_water[row], row) != 1)
+ if (Rast_get_f_row(out_fd, out_water[row], row) != 1)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
seedmap, row);
Modified: grass/trunk/raster/r.le/r.le.patch/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -956,7 +956,7 @@
if (fmask > 0) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
- Rast_get_raster_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
+ Rast_get_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
CELL_TYPE);
/* for each cell whose value is "1"
@@ -2821,7 +2821,7 @@
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);
+ Rast_get_row(fr, row_buf, i, CELL_TYPE);
for (j = 0; j < ncols; j++) {
if (*(row_buf + j) > 0) {
if (regcnt == 0)
Modified: grass/trunk/raster/r.le/r.le.patch/trace.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/trace.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.le/r.le.patch/trace.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -596,7 +596,7 @@
map row in the region file */
if (choice->wrum == 'r')
- Rast_get_raster_row_nomask(fr, tmp1, i, CELL_TYPE);
+ Rast_get_row_nomask(fr, tmp1, i, CELL_TYPE);
/* initialize each element of the
row buffer to 0; this row buffer
@@ -607,15 +607,15 @@
switch (data_type) {
case CELL_TYPE:
Rast_zero_raster_buf(tmp, data_type);
- Rast_get_raster_row(finput, tmp, i, data_type);
+ Rast_get_row(finput, tmp, i, data_type);
break;
case FCELL_TYPE:
Rast_zero_raster_buf(ftmp, data_type);
- Rast_get_raster_row(finput, ftmp, i, data_type);
+ Rast_get_row(finput, ftmp, i, data_type);
break;
case DCELL_TYPE:
Rast_zero_raster_buf(dtmp, data_type);
- Rast_get_raster_row(finput, dtmp, i, data_type);
+ Rast_get_row(finput, dtmp, i, data_type);
break;
}
Modified: grass/trunk/raster/r.le/r.le.pixel/cellclip.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/cellclip.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.le/r.le.pixel/cellclip.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -339,7 +339,7 @@
map row in the region file */
if (choice->wrum == 'r')
- Rast_get_raster_row_nomask(fr, tmp1, i, CELL_TYPE);
+ Rast_get_row_nomask(fr, tmp1, i, CELL_TYPE);
/* initialize each element of the
row buffer to 0; this row buffer
@@ -351,15 +351,15 @@
switch (data_type) {
case CELL_TYPE:
Rast_zero_raster_buf(tmp, data_type);
- Rast_get_raster_row(finput, tmp, i, CELL_TYPE);
+ Rast_get_row(finput, tmp, i, CELL_TYPE);
break;
case FCELL_TYPE:
Rast_zero_raster_buf(ftmp, data_type);
- Rast_get_raster_row(finput, ftmp, i, FCELL_TYPE);
+ Rast_get_row(finput, ftmp, i, FCELL_TYPE);
break;
case DCELL_TYPE:
Rast_zero_raster_buf(dtmp, data_type);
- Rast_get_raster_row(finput, dtmp, i, DCELL_TYPE);
+ Rast_get_row(finput, dtmp, i, DCELL_TYPE);
break;
}
Modified: grass/trunk/raster/r.le/r.le.pixel/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -443,15 +443,15 @@
switch (data_type) {
case (CELL_TYPE):
Rast_zero_raster_buf(tmp, CELL_TYPE);
- Rast_get_raster_row(finput, tmp, i, CELL_TYPE);
+ Rast_get_row(finput, tmp, i, CELL_TYPE);
break;
case (FCELL_TYPE):
Rast_zero_raster_buf(ftmp, FCELL_TYPE);
- Rast_get_raster_row(finput, ftmp, i, FCELL_TYPE);
+ Rast_get_row(finput, ftmp, i, FCELL_TYPE);
break;
case (DCELL_TYPE):
Rast_zero_raster_buf(dtmp, DCELL_TYPE);
- Rast_get_raster_row(finput, dtmp, i, DCELL_TYPE);
+ Rast_get_row(finput, dtmp, i, DCELL_TYPE);
break;
}
@@ -525,7 +525,7 @@
if (fmask > 0) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
- Rast_get_raster_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
+ Rast_get_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
CELL_TYPE);
/* for each cell whose value is "1"
@@ -1366,15 +1366,15 @@
switch (data_type) {
case (CELL_TYPE):
Rast_zero_raster_buf(tmp, CELL_TYPE);
- Rast_get_raster_row(finput, tmp, i, CELL_TYPE);
+ Rast_get_row(finput, tmp, i, CELL_TYPE);
break;
case (FCELL_TYPE):
Rast_zero_raster_buf(ftmp, FCELL_TYPE);
- Rast_get_raster_row(finput, ftmp, i, FCELL_TYPE);
+ Rast_get_row(finput, ftmp, i, FCELL_TYPE);
break;
case (DCELL_TYPE):
Rast_zero_raster_buf(dtmp, DCELL_TYPE);
- Rast_get_raster_row(finput, dtmp, i, DCELL_TYPE);
+ Rast_get_row(finput, dtmp, i, DCELL_TYPE);
break;
}
@@ -1685,15 +1685,15 @@
switch (data_type) {
case (CELL_TYPE):
Rast_zero_raster_buf(tmp, CELL_TYPE);
- Rast_get_raster_row(finput, tmp, i, CELL_TYPE);
+ Rast_get_row(finput, tmp, i, CELL_TYPE);
break;
case (FCELL_TYPE):
Rast_zero_raster_buf(ftmp, FCELL_TYPE);
- Rast_get_raster_row(finput, ftmp, i, FCELL_TYPE);
+ Rast_get_row(finput, ftmp, i, FCELL_TYPE);
break;
case (DCELL_TYPE):
Rast_zero_raster_buf(dtmp, DCELL_TYPE);
- Rast_get_raster_row(finput, dtmp, i, DCELL_TYPE);
+ Rast_get_row(finput, dtmp, i, DCELL_TYPE);
break;
}
@@ -1754,7 +1754,7 @@
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);
+ Rast_get_row(fr, row_buf, i, CELL_TYPE);
for (j = 0; j < ncols; j++) {
if (*(row_buf + j)) {
if (regcnt == 0)
Modified: grass/trunk/raster/r.le/r.le.setup/sample.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -356,7 +356,7 @@
fr = Rast_open_cell_old(n1, G_mapset());
for (j = t; j < b; j++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
- Rast_get_raster_row(fr, row_buf, j, CELL_TYPE);
+ Rast_get_row(fr, row_buf, j, CELL_TYPE);
for (k = l; k < r; k++) {
if (*(row_buf + k))
count++;
@@ -413,7 +413,7 @@
fr = Rast_open_cell_old(n1, G_mapset());
for (j = t; j < b; j++) {
Rast_zero_raster_buf(row_buf, CELL_TYPE);
- Rast_get_raster_row(fr, row_buf, j, CELL_TYPE);
+ Rast_get_row(fr, row_buf, j, CELL_TYPE);
for (k = l; k < r; k++) {
if (*(row_buf + k))
count++;
@@ -956,13 +956,13 @@
if (fmask > 0) {
row_buf = Rast_allocate_c_buf();
- Rast_get_map_row_nomask(fmask, row_buf, t + top1);
+ Rast_get_c_row_nomask(fmask, row_buf, t + top1);
if (!
(*(row_buf + l + left1) &&
*(row_buf + l + left1 + u_w - 1)))
goto back;
Rast_zero_cell_buf(row_buf);
- Rast_get_map_row_nomask(fmask, row_buf, t + top1 + u_l - 1);
+ Rast_get_c_row_nomask(fmask, row_buf, t + top1 + u_l - 1);
if (!
(*(row_buf + l + left1) &&
*(row_buf + l + left1 + u_w - 1)))
@@ -1407,7 +1407,7 @@
if (fmask > 0) {
row_buf = Rast_allocate_c_buf();
- Rast_get_map_row_nomask(fmask, row_buf, at);
+ Rast_get_c_row_nomask(fmask, row_buf, at);
if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
fprintf(stderr,
"\n The unit would be outside the mask; ");
@@ -1417,7 +1417,7 @@
goto back1;
}
Rast_zero_cell_buf(row_buf);
- Rast_get_map_row_nomask(fmask, row_buf, ab - 1);
+ Rast_get_c_row_nomask(fmask, row_buf, ab - 1);
if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
fprintf(stderr,
"\n The unit would be outside the mask; ");
@@ -1529,7 +1529,7 @@
if (fmask > 0) {
row_buf = Rast_allocate_c_buf();
- Rast_get_map_row_nomask(fmask, row_buf, at);
+ Rast_get_c_row_nomask(fmask, row_buf, at);
if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
fprintf(stderr,
"\n The unit would be outside the mask; ");
@@ -1539,7 +1539,7 @@
goto back2;
}
Rast_zero_cell_buf(row_buf);
- Rast_get_map_row_nomask(fmask, row_buf, ab - 1);
+ Rast_get_c_row_nomask(fmask, row_buf, ab - 1);
if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
fprintf(stderr,
"\n The unit would be outside the mask; ");
Modified: grass/trunk/raster/r.le/r.le.trace/main.c
===================================================================
--- grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.le/r.le.trace/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -609,15 +609,15 @@
switch (data_type) {
case CELL_TYPE:
Rast_zero_raster_buf(tmp, data_type);
- Rast_get_raster_row(finput, tmp, i, data_type);
+ Rast_get_row(finput, tmp, i, data_type);
break;
case FCELL_TYPE:
Rast_zero_raster_buf(ftmp, data_type);
- Rast_get_raster_row(finput, ftmp, i, data_type);
+ Rast_get_row(finput, ftmp, i, data_type);
break;
case DCELL_TYPE:
Rast_zero_raster_buf(dtmp, data_type);
- Rast_get_raster_row(finput, dtmp, i, data_type);
+ Rast_get_row(finput, dtmp, i, data_type);
break;
}
Modified: grass/trunk/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -246,7 +246,7 @@
int riga;
riga = (int)rint(i * add_row);
- Rast_get_map_row_nomask(old_fd, old, riga);
+ Rast_get_c_row_nomask(old_fd, old, riga);
for (j = 0; j < cl; j++) {
int colonna;
@@ -268,7 +268,7 @@
if (ad->cm->contents[hash] == row)
return ad->cm->cache[hash];
else {
- Rast_get_raster_row(fd, ad->cm->cache[hash], row, CELL_TYPE);
+ Rast_get_row(fd, ad->cm->cache[hash], row, CELL_TYPE);
ad->cm->contents[hash] = row;
return ad->cm->cache[hash];
}
@@ -283,7 +283,7 @@
if (ad->dm->contents[hash] == row)
return ad->dm->cache[hash];
else {
- Rast_get_raster_row(fd, ad->dm->cache[hash], row, DCELL_TYPE);
+ Rast_get_row(fd, ad->dm->cache[hash], row, DCELL_TYPE);
ad->dm->contents[hash] = row;
return ad->dm->cache[hash];
}
@@ -298,7 +298,7 @@
if (ad->fm->contents[hash] == row)
return ad->fm->cache[hash];
else {
- Rast_get_raster_row(fd, ad->fm->cache[hash], row, FCELL_TYPE);
+ Rast_get_row(fd, ad->fm->cache[hash], row, FCELL_TYPE);
ad->fm->contents[hash] = row;
return ad->fm->cache[hash];
}
Modified: grass/trunk/raster/r.los/main.c
===================================================================
--- grass/trunk/raster/r.los/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.los/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -267,7 +267,7 @@
patt_fd = open(patt_name, 2);
segment_init(&seg_patt, patt_fd, 4);
for (row = 0; row < nrows; row++) {
- if (Rast_get_raster_row(patt, cell, row, CELL_TYPE) < 0)
+ if (Rast_get_row(patt, cell, row, CELL_TYPE) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
patt_layer, row);
segment_put_row(&seg_patt, cell, row);
@@ -275,7 +275,7 @@
}
for (row = 0; row < nrows; row++) {
- if (Rast_get_raster_row(old, fcell, row, FCELL_TYPE) < 0)
+ if (Rast_get_row(old, fcell, row, FCELL_TYPE) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
elev_layer, row);
segment_put_row(&seg_in, fcell, row);
Modified: grass/trunk/raster/r.mapcalc/map.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.mapcalc/map.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -145,7 +145,7 @@
if (i >= 0 && i < cache->nrows) {
if (!sub->valid[i]) {
- Rast_get_raster_row(cache->fd, sub->buf[i], row + i, data_type);
+ Rast_get_row(cache->fd, sub->buf[i], row + i, data_type);
sub->valid[i] = 1;
}
return sub->buf[i];
@@ -154,7 +154,7 @@
if (i <= -cache->nrows || i >= cache->nrows * 2 - 1) {
memset(sub->valid, 0, cache->nrows);
sub->row = i;
- Rast_get_raster_row(cache->fd, sub->buf[0], row, data_type);
+ Rast_get_row(cache->fd, sub->buf[0], row, data_type);
sub->valid[0] = 1;
return sub->buf[0];
}
@@ -182,7 +182,7 @@
G__freea(tmp);
G__freea(vtmp);
- Rast_get_raster_row(cache->fd, sub->buf[i], row, data_type);
+ Rast_get_row(cache->fd, sub->buf[i], row, data_type);
sub->valid[i] = 1;
return sub->buf[i];
@@ -367,7 +367,7 @@
static void read_row(int fd, void *buf, int row, int res_type)
{
- if (Rast_get_raster_row(fd, buf, row, res_type) < 0)
+ if (Rast_get_row(fd, buf, row, res_type) < 0)
G_fatal_error(_("Unable to read raster map row %d"), row);
}
Modified: grass/trunk/raster/r.mfilter/getrow.c
===================================================================
--- grass/trunk/raster/r.mfilter/getrow.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.mfilter/getrow.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -9,7 +9,7 @@
int getmaprow(int fd, void *buf, int row, int len)
{
- if (Rast_get_d_raster_row(fd, (DCELL *) buf, row) < 0)
+ if (Rast_get_d_row(fd, (DCELL *) buf, row) < 0)
G_fatal_error(_("Cannot read raster row %d"), row);
return 1;
}
Modified: grass/trunk/raster/r.neighbors/readcell.c
===================================================================
--- grass/trunk/raster/r.neighbors/readcell.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.neighbors/readcell.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -9,7 +9,7 @@
rotate_bufs();
if (row < nrows)
- Rast_get_d_raster_row(fd, ncb.buf[ncb.nsize - 1] + ncb.dist, row);
+ Rast_get_d_row(fd, ncb.buf[ncb.nsize - 1] + ncb.dist, row);
else
Rast_set_d_null_value(ncb.buf[ncb.nsize - 1] + ncb.dist, ncols);
Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.null/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -331,7 +331,7 @@
for (row = 0; row < cellhd.rows; row++) {
G_percent(row, cellhd.rows, 1);
- if (Rast_get_raster_row_nomask(old, rast, row, map_type) < 0) {
+ if (Rast_get_row_nomask(old, rast, row, map_type) < 0) {
G_warning(_("Unable to read raster map <%s> row %d"),
name, row);
break;
Modified: grass/trunk/raster/r.out.arc/main.c
===================================================================
--- grass/trunk/raster/r.out.arc/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.arc/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -171,7 +171,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+ if (Rast_get_row(fd, raster, row, out_type) < 0)
exit(EXIT_FAILURE);
/*
if (Rast_get_null_value_row(fd, null_row, row) < 0)
Modified: grass/trunk/raster/r.out.ascii/formspecific.c
===================================================================
--- grass/trunk/raster/r.out.ascii/formspecific.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.ascii/formspecific.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -38,7 +38,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+ if (Rast_get_row(fd, raster, row, out_type) < 0)
return (row);
for (col = 0, ptr = raster; col < ncols; col++,
@@ -91,7 +91,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+ if (Rast_get_row(fd, raster, row, out_type) < 0)
return (row);
colcnt = 0;
@@ -177,7 +177,7 @@
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 2);
- if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+ if (Rast_get_row(fd, raster, row, out_type) < 0)
return (row);
colcnt = 0;
Modified: grass/trunk/raster/r.out.bin/main.c
===================================================================
--- grass/trunk/raster/r.out.bin/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.bin/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -332,7 +332,7 @@
G_message(_("c=%d"), region.cols);
for (row = 0; row < nrows; row++) {
- if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+ if (Rast_get_row(fd, raster, row, out_type) < 0)
G_fatal_error(_("Reading map"));
G_percent(row, nrows, 2);
Modified: grass/trunk/raster/r.out.gdal/export_band.c
===================================================================
--- grass/trunk/raster/r.out.gdal/export_band.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.gdal/export_band.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -209,7 +209,7 @@
for (row = 0; row < rows; row++) {
- if (Rast_get_raster_row(fd, bufer, row, maptype) < 0) {
+ if (Rast_get_row(fd, bufer, row, maptype) < 0) {
G_warning(_("Unable to read raster map <%s> row %d"),
name, row);
return -1;
@@ -251,7 +251,7 @@
for (row = 0; row < rows; row++) {
- if (Rast_get_raster_row(fd, bufer, row, maptype) < 0) {
+ if (Rast_get_row(fd, bufer, row, maptype) < 0) {
G_warning(_("Unable to read raster map <%s> row %d"),
name, row);
return -1;
@@ -293,7 +293,7 @@
for (row = 0; row < rows; row++) {
- if (Rast_get_raster_row(fd, bufer, row, maptype) < 0) {
+ if (Rast_get_row(fd, bufer, row, maptype) < 0) {
G_warning(_("Unable to read raster map <%s> row %d"),
name, row);
return -1;
Modified: grass/trunk/raster/r.out.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -55,7 +55,7 @@
G_percent(row, cellhd.rows, 2);
switch (data_type) {
case CELL_TYPE:
- if (Rast_get_c_raster_row(fd, cell, row) < 0) {
+ if (Rast_get_c_row(fd, cell, row) < 0) {
Rast_close(fd);
exit(1);
}
@@ -70,7 +70,7 @@
}
break;
case FCELL_TYPE:
- if (Rast_get_f_raster_row(fd, fcell, row) < 0) {
+ if (Rast_get_f_row(fd, fcell, row) < 0) {
Rast_close(fd);
exit(1);
}
@@ -85,7 +85,7 @@
}
break;
case DCELL_TYPE:
- if (Rast_get_d_raster_row(fd, dcell, row) < 0) {
+ if (Rast_get_d_row(fd, dcell, row) < 0) {
Rast_close(fd);
exit(1);
}
Modified: grass/trunk/raster/r.out.mat/main.c
===================================================================
--- grass/trunk/raster/r.out.mat/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.mat/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -309,7 +309,7 @@
ptr =
G_incr_void_ptr(ptr,
(G_window_cols() + 1) * Rast_cell_size(map_type))) {
- if (Rast_get_raster_row(fd, ptr, row, map_type) < 0)
+ if (Rast_get_row(fd, ptr, row, map_type) < 0)
G_fatal_error("reading map");
G_percent(row, mrows, 2);
}
Modified: grass/trunk/raster/r.out.mpeg/main.c
===================================================================
--- grass/trunk/raster/r.out.mpeg/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.mpeg/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -293,7 +293,7 @@
voidc = Rast_allocate_buf(rtype);
for (row = 0; row < vrows; row++) {
- if (Rast_get_raster_row(fd, voidc,
+ if (Rast_get_row(fd, voidc,
(int)(row / vscale), rtype) < 0)
G_fatal_error(_("Error reading row <%d>"), row);
Modified: grass/trunk/raster/r.out.png/main.c
===================================================================
--- grass/trunk/raster/r.out.png/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.png/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -252,7 +252,7 @@
for (row = 0; row < w.rows; row++) {
G_percent(row, w.rows, 5);
- if (Rast_get_raster_row(cellfile, (void *)voidc, row, rtype) < 0)
+ if (Rast_get_row(cellfile, (void *)voidc, row, rtype) < 0)
exit(EXIT_FAILURE);
Rast_lookup_colors((void *)voidc, ored, ogrn, oblu, set,
w.cols, &colors, rtype);
Modified: grass/trunk/raster/r.out.pov/main.c
===================================================================
--- grass/trunk/raster/r.out.pov/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.pov/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -262,7 +262,7 @@
cell = Rast_allocate_c_buf();
for (r = 0; r < rowCount; r++) {
- if (Rast_get_map_row(inputFile, cell, r) < 0)
+ if (Rast_get_c_row(inputFile, cell, r) < 0)
exit(1);
/* break; */
Modified: grass/trunk/raster/r.out.ppm/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.ppm/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -163,7 +163,7 @@
if (!gscale->answer) { /* 24BIT COLOR IMAGE */
for (row = 0; row < w.rows; row++) {
G_percent(row, w.rows, 5);
- if (Rast_get_raster_row(cellfile, (void *)voidc, row, rtype) < 0)
+ if (Rast_get_row(cellfile, (void *)voidc, row, rtype) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
rast->answer, row);
Rast_lookup_colors((void *)voidc, ored, ogrn, oblu, set,
@@ -187,7 +187,7 @@
for (row = 0; row < w.rows; row++) {
G_percent(row, w.rows, 5);
- if (Rast_get_raster_row(cellfile, (void *)voidc, row, rtype) < 0)
+ if (Rast_get_row(cellfile, (void *)voidc, row, rtype) < 0)
exit(1);
Rast_lookup_colors((void *)voidc, ored, ogrn, oblu, set,
w.cols, &colors, rtype);
Modified: grass/trunk/raster/r.out.ppm3/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm3/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.ppm3/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -159,8 +159,8 @@
G_percent(row, w.rows, 5);
for (i = 0; i < 3; i++) {
- if (Rast_get_raster_row(B[i].file, B[i].array, row, B[i].type) < 0)
- G_fatal_error("Rast_get_raster_row failed");
+ if (Rast_get_row(B[i].file, B[i].array, row, B[i].type) < 0)
+ G_fatal_error("Rast_get_row failed");
Rast_lookup_colors(B[i].array,
(i == 0) ? B[i].buf : dummy,
Modified: grass/trunk/raster/r.out.tiff/main.c
===================================================================
--- grass/trunk/raster/r.out.tiff/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.tiff/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -253,7 +253,7 @@
uint32 colb = 0;
for (i = 0; i < nrow; i++) {
- if (Rast_get_c_raster_row(in, cells[i], row + i) < 0)
+ if (Rast_get_c_row(in, cells[i], row + i) < 0)
G_fatal_error(_("Reading raster map..."));
}
@@ -340,7 +340,7 @@
G_percent(row, h.ras_height, 2);
- if (Rast_get_c_raster_row(in, cell, row) < 0)
+ if (Rast_get_c_row(in, cell, row) < 0)
exit(EXIT_FAILURE);
cellptr = cell;
Modified: grass/trunk/raster/r.out.vrml/put_grid.c
===================================================================
--- grass/trunk/raster/r.out.vrml/put_grid.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.vrml/put_grid.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -48,7 +48,7 @@
if (!shh)
G_percent(row, rows - 1, 10);
- Rast_get_f_raster_row(elevfd, tf, row);
+ Rast_get_f_row(elevfd, tf, row);
coordz = G_row_to_northing((double)row, w);
do_coordcnv(&coordz, 'z');
@@ -99,7 +99,7 @@
if (!shh)
G_percent(row, rows - 1, 5);
- Rast_get_f_raster_row(colorfd, tf, row);
+ Rast_get_f_row(colorfd, tf, row);
Rast_lookup_f_colors(tf, red, green, blue, set, cols, colr);
for (col = 0; col < cols; col++) {
Modified: grass/trunk/raster/r.out.vtk/writeascii.c
===================================================================
--- grass/trunk/raster/r.out.vtk/writeascii.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.out.vtk/writeascii.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -181,7 +181,7 @@
colcount = 0;
G_percent((row - nrows) * (-1), nrows, 2);
- if (Rast_get_raster_row(fd, raster, row, out_type) < 0) {
+ if (Rast_get_row(fd, raster, row, out_type) < 0) {
G_fatal_error(_("Unable to read row %i\n"), row);
return;
}
@@ -242,7 +242,7 @@
colcount = 0;
G_percent((row - nrows) * (-1), nrows, 10);
- if (Rast_get_raster_row(fd, raster, row, out_type) < 0) {
+ if (Rast_get_row(fd, raster, row, out_type) < 0) {
G_fatal_error(_("Unable to read row %i\n"), row);
return;
}
@@ -354,7 +354,7 @@
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 10);
- if (Rast_get_raster_row(fd, raster, row, out_type) < 0) {
+ if (Rast_get_row(fd, raster, row, out_type) < 0) {
G_fatal_error(_("Unable to read row %i\n"), row);
return;
}
@@ -401,15 +401,15 @@
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 10);
- if (Rast_get_raster_row(redfd, redraster, row, out_type) < 0) {
+ if (Rast_get_row(redfd, redraster, row, out_type) < 0) {
G_fatal_error(_("Unable to read row %i\n"), row);
return;
}
- if (Rast_get_raster_row(greenfd, greenraster, row, out_type) < 0) {
+ if (Rast_get_row(greenfd, greenraster, row, out_type) < 0) {
G_fatal_error(_("Unable to read row %i\n"), row);
return;
}
- if (Rast_get_raster_row(bluefd, blueraster, row, out_type) < 0) {
+ if (Rast_get_row(bluefd, blueraster, row, out_type) < 0) {
G_fatal_error(_("Unable to read row %i\n"), row);
return;
}
@@ -468,15 +468,15 @@
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 10);
- if (Rast_get_raster_row(xfd, xraster, row, out_type) < 0) {
+ if (Rast_get_row(xfd, xraster, row, out_type) < 0) {
G_fatal_error(_("Unable to read row %i\n"), row);
return;
}
- if (Rast_get_raster_row(yfd, yraster, row, out_type) < 0) {
+ if (Rast_get_row(yfd, yraster, row, out_type) < 0) {
G_fatal_error(_("Unable to read row %i\n"), row);
return;
}
- if (Rast_get_raster_row(zfd, zraster, row, out_type) < 0) {
+ if (Rast_get_row(zfd, zraster, row, out_type) < 0) {
G_fatal_error(_("Unable to read row %i\n"), row);
return;
}
Modified: grass/trunk/raster/r.param.scale/process.c
===================================================================
--- grass/trunk/raster/r.param.scale/process.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.param.scale/process.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -153,7 +153,7 @@
Rast_put_raster_row(fd_out, featrow_out, CELL_TYPE); /* Write out the edge cells as NULL. */
for (wind_row = 0; wind_row < wsize - 1; wind_row++)
- Rast_get_raster_row(fd_in, row_in + (wind_row * ncols), wind_row,
+ Rast_get_row(fd_in, row_in + (wind_row * ncols), wind_row,
DCELL_TYPE);
/* Read in enough of the first rows to */
/* allow window to be examined. */
@@ -161,7 +161,7 @@
for (row = EDGE; row < (nrows - EDGE); row++) {
G_percent(row + 1, nrows - EDGE, 2);
- Rast_get_raster_row(fd_in, row_in + ((wsize - 1) * ncols), row + EDGE,
+ Rast_get_row(fd_in, row_in + ((wsize - 1) * ncols), row + EDGE,
DCELL_TYPE);
for (col = EDGE; col < (ncols - EDGE); col++) {
Modified: grass/trunk/raster/r.patch/main.c
===================================================================
--- grass/trunk/raster/r.patch/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.patch/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -133,14 +133,14 @@
G_verbose_message(_("Percent complete..."));
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(infd[0], presult, row, out_type) < 0)
+ if (Rast_get_row(infd[0], presult, row, out_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
names[0], row);
if (out_type == CELL_TYPE)
Rast_update_cell_stats((CELL *) presult, ncols, &statf[0]);
for (i = 1; i < nfiles; i++) {
- if (Rast_get_raster_row(infd[i], patch, row, out_type) < 0)
+ if (Rast_get_row(infd[i], patch, row, out_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
names[i], row);
if (!do_patch
Modified: grass/trunk/raster/r.profile/read_rast.c
===================================================================
--- grass/trunk/raster/r.profile/read_rast.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.profile/read_rast.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -39,7 +39,7 @@
outofbounds = TRUE;
if (!outofbounds) {
- if (row != cur_row && Rast_get_d_raster_row(fd, dcell, row) < 0)
+ if (row != cur_row && Rast_get_d_row(fd, dcell, row) < 0)
G_fatal_error(_("Unable to read raster map row %d"), row);
cur_row = row;
}
Modified: grass/trunk/raster/r.proj/readcell.c
===================================================================
--- grass/trunk/raster/r.proj/readcell.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.proj/readcell.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -78,7 +78,7 @@
if (row + y >= nrows)
break;
- if (Rast_get_f_raster_row(fdi, &tmpbuf[y * nx * BDIM], row + y) < 0)
+ if (Rast_get_f_row(fdi, &tmpbuf[y * nx * BDIM], row + y) < 0)
G_fatal_error(_("Error reading input"));
}
Modified: grass/trunk/raster/r.quantile/main.c
===================================================================
--- grass/trunk/raster/r.quantile/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.quantile/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -65,7 +65,7 @@
total = 0;
for (row = 0; row < rows; row++) {
- Rast_get_d_raster_row(infile, inbuf, row);
+ Rast_get_d_row(infile, inbuf, row);
for (col = 0; col < cols; col++) {
int i;
@@ -134,7 +134,7 @@
G_message(_("Binning data"));
for (row = 0; row < rows; row++) {
- Rast_get_d_raster_row(infile, inbuf, row);
+ Rast_get_d_row(infile, inbuf, row);
for (col = 0; col < cols; col++) {
int i, bin;
Modified: grass/trunk/raster/r.random/count.c
===================================================================
--- grass/trunk/raster/r.random/count.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.random/count.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -73,11 +73,11 @@
}
G_message(_("Collecting Stats..."));
for (row = 0; row < nrows; row++) {
- if (Rast_get_raster_row(theState->fd_old, theState->buf.data.v,
+ if (Rast_get_row(theState->fd_old, theState->buf.data.v,
row, theState->buf.type) < 0)
G_fatal_error(_("Cannot read raster row [%d]"), row);
if (theState->docover == 1) {
- if (Rast_get_raster_row(theState->fd_cold, theState->cover.data.v,
+ if (Rast_get_row(theState->fd_cold, theState->cover.data.v,
row, theState->cover.type) < 0)
G_fatal_error(_("Cannot read cover raster row [%d]"), row);
}
Modified: grass/trunk/raster/r.random/random.c
===================================================================
--- grass/trunk/raster/r.random/random.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.random/random.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -124,12 +124,12 @@
cat = 1;
/* Execute for loop for every row if nt>1 */
for (row = 0; row < nrows && nt; row++) {
- if (Rast_get_raster_row
+ if (Rast_get_row
(infd, theState->buf.data.v, row, theState->buf.type) < 0)
G_fatal_error(_("Cannot read raster row [%d] from raster map <%s>"),
row, theState->inraster);
if (theState->docover == 1) {
- if (Rast_get_raster_row
+ if (Rast_get_row
(cinfd, theState->cover.data.v, row,
theState->cover.type) < 0)
G_fatal_error(_("Cannot read raster row [%d] from cover raster map <%s>"),
Modified: grass/trunk/raster/r.random.cells/init.c
===================================================================
--- grass/trunk/raster/r.random.cells/init.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.random.cells/init.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -47,7 +47,7 @@
}
else {
for (row = 0; row < Rs; row++) {
- Rast_get_map_row_nomask(FD, CellBuffer, row);
+ Rast_get_c_row_nomask(FD, CellBuffer, row);
for (col = 0; col < Cs; col++) {
if (CellBuffer[col]) {
FLAG_SET(Cells, row, col);
Modified: grass/trunk/raster/r.random.surface/calcsurf.c
===================================================================
--- grass/trunk/raster/r.random.surface/calcsurf.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.random.surface/calcsurf.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -109,7 +109,7 @@
}
else {
for (Row = 0; Row < Rs; Row++) {
- Rast_get_map_row_nomask(FDM, CellBuffer, Row);
+ Rast_get_c_row_nomask(FDM, CellBuffer, Row);
if (ODD(Row)) {
for (Col = Cs - 1; Col >= 0; Col--) {
if (CellBuffer[Col] == 0)
Modified: grass/trunk/raster/r.random.surface/init.c
===================================================================
--- grass/trunk/raster/r.random.surface/init.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.random.surface/init.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -49,7 +49,7 @@
MapCount = 0;
CellBuffer = Rast_allocate_c_buf();
for (row = 0; row < Rs; row++) {
- Rast_get_map_row_nomask(FDM, CellBuffer, row);
+ Rast_get_c_row_nomask(FDM, CellBuffer, row);
for (col = 0; col < Cs; col++) {
if (CellBuffer[col])
MapCount++;
Modified: grass/trunk/raster/r.random.surface/save.c
===================================================================
--- grass/trunk/raster/r.random.surface/save.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.random.surface/save.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -58,7 +58,7 @@
}
else {
for (Row = 0; Row < Rs; Row++) {
- Rast_get_map_row_nomask(FDM, CellBuffer, Row);
+ Rast_get_c_row_nomask(FDM, CellBuffer, Row);
for (Col = 0; Col < Cs; Col++) {
if (CellBuffer[Col] != 0) {
Value = Surface[Row][Col];
@@ -77,7 +77,7 @@
DownInterval = UpInterval = Value;
for (Row = 0; Row < Rs; Row++) {
- Rast_get_map_row_nomask(FDM, CellBuffer, Row);
+ Rast_get_c_row_nomask(FDM, CellBuffer, Row);
for (Col = 0; Col < Cs; Col++) {
if (CellBuffer[Col] != 0) {
Value = Surface[Row][Col];
Modified: grass/trunk/raster/r.recode/recode.c
===================================================================
--- grass/trunk/raster/r.recode/recode.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.recode/recode.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -80,9 +80,9 @@
static void process_row_ii(int row)
{
if (no_mask)
- Rast_get_c_raster_row_nomask(in_fd, (CELL *) in_rast, row);
+ Rast_get_c_row_nomask(in_fd, (CELL *) in_rast, row);
else
- Rast_get_c_raster_row(in_fd, (CELL *) in_rast, row);
+ Rast_get_c_row(in_fd, (CELL *) in_rast, row);
Rast_fpreclass_perform_ii(&rcl_struct, (CELL *) in_rast, (CELL *) out_rast,
ncols);
Rast_put_raster_row(out_fd, (CELL *) out_rast, CELL_TYPE);
@@ -91,9 +91,9 @@
static void process_row_if(int row)
{
if (no_mask)
- Rast_get_c_raster_row_nomask(in_fd, (CELL *) in_rast, row);
+ Rast_get_c_row_nomask(in_fd, (CELL *) in_rast, row);
else
- Rast_get_c_raster_row(in_fd, (CELL *) in_rast, row);
+ Rast_get_c_row(in_fd, (CELL *) in_rast, row);
Rast_fpreclass_perform_if(&rcl_struct, (CELL *) in_rast, (FCELL *) out_rast,
ncols);
Rast_put_f_raster_row(out_fd, (FCELL *) out_rast);
@@ -102,9 +102,9 @@
static void process_row_id(int row)
{
if (no_mask)
- Rast_get_c_raster_row_nomask(in_fd, (CELL *) in_rast, row);
+ Rast_get_c_row_nomask(in_fd, (CELL *) in_rast, row);
else
- Rast_get_c_raster_row(in_fd, (CELL *) in_rast, row);
+ Rast_get_c_row(in_fd, (CELL *) in_rast, row);
Rast_fpreclass_perform_id(&rcl_struct, (CELL *) in_rast, (DCELL *) out_rast,
ncols);
Rast_put_raster_row(out_fd, (DCELL *) out_rast, DCELL_TYPE);
@@ -113,9 +113,9 @@
static void process_row_fi(int row)
{
if (no_mask)
- Rast_get_f_raster_row_nomask(in_fd, (FCELL *) in_rast, row);
+ Rast_get_f_row_nomask(in_fd, (FCELL *) in_rast, row);
else
- Rast_get_f_raster_row(in_fd, (FCELL *) in_rast, row);
+ Rast_get_f_row(in_fd, (FCELL *) in_rast, row);
Rast_fpreclass_perform_fi(&rcl_struct, (FCELL *) in_rast, (CELL *) out_rast,
ncols);
Rast_put_raster_row(out_fd, (CELL *) out_rast, CELL_TYPE);
@@ -124,9 +124,9 @@
static void process_row_ff(int row)
{
if (no_mask)
- Rast_get_f_raster_row_nomask(in_fd, (FCELL *) in_rast, row);
+ Rast_get_f_row_nomask(in_fd, (FCELL *) in_rast, row);
else
- Rast_get_f_raster_row(in_fd, (FCELL *) in_rast, row);
+ Rast_get_f_row(in_fd, (FCELL *) in_rast, row);
Rast_fpreclass_perform_ff(&rcl_struct, (FCELL *) in_rast, (FCELL *) out_rast,
ncols);
Rast_put_f_raster_row(out_fd, (FCELL *) out_rast);
@@ -135,9 +135,9 @@
static void process_row_fd(int row)
{
if (no_mask)
- Rast_get_f_raster_row_nomask(in_fd, (FCELL *) in_rast, row);
+ Rast_get_f_row_nomask(in_fd, (FCELL *) in_rast, row);
else
- Rast_get_f_raster_row(in_fd, (FCELL *) in_rast, row);
+ Rast_get_f_row(in_fd, (FCELL *) in_rast, row);
Rast_fpreclass_perform_fd(&rcl_struct, (FCELL *) in_rast, (DCELL *) out_rast,
ncols);
Rast_put_raster_row(out_fd, (DCELL *) out_rast, DCELL_TYPE);
@@ -146,9 +146,9 @@
static void process_row_di(int row)
{
if (no_mask)
- Rast_get_d_raster_row_nomask(in_fd, (DCELL *) in_rast, row);
+ Rast_get_d_row_nomask(in_fd, (DCELL *) in_rast, row);
else
- Rast_get_d_raster_row(in_fd, (DCELL *) in_rast, row);
+ Rast_get_d_row(in_fd, (DCELL *) in_rast, row);
Rast_fpreclass_perform_di(&rcl_struct, (DCELL *) in_rast, (CELL *) out_rast,
ncols);
Rast_put_raster_row(out_fd, (CELL *) out_rast, CELL_TYPE);
@@ -157,9 +157,9 @@
static void process_row_df(int row)
{
if (no_mask)
- Rast_get_d_raster_row_nomask(in_fd, (DCELL *) in_rast, row);
+ Rast_get_d_row_nomask(in_fd, (DCELL *) in_rast, row);
else
- Rast_get_d_raster_row(in_fd, (DCELL *) in_rast, row);
+ Rast_get_d_row(in_fd, (DCELL *) in_rast, row);
Rast_fpreclass_perform_df(&rcl_struct, (DCELL *) in_rast, (FCELL *) out_rast,
ncols);
Rast_put_f_raster_row(out_fd, (FCELL *) out_rast);
@@ -168,9 +168,9 @@
static void process_row_dd(int row)
{
if (no_mask)
- Rast_get_d_raster_row_nomask(in_fd, (DCELL *) in_rast, row);
+ Rast_get_d_row_nomask(in_fd, (DCELL *) in_rast, row);
else
- Rast_get_d_raster_row(in_fd, (DCELL *) in_rast, row);
+ Rast_get_d_row(in_fd, (DCELL *) in_rast, row);
Rast_fpreclass_perform_dd(&rcl_struct, (DCELL *) in_rast, (DCELL *) out_rast,
ncols);
Rast_put_raster_row(out_fd, (DCELL *) out_rast, DCELL_TYPE);
Modified: grass/trunk/raster/r.resamp.interp/main.c
===================================================================
--- grass/trunk/raster/r.resamp.interp/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.resamp.interp/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -48,7 +48,7 @@
keep = 0;
for (i = keep; i < neighbors; i++)
- Rast_get_d_raster_row(infile, bufs[i], first_row + i);
+ Rast_get_d_row(infile, bufs[i], first_row + i);
cur_row = first_row;
}
Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.resamp.rst/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -432,7 +432,7 @@
else {
cellrow = Rast_allocate_f_buf();
for (m1 = 0; m1 < inp_rows; m1++) {
- ret_val = Rast_get_f_raster_row(fdinp, cellrow, m1);
+ ret_val = Rast_get_f_row(fdinp, cellrow, m1);
if (ret_val < 0)
G_fatal_error(_("Error reading row %d (error = %d)"),
m1, ret_val);
Modified: grass/trunk/raster/r.resamp.stats/main.c
===================================================================
--- grass/trunk/raster/r.resamp.stats/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.resamp.stats/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -120,7 +120,7 @@
Rast_set_window(&src_w);
for (i = 0; i < count; i++)
- Rast_get_d_raster_row(infile, bufs[i], maprow0 + i);
+ Rast_get_d_row(infile, bufs[i], maprow0 + i);
for (col = 0; col < dst_w.cols; col++) {
int mapcol0 = col_map[col + 0];
@@ -193,7 +193,7 @@
Rast_set_window(&src_w);
for (i = 0; i < count; i++)
- Rast_get_d_raster_row(infile, bufs[i], maprow0 + i);
+ Rast_get_d_row(infile, bufs[i], maprow0 + i);
for (col = 0; col < dst_w.cols; col++) {
double x0 = col_map[col + 0];
Modified: grass/trunk/raster/r.resample/main.c
===================================================================
--- grass/trunk/raster/r.resample/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.resample/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -118,7 +118,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(infd, rast, row, data_type) < 0)
+ if (Rast_get_row(infd, rast, row, data_type) < 0)
G_fatal_error(_("Error reading row %d"), row);
if (Rast_put_raster_row(outfd, rast, out_type) < 0)
G_fatal_error(_("Error writing row %d"), row);
Modified: grass/trunk/raster/r.rescale/get_range.c
===================================================================
--- grass/trunk/raster/r.rescale/get_range.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.rescale/get_range.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -26,7 +26,7 @@
G_message(_("Reading %s ..."), name);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_map_row_nomask(fd, cell, row) < 0)
+ if (Rast_get_c_row_nomask(fd, cell, row) < 0)
exit(1);
for (col = 0; col < ncols; col++)
Rast_update_range(cell[col], &range);
Modified: grass/trunk/raster/r.rescale.eq/get_stats.c
===================================================================
--- grass/trunk/raster/r.rescale.eq/get_stats.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.rescale.eq/get_stats.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -21,7 +21,7 @@
G_message(_("Reading %s ..."), name);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_map_row(fd, cell, row) < 0)
+ if (Rast_get_c_row(fd, cell, row) < 0)
break;
Rast_update_cell_stats(cell, ncols, statf);
}
Modified: grass/trunk/raster/r.ros/main.c
===================================================================
--- grass/trunk/raster/r.ros/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.ros/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -626,7 +626,7 @@
/*if considering spotting, read elevation map into an array */
if (spotting)
for (row = 0; row < nrows; row++) {
- if (Rast_get_map_row(elev_fd, elev, row) < 0)
+ if (Rast_get_c_row(elev_fd, elev, row) < 0)
G_fatal_error("cannot get map row!");
for (col = 0; col < ncols; col++)
DATA(map_elev, row, col) = elev[col];
@@ -637,30 +637,30 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_map_row(fuel_fd, fuel, row) < 0)
+ if (Rast_get_c_row(fuel_fd, fuel, row) < 0)
G_fatal_error("cannot get map row: %d!", row);
if (parm.mois_1h->answer)
- if (Rast_get_map_row(mois_1h_fd, mois_1h, row) < 0)
+ if (Rast_get_c_row(mois_1h_fd, mois_1h, row) < 0)
G_fatal_error("cannot get map row: %d!", row);
if (parm.mois_10h->answer)
- if (Rast_get_map_row(mois_10h_fd, mois_10h, row) < 0)
+ if (Rast_get_c_row(mois_10h_fd, mois_10h, row) < 0)
G_fatal_error("cannot get map row: %d!", row);
if (parm.mois_100h->answer)
- if (Rast_get_map_row(mois_100h_fd, mois_100h, row) < 0)
+ if (Rast_get_c_row(mois_100h_fd, mois_100h, row) < 0)
G_fatal_error("cannot get map row: %d!", row);
- if (Rast_get_map_row(mois_live_fd, mois_live, row) < 0)
+ if (Rast_get_c_row(mois_live_fd, mois_live, row) < 0)
G_fatal_error("cannot get map row: %d!", row);
if (parm.vel->answer)
- if (Rast_get_map_row(vel_fd, vel, row) < 0)
+ if (Rast_get_c_row(vel_fd, vel, row) < 0)
G_fatal_error("cannot get map row: %d!", row);
if (parm.dir->answer)
- if (Rast_get_map_row(dir_fd, dir, row) < 0)
+ if (Rast_get_c_row(dir_fd, dir, row) < 0)
G_fatal_error("cannot get map row: %d!", row);
if (parm.slope->answer)
- if (Rast_get_map_row(slope_fd, slope, row) < 0)
+ if (Rast_get_c_row(slope_fd, slope, row) < 0)
G_fatal_error("cannot get map row: %d!", row);
if (parm.aspect->answer)
- if (Rast_get_map_row(aspect_fd, aspect, row) < 0)
+ if (Rast_get_c_row(aspect_fd, aspect, row) < 0)
G_fatal_error("cannot get map row: %d!", row);
/*initialize cell buffers for output map layers */
Modified: grass/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.series/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -239,7 +239,7 @@
G_percent(row, nrows, 2);
for (i = 0; i < num_inputs; i++)
- Rast_get_d_raster_row(inputs[i].fd, inputs[i].buf, row);
+ Rast_get_d_row(inputs[i].fd, inputs[i].buf, row);
for (col = 0; col < ncols; col++) {
int null = 0;
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.slope.aspect/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -555,20 +555,20 @@
exit(EXIT_FAILURE);
if (Wrap) {
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[1] + 1, 0);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[1] + 1, 0);
elev_cell[1][0] = elev_cell[1][G_window_cols() - 1];
elev_cell[1][G_window_cols() + 1] = elev_cell[1][2];
}
else
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[1], 0);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[1], 0);
if (Wrap) {
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[2] + 1, 1);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[2] + 1, 1);
elev_cell[2][0] = elev_cell[2][G_window_cols() - 1];
elev_cell[2][G_window_cols() + 1] = elev_cell[2][2];
}
else
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[2], 1);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[2], 1);
G_verbose_message(_("Percent complete..."));
@@ -608,12 +608,12 @@
elev_cell[2] = temp;
if (Wrap) {
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[2] + 1, row);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[2] + 1, row);
elev_cell[2][0] = elev_cell[2][G_window_cols() - 1];
elev_cell[2][G_window_cols() + 1] = elev_cell[2][2];
}
else
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[2], row);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[2], row);
c1 = elev_cell[0];
c2 = c1 + 1;
Modified: grass/trunk/raster/r.spread/collect_ori.c
===================================================================
--- grass/trunk/raster/r.spread/collect_ori.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.spread/collect_ori.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -59,7 +59,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_map_row(start_fd, cell, row) < 0)
+ if (Rast_get_c_row(start_fd, cell, row) < 0)
exit(1);
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/raster/r.spread/main.c
===================================================================
--- grass/trunk/raster/r.spread/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.spread/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -433,28 +433,28 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_map_row(max_fd, cell, row) < 0)
+ if (Rast_get_c_row(max_fd, cell, row) < 0)
exit(EXIT_FAILURE);
for (col = 0; col < ncols; col++)
DATA(map_max, row, col) = cell[col];
- if (Rast_get_map_row(dir_fd, cell, row) < 0)
+ if (Rast_get_c_row(dir_fd, cell, row) < 0)
exit(EXIT_FAILURE);
for (col = 0; col < ncols; col++)
DATA(map_dir, row, col) = cell[col];
- if (Rast_get_map_row(base_fd, cell, row) < 0)
+ if (Rast_get_c_row(base_fd, cell, row) < 0)
exit(EXIT_FAILURE);
for (col = 0; col < ncols; col++)
DATA(map_base, row, col) = cell[col];
if (spotting) {
- if (Rast_get_map_row(spotdist_fd, cell, row) < 0)
+ if (Rast_get_c_row(spotdist_fd, cell, row) < 0)
exit(EXIT_FAILURE);
for (col = 0; col < ncols; col++)
DATA(map_spotdist, row, col) = cell[col];
- if (Rast_get_map_row(velocity_fd, cell, row) < 0)
+ if (Rast_get_c_row(velocity_fd, cell, row) < 0)
exit(EXIT_FAILURE);
for (col = 0; col < ncols; col++)
DATA(map_velocity, row, col) = cell[col];
- if (Rast_get_map_row(mois_fd, cell, row) < 0)
+ if (Rast_get_c_row(mois_fd, cell, row) < 0)
exit(EXIT_FAILURE);
for (col = 0; col < ncols; col++)
DATA(map_mois, row, col) = cell[col];
Modified: grass/trunk/raster/r.spreadpath/main.c
===================================================================
--- grass/trunk/raster/r.spreadpath/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.spreadpath/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -211,7 +211,7 @@
/* Write the back cell layers in the segmented files, and
* Change UTM coordinates to ROWs and COLUMNs */
for (row = 0; row < nrows; row++) {
- if (Rast_get_map_row(backrow_fd, cell, row) < 0)
+ if (Rast_get_c_row(backrow_fd, cell, row) < 0)
G_fatal_error("unable to get map row %d", row);
for (col = 0; col < ncols; col++)
@@ -221,7 +221,7 @@
else
cell[col] = -1;
segment_put_row(&in_row_seg, cell, row);
- if (Rast_get_map_row(backcol_fd, cell, row) < 0)
+ if (Rast_get_c_row(backcol_fd, cell, row) < 0)
G_fatal_error("unable to get map row %d", row);
for (col = 0; col < ncols; col++)
@@ -283,7 +283,7 @@
/* Search for the marked starting pts and make list */
for (row = 0; row < nrows; row++) {
- if (Rast_get_map_row(path_fd, cell, row) < 0)
+ if (Rast_get_c_row(path_fd, cell, row) < 0)
G_fatal_error("unable to get map row %d", row);
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/raster/r.statistics2/main.c
===================================================================
--- grass/trunk/raster/r.statistics2/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.statistics2/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -251,8 +251,8 @@
G_message(_("First pass"));
for (row = 0; row < rows; row++) {
- Rast_get_c_raster_row(base_fd, base_buf, row);
- Rast_get_d_raster_row(cover_fd, cover_buf, row);
+ Rast_get_c_row(base_fd, base_buf, row);
+ Rast_get_d_row(cover_fd, cover_buf, row);
for (col = 0; col < cols; col++) {
int n;
@@ -330,8 +330,8 @@
G_message(_("Second pass"));
for (row = 0; row < rows; row++) {
- Rast_get_c_raster_row(base_fd, base_buf, row);
- Rast_get_d_raster_row(cover_fd, cover_buf, row);
+ Rast_get_c_row(base_fd, base_buf, row);
+ Rast_get_d_row(cover_fd, cover_buf, row);
for (col = 0; col < cols; col++) {
int n;
@@ -504,7 +504,7 @@
out_buf = Rast_allocate_d_buf();
for (row = 0; row < rows; row++) {
- Rast_get_c_raster_row(base_fd, base_buf, row);
+ Rast_get_c_row(base_fd, base_buf, row);
for (col = 0; col < cols; col++)
if (Rast_is_c_null_value(&base_buf[col]))
Modified: grass/trunk/raster/r.statistics3/main.c
===================================================================
--- grass/trunk/raster/r.statistics3/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.statistics3/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -76,8 +76,8 @@
G_message(_("Computing histograms"));
for (row = 0; row < rows; row++) {
- Rast_get_c_raster_row(basefile, basebuf, row);
- Rast_get_d_raster_row(coverfile, coverbuf, row);
+ Rast_get_c_row(basefile, basebuf, row);
+ Rast_get_d_row(coverfile, coverbuf, row);
for (col = 0; col < cols; col++) {
struct basecat *bc;
@@ -166,8 +166,8 @@
G_message(_("Binning data"));
for (row = 0; row < rows; row++) {
- Rast_get_c_raster_row(basefile, basebuf, row);
- Rast_get_d_raster_row(coverfile, coverbuf, row);
+ Rast_get_c_row(basefile, basebuf, row);
+ Rast_get_d_row(coverfile, coverbuf, row);
for (col = 0; col < cols; col++) {
struct basecat *bc;
@@ -343,7 +343,7 @@
have_colors = Rast_read_colors(covermap, "", &colors) > 0;
for (row = 0; row < rows; row++) {
- Rast_get_c_raster_row(base_fd, base_buf, row);
+ Rast_get_c_row(base_fd, base_buf, row);
for (quant = 0; quant < num_quants; quant++) {
for (col = 0; col < cols; col++)
Modified: grass/trunk/raster/r.stats/cell_stats.c
===================================================================
--- grass/trunk/raster/r.stats/cell_stats.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.stats/cell_stats.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -47,7 +47,7 @@
G_percent(row, nrows, 2);
for (i = 0; i < nfiles; i++) {
- if (Rast_get_c_raster_row(fd[i], cell[i], row) < 0)
+ if (Rast_get_c_row(fd[i], cell[i], row) < 0)
G_fatal_error(_("Unable to read raster <map %d of %d> row %d"),
i+1, nfiles, row);
Modified: grass/trunk/raster/r.stats/raw_stats.c
===================================================================
--- grass/trunk/raster/r.stats/raw_stats.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.stats/raw_stats.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -39,7 +39,7 @@
/* read the rows and set the pointers */
for (i = 0; i < nfiles; i++) {
- if (Rast_get_raster_row(fd[i], rast[i], row, map_type[i]) < 0)
+ if (Rast_get_row(fd[i], rast[i], row, map_type[i]) < 0)
exit(1);
rastp[i] = rast[i];
}
Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.sun/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -566,19 +566,19 @@
for (row = 0; row < m; row++) {
- Rast_get_f_raster_row(fd1, cell1, row);
- Rast_get_f_raster_row(fd2, cell2, row);
- Rast_get_f_raster_row(fd3, cell3, row);
+ Rast_get_f_row(fd1, cell1, row);
+ Rast_get_f_row(fd2, cell2, row);
+ Rast_get_f_row(fd3, cell3, row);
if (linkein != NULL)
- Rast_get_f_raster_row(fd4, cell4, row);
+ Rast_get_f_row(fd4, cell4, row);
if (albedo != NULL)
- Rast_get_f_raster_row(fd5, cell5, row);
+ Rast_get_f_row(fd5, cell5, row);
if (latin != NULL)
- Rast_get_f_raster_row(fd6, cell6, row);
+ Rast_get_f_row(fd6, cell6, row);
if (coefbh != NULL)
- Rast_get_f_raster_row(fr1, rast1, row);
+ Rast_get_f_row(fr1, rast1, row);
if (coefdh != NULL)
- Rast_get_f_raster_row(fr2, rast2, row);
+ Rast_get_f_row(fr2, rast2, row);
for (j = 0; j < n; j++) {
Modified: grass/trunk/raster/r.sun2/main.c
===================================================================
--- grass/trunk/raster/r.sun2/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.sun2/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -964,7 +964,7 @@
row_rev = m - row - 1;
rowrevoffset = row_rev - offset;
- Rast_get_f_raster_row(fd_shad[i], horizonbuf[i], row);
+ Rast_get_f_row(fd_shad[i], horizonbuf[i], row);
horizonpointer =
horizonarray + (ssize_t) arrayNumInt *n * rowrevoffset;
for (j = 0; j < n; j++) {
@@ -982,23 +982,23 @@
for (row = m - offset - 1; row >= finalRow; row--) {
- Rast_get_f_raster_row(fd1, cell1, row);
+ Rast_get_f_row(fd1, cell1, row);
if (aspin != NULL)
- Rast_get_f_raster_row(fd2, cell2, row);
+ Rast_get_f_row(fd2, cell2, row);
if (slopein != NULL)
- Rast_get_f_raster_row(fd3, cell3, row);
+ Rast_get_f_row(fd3, cell3, row);
if (linkein != NULL)
- Rast_get_f_raster_row(fd4, cell4, row);
+ Rast_get_f_row(fd4, cell4, row);
if (albedo != NULL)
- Rast_get_f_raster_row(fd5, cell5, row);
+ Rast_get_f_row(fd5, cell5, row);
if (latin != NULL)
- Rast_get_f_raster_row(fd6, cell6, row);
+ Rast_get_f_row(fd6, cell6, row);
if (longin != NULL)
- Rast_get_f_raster_row(fd7, cell7, row);
+ Rast_get_f_row(fd7, cell7, row);
if (coefbh != NULL)
- Rast_get_f_raster_row(fr1, rast1, row);
+ Rast_get_f_row(fr1, rast1, row);
if (coefdh != NULL)
- Rast_get_f_raster_row(fr2, rast2, row);
+ Rast_get_f_row(fr2, rast2, row);
row_rev = m - row - 1;
rowrevoffset = row_rev - offset;
Modified: grass/trunk/raster/r.sunmask/main.c
===================================================================
--- grass/trunk/raster/r.sunmask/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.sunmask/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -485,7 +485,7 @@
G_percent(row1, window.rows, 2);
col1 = 0;
drow = -1;
- if (Rast_get_raster_row(elev_fd, elevbuf.v, row1, data_type) < 0)
+ if (Rast_get_row(elev_fd, elevbuf.v, row1, data_type) < 0)
G_fatal_error(_("Can't read row in input elevation map"));
while (col1 < window.cols) {
@@ -516,7 +516,7 @@
dcol = G_easting_to_col(east, &window);
if (drow != G_northing_to_row(north, &window)) {
drow = G_northing_to_row(north, &window);
- Rast_get_raster_row(elev_fd, tmpbuf.v, (int)drow,
+ Rast_get_row(elev_fd, tmpbuf.v, (int)drow,
data_type);
}
dvalue2 = raster_value(tmpbuf, data_type, (int)dcol);
Modified: grass/trunk/raster/r.support/histo.c
===================================================================
--- grass/trunk/raster/r.support/histo.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.support/histo.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -31,7 +31,7 @@
Rast_init_cell_stats(&statf);
for (row = 0; row < nrows; row++) {
- if (Rast_get_map_row_nomask(fd, cell, row) < 0) {
+ if (Rast_get_c_row_nomask(fd, cell, row) < 0) {
G_warning(_("Unable to read row %d"), row);
break;
}
Modified: grass/trunk/raster/r.support.stats/histo.c
===================================================================
--- grass/trunk/raster/r.support.stats/histo.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.support.stats/histo.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -51,7 +51,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_map_row_nomask(fd, cell, row) < 0)
+ if (Rast_get_c_row_nomask(fd, cell, row) < 0)
break;
Rast_update_cell_stats(cell, ncols, &statf);
Modified: grass/trunk/raster/r.surf.area/main.c
===================================================================
--- grass/trunk/raster/r.surf.area/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.surf.area/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -129,10 +129,10 @@
minarea = maxarea = nullarea = 0.0;
for (row = 0; row < w.rows - 1; row++) {
if (!row) {
- Rast_get_raster_row(cellfile, cell_buf[1], 0, DCELL_TYPE);
+ Rast_get_row(cellfile, cell_buf[1], 0, DCELL_TYPE);
top = cell_buf[1];
}
- Rast_get_raster_row(cellfile, cell_buf[row % 2], row + 1,
+ Rast_get_row(cellfile, cell_buf[row % 2], row + 1,
DCELL_TYPE);
bottom = cell_buf[row % 2];
add_row_area(top, bottom, sz, &w, &minarea, &maxarea);
Modified: grass/trunk/raster/r.surf.contour/main.c
===================================================================
--- grass/trunk/raster/r.surf.contour/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.surf.contour/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -98,7 +98,7 @@
if ((file_fd = Rast_open_cell_old("MASK", G_mapset())) < 0)
G_fatal_error("Unable to open MASK");
for (r = 0; r < nrows; r++) {
- Rast_get_map_row_nomask(file_fd, alt_row, r);
+ Rast_get_c_row_nomask(file_fd, alt_row, r);
for (c = 0; c < ncols; c++)
if (!alt_row[c])
FLAG_SET(mask, r, c);
Modified: grass/trunk/raster/r.surf.contour/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.contour/read_cell.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.surf.contour/read_cell.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -21,7 +21,7 @@
for (row = 0; row < nrows; row++) {
idx[row] = &buf[row * ncols];
- if (Rast_get_map_row(fd, idx[row], row) < 0)
+ if (Rast_get_c_row(fd, idx[row], row) < 0)
G_fatal_error(_("unable to read map <%s> in <%s>"),
name, mapset);
}
Modified: grass/trunk/raster/r.surf.idw/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.surf.idw/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -261,7 +261,7 @@
G_percent(row+1, nrows, 2);
/* if mask occurs, read current row of the mask */
- if (mask && Rast_get_map_row(maskfd, mask, row) < 0)
+ if (mask && Rast_get_c_row(maskfd, mask, row) < 0)
G_fatal_error(_("Cannot read row"));
/* prepare search array for next row of interpolations */
@@ -710,7 +710,7 @@
for (row = 0, Rptr = rowlist; row < rows; row++) {
G_percent(row+1, rows, 2);
- if (Rast_get_map_row_nomask(fd, cell, row) < 0)
+ if (Rast_get_c_row_nomask(fd, cell, row) < 0)
G_fatal_error(_("Unable to read raster map row %d"),
row);
Modified: grass/trunk/raster/r.surf.idw2/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.surf.idw2/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -117,7 +117,7 @@
G_percent(row, window.rows, 2);
if (mask) {
- if (Rast_get_map_row(maskfd, mask, row) < 0)
+ if (Rast_get_c_row(maskfd, mask, row) < 0)
G_fatal_error(_("Cannot get row"));
}
north += window.ns_res;
Modified: grass/trunk/raster/r.surf.idw2/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -5,7 +5,6 @@
#include <grass/glocale.h>
#include "local_proto.h"
-
int read_cell(char *name)
{
int fd;
@@ -35,7 +34,7 @@
for (row = 0; row < window.rows; row++) {
G_percent(row, window.rows, 1);
north += window.ns_res;
- if (Rast_get_map_row_nomask(fd, cell, row) < 0)
+ if (Rast_get_c_row_nomask(fd, cell, row) < 0)
exit(1);
for (col = 0; col < window.cols; col++)
if ((z = cell[col]))
Modified: grass/trunk/raster/r.terraflow/grass2str.h
===================================================================
--- grass/trunk/raster/r.terraflow/grass2str.h 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.terraflow/grass2str.h 2009-06-29 19:59:00 UTC (rev 38119)
@@ -81,7 +81,7 @@
for (int i = 0; i< nrows; i++) {
/* read input map */
- if (Rast_get_raster_row (infd, inrast, i, data_type) < 0)
+ if (Rast_get_row (infd, inrast, i, data_type) < 0)
G_fatal_error (_("Unable to read raster map <%s>, row %d"),cellname, i);
for (int j=0; j<ncols; j++) {
Modified: grass/trunk/raster/r.texture/main.c
===================================================================
--- grass/trunk/raster/r.texture/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.texture/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -241,7 +241,7 @@
/* Read in cell map values */
G_important_message(_("Reading raster map..."));
for (j = 0; j < nrows; j++) {
- Rast_get_raster_row(infd, cell_row, j, CELL_TYPE);
+ Rast_get_row(infd, cell_row, j, CELL_TYPE);
for (i = 0; i < ncols; i++)
data[j][i] = (int)cell_row[i];
}
Modified: grass/trunk/raster/r.thin/io.c
===================================================================
--- grass/trunk/raster/r.thin/io.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.thin/io.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -122,7 +122,7 @@
}
}
for (row = 0; row < n_rows; row++) {
- if (Rast_get_map_row(cell_file, buf + PAD, row) < 0) {
+ if (Rast_get_c_row(cell_file, buf + PAD, row) < 0) {
unlink(work_file_name);
G_fatal_error(_("%s: Error reading from raster map <%s>"),
error_prefix, cell);
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.to.rast3/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -114,7 +114,7 @@
for (y = 0; y < rows; y++) {
G_percent(y, rows - 1, 10);
- if (!Rast_get_raster_row(fd[z], rast, y, globalRastMapType))
+ if (!Rast_get_row(fd[z], rast, y, globalRastMapType))
fatal_error(map, fd, depths, _("Could not get raster row"));
for (x = 0, ptr = rast; x < cols; x++,
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -231,9 +231,9 @@
for (y = 0; y < rows; y++) {
G_percent(y, rows - 1, 10);
- if (!Rast_get_raster_row(db.input, input_rast, y, db.inputmaptype))
+ if (!Rast_get_row(db.input, input_rast, y, db.inputmaptype))
fatal_error(db, _("Could not get raster row from input map"));
- if (!Rast_get_raster_row(db.elev, elev_rast, y, db.elevmaptype))
+ if (!Rast_get_row(db.elev, elev_rast, y, db.elevmaptype))
fatal_error(db, _("Could not get raster row from elev map"));
for (x = 0, input_ptr = input_rast, elev_ptr = elev_rast; x < cols;
Modified: grass/trunk/raster/r.to.vect/points.c
===================================================================
--- grass/trunk/raster/r.to.vect/points.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.to.vect/points.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -43,13 +43,13 @@
switch (data_type) {
case CELL_TYPE:
- Rast_get_c_raster_row(input_fd, cellbuf, row);
+ Rast_get_c_row(input_fd, cellbuf, row);
break;
case FCELL_TYPE:
- Rast_get_f_raster_row(input_fd, fcellbuf, row);
+ Rast_get_f_row(input_fd, fcellbuf, row);
break;
case DCELL_TYPE:
- Rast_get_d_raster_row(input_fd, dcellbuf, row);
+ Rast_get_d_row(input_fd, dcellbuf, row);
break;
}
Modified: grass/trunk/raster/r.to.vect/util.c
===================================================================
--- grass/trunk/raster/r.to.vect/util.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.to.vect/util.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -102,7 +102,7 @@
/* bytes and cast the buf variable to char * before */
/* incrementing */
p = ((char *)buf) + data_size;
- Rast_get_raster_row(input_fd, p, row_count++, data_type);
+ Rast_get_row(input_fd, p, row_count++, data_type);
p = buf;
Rast_set_null_value(p, 1, data_type);
Modified: grass/trunk/raster/r.topidx/file_io.c
===================================================================
--- grass/trunk/raster/r.topidx/file_io.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.topidx/file_io.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -41,7 +41,7 @@
a[i] = (DCELL *) G_malloc(sizeof(DCELL) * window.cols);
if (data_type == CELL_TYPE) {
- if (Rast_get_c_raster_row(fd, ccell, i) < 0) {
+ if (Rast_get_c_row(fd, ccell, i) < 0) {
Rast_close(fd);
}
for (j = 0; j < window.cols; j++) {
@@ -52,7 +52,7 @@
}
}
else if (data_type == FCELL_TYPE) {
- if (Rast_get_f_raster_row(fd, fcell, i) < 0) {
+ if (Rast_get_f_row(fd, fcell, i) < 0) {
Rast_close(fd);
}
for (j = 0; j < window.cols; j++) {
@@ -62,7 +62,7 @@
cell[i][j] = (DCELL) fcell[j];
}
}
- else if (Rast_get_d_raster_row(fd, cell[i], i) < 0) {
+ else if (Rast_get_d_row(fd, cell[i], i) < 0) {
Rast_close(fd);
G_fatal_error(_("Unable to read raster map <%s> row %d"), iname,
i);
Modified: grass/trunk/raster/r.univar/r.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r.univar_main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.univar/r.univar_main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -189,7 +189,7 @@
void *ptr;
unsigned int col;
- if (Rast_get_raster_row(fd, raster_row, row, map_type) < 0)
+ if (Rast_get_row(fd, raster_row, row, map_type) < 0)
G_fatal_error(_("Reading row %d"), row);
ptr = raster_row;
Modified: grass/trunk/raster/r.uslek/main.c
===================================================================
--- grass/trunk/raster/r.uslek/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.uslek/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -123,16 +123,16 @@
G_percent(row, nrows, 2);
/* read soil input maps */
- if (Rast_get_d_raster_row(infd_psand, inrast_psand, row) < 0)
+ if (Rast_get_d_row(infd_psand, inrast_psand, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
psand, row);
- if (Rast_get_d_raster_row(infd_psilt, inrast_psilt, row) < 0)
+ if (Rast_get_d_row(infd_psilt, inrast_psilt, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
psilt, row);
- if (Rast_get_d_raster_row(infd_pclay, inrast_pclay, row) < 0)
+ if (Rast_get_d_row(infd_pclay, inrast_pclay, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
pclay, row);
- if (Rast_get_d_raster_row(infd_pomat, inrast_pomat, row) < 0)
+ if (Rast_get_d_row(infd_pomat, inrast_pomat, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
pomat, row);
Modified: grass/trunk/raster/r.usler/main.c
===================================================================
--- grass/trunk/raster/r.usler/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.usler/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -103,7 +103,7 @@
G_percent(row, nrows, 2);
/* read input map */
- if (Rast_get_d_raster_row(infd_annual_pmm, inrast_annual_pmm, row) < 0)
+ if (Rast_get_d_row(infd_annual_pmm, inrast_annual_pmm, row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
annual_pmm, row);
Modified: grass/trunk/raster/r.volume/centroids.c
===================================================================
--- grass/trunk/raster/r.volume/centroids.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.volume/centroids.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -49,7 +49,7 @@
rows = G_window_rows();
cols = G_window_cols();
for (row = 0; row < rows; row++) {
- Rast_get_map_row(fd, cell_buf, row); /* get a row */
+ Rast_get_c_row(fd, cell_buf, row); /* get a row */
for (col = 0; col < cols; col++) {
v = cell_buf[col]; /* next cell value in row */
if (v < 1)
@@ -79,7 +79,7 @@
row = n[i];
col = e[i];
/* get cell at row,col */
- Rast_get_map_row(fd, cell_buf, row);
+ Rast_get_c_row(fd, cell_buf, row);
v = cell_buf[col];
if (v > 0) {
if (v == i)
@@ -97,7 +97,7 @@
/* go through map again */
for (row = 0; row < rows; row++) {
- Rast_get_map_row(fd, cell_buf, row);
+ Rast_get_c_row(fd, cell_buf, row);
for (col = 0; col < cols; col++) {
v = cell_buf[col];
if (v < 1)
Modified: grass/trunk/raster/r.volume/main.c
===================================================================
--- grass/trunk/raster/r.volume/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.volume/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -157,8 +157,8 @@
G_message("Complete ...");
for (row = 0; row < rows; row++) {
G_percent(row, rows, 2);
- Rast_get_map_row(fd_data, data_buf, row);
- Rast_get_map_row(fd_clump, clump_buf, row);
+ Rast_get_c_row(fd_data, data_buf, row);
+ Rast_get_c_row(fd_clump, clump_buf, row);
for (col = 0; col < cols; col++) {
i = clump_buf[col];
if (i > max)
Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.walk/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -707,7 +707,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(dtm_fd, dtm_cell, row, dtm_data_type) < 0)
+ if (Rast_get_row(dtm_fd, dtm_cell, row, dtm_data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
dtm_layer, row);
/* INPUT NULL VALUES: ??? */
@@ -766,7 +766,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(cost_fd, cost_cell, row, cost_data_type) < 0)
+ if (Rast_get_row(cost_fd, cost_cell, row, cost_data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
cost_layer, row);
/* INPUT NULL VALUES: ??? */
@@ -899,7 +899,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_raster_row(cum_fd, cell2, row, data_type2) < 0)
+ if (Rast_get_row(cum_fd, cell2, row, data_type2) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
cum_cost_layer, row);
ptr2 = cell2;
@@ -1477,7 +1477,7 @@
G_percent(row, nrows, 2);
if (keep_nulls) {
- if (Rast_get_raster_row(dtm_fd, cell2, row, dtm_data_type) < 0)
+ if (Rast_get_row(dtm_fd, cell2, row, dtm_data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
dtm_layer, row);
}
@@ -1512,7 +1512,7 @@
G_percent(row, nrows, 2);
if (keep_nulls) {
- if (Rast_get_raster_row(dtm_fd, cell2, row, dtm_data_type) < 0)
+ if (Rast_get_row(dtm_fd, cell2, row, dtm_data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
dtm_layer, row);
}
@@ -1547,7 +1547,7 @@
G_percent(row, nrows, 2);
if (keep_nulls) {
- if (Rast_get_raster_row(dtm_fd, cell2, row, dtm_data_type) < 0)
+ if (Rast_get_row(dtm_fd, cell2, row, dtm_data_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
cell2, row);
}
Modified: grass/trunk/raster/r.water.outlet/main.c
===================================================================
--- grass/trunk/raster/r.water.outlet/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.water.outlet/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -138,7 +138,7 @@
cell_buf = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
- Rast_get_map_row(drain_fd, cell_buf, row);
+ Rast_get_c_row(drain_fd, cell_buf, row);
for (col = 0; col < ncols; col++) {
if (cell_buf[col] == 0)
total--;
Modified: grass/trunk/raster/r.watershed/ram/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/init_vars.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.watershed/ram/init_vars.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -156,7 +156,7 @@
MASK_flag = 0;
do_points = nrows * ncols;
for (r = 0; r < nrows; r++) {
- Rast_get_raster_row(fd, elebuf, r, ele_map_type);
+ Rast_get_row(fd, elebuf, r, ele_map_type);
ptr = elebuf;
for (c = 0; c < ncols; c++) {
index = SEG_INDEX(alt_seg, r, c);
@@ -213,7 +213,7 @@
G_fatal_error(_("unable to open runoff map layer"));
}
for (r = 0; r < nrows; r++) {
- Rast_get_c_raster_row(fd, buf, r);
+ Rast_get_c_row(fd, buf, r);
for (c = 0; c < ncols; c++) {
if (MASK_flag) {
index = FLAG_GET(worked, r, c);
@@ -252,7 +252,7 @@
G_fatal_error(_("unable to open depression map layer"));
}
for (r = 0; r < nrows; r++) {
- Rast_get_c_raster_row(fd, buf, r);
+ Rast_get_c_row(fd, buf, r);
for (c = 0; c < ncols; c++) {
asp_value = buf[c];
if (!Rast_is_c_null_value(&asp_value) && asp_value)
@@ -269,7 +269,7 @@
G_fatal_error(_("unable to open blocking map layer"));
}
for (r = 0; r < nrows; r++) {
- Rast_get_c_raster_row(fd, buf, r);
+ Rast_get_c_row(fd, buf, r);
for (c = 0; c < ncols; c++) {
block_value = buf[c];
if (!Rast_is_c_null_value(&block_value) && block_value)
Modified: grass/trunk/raster/r.watershed/ram/sg_factor.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/sg_factor.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.watershed/ram/sg_factor.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -19,7 +19,7 @@
for (r = 0; r < nrows; r++) {
G_percent(r, nrows, 3);
if (ril_flag) {
- Rast_get_c_raster_row(ril_fd, ril_buf, r);
+ Rast_get_c_row(ril_fd, ril_buf, r);
}
for (c = 0; c < ncols; c++) {
low_elev = alt[SEG_INDEX(alt_seg, r, c)];
Modified: grass/trunk/raster/r.watershed/seg/bseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_read.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.watershed/seg/bseg_read.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -27,7 +27,7 @@
ncols = G_window_cols();
buffer = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
- if (Rast_get_c_raster_row(map_fd, buffer, row) < 0) {
+ if (Rast_get_c_row(map_fd, buffer, row) < 0) {
G_free(buffer);
Rast_close(map_fd);
sprintf(msg, "%s(): unable to read file [%s] in [%s], %d %d",
Modified: grass/trunk/raster/r.watershed/seg/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -53,7 +53,7 @@
}
for (r = 0; r < nrows; r++) {
- Rast_get_d_raster_row(fd, dbuf, r);
+ Rast_get_d_row(fd, dbuf, r);
for (c = 0; c < ncols; c++) {
dvalue = dbuf[c];
if (Rast_is_d_null_value(&dvalue) == 0 && dvalue) {
Modified: grass/trunk/raster/r.watershed/seg/cseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_read.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.watershed/seg/cseg_read.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -25,7 +25,7 @@
nrows = G_window_rows();
buffer = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
- if (Rast_get_c_raster_row(map_fd, buffer, row) < 0) {
+ if (Rast_get_c_row(map_fd, buffer, row) < 0) {
G_free(buffer);
Rast_close(map_fd);
sprintf(msg, "%s(): unable to read file [%s] in [%s], %d %d",
Modified: grass/trunk/raster/r.watershed/seg/dseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -26,7 +26,7 @@
ncols = G_window_cols();
dbuffer = Rast_allocate_d_buf();
for (row = 0; row < nrows; row++) {
- if (Rast_get_d_raster_row(map_fd, dbuffer, row) < 0) {
+ if (Rast_get_d_row(map_fd, dbuffer, row) < 0) {
G_free(dbuffer);
Rast_close(map_fd);
sprintf(msg, "%s(): unable to read file [%s] in [%s], %d %d",
Modified: grass/trunk/raster/r.watershed/seg/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/init_vars.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.watershed/seg/init_vars.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -203,7 +203,7 @@
MASK_flag = 0;
do_points = nrows * ncols;
for (r = 0; r < nrows; r++) {
- Rast_get_raster_row(fd, elebuf, r, ele_map_type);
+ Rast_get_row(fd, elebuf, r, ele_map_type);
ptr = elebuf;
for (c = 0; c < ncols; c++) {
@@ -280,7 +280,7 @@
}
buf = Rast_allocate_c_buf();
for (r = 0; r < nrows; r++) {
- Rast_get_c_raster_row(fd, buf, r);
+ Rast_get_c_row(fd, buf, r);
for (c = 0; c < ncols; c++) {
asp_value = buf[c];
if (!Rast_is_c_null_value(&asp_value) && asp_value) {
@@ -309,7 +309,7 @@
}
buf = Rast_allocate_c_buf();
for (r = 0; r < nrows; r++) {
- Rast_get_c_raster_row(fd, buf, r);
+ Rast_get_c_row(fd, buf, r);
for (c = 0; c < ncols; c++) {
block_value = buf[c];
if (!Rast_is_c_null_value(&block_value) && block_value) {
Modified: grass/trunk/raster/r.watershed/shed/read.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/read.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.watershed/shed/read.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -26,7 +26,7 @@
bas_fd = Rast_open_cell_old(haf_name, mapset);
facts = output->basin_facts;
for (r = nrows - 1; r >= 0; r--) {
- Rast_get_c_raster_row(bas_fd, bas_buf, r);
+ Rast_get_c_row(bas_fd, bas_buf, r);
for (c = ncols - 1; c >= 0; c--) {
b = bas_buf[c] / 2 - 1;
if (b >= 0)
@@ -48,8 +48,8 @@
fd = Rast_open_cell_old(map->name, map->mapset);
if (fd >= 0) {
for (r = 0; r < nrows; r++) {
- Rast_get_c_raster_row(fd, buf, r);
- Rast_get_c_raster_row(bas_fd, bas_buf, r);
+ Rast_get_c_row(fd, buf, r);
+ Rast_get_c_row(bas_fd, bas_buf, r);
for (c = 0; c < ncols; c++) {
v = buf[c];
b = bas_buf[c] / 2 - 1;
Modified: grass/trunk/raster/r.watershed/shed/valid.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/valid.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.watershed/shed/valid.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -48,7 +48,7 @@
G_fatal_error("r:%d c:%d big error", r,c);
}
*/
- Rast_get_c_raster_row(fd, buf, r);
+ Rast_get_c_row(fd, buf, r);
if (buf[c] < 0) {
basin->valid = 0;
if (down_basin != NULL)
Modified: grass/trunk/raster/r.what/main.c
===================================================================
--- grass/trunk/raster/r.what/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/r.what/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -328,11 +328,11 @@
cache_miss++;
if (row_in_window)
for (i = 0; i < nfiles; i++) {
- if (Rast_get_c_raster_row(fd[i], cell[i], cache[point].row) < 0)
+ if (Rast_get_c_row(fd[i], cell[i], cache[point].row) < 0)
G_fatal_error(_("Error reading <%s>"), argv[i + 1]);
if (out_type[i] != CELL_TYPE) {
- if (Rast_get_d_raster_row(fd[i], dcell[i], cache[point].row) < 0)
+ if (Rast_get_d_row(fd[i], dcell[i], cache[point].row) < 0)
G_fatal_error(_("Error reading <%s>"), argv[i + 1]);
}
}
Modified: grass/trunk/raster/simwe/simlib/input.c
===================================================================
--- grass/trunk/raster/simwe/simlib/input.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster/simwe/simlib/input.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -249,33 +249,33 @@
}
for (row = 0; row < my; row++) {
- Rast_get_f_raster_row(fd1, cell1, row);
- Rast_get_d_raster_row(fd2, cell2, row);
- Rast_get_d_raster_row(fd3, cell3, row);
+ Rast_get_f_row(fd1, cell1, row);
+ Rast_get_d_row(fd2, cell2, row);
+ Rast_get_d_row(fd3, cell3, row);
if (manin != NULL)
- Rast_get_f_raster_row(fd5, cell5, row);
+ Rast_get_f_row(fd5, cell5, row);
if (rain != NULL)
- Rast_get_d_raster_row(fd4, cell4, row);
+ Rast_get_d_row(fd4, cell4, row);
if (infil != NULL)
- Rast_get_d_raster_row(fd4a, cell4a, row);
+ Rast_get_d_row(fd4a, cell4a, row);
if (traps != NULL)
- Rast_get_f_raster_row(fd4b, cell4b, row);
+ Rast_get_f_row(fd4b, cell4b, row);
if (detin != NULL)
- Rast_get_f_raster_row(fd9, cell9, row);
+ Rast_get_f_row(fd9, cell9, row);
if (tranin != NULL)
- Rast_get_f_raster_row(fd10, cell10, row);
+ Rast_get_f_row(fd10, cell10, row);
if (tauin != NULL)
- Rast_get_f_raster_row(fd11, cell11, row);
+ Rast_get_f_row(fd11, cell11, row);
if (wdepth != NULL)
- Rast_get_d_raster_row(fd12, cell12, row);
+ Rast_get_d_row(fd12, cell12, row);
for (j = 0; j < mx; j++) {
row_rev = my - row - 1;
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -158,7 +158,7 @@
G_percent(y, rows - 1, 10);
/*Read the input map row */
- if (!Rast_get_raster_row(elevfd, elevrast, y, globalElevMapType))
+ if (!Rast_get_row(elevfd, elevrast, y, globalElevMapType))
fatal_error(map, elevfd, outfd,
_("Unable to get elevation raster row"));
Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -128,10 +128,10 @@
G_percent(status, (rows * depths - 1), 10);
status++;
- if (!Rast_get_raster_row(in->top, rast_top, y, in->topMapType))
+ if (!Rast_get_row(in->top, rast_top, y, in->topMapType))
fatal_error(_("Could not get top raster row \n"), in);
- if (!Rast_get_raster_row
+ if (!Rast_get_row
(in->bottom, rast_bottom, y, in->bottomMapType))
fatal_error(_("Could not get bottom raster row \n"), in);
Modified: grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
===================================================================
--- grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -582,20 +582,20 @@
exit(EXIT_FAILURE);
if (Wrap) {
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[1] + 1, 0);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[1] + 1, 0);
elev_cell[1][0] = elev_cell[1][G_window_cols() - 1];
elev_cell[1][G_window_cols() + 1] = elev_cell[1][2];
}
else
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[1], 0);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[1], 0);
if (Wrap) {
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[2] + 1, 1);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[2] + 1, 1);
elev_cell[2][0] = elev_cell[2][G_window_cols() - 1];
elev_cell[2][G_window_cols() + 1] = elev_cell[2][2];
}
else
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[2], 1);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[2], 1);
G_message(_("Percent complete: "));
for (row = 2; row < nrows; row++) {
@@ -634,12 +634,12 @@
elev_cell[2] = temp;
if (Wrap) {
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[2] + 1, row);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[2] + 1, row);
elev_cell[2][0] = elev_cell[2][G_window_cols() - 1];
elev_cell[2][G_window_cols() + 1] = elev_cell[2][2];
}
else
- Rast_get_d_raster_row_nomask(elevation_fd, elev_cell[2], row);
+ Rast_get_d_row_nomask(elevation_fd, elev_cell[2], row);
c1 = elev_cell[0];
c2 = c1 + 1;
Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/vector/v.kernel/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -398,7 +398,7 @@
for (row = 0; row < window.rows; row++) {
G_percent(row, window.rows, 2);
if (mask) {
- if (Rast_get_map_row(maskfd, mask, row) < 0)
+ if (Rast_get_c_row(maskfd, mask, row) < 0)
G_fatal_error(_("Unable to read MASK"));
}
Modified: grass/trunk/vector/v.surf.idw/main.c
===================================================================
--- grass/trunk/vector/v.surf.idw/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/vector/v.surf.idw/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -261,7 +261,7 @@
G_percent(row, window.rows - 1, 1);
if (mask) {
- if (Rast_get_map_row(maskfd, mask, row) < 0)
+ if (Rast_get_c_row(maskfd, mask, row) < 0)
exit(1);
}
north -= window.ns_res;
Modified: grass/trunk/vector/v.to.rast/support.c
===================================================================
--- grass/trunk/vector/v.to.rast/support.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/vector/v.to.rast/support.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -430,7 +430,7 @@
rows = G_window_rows();
for (row = 0; row < rows; row++) {
- if (Rast_get_raster_row(fd, rowbuf, row, map_type) < 0)
+ if (Rast_get_row(fd, rowbuf, row, map_type) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
rast_name, row);
Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/vector/v.vol.rst/user1.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -368,7 +368,7 @@
cfmask = Rast_open_cell_old(maskmap, mapsetm);
for (i = 0; i < nsizr; i++) {
irev = nsizr - i - 1;
- Rast_get_map_row(cfmask, cellmask, i);
+ Rast_get_c_row(cfmask, cellmask, i);
for (j = 0; j < nsizc; j++) {
if ((cellmask[j] == 0) || Rast_is_c_null_value(&cellmask[j]))
BM_set(bitmask, j, irev, 0);
Modified: grass/trunk/vector/v.vol.rst/user3.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user3.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/vector/v.vol.rst/user3.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -414,7 +414,7 @@
w2[m] = wm * wm;
}
if ((cellinp != NULL) && (cellout != NULL) && (i == ngstl)) {
- if (Rast_get_f_raster_row(fdcell, cell, n_rows_in - k) < 0) /* fix by JH 04/24/02 */
+ if (Rast_get_f_row(fdcell, cell, n_rows_in - k) < 0) /* fix by JH 04/24/02 */
G_fatal_error
("Could not get row (eventually WIND3 does not match WIND)");
}
Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/vector/v.what.rast/main.c 2009-06-29 19:59:00 UTC (rev 38119)
@@ -263,12 +263,12 @@
if (cur_row != cache[point].row) {
if (out_type == CELL_TYPE) {
- if (Rast_get_c_raster_row(fd, cell, cache[point].row) < 0)
+ if (Rast_get_c_row(fd, cell, cache[point].row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
cell, cache[point].row);
}
else {
- if (Rast_get_d_raster_row(fd, dcell, cache[point].row) < 0)
+ if (Rast_get_d_row(fd, dcell, cache[point].row) < 0)
G_fatal_error(_("Unable to read raster map <%s> row %d"),
dcell, cache[point].row);
}
Modified: grass/trunk/visualization/xganim/main.cc
===================================================================
--- grass/trunk/visualization/xganim/main.cc 2009-06-29 19:19:06 UTC (rev 38118)
+++ grass/trunk/visualization/xganim/main.cc 2009-06-29 19:59:00 UTC (rev 38119)
@@ -244,7 +244,7 @@
G_fatal_error(_("Unable to read color file"));
for (row = 0; row < vrows; row++) {
- if (Rast_get_d_raster_row(fd, dcell, (int)(row / vscale)) < 0)
+ if (Rast_get_d_row(fd, dcell, (int)(row / vscale)) < 0)
G_fatal_error(_("Unable to read raster row"));
rowoff = (vyoff + row) * ncols;
More information about the grass-commit
mailing list