[GRASS-SVN] r40222 - in grass/trunk: display/d.his display/d.nviz
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 raster/r.basins.fill
raster/r.bitpattern raster/r.buffer raster/r.category
raster/r.clump raster/r.colors raster/r.composite
raster/r.compress raster/r.cost raster/r.covar raster/r.cross
raster/r.describe raster/r.distance raster/r.drain
raster/r.fill.dir raster/r.his raster/r.lake raster/r.los
raster/r.mapcalc raster/r.mfilter raster/r.null
raster/r.out.arc raster/r.out.ascii raster/r.out.bin
raster/r.out.gdal raster/r.out.gridatb raster/r.out.mat
raster/r.out.mpeg raster/r.out.png raster/r.out.pov
raster/r.out.ppm raster/r.out.ppm3 raster/r.out.tiff
raster/r.out.vtk raster/r.patch raster/r.profile
raster/r.proj raster/r.random raster/r.resamp.rst
raster/r.resample raster/r.rescale raster/r.rescale.eq
raster/r.ros raster/r.spread raster/r.spreadpath
raster/r.stats raster/r.sunmask raster/r.support
raster/r.support.stats raster/r.surf.contour
raster/r.surf.idw raster/r.surf.idw2 raster/r.terraflow
raster/r.thin raster/r.to.rast3 raster/r.to.rast3elev
raster/r.topidx raster/r.univar raster/r.uslek raster/r.usler
raster/r.walk raster/r.watershed/seg raster/r.what
raster3d/r3.cross.rast raster3d/r3.out.vtk 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 Jan 4 16:05:42 EST 2010
Author: glynn
Date: 2010-01-04 16:05:41 -0500 (Mon, 04 Jan 2010)
New Revision: 40222
Modified:
grass/trunk/display/d.his/main.c
grass/trunk/display/d.nviz/main.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/rasterdefs.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/sample.c
grass/trunk/lib/rst/interp_float/ressegm2d.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.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.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/tinf.c
grass/trunk/raster/r.drain/tinf.h
grass/trunk/raster/r.fill.dir/tinf.c
grass/trunk/raster/r.fill.dir/tinf.h
grass/trunk/raster/r.his/main.c
grass/trunk/raster/r.lake/main.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.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.vtk/writeascii.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.random/count.c
grass/trunk/raster/r.random/random.c
grass/trunk/raster/r.resamp.rst/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.spread/collect_ori.c
grass/trunk/raster/r.spread/main.c
grass/trunk/raster/r.spreadpath/main.c
grass/trunk/raster/r.stats/cell_stats.c
grass/trunk/raster/r.stats/raw_stats.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.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.thin/io.c
grass/trunk/raster/r.to.rast3/main.c
grass/trunk/raster/r.to.rast3elev/main.c
grass/trunk/raster/r.topidx/file_io.c
grass/trunk/raster/r.univar/r.univar_main.c
grass/trunk/raster/r.uslek/main.c
grass/trunk/raster/r.usler/main.c
grass/trunk/raster/r.walk/main.c
grass/trunk/raster/r.watershed/seg/bseg_read.c
grass/trunk/raster/r.watershed/seg/cseg_read.c
grass/trunk/raster/r.watershed/seg/dseg_read.c
grass/trunk/raster/r.what/main.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.out.vtk/writeVTKData.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/user3.c
grass/trunk/vector/v.what.rast/main.c
grass/trunk/visualization/xganim/main.cc
Log:
Rast_get_*_row* now generate errors rather than returning a status
Modified: grass/trunk/display/d.his/main.c
===================================================================
--- grass/trunk/display/d.his/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/display/d.his/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -187,19 +187,14 @@
for (atrow = 0; atrow < window.rows;) {
G_percent(atrow, window.rows, 2);
- 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"));
+ Rast_get_row_colors
+ (hue_file, atrow, &hue_colors, hue_r, hue_g, hue_b, hue_n);
- if (int_used &&
- (Rast_get_row_colors
- (int_file, atrow, &int_colors, int_r, dummy, dummy, int_n) < 0))
- G_fatal_error(_("Error reading intensity data"));
+ if (int_used)
+ Rast_get_row_colors(int_file, atrow, &int_colors, int_r, dummy, dummy, int_n);
- if (sat_used &&
- (Rast_get_row_colors
- (sat_file, atrow, &sat_colors, sat_r, dummy, dummy, sat_n) < 0))
- G_fatal_error(_("Error reading saturation data"));
+ if (sat_used)
+ Rast_get_row_colors(sat_file, atrow, &sat_colors, sat_r, dummy, dummy, sat_n);
for (atcol = 0; atcol < window.cols; atcol++) {
if (nulldraw->answer) {
Modified: grass/trunk/display/d.nviz/main.c
===================================================================
--- grass/trunk/display/d.nviz/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/display/d.nviz/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -440,8 +440,7 @@
if (data_type == CELL_TYPE) {
cell = Rast_allocate_c_buf();
- if (Rast_get_c_row(fd, cell, row) < 0)
- exit(1);
+ Rast_get_c_row(fd, cell, row);
if (Rast_is_c_null_value(&cell[col]))
camera_height = (double)9999.;
@@ -451,8 +450,7 @@
if (data_type == FCELL_TYPE) {
fcell = Rast_allocate_f_buf();
- if (Rast_get_f_row(fd, fcell, row) < 0)
- exit(1);
+ Rast_get_f_row(fd, fcell, row);
if (Rast_is_f_null_value(&fcell[col]))
camera_height = (double)9999.;
else
@@ -461,8 +459,7 @@
if (data_type == DCELL_TYPE) {
dcell = Rast_allocate_d_buf();
- if (Rast_get_d_row(fd, dcell, row) < 0)
- exit(1);
+ Rast_get_d_row(fd, dcell, row);
if (Rast_is_d_null_value(&dcell[col]))
camera_height = (double)9999.;
else
Modified: grass/trunk/display/d.rgb/main.c
===================================================================
--- grass/trunk/display/d.rgb/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/display/d.rgb/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -110,8 +110,7 @@
G_percent(row, window.rows, 5);
for (i = 0; i < 3; i++)
- if (Rast_get_row(B[i].file, B[i].array, row, B[i].type) < 0)
- G_fatal_error(_("Error reading row of data"));
+ Rast_get_row(B[i].file, B[i].array, row, B[i].type);
if (row == next_row)
next_row = D_draw_raster_RGB(next_row,
Modified: grass/trunk/display/d.what.rast/what.c
===================================================================
--- grass/trunk/display/d.what.rast/what.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/display/d.what.rast/what.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -56,17 +56,14 @@
G_message(_("You are clicking outside the map"));
continue;
}
- 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) {
+ Rast_get_c_row(fd[i], buf, row);
+ if (map_type[i] == CELL_TYPE) {
show_cat(width, mwidth, name[i], mapset[i], buf[col],
Rast_get_c_cat(&buf[col], &cats[i]), terse, fs,
map_type[i]);
continue;
}
else { /* fp map */
-
show_cat(width, mwidth, name[i], mapset[i], buf[col],
"", terse, fs, map_type[i]);
}
@@ -74,13 +71,11 @@
if (map_type[i] == CELL_TYPE)
continue;
- 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
- show_dval(width, mwidth, name[i], mapset[i], dbuf[col],
- Rast_get_d_cat(&dbuf[col], &cats[i]), terse,
- fs);
+ Rast_get_d_row(fd[i], dbuf, row);
+
+ show_dval(width, mwidth, name[i], mapset[i], dbuf[col],
+ Rast_get_d_cat(&dbuf[col], &cats[i]), terse,
+ fs);
}
}
while (!once);
Modified: grass/trunk/doc/raster/r.example/main.c
===================================================================
--- grass/trunk/doc/raster/r.example/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/doc/raster/r.example/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -135,9 +135,7 @@
G_percent(row, nrows, 2);
/* read input map */
- if (Rast_get_row(infd, inrast, row, data_type) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), name,
- row);
+ Rast_get_row(infd, inrast, row, data_type);
/* process the data */
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/general/g.region/zoom.c
===================================================================
--- grass/trunk/general/g.region/zoom.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/general/g.region/zoom.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -29,8 +29,7 @@
left = ncols;
right = -1;
for (row = 0; row < nrows; row++) {
- if (Rast_get_row(fd, rast_ptr = raster, row, map_type) < 0)
- G_fatal_error(_("Could not read from <%s>"), name);
+ Rast_get_row(fd, rast_ptr = raster, row, map_type);
for (col = 0; col < ncols; col++) {
if (!Rast_is_null_value(rast_ptr, map_type))
break;
Modified: grass/trunk/imagery/i.albedo/main.c
===================================================================
--- grass/trunk/imagery/i.albedo/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.albedo/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -185,12 +185,9 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
/* read input map */
- for (i = 1; i <= nfiles; i++) {
- 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);
- }
+ for (i = 1; i <= nfiles; i++)
+ Rast_get_row(infd[i], inrast[i], row, in_data_type[i]);
+
/*process the data */
for (col = 0; col < ncols; col++) {
for (i = 1; i <= nfiles; i++) {
@@ -343,12 +340,9 @@
G_percent(row, nrows, 2);
/* read input map */
- for (i = 1; i <= nfiles; i++) {
- 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);
- }
+ for (i = 1; i <= nfiles; i++)
+ Rast_get_row(infd[i], inrast[i], row, in_data_type[i]);
+
/*process the data */
for (col = 0; col < ncols; col++) {
for (i = 1; i <= nfiles; i++) {
Modified: grass/trunk/imagery/i.atcorr/main.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/main.cpp 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.atcorr/main.cpp 2010-01-04 21:05:41 UTC (rev 40222)
@@ -304,21 +304,15 @@
G_percent(row, nrows, 1); /* keep the user informed of our progress */
/* read the next row */
- if(Rast_get_row(ifd, buf, row, FCELL_TYPE) < 0)
- G_fatal_error (_("Unable to read input raster map row %d"),
- row);
+ Rast_get_row(ifd, buf, row, FCELL_TYPE);
/* read the next row of elevation values */
if(ialt_fd >= 0)
- if(Rast_get_row(ialt_fd, alt, row, FCELL_TYPE) < 0)
- G_fatal_error (_("Unable to read elevation raster map row %d"),
- row);
+ Rast_get_row(ialt_fd, alt, row, FCELL_TYPE);
/* read the next row of elevation values */
if(ivis_fd >= 0)
- if(Rast_get_row(ivis_fd, vis, row, FCELL_TYPE) < 0)
- G_fatal_error (_("Unable to read visibility raster map row %d"),
- row);
+ Rast_get_row(ivis_fd, vis, row, FCELL_TYPE);
/* loop over all the values in the row */
for(col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.biomass/main.c
===================================================================
--- grass/trunk/imagery/i.biomass/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.biomass/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -138,18 +138,12 @@
G_percent(row, nrows, 2);
/* read input maps */
- 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_row(infd_luf,inrast_luf,row)<0)
- G_fatal_error(_("Unable to read from <%s> row %d"),luf,row);
- 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_row(infd_doy, inrast_doy, row) < 0)
- G_fatal_error(_("Unable to read from <%s> row %d"),doy,row);
- 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_row(infd_wa,inrast_wa,row)<0)
- G_fatal_error(_("Unable to read from <%s> row %d"),wa,row);
+ Rast_get_d_row(infd_fpar, inrast_fpar, row);
+ Rast_get_d_row(infd_luf,inrast_luf,row);
+ Rast_get_d_row(infd_lat, inrast_lat, row);
+ Rast_get_d_row(infd_doy, inrast_doy, row);
+ Rast_get_d_row(infd_tsw, inrast_tsw, row);
+ Rast_get_d_row(infd_wa,inrast_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 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.cca/transform.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -26,8 +26,7 @@
for (i = 0; i < rows; i++) {
/* get one row of data */
for (j = 0; j < bands; j++)
- if (Rast_get_c_row(datafds[j], rowbufs[j], i) < 0)
- G_fatal_error(_("Error reading cell map during transform."));
+ Rast_get_c_row(datafds[j], rowbufs[j], i);
/* transform each cell in the row */
for (l = 0; l < cols; l++) {
Modified: grass/trunk/imagery/i.class/draw_cell.c
===================================================================
--- grass/trunk/imagery/i.class/draw_cell.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.class/draw_cell.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -47,8 +47,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_row_nomask(fd, dcell, row) < 0)
- break;
+ Rast_get_d_row_nomask(fd, dcell, row);
D_draw_d_raster(row, dcell, &colr);
}
D_cell_draw_end();
Modified: grass/trunk/imagery/i.class/readbands.c
===================================================================
--- grass/trunk/imagery/i.class/readbands.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.class/readbands.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -5,11 +5,10 @@
int readbands(int nbands, int cur)
{
- register int i;
+ int i;
for (i = 0; i < nbands; i++)
- if (Rast_get_c_row_nomask(Bandfd[i], Bandbuf[i], cur) < 0)
- G_fatal_error(_("Error reading raster map in function readbands."));
+ Rast_get_c_row_nomask(Bandfd[i], Bandbuf[i], cur);
return 0;
}
Modified: grass/trunk/imagery/i.cluster/main.c
===================================================================
--- grass/trunk/imagery/i.cluster/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.cluster/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -277,9 +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_row(cellfd[n], cell[n], row) < 0)
- G_fatal_error(_("Unable to read raster map row %d"),
- row);
+ Rast_get_d_row(cellfd[n], cell[n], row);
for (col = sample_cols - 1; col < ncols; col += sample_cols) {
count++;
for (n = 0; n < ref.nfiles; n++)
Modified: grass/trunk/imagery/i.eb.eta/main.c
===================================================================
--- grass/trunk/imagery/i.eb.eta/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.eb.eta/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -101,12 +101,9 @@
G_percent(row, nrows, 2);
/* read input maps */
- 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_row(infd_evapfr,inrast_evapfr,row)<0)
- G_fatal_error(_("Unable to read from <%s> row %d"), evapfr, row);
- if (Rast_get_d_row(infd_tempk,inrast_tempk,row)<0)
- G_fatal_error(_("Unable to read from <%s> row %d"), tempk, row);
+ Rast_get_d_row(infd_rnetday,inrast_rnetday,row);
+ Rast_get_d_row(infd_evapfr,inrast_evapfr,row);
+ Rast_get_d_row(infd_tempk,inrast_tempk,row);
/*process the data */
for (col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.eb.evapfr/main.c
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.eb.evapfr/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -129,12 +129,9 @@
G_percent(row, nrows, 2);
/* read input maps */
- 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_row(infd_g0, inrast_g0, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), g0, row);
- if (Rast_get_d_row(infd_h0, inrast_h0, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), h0, row);
+ Rast_get_d_row(infd_rnet, inrast_rnet, row);
+ Rast_get_d_row(infd_g0, inrast_g0, row);
+ Rast_get_d_row(infd_h0, inrast_h0, row);
/*process the data */
for (col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.eb.h_SEBAL01/main.c
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -271,12 +271,9 @@
for (row = 0; row < nrows; row++) {
DCELL d_t0dem;
G_percent(row, nrows, 2);
- 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_row(infd_Rn,inrast_Rn,row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), Rn, row);
- if (Rast_get_d_row(infd_g0,inrast_g0,row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), g0, row);
+ Rast_get_d_row(infd_t0dem,inrast_t0dem,row);
+ Rast_get_d_row(infd_Rn,inrast_Rn,row);
+ Rast_get_d_row(infd_g0,inrast_g0,row);
/*process the data */
for (col = 0; col < ncols; col++) {
d_t0dem = ((DCELL *) inrast_t0dem)[col];
@@ -344,12 +341,9 @@
}
rowDry = row;
colDry = col;
- 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_row(infd_g0, inrast_g0, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), g0, row);
- if (Rast_get_d_row(infd_t0dem, inrast_t0dem, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
+ Rast_get_d_row(infd_Rn, inrast_Rn, row);
+ Rast_get_d_row(infd_g0, inrast_g0, row);
+ Rast_get_d_row(infd_t0dem, inrast_t0dem, row);
d_Rn_dry = ((DCELL *) inrast_Rn)[col];
d_g0_dry = ((DCELL *) inrast_g0)[col];
d_t0dem_dry = ((DCELL *) inrast_t0dem)[col];
@@ -367,8 +361,7 @@
}
rowWet = row;
colWet = col;
- if (Rast_get_d_row(infd_t0dem, inrast_t0dem, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
+ Rast_get_d_row(infd_t0dem, inrast_t0dem, row);
d_t0dem_wet = ((DCELL *) inrast_t0dem)[col];
/* END OF MANUAL WET/DRY PIXELS */
double h_dry;
@@ -389,10 +382,8 @@
DCELL d_u5;
G_percent(row, nrows, 2);
/* read a line input maps into buffers */
- 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_row(infd_t0dem, inrast_t0dem,row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
+ Rast_get_d_row(infd_z0m, inrast_z0m, row);
+ Rast_get_d_row(infd_t0dem, inrast_t0dem,row);
/* read every cell in the line buffers */
for (col = 0; col < ncols; col++) {
d_z0m = ((DCELL *) inrast_z0m)[col];
@@ -452,10 +443,8 @@
DCELL d_u5;
G_percent(row, nrows, 2);
/* read a line input maps into buffers */
- 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_row(infd_t0dem, inrast_t0dem,row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
+ Rast_get_d_row(infd_z0m, inrast_z0m, row);
+ Rast_get_d_row(infd_t0dem, inrast_t0dem,row);
/* read every cell in the line buffers */
for (col = 0; col < ncols; col++) {
d_z0m = ((DCELL *) inrast_z0m)[col];
@@ -521,10 +510,8 @@
DCELL d_u5;
G_percent(row, nrows, 2);
/* read a line input maps into buffers */
- 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_row(infd_t0dem,inrast_t0dem,row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
+ Rast_get_d_row(infd_z0m,inrast_z0m,row);
+ Rast_get_d_row(infd_t0dem,inrast_t0dem,row);
/* read every cell in the line buffers */
for (col = 0; col < ncols; col++) {
d_z0m = ((DCELL *) inrast_z0m)[col];
@@ -591,10 +578,8 @@
DCELL d; /* Output pixel */
G_percent(row, nrows, 2);
/* read a line input maps into buffers */
- 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_row(infd_t0dem,inrast_t0dem,row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
+ Rast_get_d_row(infd_z0m, inrast_z0m, row);
+ Rast_get_d_row(infd_t0dem,inrast_t0dem,row);
/* read every cell in the line buffers */
for (col = 0; col < ncols; col++) {
d_z0m = ((DCELL *) inrast_z0m)[col];
Modified: grass/trunk/imagery/i.eb.soilheatflux/main.c
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.eb.soilheatflux/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -127,21 +127,11 @@
DCELL d_time;
G_percent(row, nrows, 2);
/* read input maps */
- 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_row(infd_ndvi, inrast_ndvi, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- ndvi, row);
- 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_row(infd_rnet, inrast_rnet, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- rnet, row);
- if (Rast_get_d_row(infd_time, inrast_time, row)<0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- time, row);
+ Rast_get_d_row(infd_albedo, inrast_albedo, row);
+ Rast_get_d_row(infd_ndvi, inrast_ndvi, row);
+ Rast_get_d_row(infd_tempk, inrast_tempk, row);
+ Rast_get_d_row(infd_rnet, inrast_rnet, row);
+ Rast_get_d_row(infd_time, inrast_time, row);
/*process the data */
for (col = 0; col < ncols; col++)
{
Modified: grass/trunk/imagery/i.emissivity/main.c
===================================================================
--- grass/trunk/imagery/i.emissivity/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.emissivity/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -81,8 +81,7 @@
G_percent(row, nrows, 2);
/* read input maps */
- if (Rast_get_row(infd,inr,row,DCELL_TYPE)< 0)
- G_fatal_error(_("Could not read from <%s>"), ndvi);
+ Rast_get_row(infd,inr,row,DCELL_TYPE);
/*process the data */
for (col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.evapo.time_integration/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.evapo.time_integration/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -259,16 +259,13 @@
/* read input map */
for (i = 1; i <= nfiles; i++)
- if ((Rast_get_d_row(infd[i], inrast[i], row)) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), name, row);
+ Rast_get_d_row(infd[i], inrast[i], row);
for (i = 1; i <= nfiles1; i++)
- if ((Rast_get_d_row(infd1[i], inrast1[i], row)) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), name1, row);
+ Rast_get_d_row(infd1[i], inrast1[i], row);
for (i = 1; i <= nfiles2; i++)
- if ((Rast_get_d_row (infd2[i], inrast2[i], row)) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), name2, row);
+ Rast_get_d_row (infd2[i], inrast2[i], row);
/*process the data */
for (col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.fft/main.c
===================================================================
--- grass/trunk/imagery/i.fft/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.fft/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -129,9 +129,7 @@
G_message(_("Reading the raster map <%s>..."),
Cellmap_orig);
for (i = 0; i < rows; i++) {
- if (Rast_get_d_row(inputfd, cell_real, i) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- Cellmap_orig, i);
+ Rast_get_d_row(inputfd, cell_real, i);
for (j = 0; j < cols; j++) {
data[C(i, j)][0] = cell_real[j];
data[C(i, j)][1] = 0.0;
Modified: grass/trunk/imagery/i.gensig/covariance.c
===================================================================
--- grass/trunk/imagery/i.gensig/covariance.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.gensig/covariance.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -33,9 +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_row(files->band_fd[b], files->band_cell[b], row) < 0)
- G_fatal_error(_("Unable to read raster map row %d"),
- row);
+ Rast_get_d_row(files->band_fd[b], files->band_cell[b], row);
for (b1 = 0; b1 < files->nbands; b1++) {
cell1 = files->band_cell[b1];
for (b2 = 0; b2 <= b1; b2++) { /* only need to calculate the lower half */
Modified: grass/trunk/imagery/i.gensig/get_train.c
===================================================================
--- grass/trunk/imagery/i.gensig/get_train.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.gensig/get_train.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -32,9 +32,7 @@
G_message(_("Finding training classes..."));
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_row(fd, cell, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), cell,
- row);
+ Rast_get_c_row(fd, cell, row);
Rast_update_cell_stats(cell, ncols, &cell_stats);
}
G_percent(nrows, nrows, 2);
Modified: grass/trunk/imagery/i.gensig/means.c
===================================================================
--- grass/trunk/imagery/i.gensig/means.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.gensig/means.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -29,8 +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_row(files->band_fd[b], cell = files->band_cell[b], row) < 0)
- exit(1);
+ Rast_get_d_row(files->band_fd[b], cell = files->band_cell[b], row);
for (col = 0; col < ncols; col++) {
if (Rast_is_d_null_value(&cell[col])) {
n_nulls++;
Modified: grass/trunk/imagery/i.gensig/read_train.c
===================================================================
--- grass/trunk/imagery/i.gensig/read_train.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.gensig/read_train.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -9,9 +9,7 @@
int read_training_map(CELL * class, int row, int ncols, struct files *files)
{
- if (Rast_get_c_row(files->train_fd, files->train_cell, row) < 0)
- G_fatal_error(_("Unable to read raster map row %d"),
- row);
+ Rast_get_c_row(files->train_fd, files->train_cell, row);
lookup_class(files->train_cell, ncols, files->training_cats, files->ncats,
class);
Modified: grass/trunk/imagery/i.gensigset/get_train.c
===================================================================
--- grass/trunk/imagery/i.gensigset/get_train.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.gensigset/get_train.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -35,9 +35,7 @@
G_message(_("Finding training classes..."));
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_row(fd, cell, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), cell,
- row);
+ Rast_get_c_row(fd, cell, row);
Rast_update_cell_stats(cell, ncols, &cell_stats);
}
G_percent(nrows, nrows, 2);
Modified: grass/trunk/imagery/i.gensigset/read_data.c
===================================================================
--- grass/trunk/imagery/i.gensigset/read_data.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.gensigset/read_data.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -25,10 +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_row
- (files->band_fd[b], files->band_cell[b], row) < 0)
- G_fatal_error(_("Unable to read raster map row %d"),
- row);
+ Rast_get_d_row(files->band_fd[b], files->band_cell[b], row);
for (col = 0; col < ncols; col++) {
n = class[col];
Modified: grass/trunk/imagery/i.gensigset/read_train.c
===================================================================
--- grass/trunk/imagery/i.gensigset/read_train.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.gensigset/read_train.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -9,9 +9,7 @@
int read_training_map(CELL * class, int row, int ncols, struct files *files)
{
- if (Rast_get_c_row(files->train_fd, files->train_cell, row) < 0)
- G_fatal_error(_("Unable to read raster map row %d"),
- row);
+ Rast_get_c_row(files->train_fd, files->train_cell, row);
lookup_class(files->train_cell, ncols, files->training_cats, files->ncats,
class);
Modified: grass/trunk/imagery/i.his.rgb/main.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.his.rgb/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -94,8 +94,7 @@
/* read in a row from each cell map */
for (band = 0; band < 3; band++)
- if (Rast_get_c_row(fd_input[band], rowbuffer[band], i) < 0)
- G_fatal_error(_("Unable to read raster map row %d"), i);
+ Rast_get_c_row(fd_input[band], rowbuffer[band], i);
/* process this row of the map */
his2rgb(rowbuffer, cols);
Modified: grass/trunk/imagery/i.ifft/main.c
===================================================================
--- grass/trunk/imagery/i.ifft/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.ifft/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -140,12 +140,8 @@
/* Read in cell map values */
G_message(_("Reading raster maps..."));
for (i = 0; i < rows; i++) {
- 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_row(imagfd, cell_imag, i) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- Cellmap_imag, i);
+ Rast_get_d_row(realfd, cell_real, i);
+ Rast_get_d_row(imagfd, cell_imag, i);
for (j = 0; j < cols; j++) {
data[C(i, j)][0] = cell_real[j];
data[C(i, j)][1] = cell_imag[j];
Modified: grass/trunk/imagery/i.latlong/main.c
===================================================================
--- grass/trunk/imagery/i.latlong/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.latlong/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -123,8 +123,7 @@
{
G_percent(row, nrows, 2);
- if (Rast_get_d_row(infd, inrast, row) < 0)
- G_fatal_error(_("Could not read from <%s>"), in);
+ Rast_get_d_row(infd, inrast, row);
for (col = 0; col < ncols; col++)
{
Modified: grass/trunk/imagery/i.maxlik/main.c
===================================================================
--- grass/trunk/imagery/i.maxlik/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.maxlik/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -109,9 +109,7 @@
G_percent(row, nrows, 2);
for (band = 0; band < Ref.nfiles; band++)
- if (Rast_get_d_row(cellfd[band], cell[band], row) < 0)
- G_fatal_error(_("Unable to read raster map row %d"),
- row);
+ Rast_get_d_row(cellfd[band], cell[band], row);
classify(class_cell, reject_cell, ncols);
Rast_put_row(class_fd, class_cell, CELL_TYPE);
Modified: grass/trunk/imagery/i.modis.qc/main.c
===================================================================
--- grass/trunk/imagery/i.modis.qc/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.modis.qc/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -216,9 +216,7 @@
{
CELL c;
G_percent(row, nrows, 2);
- if (Rast_get_c_row(infd, inrast, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- qcchan, row);
+ Rast_get_c_row(infd, inrast, row);
/*process the data */
for (col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.pca/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -249,8 +249,7 @@
G_percent(row, rows - 1, 2);
- if (Rast_get_row(fds[i], rowbuf, row, maptype) < 0)
- G_fatal_error(_("Unable to read raster map row %d"), row);
+ Rast_get_row(fds[i], rowbuf, row, maptype);
for (col = 0; col < cols; col++) {
/* skip null cells */
@@ -299,8 +298,7 @@
G_percent(row, rows - 1, 2);
- if (Rast_get_row(fds[j], rowbuf1, row, maptype) < 0)
- G_fatal_error(_("Unable to read raster map row %d"), row);
+ Rast_get_row(fds[j], rowbuf1, row, maptype);
for (k = j; k < bands; k++) {
RASTER_MAP_TYPE maptype2 = Rast_get_map_type(fds[k]);
@@ -311,8 +309,7 @@
if ((rowbuf2 = Rast_allocate_buf(maptype2)) == NULL)
G_fatal_error(_("Unable to allocate memory for row buffer"));
- if (Rast_get_row(fds[k], rowbuf2, row, maptype2) < 0)
- G_fatal_error(_("Unable to read raster map row %d"), row);
+ Rast_get_row(fds[k], rowbuf2, row, maptype2);
ptr1 = rowbuf1;
ptr2 = rowbuf2;
@@ -421,8 +418,7 @@
if (!(rowbuf = Rast_allocate_buf(maptype)))
G_fatal_error(_("Unable allocate memory for row buffer"));
- if (Rast_get_row(inp_fd[j], rowbuf, row, maptype) < 0)
- G_fatal_error(_("Unable to read raster map row %d"), row);
+ Rast_get_row(inp_fd[j], rowbuf, row, maptype);
rowptr = rowbuf;
outptr = outbuf;
Modified: grass/trunk/imagery/i.points/drawcell.c
===================================================================
--- grass/trunk/imagery/i.points/drawcell.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.points/drawcell.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -57,8 +57,7 @@
D_cell_draw_setup(top, top + nrows, left, left + ncols);
for (row = 0; row < nrows; row++) {
- if (Rast_get_d_row_nomask(fd, dcell, row) < 0)
- break;
+ Rast_get_d_row_nomask(fd, dcell, row);
D_draw_d_raster(row, dcell, colors);
}
D_cell_draw_end();
Modified: grass/trunk/imagery/i.rectify/perform.c
===================================================================
--- grass/trunk/imagery/i.rectify/perform.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.rectify/perform.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -39,9 +39,7 @@
fprintf (stderr, "read row %d\n", row);
*/
- if (Rast_get_row_nomask
- (infd, G_incr_void_ptr(rast, rast_size), row, map_type) < 0)
- return 0;
+ Rast_get_row_nomask(infd, G_incr_void_ptr(rast, rast_size), row, map_type);
for (i = curidx; i < matrix_rows; i++) {
idx = row_idx[i];
Modified: grass/trunk/imagery/i.rgb.his/main.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.rgb.his/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -93,8 +93,7 @@
G_percent(i, rows, 2);
for (band = 0; band < 3; band++)
- if (Rast_get_c_row(fd_input[band], rowbuffer[band], i) < 0)
- G_fatal_error(_("Unable to read raster map row %ld"), i);
+ Rast_get_c_row(fd_input[band], rowbuffer[band], i);
/* process this row of the map */
rgb2his(rowbuffer, cols);
Modified: grass/trunk/imagery/i.smap/read_block.c
===================================================================
--- grass/trunk/imagery/i.smap/read_block.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.smap/read_block.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -14,10 +14,7 @@
for (band = 0; band < files->nbands; band++) {
for (row = region->ymin; row < region->ymax; 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);
+ Rast_get_d_row(files->band_fd[band], files->cellbuf, row);
for (col = region->xmin; col < region->xmax; col++)
img[band][row][col] = files->cellbuf[col];
}
Modified: grass/trunk/imagery/i.sunhours/main.c
===================================================================
--- grass/trunk/imagery/i.sunhours/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.sunhours/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -95,10 +95,8 @@
DCELL d_doy;
G_percent(row, nrows, 2);
- if (Rast_get_row(infd_doy, inrast_doy, row, DCELL_TYPE) < 0)
- G_fatal_error(_("Could not read from <%s>"), doy);
- if (Rast_get_row(infd_lat, inrast_lat, row, DCELL_TYPE) < 0)
- G_fatal_error(_("Could not read from <%s>"), lat);
+ Rast_get_row(infd_doy, inrast_doy, row, DCELL_TYPE);
+ Rast_get_row(infd_lat, inrast_lat, row, DCELL_TYPE);
for (col = 0; col < ncols; col++)
{
Modified: grass/trunk/imagery/i.vi/main.c
===================================================================
--- grass/trunk/imagery/i.vi/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.vi/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -257,34 +257,17 @@
G_percent(row, nrows, 2);
- 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_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_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_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_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_row(infd_chan7chan, inrast_chan7chan, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- chan7chan, row);
- }
+ Rast_get_d_row(infd_redchan, inrast_redchan, row);
+ if (nirchan)
+ Rast_get_d_row(infd_nirchan, inrast_nirchan, row);
+ if (greenchan)
+ Rast_get_d_row(infd_greenchan, inrast_greenchan, row);
+ if (bluechan)
+ Rast_get_d_row(infd_bluechan, inrast_bluechan, row);
+ if (chan5chan)
+ Rast_get_d_row(infd_chan5chan, inrast_chan5chan, row);
+ if (chan7chan)
+ Rast_get_d_row(infd_chan7chan, inrast_chan7chan, row);
/* process the data */
for (col = 0; col < ncols; col++)
Modified: grass/trunk/imagery/i.vpoints/drawcell.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawcell.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.vpoints/drawcell.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -67,8 +67,7 @@
D_cell_draw_setup(top, top + nrows, left, left + ncols);
for (row = 0; row < nrows; row++) {
- if (Rast_get_d_row_nomask(fd, dcell, row) < 0)
- break;
+ Rast_get_d_row_nomask(fd, dcell, row);
D_draw_d_raster(row, dcell, colors);
}
D_cell_draw_end();
Modified: grass/trunk/imagery/i.zc/main.c
===================================================================
--- grass/trunk/imagery/i.zc/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/imagery/i.zc/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -150,8 +150,7 @@
/* Read in cell map values */
G_message(_("Reading raster map..."));
for (i = 0; i < or; i++) {
- if (Rast_get_c_row(inputfd, cell_row, i) < 0)
- G_fatal_error(_("Error while reading input raster map."));
+ Rast_get_c_row(inputfd, cell_row, i);
for (j = 0; j < oc; j++)
*(data[0] + (i * size) + j) = (double)cell_row[j];
Modified: grass/trunk/include/rasterdefs.h
===================================================================
--- grass/trunk/include/rasterdefs.h 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/include/rasterdefs.h 2010-01-04 21:05:41 UTC (rev 40222)
@@ -297,20 +297,20 @@
void Rast_get_cellhd(const char *, const char *, struct Cell_head *);
/* get_row.c */
-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);
+void Rast_get_row_nomask(int, void *, int, RASTER_MAP_TYPE);
+void Rast_get_c_row_nomask(int, CELL *, int);
+void Rast_get_f_row_nomask(int, FCELL *, int);
+void Rast_get_d_row_nomask(int, DCELL *, int);
+void Rast_get_row(int, void *, int, RASTER_MAP_TYPE);
+void Rast_get_c_row(int, CELL *, int);
+void Rast_get_f_row(int, FCELL *, int);
+void Rast_get_d_row(int, DCELL *, int);
+void Rast_get_null_value_row(int, char *, int);
/* get_row_colr.c */
-int Rast_get_row_colors(int, int, struct Colors *,
- unsigned char *, unsigned char *, unsigned char *,
- unsigned char *);
+void Rast_get_row_colors(int, int, struct Colors *,
+ unsigned char *, unsigned char *, unsigned char *,
+ unsigned char *);
/* histo_eq.c */
void Rast_histogram_eq(const struct Histogram *, unsigned char **,
CELL *, CELL *);
Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/lib/gpde/N_arrays_io.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -95,10 +95,7 @@
for (y = 0; y < rows; y++) {
G_percent(y, rows - 1, 10);
- if (!Rast_get_row(map, rast, y, type)) {
- Rast_close(map);
- G_fatal_error(_("Could not get raster row"));
- }
+ Rast_get_row(map, rast, y, type);
for (x = 0, ptr = rast; x < cols;
x++, ptr = G_incr_void_ptr(ptr, Rast_cell_size(type))) {
Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/lib/ogsf/Gs3.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -834,10 +834,8 @@
if (map_type == CELL_TYPE) {
buf = Rast_allocate_c_buf();
- if (Rast_get_c_row(fd, buf, drow) < 0) {
- sprintf(catstr, "error");
- }
- else if (Rast_is_c_null_value(&buf[dcol])) {
+ Rast_get_c_row(fd, buf, drow);
+ if (Rast_is_c_null_value(&buf[dcol])) {
sprintf(catstr, "(NULL) %s",
Rast_get_c_cat(&buf[dcol], &cats));
}
@@ -853,10 +851,8 @@
/* fp map */
dbuf = Rast_allocate_d_buf();
- if (Rast_get_d_row(fd, dbuf, drow) < 0) {
- sprintf(catstr, "error");
- }
- else if (Rast_is_d_null_value(&dbuf[dcol])) {
+ Rast_get_d_row(fd, dbuf, drow);
+ if (Rast_is_d_null_value(&dbuf[dcol])) {
sprintf(catstr, "(NULL) %s",
Rast_get_d_cat(&dbuf[dcol], &cats));
}
Modified: grass/trunk/lib/raster/get_row.c
===================================================================
--- grass/trunk/lib/raster/get_row.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/lib/raster/get_row.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -25,7 +25,7 @@
#include "../gis/G.h"
#include "R.h"
-static int embed_nulls(int, void *, int, RASTER_MAP_TYPE, int, int);
+static void embed_nulls(int, void *, int, RASTER_MAP_TYPE, int, int);
static int compute_window_row(int fd, int row, int *cellRow)
{
@@ -35,10 +35,8 @@
/* check for row in window */
if (row < 0 || row >= G__.window.rows) {
- G_warning(_("Reading raster map <%s@%s> request for row %d is outside region"),
- fcb->name, fcb->mapset, row);
-
- return -1;
+ G_fatal_error(_("Reading raster map <%s@%s> request for row %d is outside region"),
+ fcb->name, fcb->mapset, row);
}
/* convert window row to cell file row */
@@ -86,8 +84,8 @@
}
}
-static int read_data_fp_compressed(int fd, int row, unsigned char *data_buf,
- int *nbytes)
+static void read_data_fp_compressed(int fd, int row, unsigned char *data_buf,
+ int *nbytes)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
off_t t1 = fcb->row_ptr[row];
@@ -96,14 +94,12 @@
size_t bufsize = fcb->cellhd.cols * fcb->nbytes;
if (lseek(fd, t1, SEEK_SET) < 0)
- return -1;
+ G_fatal_error(_("Error reading raster data"));
*nbytes = fcb->nbytes;
if ((size_t) G_zlib_read(fd, readamount, data_buf, bufsize) != bufsize)
- return -1;
-
- return 0;
+ G_fatal_error(_("Error reading raster data"));
}
static void rle_decompress(unsigned char *dst, const unsigned char *src,
@@ -125,8 +121,8 @@
}
}
-static int read_data_compressed(int fd, int row, unsigned char *data_buf,
- int *nbytes)
+static void read_data_compressed(int fd, int row, unsigned char *data_buf,
+ int *nbytes)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
off_t t1 = fcb->row_ptr[row];
@@ -136,13 +132,13 @@
int n;
if (lseek(fd, t1, SEEK_SET) < 0)
- return -1;
+ G_fatal_error(_("Error reading raster data"));
cmp = G__alloca(readamount);
if (read(fd, cmp, readamount) != readamount) {
G__freea(cmp);
- return -1;
+ G_fatal_error(_("Error reading raster data"));
}
/* Now decompress the row */
@@ -165,12 +161,10 @@
memcpy(data_buf, cmp, readamount);
G__freea(cmp);
-
- return 0;
}
-static int read_data_uncompressed(int fd, int row, unsigned char *data_buf,
- int *nbytes)
+static void read_data_uncompressed(int fd, int row, unsigned char *data_buf,
+ int *nbytes)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
ssize_t bufsize = fcb->cellhd.cols * fcb->nbytes;
@@ -178,17 +172,15 @@
*nbytes = fcb->nbytes;
if (lseek(fd, (off_t) row * bufsize, SEEK_SET) == -1)
- return -1;
+ G_fatal_error(_("Error reading raster data"));
if (read(fd, data_buf, bufsize) != bufsize)
- return -1;
-
- return 0;
+ G_fatal_error(_("Error reading raster data"));
}
#ifdef HAVE_GDAL
-static int read_data_gdal(int fd, int row, unsigned char *data_buf,
- int *nbytes)
+static void read_data_gdal(int fd, int row, unsigned char *data_buf,
+ int *nbytes)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
unsigned char *buf;
@@ -217,28 +209,28 @@
G__freea(buf);
}
- return err == CE_None ? 0 : -1;
+ if (err != CE_None)
+ G_fatal_error(_("Error reading raster data via GDAL"));
}
#endif
-static int read_data(int fd, int row, unsigned char *data_buf, int *nbytes)
+static void read_data(int fd, int row, unsigned char *data_buf, int *nbytes)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
#ifdef HAVE_GDAL
- if (fcb->gdal)
- return read_data_gdal(fd, row, data_buf, nbytes);
+ if (fcb->gdal) {
+ read_data_gdal(fd, row, data_buf, nbytes);
+ return;
+ }
#endif
if (!fcb->cellhd.compressed)
- return read_data_uncompressed(fd, row, data_buf, nbytes);
-
- /* map is in compressed form */
-
- if (fcb->map_type == CELL_TYPE)
- return read_data_compressed(fd, row, data_buf, nbytes);
+ read_data_uncompressed(fd, row, data_buf, nbytes);
+ else if (fcb->map_type == CELL_TYPE)
+ read_data_compressed(fd, row, data_buf, nbytes);
else
- return read_data_fp_compressed(fd, row, data_buf, nbytes);
+ read_data_fp_compressed(fd, row, data_buf, nbytes);
}
/* copy cell file data to user buffer translated by window column mapping */
@@ -591,35 +583,20 @@
};
struct fileinfo *fcb = &R__.fileinfo[fd];
int r;
- int rowStatus;
+ int row_status;
- rowStatus = compute_window_row(fd, row, &r);
+ row_status = compute_window_row(fd, row, &r);
- if (rowStatus <= 0) {
+ if (!row_status) {
fcb->cur_row = -1;
Rast_zero_buf(rast, data_type);
- return rowStatus;
+ return 0;
}
/* read cell file row if not in memory */
if (r != fcb->cur_row) {
fcb->cur_row = r;
-
- if (read_data(fd, fcb->cur_row, fcb->data, &fcb->cur_nbytes) < 0) {
- Rast_zero_buf(rast, data_type);
-
- if (!fcb->io_error) {
- if (fcb->cellhd.compressed)
- G_warning(_("Error reading compressed map <%s@%s>, row %d"),
- fcb->name, fcb->mapset, r);
- else
- G_warning(_("Error reading map <%s@%s>, row %d"),
- fcb->name, fcb->mapset, r);
-
- fcb->io_error = 1;
- }
- return -1;
- }
+ read_data(fd, fcb->cur_row, fcb->data, &fcb->cur_nbytes);
}
(transfer_to_cell_FtypeOtype[fcb->map_type][data_type]) (fd, rast);
@@ -627,32 +604,22 @@
return 1;
}
-static int get_map_row_no_reclass(int fd, void *rast, int row,
- RASTER_MAP_TYPE data_type, int null_is_zero,
- int with_mask)
+static void get_map_row_no_reclass(int fd, void *rast, int row,
+ RASTER_MAP_TYPE data_type, int null_is_zero,
+ int with_mask)
{
- int stat;
-
- stat = get_map_row_nomask(fd, rast, row, data_type);
- if (stat < 0)
- return stat;
-
- stat = embed_nulls(fd, rast, row, data_type, null_is_zero, with_mask);
- if (stat < 0)
- return stat;
-
- return 1;
+ get_map_row_nomask(fd, rast, row, data_type);
+ embed_nulls(fd, rast, row, data_type, null_is_zero, with_mask);
}
-static int get_map_row(int fd, void *rast, int row, RASTER_MAP_TYPE data_type,
- int null_is_zero, int with_mask)
+static void get_map_row(int fd, void *rast, int row, RASTER_MAP_TYPE data_type,
+ int null_is_zero, int with_mask)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
int size = Rast_cell_size(data_type);
CELL *temp_buf = NULL;
void *buf;
int type;
- int stat;
int i;
if (fcb->reclass_flag && data_type != CELL_TYPE) {
@@ -665,16 +632,10 @@
type = data_type;
}
- stat =
- get_map_row_no_reclass(fd, buf, row, type, null_is_zero, with_mask);
- if (stat < 0) {
- if (temp_buf)
- G__freea(temp_buf);
- return stat;
- }
+ get_map_row_no_reclass(fd, buf, row, type, null_is_zero, with_mask);
if (!fcb->reclass_flag)
- return 1;
+ return;
/* if the map is reclass table, get and
reclass CELL row and copy results to needed type */
@@ -682,7 +643,7 @@
do_reclass_int(fd, buf, null_is_zero);
if (data_type == CELL_TYPE)
- return 1;
+ return;
for (i = 0; i < G__.window.cols; i++) {
Rast_set_c_value(rast, temp_buf[i], data_type);
@@ -690,8 +651,6 @@
}
G__freea(temp_buf);
-
- return 1;
}
/*!
@@ -719,13 +678,11 @@
* \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
+ * \return void
*/
-int Rast_get_row_nomask(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
+void 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);
+ get_map_row(fd, buf, row, data_type, 0, 0);
}
/*!
@@ -738,13 +695,11 @@
* \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
+ * \return void
*/
-int Rast_get_c_row_nomask(int fd, CELL * buf, int row)
+void Rast_get_c_row_nomask(int fd, CELL * buf, int row)
{
- return Rast_get_row_nomask(fd, buf, row, CELL_TYPE);
+ Rast_get_row_nomask(fd, buf, row, CELL_TYPE);
}
/*!
@@ -757,13 +712,11 @@
* \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
+ * \return void
*/
-int Rast_get_f_row_nomask(int fd, FCELL * buf, int row)
+void Rast_get_f_row_nomask(int fd, FCELL * buf, int row)
{
- return Rast_get_row_nomask(fd, buf, row, FCELL_TYPE);
+ Rast_get_row_nomask(fd, buf, row, FCELL_TYPE);
}
/*!
@@ -776,13 +729,11 @@
* \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
+ * \return void
*/
-int Rast_get_d_row_nomask(int fd, DCELL * buf, int row)
+void Rast_get_d_row_nomask(int fd, DCELL * buf, int row)
{
- return Rast_get_row_nomask(fd, buf, row, DCELL_TYPE);
+ Rast_get_row_nomask(fd, buf, row, DCELL_TYPE);
}
/*!
@@ -823,13 +774,11 @@
* \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
+ * \return void
*/
-int Rast_get_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
+void 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);
+ get_map_row(fd, buf, row, data_type, 0, 1);
}
/*!
@@ -849,13 +798,11 @@
* \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
+ * \return void
*/
-int Rast_get_c_row(int fd, CELL * buf, int row)
+void Rast_get_c_row(int fd, CELL * buf, int row)
{
- return Rast_get_row(fd, buf, row, CELL_TYPE);
+ Rast_get_row(fd, buf, row, CELL_TYPE);
}
/*!
@@ -871,13 +818,11 @@
* \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
+ * \return void
*/
-int Rast_get_f_row(int fd, FCELL * buf, int row)
+void Rast_get_f_row(int fd, FCELL * buf, int row)
{
- return Rast_get_row(fd, buf, row, FCELL_TYPE);
+ Rast_get_row(fd, buf, row, FCELL_TYPE);
}
/*!
@@ -890,13 +835,11 @@
* \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
+ * \return void
*/
-int Rast_get_d_row(int fd, DCELL * buf, int row)
+void Rast_get_d_row(int fd, DCELL * buf, int row)
{
- return Rast_get_row(fd, buf, row, DCELL_TYPE);
+ Rast_get_row(fd, buf, row, DCELL_TYPE);
}
static int read_null_bits(int fd, int row)
@@ -915,20 +858,16 @@
}
if (null_fd < 0)
- return -1;
+ return 0;
size = Rast__null_bitstream_size(cols);
offset = (off_t) size * R;
- if (lseek(null_fd, offset, SEEK_SET) < 0) {
- G_warning(_("Error reading null row %d"), R);
- return -1;
- }
+ if (lseek(null_fd, offset, SEEK_SET) < 0)
+ G_fatal_error(_("Error reading null row %d"), R);
- if (read(null_fd, flags, size) != size) {
- G_warning(_("Error reading null row %d"), R);
- return -1;
- }
+ if (read(null_fd, flags, size) != size)
+ G_fatal_error(_("Error reading null row %d"), R);
return 1;
}
@@ -947,7 +886,7 @@
}
if (row != fcb->null_cur_row) {
- if (read_null_bits(fd, row) < 0) {
+ if (!read_null_bits(fd, row)) {
fcb->null_cur_row = -1;
if (fcb->map_type == CELL_TYPE) {
/* If can't read null row, assume that all map 0's are nulls */
@@ -1048,8 +987,8 @@
embed_mask(flags, row);
}
-static int embed_nulls(int fd, void *buf, int row, RASTER_MAP_TYPE map_type,
- int null_is_zero, int with_mask)
+static void embed_nulls(int fd, void *buf, int row, RASTER_MAP_TYPE map_type,
+ int null_is_zero, int with_mask)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
char *null_buf;
@@ -1059,7 +998,7 @@
in data row or mask */
if (null_is_zero && !fcb->null_file_exists
&& (R__.auto_mask <= 0 || !with_mask))
- return 1;
+ return;
null_buf = G__alloca(G__.window.cols);
@@ -1077,8 +1016,6 @@
}
G__freea(null_buf);
-
- return 1;
}
/*!
@@ -1095,11 +1032,9 @@
\param buf buffer for the row to be placed into
\param row data row desired
- \return 1
+ \return void
*/
-int Rast_get_null_value_row(int fd, char *flags, int row)
+void Rast_get_null_value_row(int fd, char *flags, int row)
{
get_null_value_row(fd, flags, row, 1);
-
- return 1;
}
Modified: grass/trunk/lib/raster/get_row_colr.c
===================================================================
--- grass/trunk/lib/raster/get_row_colr.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/lib/raster/get_row_colr.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -34,12 +34,11 @@
* \param[out] blu blue value
* \param[out] nul null value
*
- * \return -1 on error
- * \return 0 on success
+ * \return void
*/
-int Rast_get_row_colors(int fd, int row, struct Colors *colors,
- unsigned char *red, unsigned char *grn,
- unsigned char *blu, unsigned char *nul)
+void Rast_get_row_colors(int fd, int row, struct Colors *colors,
+ unsigned char *red, unsigned char *grn,
+ unsigned char *blu, unsigned char *nul)
{
int cols = G_window_cols();
int type = Rast_get_map_type(fd);
@@ -51,10 +50,7 @@
array = G__alloca(cols * size);
- if (Rast_get_row(fd, array, row, type) < 0) {
- G__freea(array);
- return -1;
- }
+ Rast_get_row(fd, array, row, type);
if (nul)
for (i = 0, p = array; i < cols; i++, p = G_incr_void_ptr(p, size))
@@ -66,6 +62,4 @@
G__freea(array);
G__freea(set);
-
- return 0;
}
Modified: grass/trunk/lib/raster/sample.c
===================================================================
--- grass/trunk/lib/raster/sample.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/lib/raster/sample.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -24,8 +24,6 @@
/* prototypes */
static double scancatlabel(const char *);
-static void raster_row_error(const struct Cell_head *window, double north,
- double east);
/*!
* \brief Extract a cell value from raster map.
@@ -109,8 +107,7 @@
goto done;
}
- if (Rast_get_d_row(fd, maprow, row) < 0)
- raster_row_error(window, north, east);
+ Rast_get_d_row(fd, maprow, row);
if (Rast_is_d_null_value(&maprow[col])) {
Rast_set_d_null_value(&result, 1);
@@ -176,10 +173,8 @@
goto done;
}
- if (Rast_get_d_row(fd, arow, row) < 0)
- raster_row_error(window, north, east);
- if (Rast_get_d_row(fd, brow, row + 1) < 0)
- raster_row_error(window, north, east);
+ Rast_get_d_row(fd, arow, row);
+ Rast_get_d_row(fd, brow, row + 1);
if (Rast_is_d_null_value(&arow[col]) ||
Rast_is_d_null_value(&arow[col + 1]) ||
@@ -271,8 +266,7 @@
}
for (i = 0; i < 4; i++)
- if (Rast_get_d_row(fd, rows[i], row + i) < 0)
- raster_row_error(window, north, east);
+ Rast_get_d_row(fd, rows[i], row + i);
for (i = 0; i < 4; i++)
for (j = 0; j < 4; j++)
@@ -337,13 +331,3 @@
return val;
}
-
-static void raster_row_error(const struct Cell_head *window, double north,
- double east)
-{
- G_debug(3, "DIAG: \tRegion is: n=%g s=%g e=%g w=%g",
- window->north, window->south, window->east, window->west);
- G_debug(3, " \tData point is north=%g east=%g", north, east);
-
- G_fatal_error(_("Problem reading raster map"));
-}
Modified: grass/trunk/lib/rst/interp_float/ressegm2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/ressegm2d.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/lib/rst/interp_float/ressegm2d.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -505,21 +505,10 @@
cellsmooth = Rast_allocate_f_buf();
for (m1 = 0; m1 <= last_row - first_row; m1++) {
- ret_val =
- 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);
- return -1;
- }
- if (fdsmooth >= 0) {
- ret_val1 =
- Rast_get_f_row(fdsmooth, cellsmooth,
- inp_rows - m1 - first_row);
- if (ret_val1 < 0) {
- fprintf(stderr, "Cannot get smoothing row\n");
- }
- }
+ Rast_get_f_row(fdinp, cellinp, inp_rows - m1 - first_row);
+ if (fdsmooth >= 0)
+ Rast_get_f_row(fdsmooth, cellsmooth, inp_rows - m1 - first_row);
+
y = params->y_orig + (m1 + first_row - 1 + 0.5) * inp_ns_res;
for (m2 = 0; m2 < inp_cols; m2++) {
x = params->x_orig + (m2 + 0.5) * inp_ew_res;
Modified: grass/trunk/raster/r.basins.fill/read_map.c
===================================================================
--- grass/trunk/raster/r.basins.fill/read_map.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.basins.fill/read_map.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -27,7 +27,7 @@
int fd;
CELL *map;
int row;
- int (*get_row)(int, CELL *, int);
+ void (*get_row)(int, CELL *, int);
/* allocate entire map */
map = (CELL *) G_malloc(nrows * ncols * sizeof(CELL));
@@ -45,8 +45,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 10);
- if ((*get_row) (fd, map + row * ncols, row) < 0)
- G_fatal_error(_("Error reading <%s>"), name);
+ (*get_row)(fd, map + row * ncols, row);
}
G_percent(nrows, nrows, 10);
Modified: grass/trunk/raster/r.bitpattern/main.c
===================================================================
--- grass/trunk/raster/r.bitpattern/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.bitpattern/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -120,9 +120,7 @@
G_percent(row, nrows, 2);
/* read input map */
- if (Rast_get_row(infd, inrast, row, data_type) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), name,
- row);
+ Rast_get_row(infd, inrast, row, data_type);
/*process the data */
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/raster/r.buffer/read_map.c
===================================================================
--- grass/trunk/raster/r.buffer/read_map.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.buffer/read_map.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -58,9 +58,7 @@
hit = 0;
G_percent(row, window.rows, 2);
- 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);
+ Rast_get_c_row(fd, cell, row);
for (col = 0; col < window.cols; col++) {
if (ZEROFLAG) {
Modified: grass/trunk/raster/r.buffer/write_map.c
===================================================================
--- grass/trunk/raster/r.buffer/write_map.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.buffer/write_map.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -54,9 +54,7 @@
*cell++ = (CELL) * ptr++;
}
else {
- if (Rast_get_c_row_nomask(fd_in, cell, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- output, row);
+ Rast_get_c_row_nomask(fd_in, cell, row);
while (col-- > 0) {
if (*cell == 0 && *ptr != 0)
Modified: grass/trunk/raster/r.category/cats.c
===================================================================
--- grass/trunk/raster/r.category/cats.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.category/cats.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -48,8 +48,7 @@
for (row = 0; row < nrows; row++) {
if (G_verbose() > G_verbose_std())
G_percent(row, nrows, 2);
- if (Rast_get_c_row_nomask(fd, cell, row) < 0)
- exit(EXIT_SUCCESS);
+ Rast_get_c_row_nomask(fd, cell, row);
Rast_update_cell_stats(cell, ncols, &statf);
}
/* done */
Modified: grass/trunk/raster/r.clump/clump.c
===================================================================
--- grass/trunk/raster/r.clump/clump.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.clump/clump.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -98,9 +98,7 @@
G_message(_("Pass %d..."), pass);
for (row = 0; row < nrows; row++) {
- if (Rast_get_c_row(in_fd, cur_in + 1, row) < 0)
- G_fatal_error(_("Unable to read raster map row %d "),
- row);
+ Rast_get_c_row(in_fd, cur_in + 1, row);
G_percent(row+1, nrows, 2);
X = 0;
Modified: grass/trunk/raster/r.colors/stats.c
===================================================================
--- grass/trunk/raster/r.colors/stats.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.colors/stats.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -41,9 +41,7 @@
G_fully_qualified_name(name, mapset));
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- 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_get_c_row(fd, cell, row);
Rast_update_cell_stats(cell, ncols, statf);
}
G_percent(row, nrows, 2);
@@ -106,9 +104,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- 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);
+ Rast_get_d_row(fd, dcell, row);
for (col = 0; col < ncols; col++) {
DCELL x;
Modified: grass/trunk/raster/r.composite/main.c
===================================================================
--- grass/trunk/raster/r.composite/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.composite/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -195,11 +195,9 @@
for (i = 0; i < 3; i++) {
struct band *b = &B[i];
- 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>"),
- color_names[i]);
+ Rast_get_row_colors(b->file, atrow, &b->colors,
+ b->array[0],
+ b->array[1], b->array[2], nulls);
if (dither) {
short *tmp = b->floyd[0];
Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.compress/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -210,8 +210,7 @@
/* the null file is written automatically */
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_row_nomask(old, rast, row, map_type) < 0)
- break;
+ Rast_get_row_nomask(old, rast, row, map_type);
if (Rast_put_row(new, rast, map_type) < 0)
break;
}
Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.cost/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -481,9 +481,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- 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);
+ Rast_get_row(cost_fd, cell, row, data_type);
/* INPUT NULL VALUES: ??? */
ptr2 = cell;
@@ -655,9 +653,7 @@
G_message(_("Reading raster map <%s>..."), opt9->answer);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_row(fd, cell2, row, data_type2) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- opt9->answer, row);
+ Rast_get_row(fd, cell2, row, data_type2);
ptr2 = cell2;
for (col = 0; col < ncols; col++) {
/* Did I understand that concept of cummulative cost map? - (pmx) 12 april 2000 */
@@ -1001,11 +997,9 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (keep_nulls) {
- 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);
- }
+ if (keep_nulls)
+ Rast_get_row(cost_fd, cell2, row, data_type);
+
p = cell;
p2 = cell2;
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/raster/r.covar/main.c
===================================================================
--- grass/trunk/raster/r.covar/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.covar/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -86,10 +86,9 @@
count = 0;
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- for (i = 0; i < nfiles; i++) {
- if (Rast_get_d_row(fd[i], dcell[i], row) < 0)
- exit(1);
- }
+ for (i = 0; i < nfiles; i++)
+ Rast_get_d_row(fd[i], dcell[i], row);
+
for (col = 0; col < ncols; col++) {
/* ignore cells where any of the maps has null value */
for (i = 0; i < nfiles; i++)
Modified: grass/trunk/raster/r.cross/cross.c
===================================================================
--- grass/trunk/raster/r.cross/cross.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.cross/cross.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -55,14 +55,13 @@
G_percent(row, nrows, 5);
/* read the primary file first, even if not first in the list */
- if (Rast_get_c_row(fd[primary], cell[0], row) < 0)
- exit(1);
+ Rast_get_c_row(fd[primary], cell[0], row);
/* read the others */
col = 1;
for (i = 0; i < nfiles; i++)
- if (i != primary && Rast_get_c_row(fd[i], cell[col++], row) < 0)
- exit(1);
+ if (i != primary)
+ Rast_get_c_row(fd[i], cell[col++], row);
for (col = 0; col < ncols; col++) {
zero = 1;
for (i = 0; i < nfiles; i++) {
Modified: grass/trunk/raster/r.cross/renumber.c
===================================================================
--- grass/trunk/raster/r.cross/renumber.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.cross/renumber.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -33,8 +33,7 @@
G_message(_("%s: STEP 3 ... "), G_program_name());
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 5);
- if (Rast_get_c_row(in, c = cell, row) < 0)
- exit(1);
+ Rast_get_c_row(in, c = cell, row);
col = ncols;
while (col-- > 0) {
*c = table[*c];
Modified: grass/trunk/raster/r.describe/describe.c
===================================================================
--- grass/trunk/raster/r.describe/describe.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.describe/describe.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -37,7 +37,7 @@
struct Quant q;
struct FPRange r;
DCELL dmin, dmax;
- int (*get_row)(int, CELL *, int);
+ void (*get_row)(int, CELL *, int);
if (windowed) {
get_row = Rast_get_c_row;
@@ -94,8 +94,7 @@
G_verbose_message(_("Reading <%s> ..."), name);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if ((*get_row) (fd, b = buf, row) < 0)
- break;
+ (*get_row) (fd, b = buf, row);
if (range) {
for (col = ncols; col-- > 0; b++) {
if (Rast_is_c_null_value(b))
Modified: grass/trunk/raster/r.distance/distance.c
===================================================================
--- grass/trunk/raster/r.distance/distance.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.distance/distance.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -108,10 +108,8 @@
G_percent(row, nrows, 2);
- if (Rast_get_row(mapd1, inrast1, row, maptype1) < 0)
- G_fatal_error("Could not read from <%s>", name1);
- if (Rast_get_row(mapd2, inrast2, row, maptype2) < 0)
- G_fatal_error("Could not read from <%s>", name2);
+ Rast_get_row(mapd1, inrast1, row, maptype1);
+ Rast_get_row(mapd2, inrast2, row, maptype2);
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/raster/r.distance/edges.c
===================================================================
--- grass/trunk/raster/r.distance/edges.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.distance/edges.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -71,8 +71,7 @@
buf2 = tmp;
/* read a row */
- if (Rast_get_c_row(fd, &buf1[1], row) < 0)
- exit(1);
+ Rast_get_c_row(fd, &buf1[1], row);
for (col = 1; col <= ncols; col++) {
if (buf1[col] /* is a valid category */
Modified: grass/trunk/raster/r.drain/tinf.c
===================================================================
--- grass/trunk/raster/r.drain/tinf.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.drain/tinf.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -11,9 +11,9 @@
int (*bpe) ();
void *(*get_max) (void *, void *);
void *(*get_min) (void *, void *);
-int (*get_row) (int, void *, int);
+void (*get_row) (int, void *, int);
void *(*get_buf) ();
-int (*put_row) (int, void *);
+void (*put_row) (int, void *);
double (*slope) (void *, void *, double);
void (*set_min) (void *);
void (*set_max) (void *);
@@ -198,35 +198,35 @@
}
/* Read one line from a raster map */
-int get_row_c(int fd, void *row, int n)
+void get_row_c(int fd, void *row, int n)
{
- return Rast_get_c_row(fd, (CELL *) row, n);
+ Rast_get_c_row(fd, (CELL *) row, n);
}
-int get_row_f(int fd, void *row, int n)
+void get_row_f(int fd, void *row, int n)
{
- return Rast_get_f_row(fd, (FCELL *) row, n);
+ Rast_get_f_row(fd, (FCELL *) row, n);
}
-int get_row_d(int fd, void *row, int n)
+void get_row_d(int fd, void *row, int n)
{
- return Rast_get_d_row(fd, (DCELL *) row, n);
+ Rast_get_d_row(fd, (DCELL *) row, n);
}
/* Write one row to a raster map */
-int put_row_c(int fd, void *row)
+void put_row_c(int fd, void *row)
{
- return Rast_put_c_row(fd, (CELL *) row);
+ Rast_put_c_row(fd, (CELL *) row);
}
-int put_row_f(int fd, void *row)
+void put_row_f(int fd, void *row)
{
- return Rast_put_f_row(fd, (FCELL *) row);
+ Rast_put_f_row(fd, (FCELL *) row);
}
-int put_row_d(int fd, void *row)
+void put_row_d(int fd, void *row)
{
- return Rast_put_d_row(fd, (DCELL *) row);
+ Rast_put_d_row(fd, (DCELL *) row);
}
/* Allocate memory for one line of data */
Modified: grass/trunk/raster/r.drain/tinf.h
===================================================================
--- grass/trunk/raster/r.drain/tinf.h 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.drain/tinf.h 2010-01-04 21:05:41 UTC (rev 40222)
@@ -30,13 +30,13 @@
void *get_max_f(void *, void *);
void *get_max_d(void *, void *);
-int get_row_c(int, void *, int);
-int get_row_f(int, void *, int);
-int get_row_d(int, void *, int);
+void get_row_c(int, void *, int);
+void get_row_f(int, void *, int);
+void get_row_d(int, void *, int);
-int put_row_c(int, void *);
-int put_row_f(int, void *);
-int put_row_d(int, void *);
+void put_row_c(int, void *);
+void put_row_f(int, void *);
+void put_row_d(int, void *);
void *get_buf_c(void);
void *get_buf_f(void);
@@ -74,9 +74,9 @@
extern int (*bpe) ();
extern void *(*get_max) (void *, void *);
extern void *(*get_min) (void *, void *);
-extern int (*get_row) (int, void *, int);
+extern void (*get_row) (int, void *, int);
extern void *(*get_buf) ();
-extern int (*put_row) (int, void *);
+extern void (*put_row) (int, void *);
extern double (*slope) (void *, void *, double);
extern void (*set_min) (void *);
extern void (*set_max) (void *);
Modified: grass/trunk/raster/r.fill.dir/tinf.c
===================================================================
--- grass/trunk/raster/r.fill.dir/tinf.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.fill.dir/tinf.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -14,9 +14,9 @@
int (*bpe) ();
void *(*get_max) (void *, void *);
void *(*get_min) (void *, void *);
-int (*get_row) (int, void *, int);
+void (*get_row) (int, void *, int);
void *(*get_buf) ();
-int (*put_row) (int, void *);
+void (*put_row) (int, void *);
double (*slope) (void *, void *, double);
void (*set_min) (void *);
void (*set_max) (void *);
@@ -178,35 +178,35 @@
}
/* Read one line from a raster map */
-int get_row_c(int fd, void *row, int n)
+void get_row_c(int fd, void *row, int n)
{
- return Rast_get_c_row(fd, (CELL *) row, n);
+ Rast_get_c_row(fd, (CELL *) row, n);
}
-int get_row_f(int fd, void *row, int n)
+void get_row_f(int fd, void *row, int n)
{
- return Rast_get_f_row(fd, (FCELL *) row, n);
+ Rast_get_f_row(fd, (FCELL *) row, n);
}
-int get_row_d(int fd, void *row, int n)
+void get_row_d(int fd, void *row, int n)
{
- return Rast_get_d_row(fd, (DCELL *) row, n);
+ Rast_get_d_row(fd, (DCELL *) row, n);
}
/* Write one row to a raster map */
-int put_row_c(int fd, void *row)
+void put_row_c(int fd, void *row)
{
- return Rast_put_c_row(fd, (CELL *) row);
+ Rast_put_c_row(fd, (CELL *) row);
}
-int put_row_f(int fd, void *row)
+void put_row_f(int fd, void *row)
{
- return Rast_put_f_row(fd, (FCELL *) row);
+ Rast_put_f_row(fd, (FCELL *) row);
}
-int put_row_d(int fd, void *row)
+void put_row_d(int fd, void *row)
{
- return Rast_put_d_row(fd, (DCELL *) row);
+ Rast_put_d_row(fd, (DCELL *) row);
}
/* Allocate memory for one line of data */
Modified: grass/trunk/raster/r.fill.dir/tinf.h
===================================================================
--- grass/trunk/raster/r.fill.dir/tinf.h 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.fill.dir/tinf.h 2010-01-04 21:05:41 UTC (rev 40222)
@@ -25,13 +25,13 @@
void *get_max_f(void *, void *);
void *get_max_d(void *, void *);
-int get_row_c(int, void *, int);
-int get_row_f(int, void *, int);
-int get_row_d(int, void *, int);
+void get_row_c(int, void *, int);
+void get_row_f(int, void *, int);
+void get_row_d(int, void *, int);
-int put_row_c(int, void *);
-int put_row_f(int, void *);
-int put_row_d(int, void *);
+void put_row_c(int, void *);
+void put_row_f(int, void *);
+void put_row_d(int, void *);
void *get_buf_c();
void *get_buf_f();
@@ -69,9 +69,9 @@
extern int (*bpe) ();
extern void *(*get_max) (void *, void *);
extern void *(*get_min) (void *, void *);
-extern int (*get_row) (int, void *, int);
+extern void (*get_row) (int, void *, int);
extern void *(*get_buf) ();
-extern int (*put_row) (int, void *);
+extern void (*put_row) (int, void *);
extern double (*slope) (void *, void *, double);
extern void (*set_min) (void *);
extern void (*set_max) (void *);
Modified: grass/trunk/raster/r.his/main.c
===================================================================
--- grass/trunk/raster/r.his/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.his/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -209,17 +209,11 @@
for (atrow = 0; atrow < window.rows; atrow++) {
G_percent(atrow, window.rows, 2);
- 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_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_row_colors
- (sat_file, atrow, &sat_colors, sat_r, dummy, dummy, sat_n) < 0))
- G_fatal_error(_("Error reading 'saturation' map"));
+ Rast_get_row_colors(hue_file, atrow, &hue_colors, hue_r, hue_g, hue_b, hue_n);
+ if (int_used)
+ Rast_get_row_colors(int_file, atrow, &int_colors, int_r, dummy, dummy, int_n);
+ if (sat_used)
+ Rast_get_row_colors(sat_file, atrow, &sat_colors, sat_r, dummy, dummy, sat_n);
for (atcol = 0; atcol < window.cols; atcol++) {
if (nulldraw->answer) {
Modified: grass/trunk/raster/r.lake/main.c
===================================================================
--- grass/trunk/raster/r.lake/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.lake/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -255,14 +255,10 @@
out_water[row] = (FCELL *) G_calloc(cols, sizeof(FCELL));
/* In newly created space load data from file. */
- 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);
+ Rast_get_f_row(in_terran_fd, in_terran[row], row);
if (smap_opt->answer)
- 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);
+ Rast_get_f_row(out_fd, out_water[row], row);
G_percent(row + 1, rows, 5);
}
Modified: grass/trunk/raster/r.los/main.c
===================================================================
--- grass/trunk/raster/r.los/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.los/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -259,17 +259,13 @@
patt_fd = open(patt_name, 2);
segment_init(&seg_patt, patt_fd, 4);
for (row = 0; row < nrows; row++) {
- if (Rast_get_row(patt, cell, row, CELL_TYPE) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- patt_layer, row);
+ Rast_get_row(patt, cell, row, CELL_TYPE);
segment_put_row(&seg_patt, cell, row);
}
}
for (row = 0; row < nrows; row++) {
- if (Rast_get_row(old, fcell, row, FCELL_TYPE) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- elev_layer, row);
+ Rast_get_row(old, fcell, row, FCELL_TYPE);
segment_put_row(&seg_in, fcell, row);
}
Modified: grass/trunk/raster/r.mapcalc/map.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.mapcalc/map.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -367,8 +367,7 @@
static void read_row(int fd, void *buf, int row, int res_type)
{
- if (Rast_get_row(fd, buf, row, res_type) < 0)
- G_fatal_error(_("Unable to read raster map row %d"), row);
+ Rast_get_row(fd, buf, row, res_type);
}
static void setup_map(struct map *m)
Modified: grass/trunk/raster/r.mfilter/getrow.c
===================================================================
--- grass/trunk/raster/r.mfilter/getrow.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.mfilter/getrow.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -9,8 +9,7 @@
int getmaprow(int fd, void *buf, int row, int len)
{
- if (Rast_get_d_row(fd, (DCELL *) buf, row) < 0)
- G_fatal_error(_("Cannot read raster row %d"), row);
+ Rast_get_d_row(fd, (DCELL *) buf, row);
return 1;
}
Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.null/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -324,11 +324,7 @@
for (row = 0; row < cellhd.rows; row++) {
G_percent(row, cellhd.rows, 1);
- if (Rast_get_row_nomask(old, rast, row, map_type) < 0) {
- G_warning(_("Unable to read raster map <%s> row %d"),
- name, row);
- break;
- }
+ Rast_get_row_nomask(old, rast, row, map_type);
mask_raster_array(rast, cellhd.cols, change_null, map_type);
Modified: grass/trunk/raster/r.out.arc/main.c
===================================================================
--- grass/trunk/raster/r.out.arc/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.arc/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -169,11 +169,9 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_row(fd, raster, row, out_type) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_row(fd, raster, row, out_type);
/*
- if (Rast_get_null_value_row(fd, null_row, row) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_null_value_row(fd, null_row, row);
*/
for (col = 0, ptr = raster; col < ncols; col++,
ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
Modified: grass/trunk/raster/r.out.ascii/formspecific.c
===================================================================
--- grass/trunk/raster/r.out.ascii/formspecific.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.ascii/formspecific.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -38,8 +38,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_row(fd, raster, row, out_type) < 0)
- return (row);
+ Rast_get_row(fd, raster, row, out_type);
for (col = 0, ptr = raster; col < ncols; col++,
ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
@@ -91,8 +90,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_row(fd, raster, row, out_type) < 0)
- return (row);
+ Rast_get_row(fd, raster, row, out_type);
colcnt = 0;
for (col = 0, ptr = raster; col < ncols; col++,
@@ -177,8 +175,7 @@
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 2);
- if (Rast_get_row(fd, raster, row, out_type) < 0)
- return (row);
+ Rast_get_row(fd, raster, row, out_type);
colcnt = 0;
for (col = 0, ptr = raster; col < ncols; col++,
Modified: grass/trunk/raster/r.out.bin/main.c
===================================================================
--- grass/trunk/raster/r.out.bin/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.bin/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -330,8 +330,7 @@
G_message(_("c=%d"), region.cols);
for (row = 0; row < nrows; row++) {
- if (Rast_get_row(fd, raster, row, out_type) < 0)
- G_fatal_error(_("Reading map"));
+ Rast_get_row(fd, raster, row, out_type);
G_percent(row, nrows, 2);
for (col = 0, ptr = raster; col < ncols; col++,
Modified: grass/trunk/raster/r.out.gdal/export_band.c
===================================================================
--- grass/trunk/raster/r.out.gdal/export_band.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.gdal/export_band.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -88,11 +88,7 @@
for (row = 0; row < rows; row++) {
- if (Rast_get_row(fd, bufer, row, maptype) < 0) {
- G_warning(_("Unable to read raster map <%s> row %d"),
- name, row);
- return -1;
- }
+ Rast_get_row(fd, bufer, row, maptype);
Rast_get_null_value_row(fd, nulls, row);
for (col = 0; col < cols; col++) {
if (nulls[col]) {
@@ -120,11 +116,7 @@
for (row = 0; row < rows; row++) {
- if (Rast_get_row(fd, bufer, row, maptype) < 0) {
- G_warning(_("Unable to read raster map <%s> row %d"),
- name, row);
- return -1;
- }
+ Rast_get_row(fd, bufer, row, maptype);
Rast_get_null_value_row(fd, nulls, row);
for (col = 0; col < cols; col++) {
if (nulls[col]) {
@@ -152,11 +144,7 @@
for (row = 0; row < rows; row++) {
- if (Rast_get_row(fd, bufer, row, maptype) < 0) {
- G_warning(_("Unable to read raster map <%s> row %d"),
- name, row);
- return -1;
- }
+ Rast_get_row(fd, bufer, row, maptype);
Rast_get_null_value_row(fd, nulls, row);
for (col = 0; col < cols; col++) {
if (nulls[col]) {
@@ -395,11 +383,7 @@
for (row = 0; row < rows; row++) {
- if (Rast_get_row(fd, bufer, row, maptype) < 0) {
- G_warning(_("Unable to read raster map <%s> row %d"),
- name, row);
- return -1;
- }
+ Rast_get_row(fd, bufer, row, maptype);
Rast_get_null_value_row(fd, nulls, row);
for (col = 0; col < cols; col++) {
if (nulls[col]) {
@@ -429,11 +413,7 @@
for (row = 0; row < rows; row++) {
- if (Rast_get_row(fd, bufer, row, maptype) < 0) {
- G_warning(_("Unable to read raster map <%s> row %d"),
- name, row);
- return -1;
- }
+ Rast_get_row(fd, bufer, row, maptype);
Rast_get_null_value_row(fd, nulls, row);
for (col = 0; col < cols; col++) {
if (nulls[col]) {
@@ -463,11 +443,7 @@
for (row = 0; row < rows; row++) {
- if (Rast_get_row(fd, bufer, row, maptype) < 0) {
- G_warning(_("Unable to read raster map <%s> row %d"),
- name, row);
- return -1;
- }
+ Rast_get_row(fd, bufer, row, maptype);
Rast_get_null_value_row(fd, nulls, row);
for (col = 0; col < cols; col++) {
if (nulls[col]) {
Modified: grass/trunk/raster/r.out.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.out.gridatb/file_io.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.gridatb/file_io.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -53,10 +53,7 @@
G_percent(row, cellhd.rows, 2);
switch (data_type) {
case CELL_TYPE:
- if (Rast_get_c_row(fd, cell, row) < 0) {
- Rast_close(fd);
- exit(1);
- }
+ Rast_get_c_row(fd, cell, row);
for (col = 0; col < cellhd.cols; col++) {
if (Rast_is_c_null_value(&cell[col]))
@@ -68,10 +65,7 @@
}
break;
case FCELL_TYPE:
- if (Rast_get_f_row(fd, fcell, row) < 0) {
- Rast_close(fd);
- exit(1);
- }
+ Rast_get_f_row(fd, fcell, row);
for (col = 0; col < cellhd.cols; col++) {
if (Rast_is_f_null_value(&fcell[col]))
@@ -83,10 +77,7 @@
}
break;
case DCELL_TYPE:
- if (Rast_get_d_row(fd, dcell, row) < 0) {
- Rast_close(fd);
- exit(1);
- }
+ Rast_get_d_row(fd, dcell, row);
for (col = 0; col < cellhd.cols; col++) {
if (Rast_is_d_null_value(&dcell[col]))
Modified: grass/trunk/raster/r.out.mat/main.c
===================================================================
--- grass/trunk/raster/r.out.mat/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.mat/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -307,8 +307,7 @@
ptr =
G_incr_void_ptr(ptr,
(G_window_cols() + 1) * Rast_cell_size(map_type))) {
- if (Rast_get_row(fd, ptr, row, map_type) < 0)
- G_fatal_error("reading map");
+ Rast_get_row(fd, ptr, row, map_type);
G_percent(row, mrows, 2);
}
G_percent(row, mrows, 2); /* finish it off */
Modified: grass/trunk/raster/r.out.mpeg/main.c
===================================================================
--- grass/trunk/raster/r.out.mpeg/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.mpeg/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -291,9 +291,7 @@
voidc = Rast_allocate_buf(rtype);
for (row = 0; row < vrows; row++) {
- if (Rast_get_row(fd, voidc,
- (int)(row / vscale), rtype) < 0)
- G_fatal_error(_("Error reading row <%d>"), row);
+ Rast_get_row(fd, voidc, (int)(row / vscale), rtype);
rowoff = (vyoff + row) * ncols;
Rast_lookup_colors(voidc, tr, tg, tb,
Modified: grass/trunk/raster/r.out.png/main.c
===================================================================
--- grass/trunk/raster/r.out.png/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.png/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -251,8 +251,7 @@
for (row = 0; row < w.rows; row++) {
G_percent(row, w.rows, 5);
- if (Rast_get_row(cellfile, (void *)voidc, row, rtype) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_row(cellfile, (void *)voidc, row, rtype);
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 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.pov/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -259,8 +259,7 @@
cell = Rast_allocate_c_buf();
for (r = 0; r < rowCount; r++) {
- if (Rast_get_c_row(inputFile, cell, r) < 0)
- exit(1);
+ Rast_get_c_row(inputFile, cell, r);
/* break; */
for (c = 0; c < columnCount; c++) {
Modified: grass/trunk/raster/r.out.ppm/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.ppm/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -162,9 +162,7 @@
if (!gscale->answer) { /* 24BIT COLOR IMAGE */
for (row = 0; row < w.rows; row++) {
G_percent(row, w.rows, 5);
- 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_get_row(cellfile, (void *)voidc, row, rtype);
Rast_lookup_colors((void *)voidc, ored, ogrn, oblu, set,
w.cols, &colors, rtype);
@@ -186,8 +184,7 @@
for (row = 0; row < w.rows; row++) {
G_percent(row, w.rows, 5);
- if (Rast_get_row(cellfile, (void *)voidc, row, rtype) < 0)
- exit(1);
+ Rast_get_row(cellfile, (void *)voidc, row, rtype);
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 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.ppm3/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -158,8 +158,7 @@
G_percent(row, w.rows, 5);
for (i = 0; i < 3; i++) {
- if (Rast_get_row(B[i].file, B[i].array, row, B[i].type) < 0)
- G_fatal_error("Rast_get_row failed");
+ Rast_get_row(B[i].file, B[i].array, row, B[i].type);
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 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.tiff/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -249,10 +249,8 @@
imagelength) ? imagelength - row : tilelength;
uint32 colb = 0;
- for (i = 0; i < nrow; i++) {
- if (Rast_get_c_row(in, cells[i], row + i) < 0)
- G_fatal_error(_("Reading raster map..."));
- }
+ for (i = 0; i < nrow; i++)
+ Rast_get_c_row(in, cells[i], row + i);
for (col = 0; col < imagewidth; col += tilewidth) {
tsample_t s;
@@ -337,8 +335,7 @@
G_percent(row, h.ras_height, 2);
- if (Rast_get_c_row(in, cell, row) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_c_row(in, cell, row);
cellptr = cell;
if (palette) {
Modified: grass/trunk/raster/r.out.vtk/writeascii.c
===================================================================
--- grass/trunk/raster/r.out.vtk/writeascii.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.out.vtk/writeascii.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -181,10 +181,7 @@
colcount = 0;
G_percent((row - nrows) * (-1), nrows, 2);
- if (Rast_get_row(fd, raster, row, out_type) < 0) {
- G_fatal_error(_("Unable to read row %i\n"), row);
- return;
- }
+ Rast_get_row(fd, raster, row, out_type);
nspos = region.ns_res / 2 + region.south + rowcount * region.ns_res;
nspos -= y_extent;
@@ -242,10 +239,7 @@
colcount = 0;
G_percent((row - nrows) * (-1), nrows, 10);
- if (Rast_get_row(fd, raster, row, out_type) < 0) {
- G_fatal_error(_("Unable to read row %i\n"), row);
- return;
- }
+ Rast_get_row(fd, raster, row, out_type);
nspos = region.ns_res / 2 + region.south + rowcount * region.ns_res;
nspos -= y_extent;
@@ -354,10 +348,7 @@
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 10);
- if (Rast_get_row(fd, raster, row, out_type) < 0) {
- G_fatal_error(_("Unable to read row %i\n"), row);
- return;
- }
+ Rast_get_row(fd, raster, row, out_type);
for (col = 0, ptr = raster; col < ncols;
col++, ptr = G_incr_void_ptr(ptr, Rast_cell_size(out_type))) {
@@ -401,18 +392,9 @@
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 10);
- if (Rast_get_row(redfd, redraster, row, out_type) < 0) {
- G_fatal_error(_("Unable to read row %i\n"), row);
- return;
- }
- if (Rast_get_row(greenfd, greenraster, row, out_type) < 0) {
- G_fatal_error(_("Unable to read row %i\n"), row);
- return;
- }
- if (Rast_get_row(bluefd, blueraster, row, out_type) < 0) {
- G_fatal_error(_("Unable to read row %i\n"), row);
- return;
- }
+ Rast_get_row(redfd, redraster, row, out_type);
+ Rast_get_row(greenfd, greenraster, row, out_type);
+ Rast_get_row(bluefd, blueraster, row, out_type);
for (col = 0, redptr = redraster, greenptr = greenraster, blueptr =
blueraster; col < ncols;
@@ -468,18 +450,9 @@
for (row = nrows - 1; row >= 0; row--) {
G_percent((row - nrows) * (-1), nrows, 10);
- if (Rast_get_row(xfd, xraster, row, out_type) < 0) {
- G_fatal_error(_("Unable to read row %i\n"), row);
- return;
- }
- if (Rast_get_row(yfd, yraster, row, out_type) < 0) {
- G_fatal_error(_("Unable to read row %i\n"), row);
- return;
- }
- if (Rast_get_row(zfd, zraster, row, out_type) < 0) {
- G_fatal_error(_("Unable to read row %i\n"), row);
- return;
- }
+ Rast_get_row(xfd, xraster, row, out_type);
+ Rast_get_row(yfd, yraster, row, out_type);
+ Rast_get_row(zfd, zraster, row, out_type);
for (col = 0, xptr = xraster, yptr = yraster, zptr =
zraster; col < ncols;
Modified: grass/trunk/raster/r.patch/main.c
===================================================================
--- grass/trunk/raster/r.patch/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.patch/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -118,16 +118,12 @@
G_verbose_message(_("Percent complete..."));
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- 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);
+ Rast_get_row(infd[0], presult, row, out_type);
if (out_type == CELL_TYPE)
Rast_update_cell_stats((CELL *) presult, ncols, &statf[0]);
for (i = 1; i < nfiles; i++) {
- 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);
+ Rast_get_row(infd[i], patch, row, out_type);
if (!do_patch
(presult, patch, &statf[i], ncols, out_type, ZEROFLAG))
break;
Modified: grass/trunk/raster/r.profile/read_rast.c
===================================================================
--- grass/trunk/raster/r.profile/read_rast.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.profile/read_rast.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -39,8 +39,8 @@
outofbounds = TRUE;
if (!outofbounds) {
- if (row != cur_row && Rast_get_d_row(fd, dcell, row) < 0)
- G_fatal_error(_("Unable to read raster map row %d"), row);
+ if (row != cur_row)
+ Rast_get_d_row(fd, dcell, row);
cur_row = row;
}
Modified: grass/trunk/raster/r.proj/readcell.c
===================================================================
--- grass/trunk/raster/r.proj/readcell.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.proj/readcell.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -78,8 +78,7 @@
if (row + y >= nrows)
break;
- if (Rast_get_f_row(fdi, &tmpbuf[y * nx * BDIM], row + y) < 0)
- G_fatal_error(_("Error reading input"));
+ Rast_get_f_row(fdi, &tmpbuf[y * nx * BDIM], row + y);
}
for (x = 0; x < nx; x++)
Modified: grass/trunk/raster/r.random/count.c
===================================================================
--- grass/trunk/raster/r.random/count.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.random/count.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -67,14 +67,12 @@
}
G_message(_("Collecting Stats..."));
for (row = 0; row < nrows; row++) {
- 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_row(theState->fd_cold, theState->cover.data.v,
- row, theState->cover.type) < 0)
- G_fatal_error(_("Cannot read cover raster row [%d]"), row);
- }
+ Rast_get_row(theState->fd_old, theState->buf.data.v,
+ row, theState->buf.type);
+ if (theState->docover == 1)
+ Rast_get_row(theState->fd_cold, theState->cover.data.v,
+ row, theState->cover.type);
+
for (col = 0; col < ncols; col++) {
if (is_null_value(theState->buf, col)) {
theState->nNulls++;
Modified: grass/trunk/raster/r.random/random.c
===================================================================
--- grass/trunk/raster/r.random/random.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.random/random.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -122,16 +122,10 @@
cat = 1;
/* Execute for loop for every row if nt>1 */
for (row = 0; row < nrows && nt; 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);
+ Rast_get_row(infd, theState->buf.data.v, row, theState->buf.type);
if (theState->docover == 1) {
- 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>"),
- row, theState->inrcover);
+ Rast_get_row(cinfd, theState->cover.data.v, row,
+ theState->cover.type);
}
for (col = 0; col < ncols && nt; col++) {
Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.resamp.rst/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -427,11 +427,7 @@
else {
cellrow = Rast_allocate_f_buf();
for (m1 = 0; m1 < inp_rows; 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);
-
+ Rast_get_f_row(fdinp, cellrow, m1);
Rast_row_update_fp_range(cellrow, m1, &range, FCELL_TYPE);
}
Rast_get_fp_range_min_max(&range, &cellmin, &cellmax);
Modified: grass/trunk/raster/r.resample/main.c
===================================================================
--- grass/trunk/raster/r.resample/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.resample/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -112,8 +112,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_row(infd, rast, row, data_type) < 0)
- G_fatal_error(_("Error reading row %d"), row);
+ Rast_get_row(infd, rast, row, data_type);
if (Rast_put_row(outfd, rast, out_type) < 0)
G_fatal_error(_("Error writing row %d"), row);
Rast_mark_cats(rast, ncols, &cats, data_type);
Modified: grass/trunk/raster/r.rescale/get_range.c
===================================================================
--- grass/trunk/raster/r.rescale/get_range.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.rescale/get_range.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -24,8 +24,7 @@
G_message(_("Reading %s ..."), name);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_row_nomask(fd, cell, row) < 0)
- exit(1);
+ Rast_get_c_row_nomask(fd, cell, row);
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 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.rescale.eq/get_stats.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -19,8 +19,7 @@
G_message(_("Reading %s ..."), name);
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_row(fd, cell, row) < 0)
- break;
+ Rast_get_c_row(fd, cell, row);
Rast_update_cell_stats(cell, ncols, statf);
}
if (row < nrows)
Modified: grass/trunk/raster/r.ros/main.c
===================================================================
--- grass/trunk/raster/r.ros/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.ros/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -530,8 +530,7 @@
/*if considering spotting, read elevation map into an array */
if (spotting)
for (row = 0; row < nrows; row++) {
- if (Rast_get_c_row(elev_fd, elev, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.elev->answer, row);
+ Rast_get_c_row(elev_fd, elev, row);
for (col = 0; col < ncols; col++)
DATA(map_elev, row, col) = elev[col];
}
@@ -539,31 +538,22 @@
/*major computation: compute ROSs one cell a time */
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_row(fuel_fd, fuel, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.model->answer, row);
+ Rast_get_c_row(fuel_fd, fuel, row);
if (parm.mois_1h->answer)
- if (Rast_get_c_row(mois_1h_fd, mois_1h, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.mois_1h->answer, row);
+ Rast_get_c_row(mois_1h_fd, mois_1h, row);
if (parm.mois_10h->answer)
- if (Rast_get_c_row(mois_10h_fd, mois_10h, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.mois_10h->answer, row);
+ Rast_get_c_row(mois_10h_fd, mois_10h, row);
if (parm.mois_100h->answer)
- if (Rast_get_c_row(mois_100h_fd, mois_100h, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.mois_100h->answer, row);
- if (Rast_get_c_row(mois_live_fd, mois_live, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.mois_live->answer, row);
+ Rast_get_c_row(mois_100h_fd, mois_100h, row);
+ Rast_get_c_row(mois_live_fd, mois_live, row);
if (parm.vel->answer)
- if (Rast_get_c_row(vel_fd, vel, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.vel->answer, row);
+ Rast_get_c_row(vel_fd, vel, row);
if (parm.dir->answer)
- if (Rast_get_c_row(dir_fd, dir, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.dir->answer, row);
+ Rast_get_c_row(dir_fd, dir, row);
if (parm.slope->answer)
- if (Rast_get_c_row(slope_fd, slope, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.slope->answer, row);
+ Rast_get_c_row(slope_fd, slope, row);
if (parm.aspect->answer)
- if (Rast_get_c_row(aspect_fd, aspect, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"), parm.aspect->answer, row);
+ Rast_get_c_row(aspect_fd, aspect, row);
/*initialize cell buffers for output map layers */
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/raster/r.spread/collect_ori.c
===================================================================
--- grass/trunk/raster/r.spread/collect_ori.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.spread/collect_ori.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -59,8 +59,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_row(start_fd, cell, row) < 0)
- exit(1);
+ Rast_get_c_row(start_fd, cell, row);
for (col = 0; col < ncols; col++) {
if (*(cell + col) > 0) {
Modified: grass/trunk/raster/r.spread/main.c
===================================================================
--- grass/trunk/raster/r.spread/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.spread/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -421,29 +421,23 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_row(max_fd, cell, row) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_c_row(max_fd, cell, row);
for (col = 0; col < ncols; col++)
DATA(map_max, row, col) = cell[col];
- if (Rast_get_c_row(dir_fd, cell, row) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_c_row(dir_fd, cell, row);
for (col = 0; col < ncols; col++)
DATA(map_dir, row, col) = cell[col];
- if (Rast_get_c_row(base_fd, cell, row) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_c_row(base_fd, cell, row);
for (col = 0; col < ncols; col++)
DATA(map_base, row, col) = cell[col];
if (spotting) {
- if (Rast_get_c_row(spotdist_fd, cell, row) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_c_row(spotdist_fd, cell, row);
for (col = 0; col < ncols; col++)
DATA(map_spotdist, row, col) = cell[col];
- if (Rast_get_c_row(velocity_fd, cell, row) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_c_row(velocity_fd, cell, row);
for (col = 0; col < ncols; col++)
DATA(map_velocity, row, col) = cell[col];
- if (Rast_get_c_row(mois_fd, cell, row) < 0)
- exit(EXIT_FAILURE);
+ Rast_get_c_row(mois_fd, cell, row);
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 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.spreadpath/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -206,8 +206,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_c_row(backrow_fd, cell, row) < 0)
- G_fatal_error("unable to get map row %d", row);
+ Rast_get_c_row(backrow_fd, cell, row);
for (col = 0; col < ncols; col++)
if (cell[col] > 0)
@@ -216,8 +215,7 @@
else
cell[col] = -1;
segment_put_row(&in_row_seg, cell, row);
- if (Rast_get_c_row(backcol_fd, cell, row) < 0)
- G_fatal_error("unable to get map row %d", row);
+ Rast_get_c_row(backcol_fd, cell, row);
for (col = 0; col < ncols; col++)
if (cell[col] > 0)
@@ -276,8 +274,7 @@
/* Search for the marked starting pts and make list */
for (row = 0; row < nrows; row++) {
- if (Rast_get_c_row(path_fd, cell, row) < 0)
- G_fatal_error("unable to get map row %d", row);
+ Rast_get_c_row(path_fd, cell, row);
for (col = 0; col < ncols; col++) {
if (cell[col] > 0) {
Modified: grass/trunk/raster/r.stats/cell_stats.c
===================================================================
--- grass/trunk/raster/r.stats/cell_stats.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.stats/cell_stats.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -47,9 +47,7 @@
G_percent(row, nrows, 2);
for (i = 0; i < nfiles; i++) {
- 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);
+ Rast_get_c_row(fd[i], cell[i], row);
/* include max FP value in nsteps'th bin */
if(is_fp[i])
Modified: grass/trunk/raster/r.stats/raw_stats.c
===================================================================
--- grass/trunk/raster/r.stats/raw_stats.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.stats/raw_stats.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -39,8 +39,7 @@
/* read the rows and set the pointers */
for (i = 0; i < nfiles; i++) {
- if (Rast_get_row(fd[i], rast[i], row, map_type[i]) < 0)
- exit(1);
+ Rast_get_row(fd[i], rast[i], row, map_type[i]);
rastp[i] = rast[i];
}
Modified: grass/trunk/raster/r.sunmask/main.c
===================================================================
--- grass/trunk/raster/r.sunmask/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.sunmask/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -483,8 +483,7 @@
G_percent(row1, window.rows, 2);
col1 = 0;
drow = -1;
- if (Rast_get_row(elev_fd, elevbuf.v, row1, data_type) < 0)
- G_fatal_error(_("Can't read row in input elevation map"));
+ Rast_get_row(elev_fd, elevbuf.v, row1, data_type);
while (col1 < window.cols) {
dvalue = raster_value(elevbuf, data_type, col1);
@@ -515,7 +514,7 @@
if (drow != G_northing_to_row(north, &window)) {
drow = G_northing_to_row(north, &window);
Rast_get_row(elev_fd, tmpbuf.v, (int)drow,
- data_type);
+ data_type);
}
dvalue2 = raster_value(tmpbuf, data_type, (int)dcol);
if ((dvalue2 - dvalue) > (maxh)) {
Modified: grass/trunk/raster/r.support/histo.c
===================================================================
--- grass/trunk/raster/r.support/histo.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.support/histo.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -29,11 +29,7 @@
Rast_init_cell_stats(&statf);
for (row = 0; row < nrows; row++) {
- if (Rast_get_c_row_nomask(fd, cell, row) < 0) {
- G_warning(_("Unable to read row %d"), row);
- break;
- }
-
+ Rast_get_c_row_nomask(fd, cell, row);
Rast_update_cell_stats(cell, ncols, &statf);
}
Modified: grass/trunk/raster/r.support.stats/histo.c
===================================================================
--- grass/trunk/raster/r.support.stats/histo.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.support.stats/histo.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -49,8 +49,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (Rast_get_c_row_nomask(fd, cell, row) < 0)
- break;
+ Rast_get_c_row_nomask(fd, cell, row);
Rast_update_cell_stats(cell, ncols, &statf);
}
Modified: grass/trunk/raster/r.surf.contour/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.contour/read_cell.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.surf.contour/read_cell.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -18,9 +18,7 @@
for (row = 0; row < nrows; row++) {
idx[row] = &buf[row * ncols];
- if (Rast_get_c_row(fd, idx[row], row) < 0)
- G_fatal_error(_("unable to read map <%s> in <%s>"),
- name, mapset);
+ Rast_get_c_row(fd, idx[row], row);
}
Rast_close(fd);
Modified: grass/trunk/raster/r.surf.idw/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.surf.idw/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -257,8 +257,8 @@
G_percent(row+1, nrows, 2);
/* if mask occurs, read current row of the mask */
- if (mask && Rast_get_c_row(maskfd, mask, row) < 0)
- G_fatal_error(_("Cannot read row"));
+ if (mask)
+ Rast_get_c_row(maskfd, mask, row);
/* prepare search array for next row of interpolations */
for (ewptr = search, Rptr = rowlist; ewptr <= lastrow;
@@ -706,9 +706,7 @@
for (row = 0, Rptr = rowlist; row < rows; row++) {
G_percent(row+1, rows, 2);
- if (Rast_get_c_row_nomask(fd, cell, row) < 0)
- G_fatal_error(_("Unable to read raster map row %d"),
- row);
+ Rast_get_c_row_nomask(fd, cell, row);
for (col = 0; col < cols; col++) {
if (cell[col] != 0) {
Modified: grass/trunk/raster/r.surf.idw2/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.surf.idw2/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -113,10 +113,9 @@
for (row = 0; row < window.rows; row++) {
G_percent(row, window.rows, 2);
- if (mask) {
- if (Rast_get_c_row(maskfd, mask, row) < 0)
- G_fatal_error(_("Cannot get row"));
- }
+ if (mask)
+ Rast_get_c_row(maskfd, mask, row);
+
north += window.ns_res;
east = window.west - window.ew_res / 2.0;
for (col = 0; col < window.cols; col++) {
Modified: grass/trunk/raster/r.surf.idw2/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/read_cell.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.surf.idw2/read_cell.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -30,8 +30,7 @@
for (row = 0; row < window.rows; row++) {
G_percent(row, window.rows, 1);
north += window.ns_res;
- if (Rast_get_c_row_nomask(fd, cell, row) < 0)
- exit(1);
+ Rast_get_c_row_nomask(fd, cell, row);
for (col = 0; col < window.cols; col++)
if ((z = cell[col]))
newpoint(z, window.west + (col + .5) * window.ew_res, north);
Modified: grass/trunk/raster/r.terraflow/grass2str.h
===================================================================
--- grass/trunk/raster/r.terraflow/grass2str.h 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.terraflow/grass2str.h 2010-01-04 21:05:41 UTC (rev 40222)
@@ -81,8 +81,7 @@
for (int i = 0; i< nrows; i++) {
/* read input map */
- if (Rast_get_row (infd, inrast, i, data_type) < 0)
- G_fatal_error (_("Unable to read raster map <%s>, row %d"),cellname, i);
+ Rast_get_row (infd, inrast, i, data_type);
for (int j=0; j<ncols; j++) {
Modified: grass/trunk/raster/r.thin/io.c
===================================================================
--- grass/trunk/raster/r.thin/io.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.thin/io.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -119,11 +119,7 @@
}
}
for (row = 0; row < n_rows; row++) {
- 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);
- }
+ Rast_get_c_row(cell_file, buf + PAD, row);
if (write(work_file, buf, buf_len) != buf_len) {
unlink(work_file_name);
G_fatal_error(_("%s: Error writing temporary file"),
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.to.rast3/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -114,8 +114,7 @@
for (y = 0; y < rows; y++) {
G_percent(y, rows - 1, 10);
- if (!Rast_get_row(fd[z], rast, y, globalRastMapType))
- fatal_error(map, fd, depths, _("Could not get raster row"));
+ Rast_get_row(fd[z], rast, y, globalRastMapType);
for (x = 0, ptr = rast; x < cols; x++,
ptr =
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -222,10 +222,8 @@
for (y = 0; y < rows; y++) {
G_percent(y, rows - 1, 10);
- 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_row(db.elev, elev_rast, y, db.elevmaptype))
- fatal_error(db, _("Could not get raster row from elev map"));
+ Rast_get_row(db.input, input_rast, y, db.inputmaptype);
+ Rast_get_row(db.elev, elev_rast, y, db.elevmaptype);
for (x = 0, input_ptr = input_rast, elev_ptr = elev_rast; x < cols;
x++, input_ptr =
Modified: grass/trunk/raster/r.topidx/file_io.c
===================================================================
--- grass/trunk/raster/r.topidx/file_io.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.topidx/file_io.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -39,9 +39,7 @@
a[i] = (DCELL *) G_malloc(sizeof(DCELL) * window.cols);
if (data_type == CELL_TYPE) {
- if (Rast_get_c_row(fd, ccell, i) < 0) {
- Rast_close(fd);
- }
+ Rast_get_c_row(fd, ccell, i);
for (j = 0; j < window.cols; j++) {
if (Rast_is_c_null_value(&ccell[j]))
Rast_set_d_null_value(&cell[i][j], 1);
@@ -50,9 +48,7 @@
}
}
else if (data_type == FCELL_TYPE) {
- if (Rast_get_f_row(fd, fcell, i) < 0) {
- Rast_close(fd);
- }
+ Rast_get_f_row(fd, fcell, i);
for (j = 0; j < window.cols; j++) {
if (Rast_is_f_null_value(&fcell[j]))
Rast_set_d_null_value(&cell[i][j], 1);
@@ -60,11 +56,8 @@
cell[i][j] = (DCELL) fcell[j];
}
}
- 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);
- }
+ else
+ Rast_get_d_row(fd, cell[i], i);
}
if (data_type == CELL_TYPE)
G_free(ccell);
Modified: grass/trunk/raster/r.univar/r.univar_main.c
===================================================================
--- grass/trunk/raster/r.univar/r.univar_main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.univar/r.univar_main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -183,8 +183,7 @@
void *ptr;
unsigned int col;
- if (Rast_get_row(fd, raster_row, row, map_type) < 0)
- G_fatal_error(_("Reading row %d"), row);
+ Rast_get_row(fd, raster_row, row, map_type);
ptr = raster_row;
Modified: grass/trunk/raster/r.uslek/main.c
===================================================================
--- grass/trunk/raster/r.uslek/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.uslek/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -118,18 +118,10 @@
G_percent(row, nrows, 2);
/* read soil input maps */
- 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_row(infd_psilt, inrast_psilt, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- psilt, row);
- 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_row(infd_pomat, inrast_pomat, row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- pomat, row);
+ Rast_get_d_row(infd_psand, inrast_psand, row);
+ Rast_get_d_row(infd_psilt, inrast_psilt, row);
+ Rast_get_d_row(infd_pclay, inrast_pclay, row);
+ Rast_get_d_row(infd_pomat, inrast_pomat, row);
/*process the data */
for (col = 0; col < ncols; col++)
Modified: grass/trunk/raster/r.usler/main.c
===================================================================
--- grass/trunk/raster/r.usler/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.usler/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -101,9 +101,7 @@
G_percent(row, nrows, 2);
/* read input map */
- 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);
+ Rast_get_d_row(infd_annual_pmm, inrast_annual_pmm, row);
/*process the data */
for (col = 0; col < ncols; col++)
Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.walk/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -693,9 +693,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- 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);
+ Rast_get_row(dtm_fd, dtm_cell, row, dtm_data_type);
/* INPUT NULL VALUES: ??? */
ptr2 = dtm_cell;
switch (dtm_data_type) {
@@ -752,9 +750,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- 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);
+ Rast_get_row(cost_fd, cost_cell, row, cost_data_type);
/* INPUT NULL VALUES: ??? */
ptr2 = cost_cell;
switch (cost_data_type) {
@@ -882,9 +878,7 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- 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);
+ Rast_get_row(cum_fd, cell2, row, data_type2);
ptr2 = cell2;
for (col = 0; col < ncols; col++) {
/* Did I understand that concept of cummulative cost map? - (pmx) 12 april 2000 */
@@ -1459,11 +1453,9 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (keep_nulls) {
- 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);
- }
+ if (keep_nulls)
+ Rast_get_row(dtm_fd, cell2, row, dtm_data_type);
+
p = cum_cell;
p2 = cell2;
for (col = 0; col < ncols; col++) {
@@ -1494,11 +1486,9 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (keep_nulls) {
- 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);
- }
+ if (keep_nulls)
+ Rast_get_row(dtm_fd, cell2, row, dtm_data_type);
+
p = cum_cell;
p2 = cell2;
for (col = 0; col < ncols; col++) {
@@ -1529,11 +1519,9 @@
for (row = 0; row < nrows; row++) {
G_percent(row, nrows, 2);
- if (keep_nulls) {
- 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);
- }
+ if (keep_nulls)
+ Rast_get_row(dtm_fd, cell2, row, dtm_data_type);
+
p = cum_cell;
p2 = cell2;
for (col = 0; col < ncols; col++) {
Modified: grass/trunk/raster/r.watershed/seg/bseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_read.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.watershed/seg/bseg_read.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -22,14 +22,7 @@
ncols = G_window_cols();
buffer = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
- 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",
- me, map_name, mapset, row, nrows);
- G_warning(msg);
- return -2;
- }
+ Rast_get_c_row(map_fd, buffer, row);
for (col = ncols; col >= 0; col--) {
cbuf = (char) buffer[col];
bseg_put(bseg, &cbuf, row, col);
Modified: grass/trunk/raster/r.watershed/seg/cseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_read.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.watershed/seg/cseg_read.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -19,14 +19,7 @@
nrows = G_window_rows();
buffer = Rast_allocate_c_buf();
for (row = 0; row < nrows; row++) {
- 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",
- me, map_name, mapset, row, nrows);
- G_warning(msg);
- return -2;
- }
+ Rast_get_c_row(map_fd, buffer, row);
if (segment_put_row(&(cseg->seg), buffer, row) < 0) {
G_free(buffer);
Rast_close(map_fd);
Modified: grass/trunk/raster/r.watershed/seg/dseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_read.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.watershed/seg/dseg_read.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -20,14 +20,7 @@
ncols = G_window_cols();
dbuffer = Rast_allocate_d_buf();
for (row = 0; row < nrows; row++) {
- 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",
- me, map_name, mapset, row, nrows);
- G_warning(msg);
- return -2;
- }
+ Rast_get_d_row(map_fd, dbuffer, row);
if (segment_put_row(&(dseg->seg), (DCELL *) dbuffer, row) < 0) {
G_free(dbuffer);
Rast_close(map_fd);
Modified: grass/trunk/raster/r.what/main.c
===================================================================
--- grass/trunk/raster/r.what/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster/r.what/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -352,13 +352,10 @@
cache_miss++;
if (row_in_window)
for (i = 0; i < nfiles; i++) {
- if (Rast_get_c_row(fd[i], cell[i], cache[point].row) < 0)
- G_fatal_error(_("Error reading <%s>"), argv[i + 1]);
+ Rast_get_c_row(fd[i], cell[i], cache[point].row);
- if (out_type[i] != CELL_TYPE) {
- if (Rast_get_d_row(fd[i], dcell[i], cache[point].row) < 0)
- G_fatal_error(_("Error reading <%s>"), argv[i + 1]);
- }
+ if (out_type[i] != CELL_TYPE)
+ Rast_get_d_row(fd[i], dcell[i], cache[point].row);
}
cur_row = cache[point].row;
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -157,9 +157,7 @@
G_percent(y, rows - 1, 10);
/*Read the input map row */
- if (!Rast_get_row(elevfd, elevrast, y, globalElevMapType))
- fatal_error(map, elevfd, outfd,
- _("Unable to get elevation raster row"));
+ Rast_get_row(elevfd, elevrast, y, globalElevMapType);
for (x = 0, ptr = elevrast; x < cols; x++, ptr =
G_incr_void_ptr(ptr, Rast_cell_size(globalElevMapType))) {
Modified: grass/trunk/raster3d/r3.out.vtk/writeVTKData.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/raster3d/r3.out.vtk/writeVTKData.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -128,12 +128,9 @@
G_percent(status, (rows * depths - 1), 10);
status++;
- if (!Rast_get_row(in->top, rast_top, y, in->topMapType))
- fatal_error(_("Could not get top raster row \n"), in);
+ Rast_get_row(in->top, rast_top, y, in->topMapType);
- if (!Rast_get_row
- (in->bottom, rast_bottom, y, in->bottomMapType))
- fatal_error(_("Could not get bottom raster row \n"), in);
+ Rast_get_row(in->bottom, rast_bottom, y, in->bottomMapType);
for (x = 0, ptr_top = rast_top, ptr_bottom = rast_bottom;
x < cols;
Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/vector/v.kernel/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -395,10 +395,8 @@
for (row = 0; row < window.rows; row++) {
G_percent(row, window.rows, 2);
- if (mask) {
- if (Rast_get_c_row(maskfd, mask, row) < 0)
- G_fatal_error(_("Unable to read MASK"));
- }
+ if (mask)
+ Rast_get_c_row(maskfd, mask, row);
for (col = 0; col < window.cols; col++) {
/* don't interpolate outside of the mask */
Modified: grass/trunk/vector/v.surf.idw/main.c
===================================================================
--- grass/trunk/vector/v.surf.idw/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/vector/v.surf.idw/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -250,10 +250,9 @@
for (row = 0; row < window.rows; row++) {
G_percent(row, window.rows, 1);
- if (mask) {
- if (Rast_get_c_row(maskfd, mask, row) < 0)
- exit(1);
- }
+ if (mask)
+ Rast_get_c_row(maskfd, mask, row);
+
north -= window.ns_res;
east = window.west - window.ew_res / 2.0;
for (col = 0; col < window.cols; col++) {
Modified: grass/trunk/vector/v.to.rast/support.c
===================================================================
--- grass/trunk/vector/v.to.rast/support.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/vector/v.to.rast/support.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -428,10 +428,7 @@
rows = G_window_rows();
for (row = 0; row < rows; row++) {
- if (Rast_get_row(fd, rowbuf, row, map_type) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- rast_name, row);
-
+ Rast_get_row(fd, rowbuf, row, map_type);
Rast_update_cell_stats(rowbuf, G_window_cols(), &stats);
}
Modified: grass/trunk/vector/v.vol.rst/user3.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user3.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/vector/v.vol.rst/user3.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -414,11 +414,9 @@
w[m] = wm;
w2[m] = wm * wm;
}
- if ((cellinp != NULL) && (cellout != NULL) && (i == ngstl)) {
- 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)");
- }
+ if ((cellinp != NULL) && (cellout != NULL) && (i == ngstl))
+ Rast_get_f_row(fdcell, cell, n_rows_in - k);
+
for (l = ngstc; l <= nszc; l++) {
LSIZE = LSIZE + 1;
if (maskmap != NULL)
Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/vector/v.what.rast/main.c 2010-01-04 21:05:41 UTC (rev 40222)
@@ -261,16 +261,10 @@
continue; /* duplicate cats */
if (cur_row != cache[point].row) {
- if (out_type == CELL_TYPE) {
- 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_row(fd, dcell, cache[point].row) < 0)
- G_fatal_error(_("Unable to read raster map <%s> row %d"),
- dcell, cache[point].row);
- }
+ if (out_type == CELL_TYPE)
+ Rast_get_c_row(fd, cell, cache[point].row);
+ else
+ Rast_get_d_row(fd, dcell, cache[point].row);
}
cur_row = cache[point].row;
Modified: grass/trunk/visualization/xganim/main.cc
===================================================================
--- grass/trunk/visualization/xganim/main.cc 2010-01-04 21:02:20 UTC (rev 40221)
+++ grass/trunk/visualization/xganim/main.cc 2010-01-04 21:05:41 UTC (rev 40222)
@@ -244,8 +244,7 @@
G_fatal_error(_("Unable to read color file"));
for (row = 0; row < vrows; row++) {
- if (Rast_get_d_row(fd, dcell, (int)(row / vscale)) < 0)
- G_fatal_error(_("Unable to read raster row"));
+ Rast_get_d_row(fd, dcell, (int)(row / vscale));
rowoff = (vyoff + row) * ncols;
Rast_lookup_d_colors(dcell, tr, tg, tb, tset, tsiz, &colors);
More information about the grass-commit
mailing list