[GRASS-SVN] r38127 - in grass/trunk: doc/raster/r.example
imagery/i.albedo imagery/i.atcorr imagery/i.biomass
imagery/i.cca imagery/i.class 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.his.rgb imagery/i.ifft imagery/i.latlong
imagery/i.maxlik imagery/i.modis.qc imagery/i.pca
imagery/i.rectify imagery/i.rgb.his imagery/i.smap
imagery/i.sunhours imagery/i.vi imagery/i.zc include lib/gpde
lib/raster lib/rst/interp_float raster/r.basins.fill
raster/r.bitpattern raster/r.buffer raster/r.carve
raster/r.circle raster/r.clump raster/r.composite
raster/r.compress raster/r.cost raster/r.cross raster/r.drain
raster/r.fill.dir raster/r.flow raster/r.grow
raster/r.grow.distance raster/r.his raster/r.horizon
raster/r.in.arc raster/r.in.ascii raster/r.in.bin
raster/r.in.gdal raster/r.in.gridatb raster/r.in.mat
raster/r.in.poly raster/r.in.xyz raster/r.lake
raster/r.le/r.le.patch raster/r.le/r.le.pixel
raster/r.le/r.le.setup/polytocell raster/r.li/r.li.daemon
raster/r.los raster/r.mapcalc raster/r.mfilter
raster/r.neighbors raster/r.null raster/r.param.scale
raster/r.patch raster/r.proj raster/r.random
raster/r.random.cells raster/r.random.surface raster/r.recode
raster/r.resamp.interp raster/r.resamp.stats
raster/r.resample raster/r.ros raster/r.series
raster/r.slope.aspect raster/r.spread raster/r.spreadpath
raster/r.statistics2 raster/r.statistics3 raster/r.sun
raster/r.sun2 raster/r.sunmask raster/r.surf.contour
raster/r.surf.fractal raster/r.surf.gauss raster/r.surf.idw
raster/r.surf.idw2 raster/r.surf.random raster/r.terraflow
raster/r.texture raster/r.thin raster/r.topidx raster/r.uslek
raster/r.usler raster/r.walk raster/r.water.outlet
raster/r.watershed/ram raster/r.watershed/seg
raster/simwe/simlib raster3d/r3.cross.rast
raster3d/r3.to.rast swig/perl/R_slope_aspect/r_slope_aspect
vector/lidar/lidarlib vector/v.kernel vector/v.neighbors
vector/v.surf.idw vector/v.to.rast vector/v.vol.rst
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Jun 30 12:20:43 EDT 2009
Author: martinl
Date: 2009-06-30 12:20:43 -0400 (Tue, 30 Jun 2009)
New Revision: 38127
Modified:
grass/trunk/doc/raster/r.example/main.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/signature.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.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.rectify/write.c
grass/trunk/imagery/i.rgb.his/main.c
grass/trunk/imagery/i.smap/write_img.c
grass/trunk/imagery/i.sunhours/main.c
grass/trunk/imagery/i.vi/main.c
grass/trunk/imagery/i.zc/main.c
grass/trunk/include/raster.h
grass/trunk/lib/gpde/N_arrays_io.c
grass/trunk/lib/raster/closecell.c
grass/trunk/lib/raster/opencell.c
grass/trunk/lib/raster/put_row.c
grass/trunk/lib/rst/interp_float/output2d.c
grass/trunk/lib/rst/interp_float/resout2d.c
grass/trunk/raster/r.basins.fill/main.c
grass/trunk/raster/r.bitpattern/main.c
grass/trunk/raster/r.buffer/write_map.c
grass/trunk/raster/r.carve/raster.c
grass/trunk/raster/r.circle/main.c
grass/trunk/raster/r.clump/clump.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.cross/cross.c
grass/trunk/raster/r.cross/renumber.c
grass/trunk/raster/r.drain/main.c
grass/trunk/raster/r.drain/tinf.c
grass/trunk/raster/r.fill.dir/main.c
grass/trunk/raster/r.fill.dir/tinf.c
grass/trunk/raster/r.flow/io.c
grass/trunk/raster/r.flow/main.c
grass/trunk/raster/r.grow.distance/main.c
grass/trunk/raster/r.grow/main.c
grass/trunk/raster/r.his/main.c
grass/trunk/raster/r.horizon/main.c
grass/trunk/raster/r.in.arc/main.c
grass/trunk/raster/r.in.ascii/main.c
grass/trunk/raster/r.in.bin/main.c
grass/trunk/raster/r.in.gdal/main.c
grass/trunk/raster/r.in.gridatb/file_io.c
grass/trunk/raster/r.in.mat/main.c
grass/trunk/raster/r.in.poly/raster.c
grass/trunk/raster/r.in.xyz/main.c
grass/trunk/raster/r.lake/main.c
grass/trunk/raster/r.le/r.le.patch/driver.c
grass/trunk/raster/r.le/r.le.patch/trace.c
grass/trunk/raster/r.le/r.le.pixel/driver.c
grass/trunk/raster/r.le/r.le.pixel/texture.c
grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c
grass/trunk/raster/r.li/r.li.daemon/daemon.c
grass/trunk/raster/r.los/main.c
grass/trunk/raster/r.mapcalc/map.c
grass/trunk/raster/r.mfilter/perform.c
grass/trunk/raster/r.neighbors/main.c
grass/trunk/raster/r.null/main.c
grass/trunk/raster/r.param.scale/process.c
grass/trunk/raster/r.patch/main.c
grass/trunk/raster/r.proj/main.c
grass/trunk/raster/r.random.cells/indep.c
grass/trunk/raster/r.random.surface/save.c
grass/trunk/raster/r.random/random.c
grass/trunk/raster/r.recode/recode.c
grass/trunk/raster/r.resamp.interp/main.c
grass/trunk/raster/r.resamp.stats/main.c
grass/trunk/raster/r.resample/main.c
grass/trunk/raster/r.ros/main.c
grass/trunk/raster/r.series/main.c
grass/trunk/raster/r.slope.aspect/main.c
grass/trunk/raster/r.spread/ram2out.c
grass/trunk/raster/r.spreadpath/main.c
grass/trunk/raster/r.statistics2/main.c
grass/trunk/raster/r.statistics3/main.c
grass/trunk/raster/r.sun/main.c
grass/trunk/raster/r.sun2/main.c
grass/trunk/raster/r.sunmask/main.c
grass/trunk/raster/r.surf.contour/main.c
grass/trunk/raster/r.surf.fractal/write_rast.c
grass/trunk/raster/r.surf.gauss/gaussurf.c
grass/trunk/raster/r.surf.idw/main.c
grass/trunk/raster/r.surf.idw2/main.c
grass/trunk/raster/r.surf.random/randsurf.c
grass/trunk/raster/r.terraflow/grass2str.h
grass/trunk/raster/r.texture/main.c
grass/trunk/raster/r.thin/io.c
grass/trunk/raster/r.topidx/file_io.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.water.outlet/main.c
grass/trunk/raster/r.watershed/ram/close_maps.c
grass/trunk/raster/r.watershed/ram/close_maps2.c
grass/trunk/raster/r.watershed/seg/bseg_write.c
grass/trunk/raster/r.watershed/seg/close_maps.c
grass/trunk/raster/r.watershed/seg/close_maps2.c
grass/trunk/raster/r.watershed/seg/cseg_write.c
grass/trunk/raster/r.watershed/seg/dseg_write.c
grass/trunk/raster/simwe/simlib/output.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
grass/trunk/vector/lidar/lidarlib/zones.c
grass/trunk/vector/v.kernel/main.c
grass/trunk/vector/v.neighbors/main.c
grass/trunk/vector/v.surf.idw/main.c
grass/trunk/vector/v.to.rast/raster.c
grass/trunk/vector/v.vol.rst/user1.c
Log:
rasterlib: fns from put_row.c renamed, see
http://trac.osgeo.org/grass/wiki/Grass7/RasterLib
Modified: grass/trunk/doc/raster/r.example/main.c
===================================================================
--- grass/trunk/doc/raster/r.example/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/doc/raster/r.example/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -175,7 +175,7 @@
}
/* write raster row to output raster map */
- if (Rast_put_raster_row(outfd, outrast, data_type) < 0)
+ if (Rast_put_row(outfd, outrast, data_type) < 0)
G_fatal_error(_("Failed writing raster map <%s>"), result);
}
Modified: grass/trunk/imagery/i.albedo/main.c
===================================================================
--- grass/trunk/imagery/i.albedo/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.albedo/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -389,7 +389,7 @@
}
((DCELL *) outrast)[col] = de;
}
- if (Rast_put_raster_row(outfd, outrast, out_data_type) < 0)
+ if (Rast_put_row(outfd, outrast, out_data_type) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
}
Modified: grass/trunk/imagery/i.atcorr/main.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/main.cpp 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.atcorr/main.cpp 2009-06-30 16:20:43 UTC (rev 38127)
@@ -124,7 +124,7 @@
cbuf = (CELL*)Rast_allocate_buf(CELL_TYPE);
for(col = 0; col < G_window_cols(); col++) cbuf[col] = round_c(buf[col]);
- Rast_put_raster_row(ofd, cbuf, CELL_TYPE);
+ Rast_put_row(ofd, cbuf, CELL_TYPE);
}
@@ -405,7 +405,7 @@
}
/* write output */
- if(oflt) Rast_put_raster_row(ofd, buf, FCELL_TYPE);
+ if(oflt) Rast_put_row(ofd, buf, FCELL_TYPE);
else write_fp_to_cell(ofd, buf);
}
Modified: grass/trunk/imagery/i.biomass/main.c
===================================================================
--- grass/trunk/imagery/i.biomass/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.biomass/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -179,7 +179,7 @@
outrast1[col] = d;
}
}
- if (Rast_put_d_raster_row(outfd1, outrast1) < 0)
+ if (Rast_put_d_row(outfd1, outrast1) < 0)
G_fatal_error(_("Failed writing raster map <%s>"), result1);
}
Modified: grass/trunk/imagery/i.cca/transform.c
===================================================================
--- grass/trunk/imagery/i.cca/transform.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.cca/transform.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -43,7 +43,7 @@
/* output the row of data */
for (j = 1; j <= bands; j++)
- if (Rast_put_raster_row(outfds[j], rowbufs[j], CELL_TYPE) < 0)
+ if (Rast_put_row(outfds[j], rowbufs[j], CELL_TYPE) < 0)
G_fatal_error(_("Error writing cell map during transform."));
}
for (i = 1; i <= bands; i++)
Modified: grass/trunk/imagery/i.class/signature.c
===================================================================
--- grass/trunk/imagery/i.class/signature.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.class/signature.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -291,7 +291,7 @@
buffer[col] = (CELL) 1;
past:;
}
- Rast_put_raster_row(fd, buffer, CELL_TYPE);
+ Rast_put_row(fd, buffer, CELL_TYPE);
}
Rast_close(fd);
Modified: grass/trunk/imagery/i.eb.eta/main.c
===================================================================
--- grass/trunk/imagery/i.eb.eta/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.eb.eta/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -127,7 +127,7 @@
outrast1[col] = d;
}
}
- if (Rast_put_d_raster_row(outfd1,outrast1) < 0)
+ if (Rast_put_d_row(outfd1,outrast1) < 0)
G_fatal_error(_("Failed writing raster map <%s>"), result1);
}
G_free(inrast_rnetday);
Modified: grass/trunk/imagery/i.eb.evapfr/main.c
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -166,11 +166,11 @@
}
}
}
- if (Rast_put_d_raster_row(outfd1, outrast1) < 0)
+ if (Rast_put_d_row(outfd1, outrast1) < 0)
G_fatal_error(_("Failed writing raster map <%s>"), result1);
if (makin)
{
- if (Rast_put_d_raster_row(outfd2, outrast2) < 0)
+ if (Rast_put_d_row(outfd2, outrast2) < 0)
G_fatal_error(_("Failed writing raster map <%s>"), result2);
}
}
Modified: grass/trunk/imagery/i.eb.h_SEBAL01/main.c
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -629,7 +629,7 @@
outrast[col] = d_h3;
}
}
- if (Rast_put_d_raster_row(outfd, outrast) < 0)
+ if (Rast_put_d_row(outfd, outrast) < 0)
G_fatal_error("Failed writing raster map <%s>", h0);
}
Modified: grass/trunk/imagery/i.eb.soilheatflux/main.c
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.eb.soilheatflux/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -169,7 +169,7 @@
outrast[col] = d;
}
}
- if (Rast_put_d_raster_row(outfd, outrast) < 0)
+ if (Rast_put_d_row(outfd, outrast) < 0)
G_fatal_error(_("Failed writing raster map <%s>"), result);
}
G_free(inrast_albedo);
Modified: grass/trunk/imagery/i.emissivity/main.c
===================================================================
--- grass/trunk/imagery/i.emissivity/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.emissivity/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -99,7 +99,7 @@
outr[col] = d;
}
}
- if (Rast_put_raster_row(outfd, outr, DCELL_TYPE) < 0)
+ if (Rast_put_row(outfd, outr, DCELL_TYPE) < 0)
G_fatal_error(_("Cannot write to output raster file"));
}
G_free(inr);
Modified: grass/trunk/imagery/i.evapo.time_integration/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -413,7 +413,7 @@
}
}
}
- if (Rast_put_raster_row(outfd, outrast, out_data_type) < 0)
+ if (Rast_put_row(outfd, outrast, out_data_type) < 0)
G_fatal_error(_("Unable to write to raster map<%s>"), result);
}
Modified: grass/trunk/imagery/i.fft/main.c
===================================================================
--- grass/trunk/imagery/i.fft/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.fft/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -184,8 +184,8 @@
cell_real[j] = data[C(i, j)][0];
cell_imag[j] = data[C(i, j)][1];
}
- Rast_put_d_raster_row(realfd, cell_real);
- Rast_put_d_raster_row(imagfd, cell_imag);
+ Rast_put_d_row(realfd, cell_real);
+ Rast_put_d_row(imagfd, cell_imag);
G_percent(i+1, rows, 2);
}
Modified: grass/trunk/imagery/i.his.rgb/main.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.his.rgb/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -102,7 +102,7 @@
/* write out the new row for each cell map */
for (band = 0; band < 3; band++)
- if (Rast_put_raster_row(fd_output[band], rowbuffer[band], CELL_TYPE)
+ if (Rast_put_row(fd_output[band], rowbuffer[band], CELL_TYPE)
< 0)
G_fatal_error(_("Failed writing raster map row %d"), i);
}
Modified: grass/trunk/imagery/i.ifft/main.c
===================================================================
--- grass/trunk/imagery/i.ifft/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.ifft/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -223,7 +223,7 @@
for (i = 0; i < rows; i++) {
for (j = 0; j < cols; j++)
cell_real[j] = data[C(i, j)][0];
- Rast_put_d_raster_row(outputfd, cell_real);
+ Rast_put_d_row(outputfd, cell_real);
G_percent(i+1, rows, 2);
}
Modified: grass/trunk/imagery/i.latlong/main.c
===================================================================
--- grass/trunk/imagery/i.latlong/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.latlong/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -142,7 +142,7 @@
d = latitude;
outrast1[col] = d;
}
- if (Rast_put_d_raster_row(outfd1, outrast1) < 0)
+ if (Rast_put_d_row(outfd1, outrast1) < 0)
G_fatal_error(_("Cannot write to output raster file"));
}
G_free(inrast);
Modified: grass/trunk/imagery/i.maxlik/main.c
===================================================================
--- grass/trunk/imagery/i.maxlik/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.maxlik/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -114,9 +114,9 @@
row);
classify(class_cell, reject_cell, ncols);
- Rast_put_raster_row(class_fd, class_cell, CELL_TYPE);
+ Rast_put_row(class_fd, class_cell, CELL_TYPE);
if (reject_fd > 0)
- Rast_put_raster_row(reject_fd, reject_cell, CELL_TYPE);
+ Rast_put_row(reject_fd, reject_cell, CELL_TYPE);
}
G_percent(nrows, nrows, 2);
Modified: grass/trunk/imagery/i.modis.qc/main.c
===================================================================
--- grass/trunk/imagery/i.modis.qc/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.modis.qc/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -323,7 +323,7 @@
outrast[col] = c;
}
- if (Rast_put_c_raster_row(outfd, outrast) < 0)
+ if (Rast_put_c_row(outfd, outrast) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"),
output->answer, row);
}
Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.pca/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -512,9 +512,9 @@
if (pass == PASSES) {
if (scale)
- Rast_put_raster_row(out_fd, outbuf, CELL_TYPE);
+ Rast_put_row(out_fd, outbuf, CELL_TYPE);
else
- Rast_put_raster_row(out_fd, outbuf, DCELL_TYPE);
+ Rast_put_row(out_fd, outbuf, DCELL_TYPE);
}
}
Modified: grass/trunk/imagery/i.rectify/write.c
===================================================================
--- grass/trunk/imagery/i.rectify/write.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.rectify/write.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -29,7 +29,7 @@
unlink(temp_name);
G_fatal_error(_("Error while writing to temp file"));
}
- /*Rast_put_map_row_random (outfd, cell_buf[n], row++, col, matrix_cols); */
+ /*Rast_put_c_row_random (outfd, cell_buf[n], row++, col, matrix_cols); */
}
select_current_env();
@@ -55,7 +55,7 @@
if (read(temp_fd, rast, target_window.cols * Rast_cell_size(map_type))
!= target_window.cols * Rast_cell_size(map_type))
G_fatal_error(_("Error writing row %d"), row);
- if (Rast_put_raster_row(fd, rast, map_type) < 0) {
+ if (Rast_put_row(fd, rast, map_type) < 0) {
G_fatal_error(_("Failed writing raster map <%s> row %d"),
name, row);
unlink(temp_name);
Modified: grass/trunk/imagery/i.rgb.his/main.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.rgb.his/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -100,7 +100,7 @@
/* write out the new row for each cell map */
for (band = 0; band < 3; band++)
- if (Rast_put_raster_row(fd_output[band], rowbuffer[band], CELL_TYPE)
+ if (Rast_put_row(fd_output[band], rowbuffer[band], CELL_TYPE)
< 0)
G_fatal_error(_("Failed writing raster map row %d"), i);
}
Modified: grass/trunk/imagery/i.smap/write_img.c
===================================================================
--- grass/trunk/imagery/i.smap/write_img.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.smap/write_img.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -20,7 +20,7 @@
G_debug(3, "class: [%d] row/col: [%d][%d]", class, row, col);
files->outbuf[col] = (CELL) S->ClassSig[class].classnum;
}
- Rast_put_raster_row(files->output_fd, files->outbuf, CELL_TYPE);
+ Rast_put_row(files->output_fd, files->outbuf, CELL_TYPE);
}
G_percent(nrows, nrows, 2);
Modified: grass/trunk/imagery/i.sunhours/main.c
===================================================================
--- grass/trunk/imagery/i.sunhours/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.sunhours/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -118,7 +118,7 @@
d_N = (360.0 / (15.0 * PI)) * d_Ws;
((DCELL *) outrast1)[col] = d_N;
}
- if (Rast_put_raster_row(outfd1, outrast1, DCELL_TYPE) < 0)
+ if (Rast_put_row(outfd1, outrast1, DCELL_TYPE) < 0)
G_fatal_error(_("Cannot write to output raster file"));
}
G_free(inrast_lat);
Modified: grass/trunk/imagery/i.vi/main.c
===================================================================
--- grass/trunk/imagery/i.vi/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.vi/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -370,7 +370,7 @@
outrast[col] = va_ri(d_redchan, d_greenchan, d_bluechan);
}
}
- if (Rast_put_d_raster_row(outfd, outrast) < 0)
+ if (Rast_put_d_row(outfd, outrast) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
}
Modified: grass/trunk/imagery/i.zc/main.c
===================================================================
--- grass/trunk/imagery/i.zc/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/imagery/i.zc/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -182,7 +182,7 @@
for (j = 0; j < oc; j++) {
*(cell_row + j) = (CELL) (*(data[1] + i * cols + j));
}
- Rast_put_raster_row(zcfd, cell_row, CELL_TYPE);
+ Rast_put_row(zcfd, cell_row, CELL_TYPE);
}
Rast_close(zcfd);
Modified: grass/trunk/include/raster.h
===================================================================
--- grass/trunk/include/raster.h 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/include/raster.h 2009-06-30 16:20:43 UTC (rev 38127)
@@ -401,11 +401,10 @@
int Rast_put_cellhd(const char *, struct Cell_head *);
/* put_row.c */
-int Rast_put_map_row(int, const CELL *);
-int Rast_put_raster_row(int, const void *, RASTER_MAP_TYPE);
-int Rast_put_c_raster_row(int, const CELL *);
-int Rast_put_f_raster_row(int, const FCELL *);
-int Rast_put_d_raster_row(int, const DCELL *);
+int Rast_put_row(int, const void *, RASTER_MAP_TYPE);
+int Rast_put_c_row(int, const CELL *);
+int Rast_put_f_row(int, const FCELL *);
+int Rast_put_d_row(int, const DCELL *);
int Rast__open_null_write(int);
int Rast__write_null_bits(int, const unsigned char *, int, int, int);
Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/lib/gpde/N_arrays_io.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -224,17 +224,17 @@
drast[x] = N_get_array_2d_d_value(array, x, y);
}
if (type == CELL_TYPE)
- if (!Rast_put_c_raster_row(map, rast)) {
+ if (!Rast_put_c_row(map, rast)) {
Rast_unopen(map); /*unopen the new raster map */
G_fatal_error(_("Unable to write raster row %i"), y);
}
if (type == FCELL_TYPE)
- if (!Rast_put_f_raster_row(map, frast)) {
+ if (!Rast_put_f_row(map, frast)) {
Rast_unopen(map); /*unopen the new raster map */
G_fatal_error(_("Unable to write raster row %i"), y);
}
if (type == DCELL_TYPE)
- if (!Rast_put_d_raster_row(map, drast)) {
+ if (!Rast_put_d_row(map, drast)) {
Rast_unopen(map); /*unopen the new raster map */
G_fatal_error(_("Unable to write raster row %i"), y);
}
Modified: grass/trunk/lib/raster/closecell.c
===================================================================
--- grass/trunk/lib/raster/closecell.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/lib/raster/closecell.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -243,7 +243,7 @@
Rast_zero_raster_buf(fcb->data, fcb->map_type);
for (row = fcb->cur_row; row < fcb->cellhd.rows; row++)
- Rast_put_raster_row(fd, fcb->data, fcb->map_type);
+ Rast_put_row(fd, fcb->data, fcb->map_type);
G_free(fcb->data);
fcb->data = NULL;
}
@@ -334,7 +334,7 @@
if (fcb->cur_row < fcb->cellhd.rows) {
Rast_zero_raster_buf(fcb->data, fcb->map_type);
for (row = fcb->cur_row; row < fcb->cellhd.rows; row++)
- Rast_put_raster_row(fd, fcb->data, fcb->map_type);
+ Rast_put_row(fd, fcb->data, fcb->map_type);
G_free(fcb->data);
fcb->data = NULL;
}
Modified: grass/trunk/lib/raster/opencell.c
===================================================================
--- grass/trunk/lib/raster/opencell.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/lib/raster/opencell.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -354,7 +354,7 @@
\brief Opens a new cell file in a database (compressed)
Opens a new cell file <i>name</i> in the current mapset for writing
- by Rast_put_raster_row().
+ by Rast_put_row().
The file is created and filled with no data it is assumed that the
new cell file is to conform to the current window.
Modified: grass/trunk/lib/raster/put_row.c
===================================================================
--- grass/trunk/lib/raster/put_row.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/lib/raster/put_row.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -1,76 +1,18 @@
+/*!
+ \file raster/put_row.c
+ \brief Raster library - Put raster row
+
+ (C) 2003-2009 by the GRASS Development Team
+
+ This program is free software under the GNU General Public License
+ (>=v2). Read the file COPYING that comes with GRASS for details.
+
+ \author Original author CERL
+ */
+
/**********************************************************************
- *
- * G_put_[c/f/d]_raster_row(fd, buf)
- * int fd file descriptor of the opened map
- * [F/D]CELL *buf buffer holding row info to be written
- *
- * Writes the next row for the cell file opened on 'fd' from 'buf'
- * All writes go into NEW files that exactly match the current window.
- * The file must have been opened with Rast_open_new()
- * and be written sequentially, ie no skipping rows
- *
- * when the null values are embeded into the data, corresponding cells are
- * changed to 0's and the corresponding null value row is written into null
- * file.
- *
- * *** NOTE ***
- * A map cannot be copied using Rast_get_row() and Rast_put_raster_row().
- * The former resamples the data of the original map into a row buffer
- * that matches the current window. The later writes out rows associated
- * with the window.
- *
- * returns: 1 if successful
- * -1 on fail
- *
- * Keeps track of the minimum and maximum cell value for use in updating
- * the range file upon close of the cell file.
- * HOWEVER when nulls are not embeded, the cells are considered 0's as far
- * as updating range is concerned, even if the corresponding cell is null
- * in the resulting null file, so programmer should be carefult to set all
- * the null values using Rast_set_null_value() or G_insert_[d/f_]null_values()
- *
- **********************************************************************
- *
- * Rast_put_map_row(fd, buf)
- * int fd file descriptor of the opened map
- * CELL *buf buffer holding row info to be written
- *
- * Writes the next row for the cell file opened on 'fd' from 'buf'
- * All writes go into NEW files that exactly match the current window.
- * The file must have been opened with Rast_open_new()
- * and be written sequentially, ie no skipping rows
- *
- * NULLS are written into null bitmap file for all cells which are zero,
- * and cells which have null value (these cells are converted to 0's before
- * writing)
- *
- * *** NOTE ***
- * A map cannot be copied using Rast_get_c_row() and Rast_put_map_row().
- * The former resamples the data of the original map into a row buffer
- * that matches the current window. The later writes out rows associated
- * with the window.
- *
- * returns: 1 if successful
- * -1 on fail
- *
- * Keeps track of the minimum and maximum cell value for use in updating
- * the range file upon close of the cell file.
- *
- ***********************************************************************
- *
- * put_null_value_row(fd, buf)
- * int fd File descriptor where data is to be written
- * char *buf Buffer holding null data
- *
- * converts a buffer of zero's and ones to bitstream and stores this
- * bitstream in memory. (the null rows from memory are written into null
- * file after the limit is reached, and the place for new null rows
- * to be kept in memory is freed. Should not be used by application
- * programs.
- *
- * returns: 0 if successful
- * -1 on fail
+
**********************************************************************/
#include <string.h>
@@ -99,15 +41,9 @@
static int convert_and_write_id(int, const CELL *);
static int convert_and_write_df(int, const DCELL *);
static int convert_and_write_fd(int, const FCELL *);
-static int put_raster_row(int fd, const void *buf, RASTER_MAP_TYPE data_type,
- int zeros_r_nulls);
+static int put_raster_row(int, const void *, RASTER_MAP_TYPE,
+ int);
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
static int put_null_value_row(int fd, const char *buf)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
@@ -127,48 +63,98 @@
return 1;
}
-int Rast_put_map_row(int fd, const CELL * buf)
-{
- struct fileinfo *fcb = &R__.fileinfo[fd];
+/*!
+ \brief Writes the next row for cell/fcell/dcell file
- if (fcb->map_type != CELL_TYPE) {
- G_fatal_error(_("Rast_put_map_row: %s is not integer! Use G_put_[f/d]_raster_row()!"),
- fcb->name);
- return -1;
- }
+ Writes the next row for the cell file opened on 'fd' from 'buf' All
+ writes go into NEW files that exactly match the current window. The
+ file must have been opened with Rast_open_new() and be written
+ sequentially, ie no skipping rows.
+
+ When the null values are embeded into the data, corresponding cells
+ are changed to 0's and the corresponding null value row is written
+ into null file.
+
+ A map cannot be copied using Rast_get_row() and
+ Rast_put_row(). The former resamples the data of the original
+ map into a row buffer that matches the current window. The later
+ writes out rows associated with the window.
+
+ Keeps track of the minimum and maximum cell value for use in
+ updating the range file upon close of the cell file. HOWEVER when
+ nulls are not embeded, the cells are considered 0's as far as
+ updating range is concerned, even if the corresponding cell is null
+ in the resulting null file, so programmer should be carefult to set
+ all the null values using Rast_set_null_value() or
+ G_insert_d_null_values() or G_insert_f_null_values().
- return put_raster_row(fd, buf, CELL_TYPE, 1);
-}
+ \param fd file descriptor where data is to be written
+ \param buf buffer holding data
+ \param data_type raster map type (CELL_TYPE, FCELL_TYPE, DCELL_TYPE)
-int Rast_put_raster_row(int fd, const void *buf, RASTER_MAP_TYPE data_type)
+ \return 1 on success
+ \return -1 on failure
+*/
+int Rast_put_row(int fd, const void *buf, RASTER_MAP_TYPE data_type)
{
- return put_raster_row(fd, buf, data_type, 0);
+ return put_raster_row(fd, buf, data_type, data_type);
}
-int Rast_put_c_raster_row(int fd, const CELL * buf)
+/*!
+ \brief Writes the next row for cell file (CELL version)
+
+ See Rast_put_row() for details.
+
+ \param fd file descriptor where data is to be written
+ \param buf buffer holding data
+
+ \return 1 on success
+ \return -1 on failure
+*/
+int Rast_put_c_row(int fd, const CELL * buf)
{
- return Rast_put_raster_row(fd, buf, CELL_TYPE);
+ return Rast_put_row(fd, buf, CELL_TYPE);
}
-int Rast_put_f_raster_row(int fd, const FCELL * buf)
+/*!
+ \brief Writes the next row for fcell file (FCELL version)
+
+ See Rast_put_row() for details.
+
+ \param fd file descriptor where data is to be written
+ \param buf buffer holding data
+
+ \return 1 on success
+ \return -1 on failure
+*/
+int Rast_put_f_row(int fd, const FCELL * buf)
{
- return Rast_put_raster_row(fd, buf, FCELL_TYPE);
+ return Rast_put_row(fd, buf, FCELL_TYPE);
}
-int Rast_put_d_raster_row(int fd, const DCELL * buf)
+/*!
+ \brief Writes the next row for dcell file (DCELL version)
+
+ See Rast_put_row() for details.
+
+ \param fd file descriptor where data is to be written
+ \param buf buffer holding data
+
+ \return 1 on success
+ \return -1 on failure
+*/
+int Rast_put_d_row(int fd, const DCELL * buf)
{
- return Rast_put_raster_row(fd, buf, DCELL_TYPE);
+ return Rast_put_row(fd, buf, DCELL_TYPE);
}
-/*--------------------------------------------------------------------------*/
-
static int check_open(const char *me, int fd)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
switch (fcb->open_mode) {
case OPEN_OLD:
- G_warning(_("%s: map [%s] not open for write - request ignored"), me,
+ G_warning(_("%s: raster map <%s> not open for write - request ignored"), me,
fcb->name);
break;
case OPEN_NEW_COMPRESSED:
@@ -190,13 +176,11 @@
if (fcb->io_error)
return;
- G_warning(_("map [%s] - unable to write row %d"), fcb->name, row);
+ G_warning(_("Raster map <%s> - unable to write row %d"), fcb->name, row);
fcb->io_error = 1;
}
-/*--------------------------------------------------------------------------*/
-
static int write_data(int fd, int row, unsigned char *buf, int n)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
@@ -223,8 +207,6 @@
return 0;
}
-/*--------------------------------------------------------------------------*/
-
static void set_file_pointer(int fd, int row)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
@@ -232,12 +214,6 @@
fcb->row_ptr[row] = lseek(fd, 0L, SEEK_CUR);
}
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
static int convert_float(XDR * xdrs, char *null_buf, const FCELL * rast,
int row, int n)
{
@@ -288,10 +264,7 @@
return 0;
}
-/*--------------------------------------------------------------------------*/
-
/* writes data to fcell file for either full or partial rows */
-
static int put_fp_data(int fd, char *null_buf, const void *rast,
int row, int n, RASTER_MAP_TYPE data_type)
{
@@ -346,12 +319,6 @@
return 1;
}
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
static void convert_int(unsigned char *wk, char *null_buf, const CELL * rast,
int n, int len, int zeros_r_nulls)
{
@@ -474,8 +441,6 @@
return (nwrite >= total) ? 0 : nwrite;
}
-/*--------------------------------------------------------------------------*/
-
static int put_data(int fd, char *null_buf, const CELL *cell,
int row, int n, int zeros_r_nulls)
{
@@ -564,8 +529,6 @@
return 1;
}
-/*--------------------------------------------------------------------------*/
-
static int put_data_gdal(int fd, const void *rast, int row, int n,
int zeros_r_nulls, RASTER_MAP_TYPE map_type)
{
@@ -616,12 +579,6 @@
#endif
}
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
static int put_raster_data(int fd, char *null_buf, const void *rast,
int row, int n,
int zeros_r_nulls, RASTER_MAP_TYPE map_type)
@@ -636,12 +593,6 @@
: put_fp_data(fd, null_buf, rast, row, n, map_type);
}
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
static int put_null_data(int fd, const char *flags, int row)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
@@ -684,13 +635,21 @@
return 1;
}
+/*!
+ \brief Open null file for write
+
+ \param fd file descriptor of raster cell data file
+
+ \return field descriptor of null data file
+ \return -1 on failure
+*/
int Rast__open_null_write(int fd)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
int null_fd;
if (access(fcb->null_temp_name, 0) != 0) {
- G_warning(_("unable to find a temporary null file %s"),
+ G_warning(_("Unable to find a temporary null file <%s>"),
fcb->null_temp_name);
return -1;
}
@@ -702,8 +661,20 @@
return null_fd;
}
+/*!
+ \brief Write null data
+
+ \param null_fd file descriptor of null file where data is to be written
+ \param flags ?
+ \param row row number
+ \param col col number
+ \param fd file descriptor of cell data file
+
+ \return 1 on success
+ \return -1 on failure
+*/
int Rast__write_null_bits(int null_fd, const unsigned char *flags, int row,
- int cols, int fd)
+ int cols, int fd)
{
off_t offset;
size_t size;
@@ -712,24 +683,18 @@
offset = (off_t) size *row;
if (lseek(null_fd, offset, SEEK_SET) < 0) {
- G_warning(_("error writing null row %d"), row);
+ G_warning(_("Error writing null row %d"), row);
return -1;
}
if (write(null_fd, flags, size) != size) {
- G_warning(_("error writing null row %d"), row);
+ G_warning(_("Error writing null row %d"), row);
return -1;
}
return 1;
}
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
static int convert_and_write_if(int fd, const CELL * buf)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
@@ -742,7 +707,7 @@
else
p[i] = (FCELL) buf[i];
- return Rast_put_f_raster_row(fd, p);
+ return Rast_put_f_row(fd, p);
}
static int convert_and_write_df(int fd, const DCELL * buf)
@@ -757,7 +722,7 @@
else
p[i] = (FCELL) buf[i];
- return Rast_put_f_raster_row(fd, p);
+ return Rast_put_f_row(fd, p);
}
static int convert_and_write_id(int fd, const CELL * buf)
@@ -772,7 +737,7 @@
else
p[i] = (DCELL) buf[i];
- return Rast_put_d_raster_row(fd, p);
+ return Rast_put_d_row(fd, p);
}
static int convert_and_write_fd(int fd, const FCELL * buf)
@@ -787,7 +752,7 @@
else
p[i] = (DCELL) buf[i];
- return Rast_put_d_raster_row(fd, p);
+ return Rast_put_d_row(fd, p);
}
static int convert_and_write_fi(int fd, const FCELL * buf)
@@ -802,7 +767,7 @@
else
p[i] = (CELL) buf[i];
- return Rast_put_c_raster_row(fd, p);
+ return Rast_put_c_row(fd, p);
}
static int convert_and_write_di(int fd, const DCELL * buf)
@@ -817,11 +782,23 @@
else
p[i] = (CELL) buf[i];
- return Rast_put_c_raster_row(fd, p);
+ return Rast_put_c_row(fd, p);
}
-/*--------------------------------------------------------------------------*/
+/*!
+ \brief converts a buffer of zero's and ones to bitstream.
+ Stores this bitstream in memory. (the null rows from memory are
+ written into null file after the limit is reached, and the place for
+ new null rows to be kept in memory is freed. Should not be used by
+ application programs.
+
+ \param fd file descriptor where data is to be written
+ \param buf buffer holding null data
+
+ \return 0 if successful
+ \return -1 on fail
+*/
static int put_raster_row(int fd, const void *buf, RASTER_MAP_TYPE data_type,
int zeros_r_nulls)
{
Modified: grass/trunk/lib/rst/interp_float/output2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/output2d.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/lib/rst/interp_float/output2d.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -159,7 +159,7 @@
* for(j=0;j<params->nsizc;j++) fprintf(stderr,"%f ",cell1[j]);
* fprintf(stderr,"\n");
*/
- Rast_put_f_raster_row(cf1, cell1);
+ Rast_put_f_row(cf1, cell1);
}
}
@@ -176,7 +176,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_dx);
- Rast_put_f_raster_row(cf2, cell1);
+ Rast_put_f_row(cf2, cell1);
}
}
@@ -192,7 +192,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_dy);
- Rast_put_f_raster_row(cf3, cell1);
+ Rast_put_f_row(cf3, cell1);
}
}
@@ -208,7 +208,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xx);
- Rast_put_f_raster_row(cf4, cell1);
+ Rast_put_f_row(cf4, cell1);
}
}
@@ -224,7 +224,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_yy);
- Rast_put_f_raster_row(cf5, cell1);
+ Rast_put_f_row(cf5, cell1);
}
}
@@ -240,7 +240,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xy);
- Rast_put_f_raster_row(cf6, cell1);
+ Rast_put_f_row(cf6, cell1);
}
}
Modified: grass/trunk/lib/rst/interp_float/resout2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -145,7 +145,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_z);
- if (Rast_put_f_raster_row(cf1, cell1) < 0) {
+ if (Rast_put_f_row(cf1, cell1) < 0) {
G_warning(_("Failed writing raster map"));
return -1;
}
@@ -168,7 +168,7 @@
* fprintf(stderr,"%f ",cell1[ii]); }
* fprintf(stderr,"params->nsizc=%d \n",params->nsizc);
*/
- if (Rast_put_f_raster_row(cf2, cell1) < 0) {
+ if (Rast_put_f_row(cf2, cell1) < 0) {
G_warning(_("Failed writing raster map"));
return -1;
}
@@ -186,7 +186,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_dy);
- if (Rast_put_f_raster_row(cf3, cell1) < 0) {
+ if (Rast_put_f_row(cf3, cell1) < 0) {
G_warning(_("Failed writing raster map"));
return -1;
}
@@ -204,7 +204,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xx);
- if (Rast_put_f_raster_row(cf4, cell1) < 0) {
+ if (Rast_put_f_row(cf4, cell1) < 0) {
G_warning(_("Failed writing raster map"));
return -1;
}
@@ -222,7 +222,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_yy);
- if (Rast_put_f_raster_row(cf5, cell1) < 0) {
+ if (Rast_put_f_row(cf5, cell1) < 0) {
G_warning(_("Failed writing raster map"));
return -1;
}
@@ -240,7 +240,7 @@
return -1;
}
fread(cell1, sizeof(FCELL), params->nsizc, params->Tmp_fd_xy);
- if (Rast_put_f_raster_row(cf6, cell1) < 0) {
+ if (Rast_put_f_row(cf6, cell1) < 0) {
G_warning(_("Failed writing raster map"));
return -1;
}
Modified: grass/trunk/raster/r.basins.fill/main.c
===================================================================
--- grass/trunk/raster/r.basins.fill/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.basins.fill/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -153,7 +153,7 @@
/* write out partitioned watershed map */
for (row = 0; row < nrows; row++)
- Rast_put_raster_row(partfd, drain + (row * ncols), CELL_TYPE);
+ Rast_put_row(partfd, drain + (row * ncols), CELL_TYPE);
G_message(_("Creating support files for <%s>..."), part_name);
Rast_close(partfd);
Modified: grass/trunk/raster/r.bitpattern/main.c
===================================================================
--- grass/trunk/raster/r.bitpattern/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.bitpattern/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -140,7 +140,7 @@
}
- if (Rast_put_raster_row(outfd, outrast, data_type) < 0)
+ if (Rast_put_row(outfd, outrast, data_type) < 0)
G_fatal_error(_("Unable to write to <%s>"), result);
}
Modified: grass/trunk/raster/r.buffer/write_map.c
===================================================================
--- grass/trunk/raster/r.buffer/write_map.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.buffer/write_map.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -75,7 +75,7 @@
if (cell[k] == 0)
Rast_set_null_value(&cell[k], 1, CELL_TYPE);
- if (Rast_put_raster_row(fd_out, cell, CELL_TYPE) < 0)
+ if (Rast_put_row(fd_out, cell, CELL_TYPE) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"), output,
row);
}
Modified: grass/trunk/raster/r.carve/raster.c
===================================================================
--- grass/trunk/raster/r.carve/raster.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.carve/raster.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -35,7 +35,7 @@
for (i = 0; i < rows; i++) {
G_percent(i, rows, 10);
- Rast_put_raster_row(fd, tmpbuf, rtype);
+ Rast_put_row(fd, tmpbuf, rtype);
tmpbuf =
G_incr_void_ptr(tmpbuf, Rast_cell_size(rtype) * G_window_cols());
}
Modified: grass/trunk/raster/r.circle/main.c
===================================================================
--- grass/trunk/raster/r.circle/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.circle/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -143,7 +143,7 @@
if (int_buf[c] == 0)
Rast_set_null_value(&int_buf[c], 1, CELL_TYPE);
}
- Rast_put_raster_row(cellfile, int_buf, CELL_TYPE);
+ Rast_put_row(cellfile, int_buf, CELL_TYPE);
}
}
Modified: grass/trunk/raster/r.clump/clump.c
===================================================================
--- grass/trunk/raster/r.clump/clump.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.clump/clump.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -221,7 +221,7 @@
for (col = 1; col <= ncols; col++)
out_cell[col] = index[cur_clump[col]];
- if (Rast_put_raster_row (out_fd, out_cell+1, CELL_TYPE) < 0)
+ if (Rast_put_row (out_fd, out_cell+1, CELL_TYPE) < 0)
G_fatal_error (_("Unable to properly write output raster map"));
*/
col = ncols;
@@ -235,7 +235,7 @@
if (out_cell[column] == 0)
Rast_set_null_value(&out_cell[column], 1, CELL_TYPE);
}
- if (Rast_put_raster_row(out_fd, out_cell, CELL_TYPE) < 0)
+ if (Rast_put_row(out_fd, out_cell, CELL_TYPE) < 0)
G_fatal_error(_("Failed writing raster map row %d"),
row);
}
Modified: grass/trunk/raster/r.composite/main.c
===================================================================
--- grass/trunk/raster/r.composite/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.composite/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -247,7 +247,7 @@
(val[2] * B[1].levels + val[1]) * B[0].levels + val[0];
}
- if (Rast_put_raster_row(out_file, out_array, CELL_TYPE) < 0)
+ if (Rast_put_row(out_file, out_array, CELL_TYPE) < 0)
G_fatal_error(_("Failed writing raster map <%s>"), out_name);
}
G_percent(window.rows, window.rows, 1);
Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.compress/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -27,7 +27,7 @@
* Next byte(s): category number. The number of bytes is determined
* by the number of bytes in a cell
*
- * The normal G_open_cell(), and Rast_put_raster_row() do the compression
+ * The normal G_open_cell(), and Rast_put_row() do the compression
* This program must only check that the file is not a reclass file and
* is not already compressed.
*
@@ -220,7 +220,7 @@
G_percent(row, nrows, 2);
if (Rast_get_row_nomask(old, rast, row, map_type) < 0)
break;
- if (Rast_put_raster_row(new, rast, map_type) < 0)
+ if (Rast_put_row(new, rast, map_type) < 0)
break;
}
G_free(rast);
Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.cost/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -1028,7 +1028,7 @@
*(p + col) = (int)(min_cost + .5);
}
}
- Rast_put_raster_row(cum_fd, cell, data_type);
+ Rast_put_row(cum_fd, cell, data_type);
}
}
else if (data_type == FCELL_TYPE) {
@@ -1061,7 +1061,7 @@
*(p + col) = (float)(min_cost);
}
}
- Rast_put_raster_row(cum_fd, cell, data_type);
+ Rast_put_row(cum_fd, cell, data_type);
}
}
else if (data_type == DCELL_TYPE) {
@@ -1094,7 +1094,7 @@
*(p + col) = min_cost;
}
}
- Rast_put_raster_row(cum_fd, cell, data_type);
+ Rast_put_row(cum_fd, cell, data_type);
}
}
G_percent(1, 1, 1);
@@ -1109,7 +1109,7 @@
segment_get(&out_seg2, &cur_dir, row, col);
*(p + col) = cur_dir;
}
- Rast_put_raster_row(dir_fd, dir_cell, dir_data_type);
+ Rast_put_row(dir_fd, dir_cell, dir_data_type);
G_percent(row, nrows, 2);
}
}
Modified: grass/trunk/raster/r.cross/cross.c
===================================================================
--- grass/trunk/raster/r.cross/cross.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.cross/cross.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -171,7 +171,7 @@
pnode->right = N; /* add right */
}
}
- Rast_put_raster_row(outfd, result_cell, CELL_TYPE);
+ Rast_put_row(outfd, result_cell, CELL_TYPE);
}
G_percent(nrows, nrows, 5);
Modified: grass/trunk/raster/r.cross/renumber.c
===================================================================
--- grass/trunk/raster/r.cross/renumber.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.cross/renumber.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -40,7 +40,7 @@
*c = table[*c];
c++;
}
- if (Rast_put_raster_row(out, cell, CELL_TYPE) < 0)
+ if (Rast_put_row(out, cell, CELL_TYPE) < 0)
exit(1);
}
G_percent(row, nrows, 10);
Modified: grass/trunk/raster/r.drain/main.c
===================================================================
--- grass/trunk/raster/r.drain/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.drain/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -454,7 +454,7 @@
out_buf[thispoint->col] = (int)thispoint->value;
thispoint = thispoint->next;
}
- Rast_put_c_raster_row(new_id, out_buf);
+ Rast_put_c_row(new_id, out_buf);
}
G_percent(1, 1, 1);
}
Modified: grass/trunk/raster/r.drain/tinf.c
===================================================================
--- grass/trunk/raster/r.drain/tinf.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.drain/tinf.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -215,17 +215,17 @@
/* Write one row to a raster map */
int put_row_c(int fd, void *row)
{
- return Rast_put_c_raster_row(fd, (CELL *) row);
+ return Rast_put_c_row(fd, (CELL *) row);
}
int put_row_f(int fd, void *row)
{
- return Rast_put_f_raster_row(fd, (FCELL *) row);
+ return Rast_put_f_row(fd, (FCELL *) row);
}
int put_row_d(int fd, void *row)
{
- return Rast_put_d_raster_row(fd, (DCELL *) row);
+ return Rast_put_d_row(fd, (DCELL *) row);
}
/* Allocate memory for one line of data */
Modified: grass/trunk/raster/r.fill.dir/main.c
===================================================================
--- grass/trunk/raster/r.fill.dir/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.fill.dir/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -265,7 +265,7 @@
for (i = 0; i < nrows; i++) {
read(fm, out_buf, bufsz);
- Rast_put_raster_row(bas_id, out_buf, CELL_TYPE);
+ Rast_put_row(bas_id, out_buf, CELL_TYPE);
}
Rast_close(bas_id);
@@ -281,7 +281,7 @@
for (j = 0; j < ncols; j += 1)
out_buf[j] = dir_type(type, out_buf[j]);
- Rast_put_raster_row(dir_id, out_buf, CELL_TYPE);
+ Rast_put_row(dir_id, out_buf, CELL_TYPE);
}
Modified: grass/trunk/raster/r.fill.dir/tinf.c
===================================================================
--- grass/trunk/raster/r.fill.dir/tinf.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.fill.dir/tinf.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -196,17 +196,17 @@
/* Write one row to a raster map */
int put_row_c(int fd, void *row)
{
- return Rast_put_c_raster_row(fd, (CELL *) row);
+ return Rast_put_c_row(fd, (CELL *) row);
}
int put_row_f(int fd, void *row)
{
- return Rast_put_f_raster_row(fd, (FCELL *) row);
+ return Rast_put_f_row(fd, (FCELL *) row);
}
int put_row_d(int fd, void *row)
{
- return Rast_put_d_raster_row(fd, (DCELL *) row);
+ return Rast_put_d_row(fd, (DCELL *) row);
}
/* Allocate memory for one line of data */
Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.flow/io.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -204,7 +204,7 @@
G_fatal_error(_("Unable to create raster map <%s>"), parm.dsout);
for (row = 0; row < region.rows; row++) {
- Rast_put_raster_row(dsfd, get_row(ds, row), DCELL_TYPE);
+ Rast_put_row(dsfd, get_row(ds, row), DCELL_TYPE);
for (col = 0; col < region.cols; col++)
if (ds.buf[row][col] > dsmax)
dsmax = ds.buf[row][col];
Modified: grass/trunk/raster/r.flow/main.c
===================================================================
--- grass/trunk/raster/r.flow/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.flow/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -385,7 +385,7 @@
}
if (parm.lgout)
- Rast_put_f_raster_row(lgfd, lg);
+ Rast_put_f_row(lgfd, lg);
}
G_free(fls.px);
Modified: grass/trunk/raster/r.grow/main.c
===================================================================
--- grass/trunk/raster/r.grow/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.grow/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -264,7 +264,7 @@
Rast_set_d_null_value(&out_row[col], 1);
}
- Rast_put_d_raster_row(out_fd, out_row);
+ Rast_put_d_row(out_fd, out_row);
G_percent(row, nrows, 2);
Modified: grass/trunk/raster/r.grow.distance/main.c
===================================================================
--- grass/trunk/raster/r.grow.distance/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.grow.distance/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -336,11 +336,11 @@
for (col = 0; col < ncols; col++)
out_row[col] *= scale;
- Rast_put_d_raster_row(dist_fd, out_row);
+ Rast_put_d_row(dist_fd, out_row);
}
if (val_name)
- Rast_put_d_raster_row(val_fd, new_val_row);
+ Rast_put_d_row(val_fd, new_val_row);
swap_rows();
}
Modified: grass/trunk/raster/r.his/main.c
===================================================================
--- grass/trunk/raster/r.his/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.his/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -257,15 +257,15 @@
}
if (r_used)
- if (Rast_put_raster_row(r_file, r_array, CELL_TYPE) < 0)
+ if (Rast_put_row(r_file, r_array, CELL_TYPE) < 0)
r_used = 0;
if (g_used)
- if (Rast_put_raster_row(g_file, g_array, CELL_TYPE) < 0)
+ if (Rast_put_row(g_file, g_array, CELL_TYPE) < 0)
g_used = 0;
if (b_used)
- if (Rast_put_raster_row(b_file, b_array, CELL_TYPE) < 0)
+ if (Rast_put_row(b_file, b_array, CELL_TYPE) < 0)
b_used = 0;
}
G_percent(window.rows, window.rows, 5);
Modified: grass/trunk/raster/r.horizon/main.c
===================================================================
--- grass/trunk/raster/r.horizon/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.horizon/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -642,7 +642,7 @@
else
cell1[j] = (FCELL) horizon_raster[i][j];
}
- Rast_put_f_raster_row(fd1, cell1);
+ Rast_put_f_row(fd1, cell1);
}
} /* End loop over rows. */
Modified: grass/trunk/raster/r.in.arc/main.c
===================================================================
--- grass/trunk/raster/r.in.arc/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.in.arc/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -188,13 +188,13 @@
}
switch (rtype) {
case CELL_TYPE:
- Rast_put_c_raster_row(cf, cell);
+ Rast_put_c_row(cf, cell);
break;
case FCELL_TYPE:
- Rast_put_f_raster_row(cf, fcell);
+ Rast_put_f_row(cf, fcell);
break;
case DCELL_TYPE:
- Rast_put_d_raster_row(cf, dcell);
+ Rast_put_d_row(cf, dcell);
break;
}
}
Modified: grass/trunk/raster/r.in.ascii/main.c
===================================================================
--- grass/trunk/raster/r.in.ascii/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.in.ascii/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -246,7 +246,7 @@
for (row = 0; row < nrows; row += 1) {
fread(rast, Rast_cell_size(data_type), ncols, ft);
- Rast_put_raster_row(cf, rast, data_type);
+ Rast_put_row(cf, rast, data_type);
fseek(ft, sz, SEEK_CUR);
}
fclose(ft);
Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.in.bin/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -571,11 +571,11 @@
}
if (flag.f->answer)
- Rast_put_f_raster_row(cf, fcell);
+ Rast_put_f_row(cf, fcell);
else if (flag.d->answer)
- Rast_put_d_raster_row(cf, dcell);
+ Rast_put_d_row(cf, dcell);
else
- Rast_put_c_raster_row(cf, cell);
+ Rast_put_c_row(cf, cell);
G_percent(row + 1, nrows, 2);
}
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.in.gdal/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -792,8 +792,8 @@
bufComplex[indx * 2 + 1];
}
}
- Rast_put_raster_row(cfR, cellReal, data_type);
- Rast_put_raster_row(cfI, cellImg, data_type);
+ Rast_put_row(cfR, cellReal, data_type);
+ Rast_put_row(cfI, cellImg, data_type);
} /* end of complex */
else { /* single band */
GDALRasterIO(hBand, GF_Read, 0, row - 1, ncols, 1,
@@ -820,7 +820,7 @@
Rast_insert_null_values(cell, nullFlags, ncols, data_type);
}
- Rast_put_raster_row(cf, cell, data_type);
+ Rast_put_row(cf, cell, data_type);
} /* end of not complex */
G_percent(row, nrows, 2);
@@ -853,7 +853,7 @@
Rast_insert_null_values(cell, nullFlags, ncols, data_type);
}
- Rast_put_raster_row(cf, cell, data_type);
+ Rast_put_row(cf, cell, data_type);
}
G_percent(row, nrows, 2);
Modified: grass/trunk/raster/r.in.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.in.gridatb/file_io.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.in.gridatb/file_io.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -60,7 +60,7 @@
cell[j] = idx;
}
}
- Rast_put_f_raster_row(fd, cell);
+ Rast_put_f_row(fd, cell);
}
G_percent(i, cellhd.rows, 2);
fclose(fp);
Modified: grass/trunk/raster/r.in.mat/main.c
===================================================================
--- grass/trunk/raster/r.in.mat/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.in.mat/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -470,7 +470,7 @@
fprintf(stderr, "]\n");
#endif
- if (1 != Rast_put_raster_row(cf, raster, map_type)) {
+ if (1 != Rast_put_row(cf, raster, map_type)) {
Rast_close(cf);
G_fatal_error(_("Writing raster map, row %d"), row);
}
Modified: grass/trunk/raster/r.in.poly/raster.c
===================================================================
--- grass/trunk/raster/r.in.poly/raster.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.in.poly/raster.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -186,7 +186,7 @@
}
G_percent(i, page.rows, 2);
- if (Rast_put_raster_row(fd, cell, CELL_TYPE) < 0)
+ if (Rast_put_row(fd, cell, CELL_TYPE) < 0)
return ERROR;
}
G_percent(i, page.rows, 2);
Modified: grass/trunk/raster/r.in.xyz/main.c
===================================================================
--- grass/trunk/raster/r.in.xyz/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.in.xyz/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -1011,7 +1011,7 @@
}
/* write out line of raster data */
- if (1 != Rast_put_raster_row(out_fd, raster_row, rtype)) {
+ if (1 != Rast_put_row(out_fd, raster_row, rtype)) {
Rast_close(out_fd);
G_fatal_error(_("Writing map, row %d"),
((pass - 1) * rows) + row);
Modified: grass/trunk/raster/r.lake/main.c
===================================================================
--- grass/trunk/raster/r.lake/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.lake/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -76,7 +76,7 @@
if (out[row][col] < *min_depth)
*min_depth = out[row][col];
}
- if (Rast_put_f_raster_row(out_fd, out[row]) == -1)
+ if (Rast_put_f_row(out_fd, out[row]) == -1)
G_fatal_error(_("Failed writing output raster map row %d"), row);
G_percent(row + 1, rows, 5);
}
Modified: grass/trunk/raster/r.le/r.le.patch/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -1014,20 +1014,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a1, tmp_buf);
+ Rast_put_d_row(a1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 0) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 0);
}
- Rast_put_d_raster_row(a1, tmp_buf);
+ Rast_put_d_row(a1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a1, tmp_buf2);
+ Rast_put_d_row(a1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1037,20 +1037,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a2, tmp_buf);
+ Rast_put_d_row(a2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 1) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 1);
}
- Rast_put_d_raster_row(a2, tmp_buf);
+ Rast_put_d_row(a2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a2, tmp_buf2);
+ Rast_put_d_row(a2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1059,20 +1059,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a3, tmp_buf);
+ Rast_put_d_row(a3, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 2) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 2);
}
- Rast_put_d_raster_row(a3, tmp_buf);
+ Rast_put_d_row(a3, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a3, tmp_buf2);
+ Rast_put_d_row(a3, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1081,20 +1081,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a4, tmp_buf);
+ Rast_put_d_row(a4, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 3) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 3);
}
- Rast_put_d_raster_row(a4, tmp_buf);
+ Rast_put_d_row(a4, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a4, tmp_buf2);
+ Rast_put_d_row(a4, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1103,20 +1103,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a5, tmp_buf);
+ Rast_put_d_row(a5, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 4) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 4);
}
- Rast_put_d_raster_row(a5, tmp_buf);
+ Rast_put_d_row(a5, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a5, tmp_buf2);
+ Rast_put_d_row(a5, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1125,20 +1125,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a6, tmp_buf);
+ Rast_put_d_row(a6, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 5) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 5);
}
- Rast_put_d_raster_row(a6, tmp_buf);
+ Rast_put_d_row(a6, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a6, tmp_buf2);
+ Rast_put_d_row(a6, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1147,20 +1147,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a7, tmp_buf);
+ Rast_put_d_row(a7, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 6) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 6);
}
- Rast_put_d_raster_row(a7, tmp_buf);
+ Rast_put_d_row(a7, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a7, tmp_buf2);
+ Rast_put_d_row(a7, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1169,20 +1169,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s1, tmp_buf);
+ Rast_put_d_row(s1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 7) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 7);
}
- Rast_put_d_raster_row(s1, tmp_buf);
+ Rast_put_d_row(s1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s1, tmp_buf2);
+ Rast_put_d_row(s1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1191,20 +1191,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s2, tmp_buf);
+ Rast_put_d_row(s2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 8) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 8);
}
- Rast_put_d_raster_row(s2, tmp_buf);
+ Rast_put_d_row(s2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s2, tmp_buf2);
+ Rast_put_d_row(s2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1213,20 +1213,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s3, tmp_buf);
+ Rast_put_d_row(s3, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 9) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 9);
}
- Rast_put_d_raster_row(s3, tmp_buf);
+ Rast_put_d_row(s3, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s3, tmp_buf2);
+ Rast_put_d_row(s3, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1235,20 +1235,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s4, tmp_buf);
+ Rast_put_d_row(s4, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 10) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 10);
}
- Rast_put_d_raster_row(s4, tmp_buf);
+ Rast_put_d_row(s4, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s4, tmp_buf2);
+ Rast_put_d_row(s4, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1257,20 +1257,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s5, tmp_buf);
+ Rast_put_d_row(s5, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 11) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 11);
}
- Rast_put_d_raster_row(s5, tmp_buf);
+ Rast_put_d_row(s5, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s5, tmp_buf2);
+ Rast_put_d_row(s5, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1279,20 +1279,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s6, tmp_buf);
+ Rast_put_d_row(s6, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 12) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 12);
}
- Rast_put_d_raster_row(s6, tmp_buf);
+ Rast_put_d_row(s6, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s6, tmp_buf2);
+ Rast_put_d_row(s6, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1301,20 +1301,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c1, tmp_buf);
+ Rast_put_d_row(c1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 13) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 13);
}
- Rast_put_d_raster_row(c1, tmp_buf);
+ Rast_put_d_row(c1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c1, tmp_buf2);
+ Rast_put_d_row(c1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1323,20 +1323,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c2, tmp_buf);
+ Rast_put_d_row(c2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 14) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 14);
}
- Rast_put_d_raster_row(c2, tmp_buf);
+ Rast_put_d_row(c2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c2, tmp_buf2);
+ Rast_put_d_row(c2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1345,20 +1345,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c3, tmp_buf);
+ Rast_put_d_row(c3, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 15) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 15);
}
- Rast_put_d_raster_row(c3, tmp_buf);
+ Rast_put_d_row(c3, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c3, tmp_buf2);
+ Rast_put_d_row(c3, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1367,20 +1367,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c4, tmp_buf);
+ Rast_put_d_row(c4, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 16) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 16);
}
- Rast_put_d_raster_row(c4, tmp_buf);
+ Rast_put_d_row(c4, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c4, tmp_buf2);
+ Rast_put_d_row(c4, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1389,20 +1389,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c5, tmp_buf);
+ Rast_put_d_row(c5, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 17) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 17);
}
- Rast_put_d_raster_row(c5, tmp_buf);
+ Rast_put_d_row(c5, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c5, tmp_buf2);
+ Rast_put_d_row(c5, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1411,20 +1411,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c6, tmp_buf);
+ Rast_put_d_row(c6, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 18) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 18);
}
- Rast_put_d_raster_row(c6, tmp_buf);
+ Rast_put_d_row(c6, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c6, tmp_buf2);
+ Rast_put_d_row(c6, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1433,20 +1433,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c7, tmp_buf);
+ Rast_put_d_row(c7, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 19) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 19);
}
- Rast_put_d_raster_row(c7, tmp_buf);
+ Rast_put_d_row(c7, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c7, tmp_buf2);
+ Rast_put_d_row(c7, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1455,20 +1455,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c8, tmp_buf);
+ Rast_put_d_row(c8, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 20) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 20);
}
- Rast_put_d_raster_row(c8, tmp_buf);
+ Rast_put_d_row(c8, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c8, tmp_buf2);
+ Rast_put_d_row(c8, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1477,20 +1477,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c9, tmp_buf);
+ Rast_put_d_row(c9, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 21) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 21);
}
- Rast_put_d_raster_row(c9, tmp_buf);
+ Rast_put_d_row(c9, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c9, tmp_buf2);
+ Rast_put_d_row(c9, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1499,20 +1499,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c10, tmp_buf);
+ Rast_put_d_row(c10, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 22) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 22);
}
- Rast_put_d_raster_row(c10, tmp_buf);
+ Rast_put_d_row(c10, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(c10, tmp_buf2);
+ Rast_put_d_row(c10, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1521,20 +1521,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h1, tmp_buf);
+ Rast_put_d_row(h1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 23) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 23);
}
- Rast_put_d_raster_row(h1, tmp_buf);
+ Rast_put_d_row(h1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h1, tmp_buf2);
+ Rast_put_d_row(h1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1543,20 +1543,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h2, tmp_buf);
+ Rast_put_d_row(h2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 24) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 24);
}
- Rast_put_d_raster_row(h2, tmp_buf);
+ Rast_put_d_row(h2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h2, tmp_buf2);
+ Rast_put_d_row(h2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1565,20 +1565,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h3, tmp_buf);
+ Rast_put_d_row(h3, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 25) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 25);
}
- Rast_put_d_raster_row(h3, tmp_buf);
+ Rast_put_d_row(h3, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h3, tmp_buf2);
+ Rast_put_d_row(h3, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1587,20 +1587,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h4, tmp_buf);
+ Rast_put_d_row(h4, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 26) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 26);
}
- Rast_put_d_raster_row(h4, tmp_buf);
+ Rast_put_d_row(h4, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h4, tmp_buf2);
+ Rast_put_d_row(h4, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1609,20 +1609,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h5, tmp_buf);
+ Rast_put_d_row(h5, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 27) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 27);
}
- Rast_put_d_raster_row(h5, tmp_buf);
+ Rast_put_d_row(h5, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h5, tmp_buf2);
+ Rast_put_d_row(h5, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1631,20 +1631,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h6, tmp_buf);
+ Rast_put_d_row(h6, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 28) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 28);
}
- Rast_put_d_raster_row(h6, tmp_buf);
+ Rast_put_d_row(h6, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(h6, tmp_buf2);
+ Rast_put_d_row(h6, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1653,20 +1653,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(n1, tmp_buf);
+ Rast_put_d_row(n1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 29) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 29);
}
- Rast_put_d_raster_row(n1, tmp_buf);
+ Rast_put_d_row(n1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(n1, tmp_buf2);
+ Rast_put_d_row(n1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1675,20 +1675,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p1, tmp_buf);
+ Rast_put_d_row(p1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 30) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 30);
}
- Rast_put_d_raster_row(p1, tmp_buf);
+ Rast_put_d_row(p1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p1, tmp_buf2);
+ Rast_put_d_row(p1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1697,20 +1697,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p2, tmp_buf);
+ Rast_put_d_row(p2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 31) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 31);
}
- Rast_put_d_raster_row(p2, tmp_buf);
+ Rast_put_d_row(p2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p2, tmp_buf2);
+ Rast_put_d_row(p2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1719,20 +1719,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p3, tmp_buf);
+ Rast_put_d_row(p3, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 32) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 32);
}
- Rast_put_d_raster_row(p3, tmp_buf);
+ Rast_put_d_row(p3, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p3, tmp_buf2);
+ Rast_put_d_row(p3, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1741,20 +1741,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p4, tmp_buf);
+ Rast_put_d_row(p4, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 33) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 33);
}
- Rast_put_d_raster_row(p4, tmp_buf);
+ Rast_put_d_row(p4, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p4, tmp_buf2);
+ Rast_put_d_row(p4, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1763,20 +1763,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p5, tmp_buf);
+ Rast_put_d_row(p5, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 34) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 34);
}
- Rast_put_d_raster_row(p5, tmp_buf);
+ Rast_put_d_row(p5, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p5, tmp_buf2);
+ Rast_put_d_row(p5, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1785,20 +1785,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p6, tmp_buf);
+ Rast_put_d_row(p6, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 35) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 35);
}
- Rast_put_d_raster_row(p6, tmp_buf);
+ Rast_put_d_row(p6, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(p6, tmp_buf2);
+ Rast_put_d_row(p6, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1808,20 +1808,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a8, tmp_buf);
+ Rast_put_d_row(a8, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 36) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 36);
}
- Rast_put_d_raster_row(a8, tmp_buf);
+ Rast_put_d_row(a8, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(a8, tmp_buf2);
+ Rast_put_d_row(a8, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1831,20 +1831,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s7, tmp_buf);
+ Rast_put_d_row(s7, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 37) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 37);
}
- Rast_put_d_raster_row(s7, tmp_buf);
+ Rast_put_d_row(s7, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s7, tmp_buf2);
+ Rast_put_d_row(s7, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1854,20 +1854,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s8, tmp_buf);
+ Rast_put_d_row(s8, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 38) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 38);
}
- Rast_put_d_raster_row(s8, tmp_buf);
+ Rast_put_d_row(s8, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(s8, tmp_buf2);
+ Rast_put_d_row(s8, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1877,20 +1877,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(n2, tmp_buf);
+ Rast_put_d_row(n2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 39) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 39);
}
- Rast_put_d_raster_row(n2, tmp_buf);
+ Rast_put_d_row(n2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(n2, tmp_buf2);
+ Rast_put_d_row(n2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1900,20 +1900,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(n3, tmp_buf);
+ Rast_put_d_row(n3, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 40) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 40);
}
- Rast_put_d_raster_row(n3, tmp_buf);
+ Rast_put_d_row(n3, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(n3, tmp_buf2);
+ Rast_put_d_row(n3, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1923,20 +1923,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(n4, tmp_buf);
+ Rast_put_d_row(n4, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 41) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 41);
}
- Rast_put_d_raster_row(n4, tmp_buf);
+ Rast_put_d_row(n4, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(n4, tmp_buf2);
+ Rast_put_d_row(n4, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -2711,7 +2711,7 @@
if (*(*(units + k) + m))
*(unit_buf + m - 1) = *(*(units + k) + m);
}
- Rast_put_raster_row(fd, unit_buf, CELL_TYPE);
+ Rast_put_row(fd, unit_buf, CELL_TYPE);
}
Rast_close(fd);
G_free(unit_buf);
Modified: grass/trunk/raster/r.le/r.le.patch/trace.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/trace.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.le/r.le.patch/trace.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -216,7 +216,7 @@
for (j = 1; j < ncols + 1; j++)
*(cor_cell_buf + j - 1) = (int)(*(*(cor + i) + j));
- if (Rast_put_raster_row(fe, cor_cell_buf, CELL_TYPE) < 0)
+ if (Rast_put_row(fe, cor_cell_buf, CELL_TYPE) < 0)
exit(EXIT_FAILURE);
Rast_update_cell_stats(cor_cell_buf, ncols + 1, &stats);
@@ -231,7 +231,7 @@
*(cor_fcell_buf + j - 1) = (float)(*(*(cor + i) + j));
}
- if (Rast_put_raster_row(fe, cor_fcell_buf, FCELL_TYPE) < 0)
+ if (Rast_put_row(fe, cor_fcell_buf, FCELL_TYPE) < 0)
exit(EXIT_FAILURE);
}
break;
@@ -243,7 +243,7 @@
for (j = 1; j < ncols + 1; j++)
*(cor_dcell_buf + j - 1) = (double)(*(*(cor + i) + j));
- if (Rast_put_raster_row(fe, cor_dcell_buf, DCELL_TYPE) < 0)
+ if (Rast_put_row(fe, cor_dcell_buf, DCELL_TYPE) < 0)
exit(EXIT_FAILURE);
}
break;
@@ -262,7 +262,7 @@
for (j = 1; j < ncols + 1; j++)
*(pat_buf + j - 1) = *(*(pat + i) + j);
- if (Rast_put_raster_row(fd, pat_buf, CELL_TYPE) < 0)
+ if (Rast_put_row(fd, pat_buf, CELL_TYPE) < 0)
exit(EXIT_FAILURE);
}
}
Modified: grass/trunk/raster/r.le/r.le.pixel/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -586,20 +586,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(b1, tmp_buf);
+ Rast_put_d_row(b1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 0) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 0);
}
- Rast_put_d_raster_row(b1, tmp_buf);
+ Rast_put_d_row(b1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(b1, tmp_buf2);
+ Rast_put_d_row(b1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -608,20 +608,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(b2, tmp_buf);
+ Rast_put_d_row(b2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 1) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 1);
}
- Rast_put_d_raster_row(b2, tmp_buf);
+ Rast_put_d_row(b2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(b2, tmp_buf2);
+ Rast_put_d_row(b2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -630,20 +630,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(b3, tmp_buf);
+ Rast_put_d_row(b3, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 2) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 2);
}
- Rast_put_d_raster_row(b3, tmp_buf);
+ Rast_put_d_row(b3, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(b3, tmp_buf2);
+ Rast_put_d_row(b3, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -652,20 +652,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(b4, tmp_buf);
+ Rast_put_d_row(b4, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 3) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 3);
}
- Rast_put_d_raster_row(b4, tmp_buf);
+ Rast_put_d_row(b4, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(b4, tmp_buf2);
+ Rast_put_d_row(b4, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -674,20 +674,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(d1, tmp_buf);
+ Rast_put_d_row(d1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 4) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 4);
}
- Rast_put_d_raster_row(d1, tmp_buf);
+ Rast_put_d_row(d1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(d1, tmp_buf2);
+ Rast_put_d_row(d1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -696,20 +696,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(d2, tmp_buf);
+ Rast_put_d_row(d2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 5) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 5);
}
- Rast_put_d_raster_row(d2, tmp_buf);
+ Rast_put_d_row(d2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(d2, tmp_buf2);
+ Rast_put_d_row(d2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -718,20 +718,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(d3, tmp_buf);
+ Rast_put_d_row(d3, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 6) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 6);
}
- Rast_put_d_raster_row(d3, tmp_buf);
+ Rast_put_d_row(d3, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(d3, tmp_buf2);
+ Rast_put_d_row(d3, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -740,20 +740,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(d4, tmp_buf);
+ Rast_put_d_row(d4, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 7) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 7);
}
- Rast_put_d_raster_row(d4, tmp_buf);
+ Rast_put_d_row(d4, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(d4, tmp_buf2);
+ Rast_put_d_row(d4, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -762,20 +762,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t1, tmp_buf);
+ Rast_put_d_row(t1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 8) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 8);
}
- Rast_put_d_raster_row(t1, tmp_buf);
+ Rast_put_d_row(t1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t1, tmp_buf2);
+ Rast_put_d_row(t1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -784,20 +784,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t2, tmp_buf);
+ Rast_put_d_row(t2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 9) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 9);
}
- Rast_put_d_raster_row(t2, tmp_buf);
+ Rast_put_d_row(t2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t2, tmp_buf2);
+ Rast_put_d_row(t2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -806,20 +806,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t3, tmp_buf);
+ Rast_put_d_row(t3, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 10) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 10);
}
- Rast_put_d_raster_row(t3, tmp_buf);
+ Rast_put_d_row(t3, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t3, tmp_buf2);
+ Rast_put_d_row(t3, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -828,20 +828,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t4, tmp_buf);
+ Rast_put_d_row(t4, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 11) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 11);
}
- Rast_put_d_raster_row(t4, tmp_buf);
+ Rast_put_d_row(t4, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t4, tmp_buf2);
+ Rast_put_d_row(t4, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -850,20 +850,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t5, tmp_buf);
+ Rast_put_d_row(t5, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 12) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 12);
}
- Rast_put_d_raster_row(t5, tmp_buf);
+ Rast_put_d_row(t5, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(t5, tmp_buf2);
+ Rast_put_d_row(t5, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -872,20 +872,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(j1, tmp_buf);
+ Rast_put_d_row(j1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 13) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 13);
}
- Rast_put_d_raster_row(j1, tmp_buf);
+ Rast_put_d_row(j1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(j1, tmp_buf2);
+ Rast_put_d_row(j1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -894,20 +894,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(j2, tmp_buf);
+ Rast_put_d_row(j2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 14) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 14);
}
- Rast_put_d_raster_row(j2, tmp_buf);
+ Rast_put_d_row(j2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(j2, tmp_buf2);
+ Rast_put_d_row(j2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -916,20 +916,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(e1, tmp_buf);
+ Rast_put_d_row(e1, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 15) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 15);
}
- Rast_put_d_raster_row(e1, tmp_buf);
+ Rast_put_d_row(e1, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(e1, tmp_buf2);
+ Rast_put_d_row(e1, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -938,20 +938,20 @@
Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
if (i == 0) {
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(e2, tmp_buf);
+ Rast_put_d_row(e2, tmp_buf);
}
if (i < nr) {
for (m = 0; m < nc; m++) {
if (*(*(buff + m) + 16) > -BIG)
*(tmp_buf + (x0 + m + u_w / 2)) = *(*(buff + m) + 16);
}
- Rast_put_d_raster_row(e2, tmp_buf);
+ Rast_put_d_row(e2, tmp_buf);
}
if (i == nr - 1) {
tmp_buf2 = Rast_allocate_buf(DCELL_TYPE);
Rast_set_null_value(tmp_buf2, x0 + nc + u_w, DCELL_TYPE);
for (b = 0; b < u_l / 2; b++)
- Rast_put_d_raster_row(e2, tmp_buf2);
+ Rast_put_d_row(e2, tmp_buf2);
G_free(tmp_buf2);
}
}
@@ -1533,7 +1533,7 @@
if (*(*(units + k) + m))
*(unit_buf + m - 1) = *(*(units + k) + m);
}
- Rast_put_raster_row(fd, unit_buf, CELL_TYPE);
+ Rast_put_row(fd, unit_buf, CELL_TYPE);
}
Rast_close(fd);
G_free(unit_buf);
Modified: grass/trunk/raster/r.le/r.le.pixel/texture.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/texture.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.le/r.le.pixel/texture.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -475,7 +475,7 @@
if (*(*(edgenull + i) + j) == 0)
*(edge_buf_c + j - 1) = edgemap_c[i][j];
}
- Rast_put_raster_row(fc, edge_buf_c, CELL_TYPE);
+ Rast_put_row(fc, edge_buf_c, CELL_TYPE);
}
break;
case (FCELL_TYPE):
@@ -487,7 +487,7 @@
if (*(*(edgenull + i) + j) == 0)
*(edge_buf_f + j - 1) = edgemap_f[i][j];
}
- Rast_put_raster_row(fc, edge_buf_f, FCELL_TYPE);
+ Rast_put_row(fc, edge_buf_f, FCELL_TYPE);
}
break;
case (DCELL_TYPE):
@@ -499,7 +499,7 @@
if (*(*(edgenull + i) + j) == 0)
*(edge_buf_d + j - 1) = edgemap_d[i][j];
}
- Rast_put_raster_row(fc, edge_buf_d, DCELL_TYPE);
+ Rast_put_row(fc, edge_buf_d, DCELL_TYPE);
}
break;
}
@@ -544,7 +544,7 @@
*(zscor_buf + j - 1) =
(buf[i][j] - attr[0]) / attr[1];
}
- Rast_put_raster_row(fd, zscor_buf, DCELL_TYPE);
+ Rast_put_row(fd, zscor_buf, DCELL_TYPE);
}
G_free(zscor_buf);
Rast_close(fd);
Modified: grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -91,7 +91,7 @@
if (cur_row > num_rows) {
while (atrow < num_rows) {
- Rast_put_map_row(newmap, record);
+ Rast_put_c_row(newmap, record);
atrow++;
}
Rast_close(newmap);
@@ -101,7 +101,7 @@
/* write out enough rows to get to current row */
while (atrow < cur_row + ROW_SHIFT) {
- Rast_put_map_row(newmap, record);
+ Rast_put_c_row(newmap, record);
atrow++;
}
@@ -114,7 +114,7 @@
}
while (cur_row == (atrow - ROW_SHIFT));
- Rast_put_map_row(newmap, record);
+ Rast_put_c_row(newmap, record);
}
fprintf(stderr, "Close: %d\n", Rast_close(newmap));
Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -690,7 +690,7 @@
cell_buf = Rast_allocate_d_buf();
Rast_set_d_null_value(cell_buf, G_window_cols() + 1);
for (i = 0; i < g->sf_y + ((int)g->rl / 2); i++) {
- Rast_put_raster_row(mv_fd, cell_buf, DCELL_TYPE);
+ Rast_put_row(mv_fd, cell_buf, DCELL_TYPE);
}
for (i = 0; i < rows; i++) {
letti = read(random_access, file_buf, (cols * sizeof(double)));
@@ -699,10 +699,10 @@
for (j = 0; j < cols; j++) {
cell_buf[j + center] = file_buf[j];
}
- Rast_put_raster_row(mv_fd, cell_buf, DCELL_TYPE);
+ Rast_put_row(mv_fd, cell_buf, DCELL_TYPE);
}
Rast_set_d_null_value(cell_buf, G_window_cols() + 1);
for (i = 0; i < G_window_rows() - g->sf_y - g->rows; i++)
- Rast_put_raster_row(mv_fd, cell_buf, DCELL_TYPE);
+ Rast_put_row(mv_fd, cell_buf, DCELL_TYPE);
return 1;
}
Modified: grass/trunk/raster/r.los/main.c
===================================================================
--- grass/trunk/raster/r.los/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.los/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -383,7 +383,7 @@
/* set to NULL if beyond max_dist (0) or blocked view (1) */
if (fcell[col] == 0 || fcell[col] == 1)
Rast_set_null_value(&fcell[col], 1, FCELL_TYPE);
- if (Rast_put_raster_row(new, fcell, FCELL_TYPE) < 0)
+ if (Rast_put_row(new, fcell, FCELL_TYPE) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"),
out_layer, row);
}
Modified: grass/trunk/raster/r.mapcalc/map.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.mapcalc/map.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -669,7 +669,7 @@
void put_map_row(int fd, void *buf, int res_type)
{
- if (Rast_put_raster_row(fd, buf, res_type) < 0)
+ if (Rast_put_row(fd, buf, res_type) < 0)
G_fatal_error(_("Failed writing raster map row"));
}
Modified: grass/trunk/raster/r.mfilter/perform.c
===================================================================
--- grass/trunk/raster/r.mfilter/perform.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.mfilter/perform.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -87,7 +87,7 @@
G_message(_("Writing raster map <%s>"), out_name);
for (row = 0; row < nrows; row++) {
getrow(in, cell, row, buflen);
- Rast_put_d_raster_row(out, cell);
+ Rast_put_d_row(out, cell);
}
/* remove the temporary files before closing so that the Rast_close()
Modified: grass/trunk/raster/r.neighbors/main.c
===================================================================
--- grass/trunk/raster/r.neighbors/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.neighbors/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -326,7 +326,7 @@
*rp += 0.5;
}
}
- Rast_put_d_raster_row(out_fd, result);
+ Rast_put_d_row(out_fd, result);
}
G_percent(row, nrows, 2);
Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.null/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -339,7 +339,7 @@
mask_raster_array(rast, cellhd.cols, change_null, map_type);
- if (Rast_put_raster_row(new, rast, map_type) < 0) {
+ if (Rast_put_row(new, rast, map_type) < 0) {
G_warning(_("Failed writing raster map <%s> row %d"),
name, row);
break;
Modified: grass/trunk/raster/r.param.scale/process.c
===================================================================
--- grass/trunk/raster/r.param.scale/process.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.param.scale/process.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -147,10 +147,10 @@
if (mparam != FEATURE)
for (wind_row = 0; wind_row < EDGE; wind_row++)
- Rast_put_raster_row(fd_out, row_out, DCELL_TYPE); /* Write out the edge cells as NULL. */
+ Rast_put_row(fd_out, row_out, DCELL_TYPE); /* Write out the edge cells as NULL. */
else
for (wind_row = 0; wind_row < EDGE; wind_row++)
- Rast_put_raster_row(fd_out, featrow_out, CELL_TYPE); /* Write out the edge cells as NULL. */
+ Rast_put_row(fd_out, featrow_out, CELL_TYPE); /* Write out the edge cells as NULL. */
for (wind_row = 0; wind_row < wsize - 1; wind_row++)
Rast_get_row(fd_in, row_in + (wind_row * ncols), wind_row,
@@ -211,10 +211,10 @@
}
if (mparam != FEATURE)
- Rast_put_raster_row(fd_out, row_out, DCELL_TYPE); /* Write the row buffer to the output */
+ Rast_put_row(fd_out, row_out, DCELL_TYPE); /* Write the row buffer to the output */
/* raster. */
else /* write FEATURE to CELL */
- Rast_put_raster_row(fd_out, featrow_out, CELL_TYPE); /* Write the row buffer to the output */
+ Rast_put_row(fd_out, featrow_out, CELL_TYPE); /* Write the row buffer to the output */
/* raster. */
/* 'Shuffle' rows down one, and read in */
@@ -227,9 +227,9 @@
for (wind_row = 0; wind_row < EDGE; wind_row++) {
if (mparam != FEATURE)
- Rast_put_raster_row(fd_out, row_out, DCELL_TYPE); /* Write out the edge cells as NULL. */
+ Rast_put_row(fd_out, row_out, DCELL_TYPE); /* Write out the edge cells as NULL. */
else
- Rast_put_raster_row(fd_out, featrow_out, CELL_TYPE); /* Write out the edge cells as NULL. */
+ Rast_put_row(fd_out, featrow_out, CELL_TYPE); /* Write out the edge cells as NULL. */
}
/*--------------------------------------------------------------------------*/
Modified: grass/trunk/raster/r.patch/main.c
===================================================================
--- grass/trunk/raster/r.patch/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.patch/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -147,7 +147,7 @@
(presult, patch, &statf[i], ncols, out_type, ZEROFLAG))
break;
}
- Rast_put_raster_row(outfd, presult, out_type);
+ Rast_put_row(outfd, presult, out_type);
}
G_percent(row, nrows, 2);
Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.proj/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -438,7 +438,7 @@
ycoord1 = ycoord2;
}
- if (Rast_put_raster_row(fdo, obuffer, cell_type) < 0)
+ if (Rast_put_row(fdo, obuffer, cell_type) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"), mapname,
row);
Modified: grass/trunk/raster/r.random/random.c
===================================================================
--- grass/trunk/raster/r.random/random.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.random/random.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -216,10 +216,10 @@
if (theState->outraster) {
if (theState->docover == 1)
- Rast_put_raster_row(outfd, theState->cover.data.v,
+ Rast_put_row(outfd, theState->cover.data.v,
theState->cover.type);
else
- Rast_put_raster_row(outfd, theState->buf.data.v,
+ Rast_put_row(outfd, theState->buf.data.v,
theState->buf.type);
}
}
@@ -234,10 +234,10 @@
}
for (; row < nrows; row++) {
if (theState->docover == 1)
- Rast_put_raster_row(outfd, theState->cover.data.v,
+ Rast_put_row(outfd, theState->cover.data.v,
theState->cover.type);
else
- Rast_put_raster_row(outfd, theState->buf.data.v,
+ Rast_put_row(outfd, theState->buf.data.v,
theState->buf.type);
}
}
Modified: grass/trunk/raster/r.random.cells/indep.c
===================================================================
--- grass/trunk/raster/r.random.cells/indep.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.random.cells/indep.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -141,7 +141,7 @@
for (C = 0; C < Cs; C++) {
CellBuffer[C] = Out[R][C];
}
- Rast_put_raster_row(OutFD, CellBuffer, CELL_TYPE);
+ Rast_put_row(OutFD, CellBuffer, CELL_TYPE);
}
G_percent(1, 1, 1);
Modified: grass/trunk/raster/r.random.surface/save.c
===================================================================
--- grass/trunk/raster/r.random.surface/save.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.random.surface/save.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -170,7 +170,7 @@
for (Col = 0; Col < Cs; Col++) {
CellBuffer[Col] = (CELL) Surface[Row][Col];
}
- Rast_put_raster_row(OutFD, CellBuffer, CELL_TYPE);
+ Rast_put_row(OutFD, CellBuffer, CELL_TYPE);
}
G_percent(1, 1, 1);
Modified: grass/trunk/raster/r.recode/recode.c
===================================================================
--- grass/trunk/raster/r.recode/recode.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.recode/recode.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -85,7 +85,7 @@
Rast_get_c_row(in_fd, (CELL *) in_rast, row);
Rast_fpreclass_perform_ii(&rcl_struct, (CELL *) in_rast, (CELL *) out_rast,
ncols);
- Rast_put_raster_row(out_fd, (CELL *) out_rast, CELL_TYPE);
+ Rast_put_row(out_fd, (CELL *) out_rast, CELL_TYPE);
}
static void process_row_if(int row)
@@ -96,7 +96,7 @@
Rast_get_c_row(in_fd, (CELL *) in_rast, row);
Rast_fpreclass_perform_if(&rcl_struct, (CELL *) in_rast, (FCELL *) out_rast,
ncols);
- Rast_put_f_raster_row(out_fd, (FCELL *) out_rast);
+ Rast_put_f_row(out_fd, (FCELL *) out_rast);
}
static void process_row_id(int row)
@@ -107,7 +107,7 @@
Rast_get_c_row(in_fd, (CELL *) in_rast, row);
Rast_fpreclass_perform_id(&rcl_struct, (CELL *) in_rast, (DCELL *) out_rast,
ncols);
- Rast_put_raster_row(out_fd, (DCELL *) out_rast, DCELL_TYPE);
+ Rast_put_row(out_fd, (DCELL *) out_rast, DCELL_TYPE);
}
static void process_row_fi(int row)
@@ -118,7 +118,7 @@
Rast_get_f_row(in_fd, (FCELL *) in_rast, row);
Rast_fpreclass_perform_fi(&rcl_struct, (FCELL *) in_rast, (CELL *) out_rast,
ncols);
- Rast_put_raster_row(out_fd, (CELL *) out_rast, CELL_TYPE);
+ Rast_put_row(out_fd, (CELL *) out_rast, CELL_TYPE);
}
static void process_row_ff(int row)
@@ -129,7 +129,7 @@
Rast_get_f_row(in_fd, (FCELL *) in_rast, row);
Rast_fpreclass_perform_ff(&rcl_struct, (FCELL *) in_rast, (FCELL *) out_rast,
ncols);
- Rast_put_f_raster_row(out_fd, (FCELL *) out_rast);
+ Rast_put_f_row(out_fd, (FCELL *) out_rast);
}
static void process_row_fd(int row)
@@ -140,7 +140,7 @@
Rast_get_f_row(in_fd, (FCELL *) in_rast, row);
Rast_fpreclass_perform_fd(&rcl_struct, (FCELL *) in_rast, (DCELL *) out_rast,
ncols);
- Rast_put_raster_row(out_fd, (DCELL *) out_rast, DCELL_TYPE);
+ Rast_put_row(out_fd, (DCELL *) out_rast, DCELL_TYPE);
}
static void process_row_di(int row)
@@ -151,7 +151,7 @@
Rast_get_d_row(in_fd, (DCELL *) in_rast, row);
Rast_fpreclass_perform_di(&rcl_struct, (DCELL *) in_rast, (CELL *) out_rast,
ncols);
- Rast_put_raster_row(out_fd, (CELL *) out_rast, CELL_TYPE);
+ Rast_put_row(out_fd, (CELL *) out_rast, CELL_TYPE);
}
static void process_row_df(int row)
@@ -162,7 +162,7 @@
Rast_get_d_row(in_fd, (DCELL *) in_rast, row);
Rast_fpreclass_perform_df(&rcl_struct, (DCELL *) in_rast, (FCELL *) out_rast,
ncols);
- Rast_put_f_raster_row(out_fd, (FCELL *) out_rast);
+ Rast_put_f_row(out_fd, (FCELL *) out_rast);
}
static void process_row_dd(int row)
@@ -173,5 +173,5 @@
Rast_get_d_row(in_fd, (DCELL *) in_rast, row);
Rast_fpreclass_perform_dd(&rcl_struct, (DCELL *) in_rast, (DCELL *) out_rast,
ncols);
- Rast_put_raster_row(out_fd, (DCELL *) out_rast, DCELL_TYPE);
+ Rast_put_row(out_fd, (DCELL *) out_rast, DCELL_TYPE);
}
Modified: grass/trunk/raster/r.resamp.interp/main.c
===================================================================
--- grass/trunk/raster/r.resamp.interp/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.resamp.interp/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -175,7 +175,7 @@
}
Rast_set_window(&dst_w);
- Rast_put_d_raster_row(outfile, outbuf);
+ Rast_put_d_row(outfile, outbuf);
}
break;
@@ -214,7 +214,7 @@
}
Rast_set_window(&dst_w);
- Rast_put_d_raster_row(outfile, outbuf);
+ Rast_put_d_row(outfile, outbuf);
}
break;
@@ -287,7 +287,7 @@
}
Rast_set_window(&dst_w);
- Rast_put_d_raster_row(outfile, outbuf);
+ Rast_put_d_row(outfile, outbuf);
}
break;
}
Modified: grass/trunk/raster/r.resamp.stats/main.c
===================================================================
--- grass/trunk/raster/r.resamp.stats/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.resamp.stats/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -149,7 +149,7 @@
}
Rast_set_window(&dst_w);
- Rast_put_d_raster_row(outfile, outbuf);
+ Rast_put_d_row(outfile, outbuf);
}
}
@@ -235,7 +235,7 @@
}
Rast_set_window(&dst_w);
- Rast_put_d_raster_row(outfile, outbuf);
+ Rast_put_d_row(outfile, outbuf);
}
}
Modified: grass/trunk/raster/r.resample/main.c
===================================================================
--- grass/trunk/raster/r.resample/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.resample/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -120,7 +120,7 @@
G_percent(row, nrows, 2);
if (Rast_get_row(infd, rast, row, data_type) < 0)
G_fatal_error(_("Error reading row %d"), row);
- if (Rast_put_raster_row(outfd, rast, out_type) < 0)
+ 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.ros/main.c
===================================================================
--- grass/trunk/raster/r.ros/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.ros/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -856,11 +856,11 @@
maxdir[col] = (int)Rdir;
/*printf("(%d, %d)\nR0=%.2f, vel=%d, dir=%d, phiw=%.2f, s=%d, as=%d, phis=%.2f, R=%.1f, Rdir=%.0f\n", row, col, R0, vel[col], dir[col], phiw, slope[col], aspect[col], phis, R, Rdir); */
}
- Rast_put_raster_row(base_fd, base, CELL_TYPE);
- Rast_put_raster_row(max_fd, max, CELL_TYPE);
- Rast_put_raster_row(maxdir_fd, maxdir, CELL_TYPE);
+ Rast_put_row(base_fd, base, CELL_TYPE);
+ Rast_put_row(max_fd, max, CELL_TYPE);
+ Rast_put_row(maxdir_fd, maxdir, CELL_TYPE);
if (spotting)
- Rast_put_raster_row(spotdist_fd, spotdist, CELL_TYPE);
+ Rast_put_row(spotdist_fd, spotdist, CELL_TYPE);
}
G_percent(row, nrows, 2);
Modified: grass/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.series/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -270,7 +270,7 @@
}
for (i = 0; i < num_outputs; i++)
- Rast_put_d_raster_row(outputs[i].fd, outputs[i].buf);
+ Rast_put_d_row(outputs[i].fd, outputs[i].buf);
}
G_percent(row, nrows, 2);
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.slope.aspect/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -455,7 +455,7 @@
slope_fd = opennew(slope_name, out_type);
slp_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(slp_raster, G_window_cols(), data_type);
- Rast_put_raster_row(slope_fd, slp_raster, data_type);
+ Rast_put_row(slope_fd, slp_raster, data_type);
}
else {
slp_raster = NULL;
@@ -466,7 +466,7 @@
aspect_fd = opennew(aspect_name, out_type);
asp_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(asp_raster, G_window_cols(), data_type);
- Rast_put_raster_row(aspect_fd, asp_raster, data_type);
+ Rast_put_row(aspect_fd, asp_raster, data_type);
}
else {
asp_raster = NULL;
@@ -477,7 +477,7 @@
pcurv_fd = opennew(pcurv_name, out_type);
pcurv_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(pcurv_raster, G_window_cols(), data_type);
- Rast_put_raster_row(pcurv_fd, pcurv_raster, data_type);
+ Rast_put_row(pcurv_fd, pcurv_raster, data_type);
}
else {
pcurv_raster = NULL;
@@ -488,7 +488,7 @@
tcurv_fd = opennew(tcurv_name, out_type);
tcurv_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(tcurv_raster, G_window_cols(), data_type);
- Rast_put_raster_row(tcurv_fd, tcurv_raster, data_type);
+ Rast_put_row(tcurv_fd, tcurv_raster, data_type);
}
else {
tcurv_raster = NULL;
@@ -499,7 +499,7 @@
dx_fd = opennew(dx_name, out_type);
dx_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dx_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dx_fd, dx_raster, data_type);
+ Rast_put_row(dx_fd, dx_raster, data_type);
}
else {
dx_raster = NULL;
@@ -510,7 +510,7 @@
dy_fd = opennew(dy_name, out_type);
dy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dy_fd, dy_raster, data_type);
+ Rast_put_row(dy_fd, dy_raster, data_type);
}
else {
dy_raster = NULL;
@@ -521,7 +521,7 @@
dxx_fd = opennew(dxx_name, out_type);
dxx_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dxx_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dxx_fd, dxx_raster, data_type);
+ Rast_put_row(dxx_fd, dxx_raster, data_type);
}
else {
dxx_raster = NULL;
@@ -532,7 +532,7 @@
dyy_fd = opennew(dyy_name, out_type);
dyy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dyy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dyy_fd, dyy_raster, data_type);
+ Rast_put_row(dyy_fd, dyy_raster, data_type);
}
else {
dyy_raster = NULL;
@@ -543,7 +543,7 @@
dxy_fd = opennew(dxy_name, out_type);
dxy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dxy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dxy_fd, dxy_raster, data_type);
+ Rast_put_row(dxy_fd, dxy_raster, data_type);
}
else {
dxy_raster = NULL;
@@ -961,31 +961,31 @@
} /* column for loop */
if (aspect_fd > 0)
- Rast_put_raster_row(aspect_fd, asp_raster, data_type);
+ Rast_put_row(aspect_fd, asp_raster, data_type);
if (slope_fd > 0)
- Rast_put_raster_row(slope_fd, slp_raster, data_type);
+ Rast_put_row(slope_fd, slp_raster, data_type);
if (pcurv_fd > 0)
- Rast_put_raster_row(pcurv_fd, pcurv_raster, data_type);
+ Rast_put_row(pcurv_fd, pcurv_raster, data_type);
if (tcurv_fd > 0)
- Rast_put_raster_row(tcurv_fd, tcurv_raster, data_type);
+ Rast_put_row(tcurv_fd, tcurv_raster, data_type);
if (dx_fd > 0)
- Rast_put_raster_row(dx_fd, dx_raster, data_type);
+ Rast_put_row(dx_fd, dx_raster, data_type);
if (dy_fd > 0)
- Rast_put_raster_row(dy_fd, dy_raster, data_type);
+ Rast_put_row(dy_fd, dy_raster, data_type);
if (dxx_fd > 0)
- Rast_put_raster_row(dxx_fd, dxx_raster, data_type);
+ Rast_put_row(dxx_fd, dxx_raster, data_type);
if (dyy_fd > 0)
- Rast_put_raster_row(dyy_fd, dyy_raster, data_type);
+ Rast_put_row(dyy_fd, dyy_raster, data_type);
if (dxy_fd > 0)
- Rast_put_raster_row(dxy_fd, dxy_raster, data_type);
+ Rast_put_row(dxy_fd, dxy_raster, data_type);
} /* row loop */
@@ -1002,7 +1002,7 @@
struct FPRange range;
Rast_set_null_value(asp_raster, G_window_cols(), data_type);
- Rast_put_raster_row(aspect_fd, asp_raster, data_type);
+ Rast_put_row(aspect_fd, asp_raster, data_type);
Rast_close(aspect_fd);
if (out_type != CELL_TYPE)
@@ -1107,7 +1107,7 @@
Rast_add_c_color_rule(&val1, 255, 0, 0, &val2, 0, 0, 0, &colors);
Rast_set_null_value(slp_raster, G_window_cols(), data_type);
- Rast_put_raster_row(slope_fd, slp_raster, data_type);
+ Rast_put_row(slope_fd, slp_raster, data_type);
Rast_close(slope_fd);
if (out_type != CELL_TYPE) {
@@ -1237,7 +1237,7 @@
if (pcurv_fd >= 0) {
Rast_set_null_value(pcurv_raster, G_window_cols(), data_type);
- Rast_put_raster_row(pcurv_fd, pcurv_raster, data_type);
+ Rast_put_row(pcurv_fd, pcurv_raster, data_type);
Rast_close(pcurv_fd);
Rast_write_colors(pcurv_name, G_mapset(), &colors);
@@ -1264,7 +1264,7 @@
if (tcurv_fd >= 0) {
Rast_set_null_value(tcurv_raster, G_window_cols(), data_type);
- Rast_put_raster_row(tcurv_fd, tcurv_raster, data_type);
+ Rast_put_row(tcurv_fd, tcurv_raster, data_type);
Rast_close(tcurv_fd);
Rast_write_colors(tcurv_name, G_mapset(), &colors);
@@ -1291,7 +1291,7 @@
if (dx_fd >= 0) {
Rast_set_null_value(dx_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dx_fd, dx_raster, data_type);
+ Rast_put_row(dx_fd, dx_raster, data_type);
Rast_close(dx_fd);
if (out_type != CELL_TYPE)
@@ -1316,7 +1316,7 @@
if (dy_fd >= 0) {
Rast_set_null_value(dy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dy_fd, dy_raster, data_type);
+ Rast_put_row(dy_fd, dy_raster, data_type);
Rast_close(dy_fd);
if (out_type != CELL_TYPE)
@@ -1341,7 +1341,7 @@
if (dxx_fd >= 0) {
Rast_set_null_value(dxx_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dxx_fd, dxx_raster, data_type);
+ Rast_put_row(dxx_fd, dxx_raster, data_type);
Rast_close(dxx_fd);
if (out_type != CELL_TYPE)
@@ -1366,7 +1366,7 @@
if (dyy_fd >= 0) {
Rast_set_null_value(dyy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dyy_fd, dyy_raster, data_type);
+ Rast_put_row(dyy_fd, dyy_raster, data_type);
Rast_close(dyy_fd);
if (out_type != CELL_TYPE)
@@ -1391,7 +1391,7 @@
if (dxy_fd >= 0) {
Rast_set_null_value(dxy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dxy_fd, dxy_raster, data_type);
+ Rast_put_row(dxy_fd, dxy_raster, data_type);
Rast_close(dxy_fd);
if (out_type != CELL_TYPE)
Modified: grass/trunk/raster/r.spread/ram2out.c
===================================================================
--- grass/trunk/raster/r.spread/ram2out.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.spread/ram2out.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -45,11 +45,11 @@
window.ns_res * DATA(map_y_out, row, col));
}
}
- Rast_put_raster_row(cum_fd, cell, CELL_TYPE);
+ Rast_put_row(cum_fd, cell, CELL_TYPE);
if (x_out)
- Rast_put_raster_row(x_fd, x_cell, CELL_TYPE);
+ Rast_put_row(x_fd, x_cell, CELL_TYPE);
if (y_out)
- Rast_put_raster_row(y_fd, y_cell, CELL_TYPE);
+ Rast_put_row(y_fd, y_cell, CELL_TYPE);
}
G_percent(row, nrows, 2);
}
Modified: grass/trunk/raster/r.spreadpath/main.c
===================================================================
--- grass/trunk/raster/r.spreadpath/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.spreadpath/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -331,7 +331,7 @@
path_fd = Rast_open_c_new(path_layer);
for (row = 0; row < nrows; row++) {
segment_get_row(&out_seg, cell, row);
- if (Rast_put_raster_row(path_fd, cell, CELL_TYPE) < 0)
+ if (Rast_put_row(path_fd, cell, CELL_TYPE) < 0)
G_fatal_error("unable to write map row %d", row);
}
Modified: grass/trunk/raster/r.statistics2/main.c
===================================================================
--- grass/trunk/raster/r.statistics2/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.statistics2/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -512,7 +512,7 @@
else
out_buf[col] = result[base_buf[col] - mincat];
- Rast_put_d_raster_row(out_fd, out_buf);
+ Rast_put_d_row(out_fd, out_buf);
G_percent(row, rows, 2);
}
Modified: grass/trunk/raster/r.statistics3/main.c
===================================================================
--- grass/trunk/raster/r.statistics3/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.statistics3/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -352,7 +352,7 @@
else
out_buf[col] = basecats[base_buf[col] - min].quants[quant];
- Rast_put_d_raster_row(out_fd[quant], out_buf);
+ Rast_put_d_row(out_fd[quant], out_buf);
}
G_percent(row, rows, 2);
Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.sun/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -750,7 +750,7 @@
else
cell7[j] = (FCELL) lumcl[i][j];
}
- Rast_put_f_raster_row(fd7, cell7);
+ Rast_put_f_row(fd7, cell7);
}
if (beam_rad != NULL) {
@@ -761,7 +761,7 @@
cell8[j] = (FCELL) beam[i][j];
}
- Rast_put_f_raster_row(fd8, cell8);
+ Rast_put_f_row(fd8, cell8);
}
if (insol_time != NULL) {
@@ -771,7 +771,7 @@
else
cell11[j] = (FCELL) insol[i][j];
}
- Rast_put_f_raster_row(fd11, cell11);
+ Rast_put_f_row(fd11, cell11);
}
@@ -782,7 +782,7 @@
else
cell9[j] = (FCELL) diff[i][j];
}
- Rast_put_f_raster_row(fd9, cell9);
+ Rast_put_f_row(fd9, cell9);
}
if (refl_rad != NULL) {
@@ -792,7 +792,7 @@
else
cell10[j] = (FCELL) refl[i][j];
}
- Rast_put_f_raster_row(fd10, cell10);
+ Rast_put_f_row(fd10, cell10);
}
}
Modified: grass/trunk/raster/r.sun2/main.c
===================================================================
--- grass/trunk/raster/r.sun2/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.sun2/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -1219,7 +1219,7 @@
else
cell7[j] = (FCELL) lumcl[i][j];
}
- Rast_put_f_raster_row(fd7, cell7);
+ Rast_put_f_row(fd7, cell7);
}
if (beam_rad != NULL) {
@@ -1229,7 +1229,7 @@
else
cell8[j] = (FCELL) beam[i][j];
}
- Rast_put_f_raster_row(fd8, cell8);
+ Rast_put_f_row(fd8, cell8);
}
if (glob_rad != NULL) {
@@ -1239,7 +1239,7 @@
else
cell12[j] = (FCELL) globrad[i][j];
}
- Rast_put_f_raster_row(fd12, cell12);
+ Rast_put_f_row(fd12, cell12);
}
@@ -1250,7 +1250,7 @@
else
cell11[j] = (FCELL) insol[i][j];
}
- Rast_put_f_raster_row(fd11, cell11);
+ Rast_put_f_row(fd11, cell11);
}
@@ -1261,7 +1261,7 @@
else
cell9[j] = (FCELL) diff[i][j];
}
- Rast_put_f_raster_row(fd9, cell9);
+ Rast_put_f_row(fd9, cell9);
}
if (refl_rad != NULL) {
@@ -1271,7 +1271,7 @@
else
cell10[j] = (FCELL) refl[i][j];
}
- Rast_put_f_raster_row(fd10, cell10);
+ Rast_put_f_row(fd10, cell10);
}
}
Modified: grass/trunk/raster/r.sunmask/main.c
===================================================================
--- grass/trunk/raster/r.sunmask/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.sunmask/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -531,7 +531,7 @@
col1 += 1;
}
G_debug(3, "Writing result row %i of %i", row1, window.rows);
- Rast_put_raster_row(output_fd, outbuf.c, CELL_TYPE);
+ Rast_put_row(output_fd, outbuf.c, CELL_TYPE);
row1 += 1;
}
Modified: grass/trunk/raster/r.surf.contour/main.c
===================================================================
--- grass/trunk/raster/r.surf.contour/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.surf.contour/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -130,7 +130,7 @@
else
alt_row[c] = con1;
}
- Rast_put_raster_row(file_fd, alt_row, CELL_TYPE);
+ Rast_put_row(file_fd, alt_row, CELL_TYPE);
}
G_percent(r, nrows, 1);
free_cell(con);
Modified: grass/trunk/raster/r.surf.fractal/write_rast.c
===================================================================
--- grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -69,7 +69,7 @@
for (col = 0; col < ncols; col++)
*(row_out + col) = (DCELL) (*(data[0] + row * nn + col) * 100000);
- Rast_put_raster_row(fd_out, (DCELL *) row_out, DCELL_TYPE);
+ Rast_put_row(fd_out, (DCELL *) row_out, DCELL_TYPE);
}
Rast_close(fd_out);
Modified: grass/trunk/raster/r.surf.gauss/gaussurf.c
===================================================================
--- grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -52,7 +52,7 @@
(DCELL) (G_math_rand_gauss(2742, sigma) + mean);
/* Write contents row by row */
- Rast_put_d_raster_row(fd_out, (DCELL *) row_out);
+ Rast_put_d_row(fd_out, (DCELL *) row_out);
}
Modified: grass/trunk/raster/r.surf.idw/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.surf.idw/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -302,7 +302,7 @@
}
} /* end of loop over columns */
- Rast_put_raster_row(out_fd, cell, CELL_TYPE);
+ Rast_put_row(out_fd, cell, CELL_TYPE);
/* advance current row pointer if necessary */
if (current_row->start->y == row && current_row != lastrow)
Modified: grass/trunk/raster/r.surf.idw2/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.surf.idw2/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -177,7 +177,7 @@
cell[col] = (CELL) (sum1 / sum2 + 0.5);
}
- Rast_put_raster_row(fd, cell, CELL_TYPE);
+ Rast_put_row(fd, cell, CELL_TYPE);
}
G_free(points);
Modified: grass/trunk/raster/r.surf.random/randsurf.c
===================================================================
--- grass/trunk/raster/r.surf.random/randsurf.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.surf.random/randsurf.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -56,9 +56,9 @@
/* Write contents row by row */
if (int_map)
- Rast_put_c_raster_row(fd_out, (CELL *) row_out_C);
+ Rast_put_c_row(fd_out, (CELL *) row_out_C);
else
- Rast_put_d_raster_row(fd_out, (DCELL *) row_out_D);
+ Rast_put_d_row(fd_out, (DCELL *) row_out_D);
}
Rast_close(fd_out);
Modified: grass/trunk/raster/r.terraflow/grass2str.h
===================================================================
--- grass/trunk/raster/r.terraflow/grass2str.h 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.terraflow/grass2str.h 2009-06-30 16:20:43 UTC (rev 38127)
@@ -211,7 +211,7 @@
}
} /* for j*/
- if (Rast_put_raster_row (outfd, outrast, mtype) < 0)
+ if (Rast_put_row (outfd, outrast, mtype) < 0)
G_fatal_error ("Cannot write to <%s>",cellname);
G_percent(i, nrows, 2);
@@ -290,7 +290,7 @@
}
} /* for j*/
- if (Rast_put_raster_row (outfd, outrast, CELL_TYPE) < 0)
+ if (Rast_put_row (outfd, outrast, CELL_TYPE) < 0)
G_fatal_error ("Cannot write to <%s>",cellname);
G_percent(i, nrows, 2);
@@ -364,7 +364,7 @@
}
} /* for j*/
- if (Rast_put_raster_row (outfd, outrast, FCELL_TYPE) < 0)
+ if (Rast_put_row (outfd, outrast, FCELL_TYPE) < 0)
G_fatal_error ("Cannot write to <%s>",cellname);
G_percent(i, nrows, 2);
@@ -473,9 +473,9 @@
} /* for j*/
- if (Rast_put_raster_row (fd1, rast1, FCELL_TYPE) < 0)
+ if (Rast_put_row (fd1, rast1, FCELL_TYPE) < 0)
G_fatal_error ("Cannot write to <%s>", cellname1);
- if (Rast_put_raster_row (fd2, rast2, FCELL_TYPE) < 0)
+ if (Rast_put_row (fd2, rast2, FCELL_TYPE) < 0)
G_fatal_error ("Cannot write to <%s>", cellname2);
G_percent(i, nrows, 2);
Modified: grass/trunk/raster/r.texture/main.c
===================================================================
--- grass/trunk/raster/r.texture/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.texture/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -332,19 +332,19 @@
/* The early (size/2) samples take value from (size/2+1)'th sample */
if (row == 0)
for (j = 0; j < (size / 2); j++)
- if (Rast_put_raster_row(outfd, outrast, out_data_type) <
+ if (Rast_put_row(outfd, outrast, out_data_type) <
0)
G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
- if (Rast_put_raster_row(outfd, outrast, out_data_type) < 0)
+ if (Rast_put_row(outfd, outrast, out_data_type) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
}
/* The last few (size/2) samples take value from nrows-(size/2+1)'th sample */
if ((row >= nrows - (size - 1)) && (row < nrows))
for (j = 0; j < (size / 2); j++)
- if (Rast_put_raster_row(outfd, outrast, out_data_type) < 0)
+ if (Rast_put_row(outfd, outrast, out_data_type) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
Modified: grass/trunk/raster/r.thin/io.c
===================================================================
--- grass/trunk/raster/r.thin/io.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.thin/io.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -176,7 +176,7 @@
if (buf[col] == 0)
Rast_set_null_value(&buf[col], 1, CELL_TYPE);
}
- Rast_put_raster_row(cell_file, buf + PAD, CELL_TYPE);
+ Rast_put_row(cell_file, buf + PAD, CELL_TYPE);
}
Rast_close(cell_file);
rowio_flush(&row_io);
Modified: grass/trunk/raster/r.topidx/file_io.c
===================================================================
--- grass/trunk/raster/r.topidx/file_io.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.topidx/file_io.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -89,7 +89,7 @@
for (i = 0; i < window.rows; i++) {
G_percent(i, window.rows, 2);
- Rast_put_d_raster_row(fd, atb[i]);
+ Rast_put_d_row(fd, atb[i]);
}
G_percent(i, window.rows, 2);
Rast_close(fd);
Modified: grass/trunk/raster/r.uslek/main.c
===================================================================
--- grass/trunk/raster/r.uslek/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.uslek/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -164,7 +164,7 @@
}
}
}
- if (Rast_put_d_raster_row(outfd, outrast) < 0)
+ if (Rast_put_d_row(outfd, outrast) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
}
Modified: grass/trunk/raster/r.usler/main.c
===================================================================
--- grass/trunk/raster/r.usler/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.usler/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -130,7 +130,7 @@
outrast[col] = d ;
}
}
- if (Rast_put_d_raster_row(outfd, outrast) < 0)
+ if (Rast_put_d_row(outfd, outrast) < 0)
G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
}
Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.walk/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -1500,7 +1500,7 @@
*(p + col) = (int)(min_cost + .5);
}
}
- Rast_put_raster_row(cum_fd, cum_cell, cum_data_type);
+ Rast_put_row(cum_fd, cum_cell, cum_data_type);
}
}
else if (cum_data_type == FCELL_TYPE) {
@@ -1535,7 +1535,7 @@
*(p + col) = (float)(min_cost);
}
}
- Rast_put_raster_row(cum_fd, cum_cell, cum_data_type);
+ Rast_put_row(cum_fd, cum_cell, cum_data_type);
}
}
else if (cum_data_type == DCELL_TYPE) {
@@ -1570,7 +1570,7 @@
*(p + col) = min_cost;
}
}
- Rast_put_raster_row(cum_fd, cum_cell, cum_data_type);
+ Rast_put_row(cum_fd, cum_cell, cum_data_type);
}
}
@@ -1584,7 +1584,7 @@
segment_get(&out_seg2, &cur_dir, row, col);
*(p + col) = cur_dir;
}
- Rast_put_raster_row(dir_fd, dir_cell, dir_data_type);
+ Rast_put_row(dir_fd, dir_cell, dir_data_type);
}
G_percent(row, nrows, 2);
}
Modified: grass/trunk/raster/r.water.outlet/main.c
===================================================================
--- grass/trunk/raster/r.water.outlet/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.water.outlet/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -161,7 +161,7 @@
for (col = 0; col < ncols; col++) {
cell_buf[col] = bas[SEG_INDEX(ba_seg, row, col)];
}
- Rast_put_raster_row(basin_fd, cell_buf, CELL_TYPE);
+ Rast_put_row(basin_fd, cell_buf, CELL_TYPE);
}
G_free(bas);
G_free(cell_buf);
Modified: grass/trunk/raster/r.watershed/ram/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -45,7 +45,7 @@
sum_sqr += dvalue * dvalue;
}
}
- Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
+ Rast_put_row(fd, dbuf, DCELL_TYPE);
}
}
else {
@@ -60,7 +60,7 @@
sum_sqr += dvalue * dvalue;
}
}
- Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
+ Rast_put_row(fd, dbuf, DCELL_TYPE);
}
}
if (Rast_close(fd) < 0)
@@ -148,7 +148,7 @@
for (c = 0; c < ncols; c++) {
buf[c] = asp[SEG_INDEX(asp_seg, r, c)];
}
- Rast_put_raster_row(fd, buf, CELL_TYPE);
+ Rast_put_row(fd, buf, CELL_TYPE);
}
if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
@@ -181,7 +181,7 @@
}
}
}
- Rast_put_raster_row(fd, buf, CELL_TYPE);
+ Rast_put_row(fd, buf, CELL_TYPE);
}
if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
@@ -206,7 +206,7 @@
for (c = 0; c < ncols; c++) {
dbuf[c] = l_s[SEG_INDEX(l_s_seg, r, c)];
}
- Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
+ Rast_put_row(fd, dbuf, DCELL_TYPE);
}
if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
@@ -226,7 +226,7 @@
if (dbuf[c] > max_length)
dbuf[c] = max_length;
}
- Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
+ Rast_put_row(fd, dbuf, DCELL_TYPE);
}
if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
@@ -246,7 +246,7 @@
for (c = 0; c < ncols; c++) {
dbuf[c] = s_g[SEG_INDEX(s_g_seg, r, c)];
}
- Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
+ Rast_put_row(fd, dbuf, DCELL_TYPE);
}
if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
Modified: grass/trunk/raster/r.watershed/ram/close_maps2.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps2.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.watershed/ram/close_maps2.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -91,7 +91,7 @@
if (value)
cellrow[c] = bas[SEG_INDEX(bas_seg, r, c)];
}
- Rast_put_raster_row(map_fd, cellrow, CELL_TYPE);
+ Rast_put_row(map_fd, cellrow, CELL_TYPE);
}
Rast_close(map_fd);
Rast_write_colors(seg_name, this_mapset, &colors);
@@ -106,7 +106,7 @@
if (cellrow[c] == 0)
Rast_set_c_null_value(cellrow + c, 1);
}
- Rast_put_raster_row(map_fd, cellrow, CELL_TYPE);
+ Rast_put_row(map_fd, cellrow, CELL_TYPE);
}
Rast_close(map_fd);
Rast_write_colors(bas_name, this_mapset, &colors);
@@ -121,7 +121,7 @@
if (cellrow[c] == 0)
Rast_set_c_null_value(cellrow + c, 1);
}
- Rast_put_raster_row(map_fd, cellrow, CELL_TYPE);
+ Rast_put_row(map_fd, cellrow, CELL_TYPE);
}
Rast_close(map_fd);
Rast_write_colors(haf_name, this_mapset, &colors);
Modified: grass/trunk/raster/r.watershed/seg/bseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_write.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.watershed/seg/bseg_write.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -25,7 +25,7 @@
bseg_get(bseg, &value, row, col);
buffer[col] = value;
}
- if (Rast_put_raster_row(map_fd, buffer, CELL_TYPE) < 0) {
+ if (Rast_put_row(map_fd, buffer, CELL_TYPE) < 0) {
G_free(buffer);
Rast_unopen(map_fd);
G_warning("%s(): unable to write new map layer [%s], row %d",
Modified: grass/trunk/raster/r.watershed/seg/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -38,7 +38,7 @@
sum_sqr += dvalue * dvalue;
}
}
- Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
+ Rast_put_row(fd, dbuf, DCELL_TYPE);
}
if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
Modified: grass/trunk/raster/r.watershed/seg/close_maps2.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/close_maps2.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.watershed/seg/close_maps2.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -81,7 +81,7 @@
if (value)
cseg_get(&bas, &(cellrow[c]), r, c);
}
- Rast_put_raster_row(map_fd, cellrow, CELL_TYPE);
+ Rast_put_row(map_fd, cellrow, CELL_TYPE);
}
G_free(cellrow);
Rast_close(map_fd);
Modified: grass/trunk/raster/r.watershed/seg/cseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_write.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.watershed/seg/cseg_write.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -21,7 +21,7 @@
segment_flush(&(cseg->seg));
for (row = 0; row < nrows; row++) {
segment_get_row(&(cseg->seg), buffer, row);
- if (Rast_put_raster_row(map_fd, buffer, CELL_TYPE) < 0) {
+ if (Rast_put_row(map_fd, buffer, CELL_TYPE) < 0) {
G_free(buffer);
Rast_unopen(map_fd);
G_warning("%s(): unable to write new map layer [%s], row %d",
Modified: grass/trunk/raster/r.watershed/seg/dseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -22,7 +22,7 @@
segment_flush(&(dseg->seg));
for (row = 0; row < nrows; row++) {
segment_get_row(&(dseg->seg), (DCELL *) dbuffer, row);
- if (Rast_put_raster_row(map_fd, dbuffer, DCELL_TYPE) < 0) {
+ if (Rast_put_row(map_fd, dbuffer, DCELL_TYPE) < 0) {
G_free(dbuffer);
Rast_unopen(map_fd);
G_warning("%s(): unable to write new map layer [%s], row %d",
Modified: grass/trunk/raster/simwe/simlib/output.c
===================================================================
--- grass/trunk/raster/simwe/simlib/output.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster/simwe/simlib/output.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -194,7 +194,7 @@
gmax = amax1(gmax, a1);
}
}
- Rast_put_f_raster_row(fd6, cell6);
+ Rast_put_f_row(fd6, cell6);
}
if (disch != NULL) {
@@ -208,7 +208,7 @@
dismax = amax1(dismax, a2);
}
}
- Rast_put_f_raster_row(fd7, cell7);
+ Rast_put_f_row(fd7, cell7);
}
if (err != NULL) {
@@ -220,7 +220,7 @@
gsmax = amax1(gsmax, gammas[i][j]); /* add conv? */
}
}
- Rast_put_f_raster_row(fd8, cell8);
+ Rast_put_f_row(fd8, cell8);
}
@@ -233,7 +233,7 @@
/* gsmax = amax1(gsmax, gama[i][j]); */
}
}
- Rast_put_f_raster_row(fd14, cell14);
+ Rast_put_f_row(fd14, cell14);
}
@@ -248,7 +248,7 @@
dismax = amax1(dismax, a2);
}
}
- Rast_put_f_raster_row(fd15, cell15);
+ Rast_put_f_row(fd15, cell15);
}
@@ -262,7 +262,7 @@
ermin = amin1(ermin, er[i][j]);
}
}
- Rast_put_f_raster_row(fd16, cell16);
+ Rast_put_f_row(fd16, cell16);
}
}
@@ -669,7 +669,7 @@
etmin = amin1(etmin, er[i][j]);
}
}
- Rast_put_f_raster_row(fd17, cell17);
+ Rast_put_f_row(fd17, cell17);
}
if (tc != NULL) {
@@ -686,7 +686,7 @@
/* gsmax = amax1(gsmax, trc); */
}
}
- Rast_put_f_raster_row(fd13, cell13);
+ Rast_put_f_row(fd13, cell13);
}
}
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -225,14 +225,14 @@
/*Write the data to the output map */
if (typeIntern == FCELL_TYPE) {
- check = Rast_put_f_raster_row(outfd, fcell);
+ check = Rast_put_f_row(outfd, fcell);
if (check != 1)
fatal_error(map, elevfd, outfd,
_("Could not write raster row"));
}
if (typeIntern == DCELL_TYPE) {
- check = Rast_put_d_raster_row(outfd, dcell);
+ check = Rast_put_d_row(outfd, dcell);
if (check != 1)
fatal_error(map, elevfd, outfd,
_("Could not write raster row"));
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -147,14 +147,14 @@
}
}
if (typeIntern == FCELL_TYPE) {
- check = Rast_put_f_raster_row(fd[pos], fcell);
+ check = Rast_put_f_row(fd[pos], fcell);
if (check != 1)
fatal_error(map, fd, depths,
_("Unable to write raster row"));
}
if (typeIntern == DCELL_TYPE) {
- check = Rast_put_d_raster_row(fd[pos], dcell);
+ check = Rast_put_d_row(fd[pos], dcell);
if (check != 1)
fatal_error(map, fd, depths,
_("Unable to write raster row"));
Modified: grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
===================================================================
--- grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -482,7 +482,7 @@
slope_fd = opennew(slope_name, out_type);
slp_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(slp_raster, G_window_cols(), data_type);
- Rast_put_raster_row(slope_fd, slp_raster, data_type);
+ Rast_put_row(slope_fd, slp_raster, data_type);
}
else {
slp_raster = NULL;
@@ -493,7 +493,7 @@
aspect_fd = opennew(aspect_name, out_type);
asp_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(asp_raster, G_window_cols(), data_type);
- Rast_put_raster_row(aspect_fd, asp_raster, data_type);
+ Rast_put_row(aspect_fd, asp_raster, data_type);
}
else {
asp_raster = NULL;
@@ -504,7 +504,7 @@
pcurv_fd = opennew(pcurv_name, out_type);
pcurv_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(pcurv_raster, G_window_cols(), data_type);
- Rast_put_raster_row(pcurv_fd, pcurv_raster, data_type);
+ Rast_put_row(pcurv_fd, pcurv_raster, data_type);
}
else {
pcurv_raster = NULL;
@@ -515,7 +515,7 @@
tcurv_fd = opennew(tcurv_name, out_type);
tcurv_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(tcurv_raster, G_window_cols(), data_type);
- Rast_put_raster_row(tcurv_fd, tcurv_raster, data_type);
+ Rast_put_row(tcurv_fd, tcurv_raster, data_type);
}
else {
tcurv_raster = NULL;
@@ -526,7 +526,7 @@
dx_fd = opennew(dx_name, out_type);
dx_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dx_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dx_fd, dx_raster, data_type);
+ Rast_put_row(dx_fd, dx_raster, data_type);
}
else {
dx_raster = NULL;
@@ -537,7 +537,7 @@
dy_fd = opennew(dy_name, out_type);
dy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dy_fd, dy_raster, data_type);
+ Rast_put_row(dy_fd, dy_raster, data_type);
}
else {
dy_raster = NULL;
@@ -548,7 +548,7 @@
dxx_fd = opennew(dxx_name, out_type);
dxx_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dxx_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dxx_fd, dxx_raster, data_type);
+ Rast_put_row(dxx_fd, dxx_raster, data_type);
}
else {
dxx_raster = NULL;
@@ -559,7 +559,7 @@
dyy_fd = opennew(dyy_name, out_type);
dyy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dyy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dyy_fd, dyy_raster, data_type);
+ Rast_put_row(dyy_fd, dyy_raster, data_type);
}
else {
dyy_raster = NULL;
@@ -570,7 +570,7 @@
dxy_fd = opennew(dxy_name, out_type);
dxy_raster = Rast_allocate_buf(data_type);
Rast_set_null_value(dxy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dxy_fd, dxy_raster, data_type);
+ Rast_put_row(dxy_fd, dxy_raster, data_type);
}
else {
dxy_raster = NULL;
@@ -987,31 +987,31 @@
} /* column for loop */
if (aspect_fd > 0)
- Rast_put_raster_row(aspect_fd, asp_raster, data_type);
+ Rast_put_row(aspect_fd, asp_raster, data_type);
if (slope_fd > 0)
- Rast_put_raster_row(slope_fd, slp_raster, data_type);
+ Rast_put_row(slope_fd, slp_raster, data_type);
if (pcurv_fd > 0)
- Rast_put_raster_row(pcurv_fd, pcurv_raster, data_type);
+ Rast_put_row(pcurv_fd, pcurv_raster, data_type);
if (tcurv_fd > 0)
- Rast_put_raster_row(tcurv_fd, tcurv_raster, data_type);
+ Rast_put_row(tcurv_fd, tcurv_raster, data_type);
if (dx_fd > 0)
- Rast_put_raster_row(dx_fd, dx_raster, data_type);
+ Rast_put_row(dx_fd, dx_raster, data_type);
if (dy_fd > 0)
- Rast_put_raster_row(dy_fd, dy_raster, data_type);
+ Rast_put_row(dy_fd, dy_raster, data_type);
if (dxx_fd > 0)
- Rast_put_raster_row(dxx_fd, dxx_raster, data_type);
+ Rast_put_row(dxx_fd, dxx_raster, data_type);
if (dyy_fd > 0)
- Rast_put_raster_row(dyy_fd, dyy_raster, data_type);
+ Rast_put_row(dyy_fd, dyy_raster, data_type);
if (dxy_fd > 0)
- Rast_put_raster_row(dxy_fd, dxy_raster, data_type);
+ Rast_put_row(dxy_fd, dxy_raster, data_type);
} /* row loop */
@@ -1028,7 +1028,7 @@
struct FPRange range;
Rast_set_null_value(asp_raster, G_window_cols(), data_type);
- Rast_put_raster_row(aspect_fd, asp_raster, data_type);
+ Rast_put_row(aspect_fd, asp_raster, data_type);
Rast_close(aspect_fd);
if (out_type != CELL_TYPE)
@@ -1131,7 +1131,7 @@
Rast_add_c_color_rule(&val1, 255, 0, 0, &val2, 0, 0, 0, &colors);
Rast_set_null_value(slp_raster, G_window_cols(), data_type);
- Rast_put_raster_row(slope_fd, slp_raster, data_type);
+ Rast_put_row(slope_fd, slp_raster, data_type);
Rast_close(slope_fd);
if (out_type != CELL_TYPE) {
@@ -1259,7 +1259,7 @@
if (pcurv_fd >= 0) {
Rast_set_null_value(pcurv_raster, G_window_cols(), data_type);
- Rast_put_raster_row(pcurv_fd, pcurv_raster, data_type);
+ Rast_put_row(pcurv_fd, pcurv_raster, data_type);
Rast_close(pcurv_fd);
Rast_write_colors(pcurv_name, G_mapset(), &colors);
@@ -1285,7 +1285,7 @@
if (tcurv_fd >= 0) {
Rast_set_null_value(tcurv_raster, G_window_cols(), data_type);
- Rast_put_raster_row(tcurv_fd, tcurv_raster, data_type);
+ Rast_put_row(tcurv_fd, tcurv_raster, data_type);
Rast_close(tcurv_fd);
Rast_write_colors(tcurv_name, G_mapset(), &colors);
@@ -1311,7 +1311,7 @@
if (dx_fd >= 0) {
Rast_set_null_value(dx_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dx_fd, dx_raster, data_type);
+ Rast_put_row(dx_fd, dx_raster, data_type);
Rast_close(dx_fd);
if (out_type != CELL_TYPE)
@@ -1335,7 +1335,7 @@
if (dy_fd >= 0) {
Rast_set_null_value(dy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dy_fd, dy_raster, data_type);
+ Rast_put_row(dy_fd, dy_raster, data_type);
Rast_close(dy_fd);
if (out_type != CELL_TYPE)
@@ -1359,7 +1359,7 @@
if (dxx_fd >= 0) {
Rast_set_null_value(dxx_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dxx_fd, dxx_raster, data_type);
+ Rast_put_row(dxx_fd, dxx_raster, data_type);
Rast_close(dxx_fd);
if (out_type != CELL_TYPE)
@@ -1383,7 +1383,7 @@
if (dyy_fd >= 0) {
Rast_set_null_value(dyy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dyy_fd, dyy_raster, data_type);
+ Rast_put_row(dyy_fd, dyy_raster, data_type);
Rast_close(dyy_fd);
if (out_type != CELL_TYPE)
@@ -1407,7 +1407,7 @@
if (dxy_fd >= 0) {
Rast_set_null_value(dxy_raster, G_window_cols(), data_type);
- Rast_put_raster_row(dxy_fd, dxy_raster, data_type);
+ Rast_put_row(dxy_fd, dxy_raster, data_type);
Rast_close(dxy_fd);
if (out_type != CELL_TYPE)
Modified: grass/trunk/vector/lidar/lidarlib/zones.c
===================================================================
--- grass/trunk/vector/lidar/lidarlib/zones.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/vector/lidar/lidarlib/zones.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -285,7 +285,7 @@
col++, ptr = G_incr_void_ptr(ptr, Rast_cell_size(DCELL_TYPE))) {
Rast_set_raster_value_d(ptr, (DCELL) (matrix[row][col]), DCELL_TYPE);
}
- Rast_put_d_raster_row(fd, raster);
+ Rast_put_d_row(fd, raster);
}
}
Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/vector/v.kernel/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -417,7 +417,7 @@
if (gaussian > gausmax)
gausmax = gaussian;
}
- Rast_put_raster_row(fdout, output_cell, DCELL_TYPE);
+ Rast_put_row(fdout, output_cell, DCELL_TYPE);
}
Rast_close(fdout);
Modified: grass/trunk/vector/v.neighbors/main.c
===================================================================
--- grass/trunk/vector/v.neighbors/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/vector/v.neighbors/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -141,7 +141,7 @@
rp = G_incr_void_ptr(rp, Rast_cell_size(CELL_TYPE));
}
- Rast_put_raster_row(out_fd, result, CELL_TYPE);
+ Rast_put_row(out_fd, result, CELL_TYPE);
}
G_percent(row, nrows, 1);
Modified: grass/trunk/vector/v.surf.idw/main.c
===================================================================
--- grass/trunk/vector/v.surf.idw/main.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/vector/v.surf.idw/main.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -395,7 +395,7 @@
}
dcell[col] = (DCELL) interp_value;
}
- Rast_put_d_raster_row(fd, dcell);
+ Rast_put_d_row(fd, dcell);
}
Rast_close(fd);
/* writing history file */
Modified: grass/trunk/vector/v.to.rast/raster.c
===================================================================
--- grass/trunk/vector/v.to.rast/raster.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/vector/v.to.rast/raster.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -145,7 +145,7 @@
/* insert the NULL values */
Rast_insert_c_null_values(cell, null_flags[i], page.cols);
- if (Rast_put_c_raster_row(fd, cell) < 0)
+ if (Rast_put_c_row(fd, cell) < 0)
return -1;
break;
case USE_DCELL:
@@ -153,7 +153,7 @@
/* insert the NULL values */
Rast_insert_d_null_values(dcell, null_flags[i], page.cols);
- if (Rast_put_d_raster_row(fd, dcell) < 0)
+ if (Rast_put_d_row(fd, dcell) < 0)
return -1;
break;
}
Modified: grass/trunk/vector/v.vol.rst/user1.c
===================================================================
--- grass/trunk/vector/v.vol.rst/user1.c 2009-06-30 16:12:09 UTC (rev 38126)
+++ grass/trunk/vector/v.vol.rst/user1.c 2009-06-30 16:20:43 UTC (rev 38127)
@@ -408,7 +408,7 @@
0) == -1)
G_fatal_error("cannot fseek to the right spot");
fread(cell, sizeof(FCELL), nsizc, Tmp_fd_cell);
- Rast_put_f_raster_row(fdcout, cell);
+ Rast_put_f_row(fdcout, cell);
}
}
More information about the grass-commit
mailing list