[GRASS-SVN] r38106 - in grass/trunk: display/d.his display/d.nviz
display/d.rast display/d.rast.arrow display/d.rast.num
display/d.rgb doc/raster/r.example general/g.region
imagery/i.albedo imagery/i.atcorr imagery/i.biomass
imagery/i.cca imagery/i.class imagery/i.cluster
imagery/i.eb.eta imagery/i.eb.evapfr imagery/i.eb.h_SEBAL01
imagery/i.eb.soilheatflux imagery/i.emissivity
imagery/i.evapo.time_integration imagery/i.fft
imagery/i.gensig imagery/i.gensigset imagery/i.his.rgb
imagery/i.ifft imagery/i.latlong imagery/i.maxlik
imagery/i.modis.qc imagery/i.pca imagery/i.points
imagery/i.rectify imagery/i.rgb.his imagery/i.smap
imagery/i.sunhours imagery/i.vi imagery/i.vpoints
imagery/i.zc include lib/gpde lib/ogsf lib/raster
lib/rst/interp_float ps/ps.map raster/r.basins.fill
raster/r.bitpattern raster/r.buffer raster/r.carve
raster/r.category raster/r.circle raster/r.clump
raster/r.colors raster/r.composite raster/r.compress
raster/r.cost raster/r.cross raster/r.describe
raster/r.distance raster/r.drain raster/r.fill.dir
raster/r.flow raster/r.grow raster/r.grow.distance
raster/r.his raster/r.horizon raster/r.in.arc
raster/r.in.ascii raster/r.in.bin raster/r.in.gdal
raster/r.in.gridatb raster/r.in.mat raster/r.in.poly
raster/r.in.xyz raster/r.lake raster/r.le/r.le.patch
raster/r.le/r.le.pixel raster/r.le/r.le.setup
raster/r.le/r.le.setup/polytocell raster/r.li/r.li.daemon
raster/r.los raster/r.mapcalc raster/r.mfilter
raster/r.neighbors raster/r.null raster/r.out.arc
raster/r.out.ascii raster/r.out.bin raster/r.out.gridatb
raster/r.out.mpeg raster/r.out.png raster/r.out.pov
raster/r.out.ppm raster/r.out.ppm3 raster/r.out.vrml
raster/r.out.vtk raster/r.param.scale raster/r.patch
raster/r.profile raster/r.proj raster/r.quantile
raster/r.random raster/r.random.cells raster/r.random.surface
raster/r.recode raster/r.resamp.interp raster/r.resamp.rst
raster/r.resamp.stats raster/r.resample raster/r.rescale
raster/r.rescale.eq raster/r.ros raster/r.series
raster/r.slope.aspect raster/r.spread raster/r.spreadpath
raster/r.statistics2 raster/r.statistics3 raster/r.sun
raster/r.sun2 raster/r.sunmask raster/r.support
raster/r.support.stats raster/r.surf.area
raster/r.surf.contour raster/r.surf.fractal
raster/r.surf.gauss raster/r.surf.idw raster/r.surf.idw2
raster/r.surf.random raster/r.terraflow raster/r.texture
raster/r.thin raster/r.to.rast3 raster/r.to.rast3elev
raster/r.to.vect raster/r.topidx raster/r.uslek
raster/r.usler raster/r.walk raster/r.water.outlet
raster/r.watershed/ram raster/r.watershed/seg
raster/r.watershed/shed raster/simwe/simlib
raster3d/r3.cross.rast raster3d/r3.out.vtk
raster3d/r3.to.rast swig/perl/R_slope_aspect/r_slope_aspect
vector/lidar/v.surf.bspline vector/v.drape vector/v.kernel
vector/v.neighbors vector/v.sample vector/v.surf.idw
vector/v.to.rast vector/v.vol.rst visualization/xganim
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Jun 28 12:44:46 EDT 2009
Author: martinl
Date: 2009-06-28 12:44:45 -0400 (Sun, 28 Jun 2009)
New Revision: 38106
Modified:
grass/trunk/display/d.his/main.c
grass/trunk/display/d.nviz/main.c
grass/trunk/display/d.rast.arrow/main.c
grass/trunk/display/d.rast.num/main.c
grass/trunk/display/d.rast/display.c
grass/trunk/display/d.rgb/main.c
grass/trunk/doc/raster/r.example/main.c
grass/trunk/general/g.region/zoom.c
grass/trunk/imagery/i.albedo/main.c
grass/trunk/imagery/i.atcorr/main.cpp
grass/trunk/imagery/i.biomass/main.c
grass/trunk/imagery/i.cca/main.c
grass/trunk/imagery/i.class/band_files.c
grass/trunk/imagery/i.class/draw_cell.c
grass/trunk/imagery/i.class/signature.c
grass/trunk/imagery/i.cluster/main.c
grass/trunk/imagery/i.eb.eta/main.c
grass/trunk/imagery/i.eb.evapfr/main.c
grass/trunk/imagery/i.eb.h_SEBAL01/main.c
grass/trunk/imagery/i.eb.soilheatflux/main.c
grass/trunk/imagery/i.emissivity/main.c
grass/trunk/imagery/i.evapo.time_integration/main.c
grass/trunk/imagery/i.fft/main.c
grass/trunk/imagery/i.gensig/closefiles.c
grass/trunk/imagery/i.gensigset/closefiles.c
grass/trunk/imagery/i.his.rgb/closefiles.c
grass/trunk/imagery/i.ifft/main.c
grass/trunk/imagery/i.latlong/main.c
grass/trunk/imagery/i.maxlik/main.c
grass/trunk/imagery/i.modis.qc/main.c
grass/trunk/imagery/i.pca/main.c
grass/trunk/imagery/i.points/drawcell.c
grass/trunk/imagery/i.rectify/rectify.c
grass/trunk/imagery/i.rectify/write.c
grass/trunk/imagery/i.rgb.his/closefiles.c
grass/trunk/imagery/i.smap/closefiles.c
grass/trunk/imagery/i.sunhours/main.c
grass/trunk/imagery/i.vi/main.c
grass/trunk/imagery/i.vpoints/drawcell.c
grass/trunk/imagery/i.zc/main.c
grass/trunk/include/raster.h
grass/trunk/lib/gpde/N_arrays_io.c
grass/trunk/lib/ogsf/Gs3.c
grass/trunk/lib/raster/auto_mask.c
grass/trunk/lib/raster/closecell.c
grass/trunk/lib/raster/opencell.c
grass/trunk/lib/raster/set_window.c
grass/trunk/lib/rst/interp_float/output2d.c
grass/trunk/lib/rst/interp_float/resout2d.c
grass/trunk/ps/ps.map/outl_io.c
grass/trunk/ps/ps.map/ps_raster.c
grass/trunk/ps/ps.map/r_cell.c
grass/trunk/ps/ps.map/r_group.c
grass/trunk/ps/ps.map/r_rgb.c
grass/trunk/raster/r.basins.fill/main.c
grass/trunk/raster/r.basins.fill/read_map.c
grass/trunk/raster/r.bitpattern/main.c
grass/trunk/raster/r.buffer/read_map.c
grass/trunk/raster/r.buffer/write_map.c
grass/trunk/raster/r.carve/main.c
grass/trunk/raster/r.category/cats.c
grass/trunk/raster/r.category/main.c
grass/trunk/raster/r.circle/main.c
grass/trunk/raster/r.clump/main.c
grass/trunk/raster/r.colors/stats.c
grass/trunk/raster/r.composite/main.c
grass/trunk/raster/r.compress/main.c
grass/trunk/raster/r.cost/main.c
grass/trunk/raster/r.cross/main.c
grass/trunk/raster/r.describe/describe.c
grass/trunk/raster/r.distance/distance.c
grass/trunk/raster/r.distance/edges.c
grass/trunk/raster/r.drain/main.c
grass/trunk/raster/r.fill.dir/main.c
grass/trunk/raster/r.flow/io.c
grass/trunk/raster/r.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/poly2rast.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/cellclip.c
grass/trunk/raster/r.le/r.le.pixel/driver.c
grass/trunk/raster/r.le/r.le.pixel/texture.c
grass/trunk/raster/r.le/r.le.setup/mv_wind.c
grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c
grass/trunk/raster/r.le/r.le.setup/sample.c
grass/trunk/raster/r.li/r.li.daemon/daemon.c
grass/trunk/raster/r.li/r.li.daemon/worker.c
grass/trunk/raster/r.los/main.c
grass/trunk/raster/r.mapcalc/map.c
grass/trunk/raster/r.mfilter/perform.c
grass/trunk/raster/r.neighbors/main.c
grass/trunk/raster/r.null/main.c
grass/trunk/raster/r.out.arc/main.c
grass/trunk/raster/r.out.ascii/main.c
grass/trunk/raster/r.out.bin/main.c
grass/trunk/raster/r.out.gridatb/file_io.c
grass/trunk/raster/r.out.mpeg/main.c
grass/trunk/raster/r.out.png/main.c
grass/trunk/raster/r.out.pov/main.c
grass/trunk/raster/r.out.ppm/main.c
grass/trunk/raster/r.out.ppm3/main.c
grass/trunk/raster/r.out.vrml/main.c
grass/trunk/raster/r.out.vtk/main.c
grass/trunk/raster/r.param.scale/close_down.c
grass/trunk/raster/r.patch/main.c
grass/trunk/raster/r.profile/main.c
grass/trunk/raster/r.proj/main.c
grass/trunk/raster/r.quantile/main.c
grass/trunk/raster/r.random.cells/indep.c
grass/trunk/raster/r.random.cells/init.c
grass/trunk/raster/r.random.surface/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.rst/main.c
grass/trunk/raster/r.resamp.stats/main.c
grass/trunk/raster/r.resample/main.c
grass/trunk/raster/r.rescale.eq/get_stats.c
grass/trunk/raster/r.rescale/get_range.c
grass/trunk/raster/r.ros/main.c
grass/trunk/raster/r.series/main.c
grass/trunk/raster/r.slope.aspect/main.c
grass/trunk/raster/r.spread/main.c
grass/trunk/raster/r.spreadpath/main.c
grass/trunk/raster/r.statistics2/main.c
grass/trunk/raster/r.statistics3/main.c
grass/trunk/raster/r.sun/main.c
grass/trunk/raster/r.sun2/main.c
grass/trunk/raster/r.sunmask/main.c
grass/trunk/raster/r.support.stats/histo.c
grass/trunk/raster/r.support/histo.c
grass/trunk/raster/r.support/main.c
grass/trunk/raster/r.surf.area/main.c
grass/trunk/raster/r.surf.contour/main.c
grass/trunk/raster/r.surf.contour/read_cell.c
grass/trunk/raster/r.surf.fractal/write_rast.c
grass/trunk/raster/r.surf.gauss/gaussurf.c
grass/trunk/raster/r.surf.idw/main.c
grass/trunk/raster/r.surf.idw2/main.c
grass/trunk/raster/r.surf.idw2/read_cell.c
grass/trunk/raster/r.surf.random/randsurf.c
grass/trunk/raster/r.terraflow/grass2str.h
grass/trunk/raster/r.texture/main.c
grass/trunk/raster/r.thin/io.c
grass/trunk/raster/r.to.rast3/main.c
grass/trunk/raster/r.to.rast3elev/main.c
grass/trunk/raster/r.to.vect/main.c
grass/trunk/raster/r.topidx/file_io.c
grass/trunk/raster/r.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/ram/init_vars.c
grass/trunk/raster/r.watershed/ram/sg_factor.c
grass/trunk/raster/r.watershed/seg/bseg_read.c
grass/trunk/raster/r.watershed/seg/bseg_write.c
grass/trunk/raster/r.watershed/seg/close_maps.c
grass/trunk/raster/r.watershed/seg/close_maps2.c
grass/trunk/raster/r.watershed/seg/cseg_read.c
grass/trunk/raster/r.watershed/seg/cseg_write.c
grass/trunk/raster/r.watershed/seg/dseg_read.c
grass/trunk/raster/r.watershed/seg/dseg_write.c
grass/trunk/raster/r.watershed/seg/init_vars.c
grass/trunk/raster/r.watershed/shed/read.c
grass/trunk/raster/simwe/simlib/input.c
grass/trunk/raster/simwe/simlib/output.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.out.vtk/errorHandling.c
grass/trunk/raster3d/r3.out.vtk/main.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c
grass/trunk/vector/lidar/v.surf.bspline/main.c
grass/trunk/vector/v.drape/main.c
grass/trunk/vector/v.kernel/main.c
grass/trunk/vector/v.neighbors/main.c
grass/trunk/vector/v.sample/main.c
grass/trunk/vector/v.surf.idw/main.c
grass/trunk/vector/v.to.rast/support.c
grass/trunk/vector/v.to.rast/vect2rast.c
grass/trunk/vector/v.vol.rst/main.c
grass/trunk/visualization/xganim/main.cc
Log:
rasterlib: Rast_unopen_cell -> Rast_unopen
Rast_close_cell -> Rast_close
see http://trac.osgeo.org/grass/wiki/Grass7/RasterLib
Modified: grass/trunk/display/d.his/main.c
===================================================================
--- grass/trunk/display/d.his/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/display/d.his/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -246,11 +246,11 @@
D_close_driver();
/* Close the raster maps */
- Rast_close_cell(hue_file);
+ Rast_close(hue_file);
if (int_used)
- Rast_close_cell(int_file);
+ Rast_close(int_file);
if (sat_used)
- Rast_close_cell(sat_file);
+ Rast_close(sat_file);
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/display/d.nviz/main.c
===================================================================
--- grass/trunk/display/d.nviz/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/display/d.nviz/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -315,7 +315,7 @@
fprintf(fp, "SendScriptLine \"set ScriptPlaying 0\"\n");
fprintf(fp, "puts \"DONE!\"\n");
- Rast_close_cell(fd);
+ Rast_close(fd);
fclose(fp);
sprintf(buf1, _("Created NVIZ script <%s>."), outfile);
Modified: grass/trunk/display/d.rast/display.c
===================================================================
--- grass/trunk/display/d.rast/display.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/display/d.rast/display.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -81,7 +81,7 @@
G_percent(nrows, nrows, 2);
/* Wrap up and return */
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
G_free(xarray);
return (0);
}
Modified: grass/trunk/display/d.rast.arrow/main.c
===================================================================
--- grass/trunk/display/d.rast.arrow/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/display/d.rast.arrow/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -501,9 +501,9 @@
}
}
- Rast_close_cell(layer_fd);
+ Rast_close(layer_fd);
if (opt7->answer)
- Rast_close_cell(mag_fd);
+ Rast_close(mag_fd);
D_close_driver();
Modified: grass/trunk/display/d.rast.num/main.c
===================================================================
--- grass/trunk/display/d.rast.num/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/display/d.rast.num/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -241,7 +241,7 @@
}
}
- Rast_close_cell(layer_fd);
+ Rast_close(layer_fd);
D_close_driver();
Modified: grass/trunk/display/d.rgb/main.c
===================================================================
--- grass/trunk/display/d.rgb/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/display/d.rgb/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -132,7 +132,7 @@
/* Close the raster maps */
for (i = 0; i < 3; i++)
- Rast_close_cell(B[i].file);
+ Rast_close(B[i].file);
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/doc/raster/r.example/main.c
===================================================================
--- grass/trunk/doc/raster/r.example/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/doc/raster/r.example/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -184,8 +184,8 @@
G_free(outrast);
/* closing raster maps */
- Rast_close_cell(infd);
- Rast_close_cell(outfd);
+ Rast_close(infd);
+ Rast_close(outfd);
/* add command line incantation to history file */
Rast_short_history(result, "raster", &history);
Modified: grass/trunk/general/g.region/zoom.c
===================================================================
--- grass/trunk/general/g.region/zoom.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/general/g.region/zoom.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -55,7 +55,7 @@
if (mark > right)
right = mark;
}
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(raster);
/* no data everywhere? */
Modified: grass/trunk/imagery/i.albedo/main.c
===================================================================
--- grass/trunk/imagery/i.albedo/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.albedo/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -394,10 +394,10 @@
}
for (i = 1; i <= nfiles; i++) {
G_free(inrast[i]);
- Rast_close_cell(infd[i]);
+ Rast_close(infd[i]);
}
G_free(outrast);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
/* Color table from 0.0 to 1.0 */
Rast_init_colors(&colors);
Modified: grass/trunk/imagery/i.atcorr/main.cpp
===================================================================
--- grass/trunk/imagery/i.atcorr/main.cpp 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.atcorr/main.cpp 2009-06-28 16:44:45 UTC (rev 38106)
@@ -647,10 +647,10 @@
/* Close the input and output file descriptors */
Rast_short_history(opts.oimg->answer, "raster", &hist);
- Rast_close_cell(iimg_fd);
- if(opts.ialt->answer) Rast_close_cell(ialt_fd);
- if(opts.ivis->answer) Rast_close_cell(ivis_fd);
- Rast_close_cell(oimg_fd);
+ Rast_close(iimg_fd);
+ if(opts.ialt->answer) Rast_close(ialt_fd);
+ if(opts.ivis->answer) Rast_close(ivis_fd);
+ Rast_close(oimg_fd);
Rast_command_history(&hist);
Rast_write_history(opts.oimg->answer, &hist);
Modified: grass/trunk/imagery/i.biomass/main.c
===================================================================
--- grass/trunk/imagery/i.biomass/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.biomass/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -191,13 +191,13 @@
G_free(inrast_tsw);
G_free(inrast_wa);
G_free(outrast1);
- Rast_close_cell(infd_fpar);
- Rast_close_cell(infd_luf);
- Rast_close_cell(infd_lat);
- Rast_close_cell(infd_doy);
- Rast_close_cell(infd_tsw);
- Rast_close_cell(infd_wa);
- Rast_close_cell(outfd1);
+ Rast_close(infd_fpar);
+ Rast_close(infd_luf);
+ Rast_close(infd_lat);
+ Rast_close(infd_doy);
+ Rast_close(infd_tsw);
+ Rast_close(infd_wa);
+ Rast_close(outfd1);
Rast_short_history(result1, "raster", &history);
Rast_command_history(&history);
Rast_write_history(result1, &history);
Modified: grass/trunk/imagery/i.cca/main.c
===================================================================
--- grass/trunk/imagery/i.cca/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.cca/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -188,8 +188,8 @@
/* close the cell maps */
for (i = 1; i <= bands; i++) {
- Rast_close_cell(datafds[i]);
- Rast_close_cell(outfds[i]);
+ Rast_close(datafds[i]);
+ Rast_close(outfds[i]);
if (outbandmin[i] < (CELL) 0 || outbandmax[i] > (CELL) 255) {
G_warning(_("The output cell map <%s.%d> has values "
Modified: grass/trunk/imagery/i.class/band_files.c
===================================================================
--- grass/trunk/imagery/i.class/band_files.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.class/band_files.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -34,7 +34,7 @@
nbands = Refer.nfiles;
for (n = 0; n < nbands; n++) {
G_free(Bandbuf[n]);
- Rast_close_cell(Bandfd[n]);
+ Rast_close(Bandfd[n]);
}
G_free(Bandbuf);
G_free(Bandfd);
Modified: grass/trunk/imagery/i.class/draw_cell.c
===================================================================
--- grass/trunk/imagery/i.class/draw_cell.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.class/draw_cell.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -56,7 +56,7 @@
D_draw_d_raster(row, dcell, &colr);
}
D_cell_draw_end();
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(dcell);
Rast_free_colors(&colr);
Modified: grass/trunk/imagery/i.class/signature.c
===================================================================
--- grass/trunk/imagery/i.class/signature.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.class/signature.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -294,7 +294,7 @@
Rast_put_raster_row(fd, buffer, CELL_TYPE);
}
- Rast_close_cell(fd);
+ Rast_close(fd);
close_band_files();
} /* end of if first_display */
Modified: grass/trunk/imagery/i.cluster/main.c
===================================================================
--- grass/trunk/imagery/i.cluster/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.cluster/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -303,7 +303,7 @@
for (n = 0; n < ref.nfiles; n++) {
G_free(cell[n]);
- Rast_close_cell(cellfd[n]);
+ Rast_close(cellfd[n]);
}
G_free(x);
Modified: grass/trunk/imagery/i.eb.eta/main.c
===================================================================
--- grass/trunk/imagery/i.eb.eta/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.eb.eta/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -133,11 +133,11 @@
G_free(inrast_rnetday);
G_free(inrast_evapfr);
G_free(inrast_tempk);
- Rast_close_cell(infd_rnetday);
- Rast_close_cell(infd_evapfr);
- Rast_close_cell(infd_tempk);
+ Rast_close(infd_rnetday);
+ Rast_close(infd_evapfr);
+ Rast_close(infd_tempk);
G_free(outrast1);
- Rast_close_cell(outfd1);
+ Rast_close(outfd1);
Rast_short_history(result1, "raster", &history);
Rast_command_history(&history);
Rast_write_history(result1, &history);
Modified: grass/trunk/imagery/i.eb.evapfr/main.c
===================================================================
--- grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.eb.evapfr/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -177,14 +177,14 @@
G_free(inrast_rnet);
G_free(inrast_g0);
G_free(inrast_h0);
- Rast_close_cell(infd_rnet);
- Rast_close_cell(infd_g0);
- Rast_close_cell(infd_h0);
+ Rast_close(infd_rnet);
+ Rast_close(infd_g0);
+ Rast_close(infd_h0);
G_free(outrast1);
G_free(outrast2);
if (makin) {
- Rast_close_cell(outfd1);
- Rast_close_cell(outfd2);
+ Rast_close(outfd1);
+ Rast_close(outfd2);
}
Rast_short_history(result1, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/imagery/i.eb.h_SEBAL01/main.c
===================================================================
--- grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.eb.h_SEBAL01/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -635,12 +635,12 @@
G_free(inrast_z0m);
- Rast_close_cell(infd_z0m);
+ Rast_close(infd_z0m);
G_free(inrast_t0dem);
- Rast_close_cell(infd_t0dem);
+ Rast_close(infd_t0dem);
G_free(outrast);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
/* add command line incantation to history file */
Rast_short_history(h0, "raster", &history);
Modified: grass/trunk/imagery/i.eb.soilheatflux/main.c
===================================================================
--- grass/trunk/imagery/i.eb.soilheatflux/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.eb.soilheatflux/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -176,13 +176,13 @@
G_free(inrast_tempk);
G_free(inrast_rnet);
G_free(inrast_time);
- Rast_close_cell(infd_albedo);
- Rast_close_cell(infd_ndvi);
- Rast_close_cell(infd_tempk);
- Rast_close_cell(infd_rnet);
- Rast_close_cell(infd_time);
+ Rast_close(infd_albedo);
+ Rast_close(infd_ndvi);
+ Rast_close(infd_tempk);
+ Rast_close(infd_rnet);
+ Rast_close(infd_time);
G_free(outrast);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
/* Colors in grey shade */
Rast_init_colors(&colors);
Modified: grass/trunk/imagery/i.emissivity/main.c
===================================================================
--- grass/trunk/imagery/i.emissivity/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.emissivity/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -103,9 +103,9 @@
G_fatal_error(_("Cannot write to output raster file"));
}
G_free(inr);
- Rast_close_cell(infd);
+ Rast_close(infd);
G_free(outr);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
Rast_short_history(result1, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/imagery/i.evapo.time_integration/main.c
===================================================================
--- grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.evapo.time_integration/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -418,14 +418,14 @@
for (i = 1; i <= nfiles; i++) {
G_free(inrast[i]);
- Rast_close_cell(infd[i]);
+ Rast_close(infd[i]);
G_free(inrast1[i]);
- Rast_close_cell(infd1[i]);
+ Rast_close(infd1[i]);
G_free(inrast2[i]);
- Rast_close_cell(infd2[i]);
+ Rast_close(infd2[i]);
}
G_free(outrast);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
/* Color table from 0.0 to 10.0 */
Rast_init_colors(&colors);
Modified: grass/trunk/imagery/i.fft/main.c
===================================================================
--- grass/trunk/imagery/i.fft/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.fft/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -143,7 +143,7 @@
}
/* close input cell map */
- Rast_close_cell(inputfd);
+ Rast_close(inputfd);
/* perform FFT */
G_message(_("Starting FFT..."));
@@ -190,8 +190,8 @@
G_percent(i+1, rows, 2);
}
- Rast_close_cell(realfd);
- Rast_close_cell(imagfd);
+ Rast_close(realfd);
+ Rast_close(imagfd);
G_free(cell_real);
G_free(cell_imag);
Modified: grass/trunk/imagery/i.gensig/closefiles.c
===================================================================
--- grass/trunk/imagery/i.gensig/closefiles.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.gensig/closefiles.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -7,9 +7,9 @@
int n;
- Rast_close_cell(files->train_fd);
+ Rast_close(files->train_fd);
for (n = 0; n < files->nbands; n++)
- Rast_close_cell(files->band_fd[n]);
+ Rast_close(files->band_fd[n]);
return 0;
}
Modified: grass/trunk/imagery/i.gensigset/closefiles.c
===================================================================
--- grass/trunk/imagery/i.gensigset/closefiles.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.gensigset/closefiles.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -8,9 +8,9 @@
int n;
- Rast_close_cell(files->train_fd);
+ Rast_close(files->train_fd);
for (n = 0; n < files->nbands; n++)
- Rast_close_cell(files->band_fd[n]);
+ Rast_close(files->band_fd[n]);
return 0;
}
Modified: grass/trunk/imagery/i.his.rgb/closefiles.c
===================================================================
--- grass/trunk/imagery/i.his.rgb/closefiles.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.his.rgb/closefiles.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -17,7 +17,7 @@
const char *mapset;
for (i = 0; i < 3; i++) {
- Rast_close_cell(fd_output[i]);
+ Rast_close(fd_output[i]);
G_free(rowbuf[i]);
}
Modified: grass/trunk/imagery/i.ifft/main.c
===================================================================
--- grass/trunk/imagery/i.ifft/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.ifft/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -161,8 +161,8 @@
}
/* close input cell maps */
- Rast_close_cell(realfd);
- Rast_close_cell(imagfd);
+ Rast_close(realfd);
+ Rast_close(imagfd);
/* Read in cell map values */
G_message(_("Masking raster maps..."));
@@ -181,7 +181,7 @@
G_percent(i+1, rows, 2);
}
- Rast_close_cell(maskfd);
+ Rast_close(maskfd);
G_free(maskbuf);
}
@@ -228,7 +228,7 @@
G_percent(i+1, rows, 2);
}
- Rast_close_cell(outputfd);
+ Rast_close(outputfd);
G_free(cell_real);
G_free(cell_imag);
Modified: grass/trunk/imagery/i.latlong/main.c
===================================================================
--- grass/trunk/imagery/i.latlong/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.latlong/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -146,9 +146,9 @@
G_fatal_error(_("Cannot write to output raster file"));
}
G_free(inrast);
- Rast_close_cell(infd);
+ Rast_close(infd);
G_free(outrast1);
- Rast_close_cell(outfd1);
+ Rast_close(outfd1);
Rast_short_history(result1, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/imagery/i.maxlik/main.c
===================================================================
--- grass/trunk/imagery/i.maxlik/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.maxlik/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -120,9 +120,9 @@
}
G_percent(nrows, nrows, 2);
- Rast_close_cell(class_fd);
+ Rast_close(class_fd);
if (reject_fd > 0)
- Rast_close_cell(reject_fd);
+ Rast_close(reject_fd);
Rast_init_cats("Maximum Likelihood Classification", &cats);
for (i = 0; i < S.nsigs; i++) {
Modified: grass/trunk/imagery/i.modis.qc/main.c
===================================================================
--- grass/trunk/imagery/i.modis.qc/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.modis.qc/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -328,9 +328,9 @@
}
G_free(inrast);
- Rast_close_cell(infd);
+ Rast_close(infd);
G_free(outrast);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
/* Color from 0 to 10 in grey */
Rast_init_colors(&colors);
Modified: grass/trunk/imagery/i.pca/main.c
===================================================================
--- grass/trunk/imagery/i.pca/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.pca/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -174,7 +174,7 @@
write_support(bands, outname, eigmat, eigval);
/* close output file */
- Rast_unopen_cell(inp_fd[i]);
+ Rast_unopen(inp_fd[i]);
}
exit(EXIT_SUCCESS);
@@ -523,7 +523,7 @@
/* close output file */
if (pass == PASSES)
- Rast_close_cell(out_fd);
+ Rast_close(out_fd);
}
}
Modified: grass/trunk/imagery/i.points/drawcell.c
===================================================================
--- grass/trunk/imagery/i.points/drawcell.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.points/drawcell.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -64,7 +64,7 @@
D_draw_d_raster(row, dcell, colors);
}
D_cell_draw_end();
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(dcell);
if (colors != &VIEW_MAP1->cell.colors)
set_colors(&VIEW_MAP1->cell.colors);
Modified: grass/trunk/imagery/i.rectify/rectify.c
===================================================================
--- grass/trunk/imagery/i.rectify/rectify.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.rectify/rectify.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -105,7 +105,7 @@
}
target_window.compressed = cellhd.compressed;
- Rast_close_cell(infd); /* (pmx) 17 april 2000 */
+ Rast_close(infd); /* (pmx) 17 april 2000 */
write_map(result);
select_current_env();
Modified: grass/trunk/imagery/i.rectify/write.c
===================================================================
--- grass/trunk/imagery/i.rectify/write.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.rectify/write.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -63,7 +63,7 @@
}
close(temp_fd);
unlink(temp_name);
- Rast_close_cell(fd);
+ Rast_close(fd);
return 0;
}
Modified: grass/trunk/imagery/i.rgb.his/closefiles.c
===================================================================
--- grass/trunk/imagery/i.rgb.his/closefiles.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.rgb.his/closefiles.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -17,7 +17,7 @@
const char *mapset;
for (i = 0; i < 3; i++) {
- Rast_close_cell(fd_output[i]);
+ Rast_close(fd_output[i]);
G_free(rowbuf[i]);
}
Modified: grass/trunk/imagery/i.smap/closefiles.c
===================================================================
--- grass/trunk/imagery/i.smap/closefiles.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.smap/closefiles.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -14,9 +14,9 @@
G_debug(1, "Creating support files for <%s>...", parms->output_map);
for (n = 0; n < files->nbands; n++)
- Rast_close_cell(files->band_fd[n]);
+ Rast_close(files->band_fd[n]);
- Rast_close_cell(files->output_fd);
+ Rast_close(files->output_fd);
Rast_write_cats(parms->output_map, &files->output_labels);
make_history(parms->output_map,
parms->group, parms->subgroup, parms->sigfile);
Modified: grass/trunk/imagery/i.sunhours/main.c
===================================================================
--- grass/trunk/imagery/i.sunhours/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.sunhours/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -123,10 +123,10 @@
}
G_free(inrast_lat);
G_free(inrast_doy);
- Rast_close_cell(infd_lat);
- Rast_close_cell(infd_doy);
+ Rast_close(infd_lat);
+ Rast_close(infd_doy);
G_free(outrast1);
- Rast_close_cell(outfd1);
+ Rast_close(outfd1);
Rast_short_history(result1, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/imagery/i.vi/main.c
===================================================================
--- grass/trunk/imagery/i.vi/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.vi/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -375,28 +375,28 @@
}
G_free(inrast_redchan);
- Rast_close_cell(infd_redchan);
+ Rast_close(infd_redchan);
G_free(inrast_nirchan);
- Rast_close_cell(infd_nirchan);
+ Rast_close(infd_nirchan);
if (greenchan) {
G_free(inrast_greenchan);
- Rast_close_cell(infd_greenchan);
+ Rast_close(infd_greenchan);
}
if (bluechan) {
G_free(inrast_bluechan);
- Rast_close_cell(infd_bluechan);
+ Rast_close(infd_bluechan);
}
if (chan5chan) {
G_free(inrast_chan5chan);
- Rast_close_cell(infd_chan5chan);
+ Rast_close(infd_chan5chan);
}
if (chan7chan) {
G_free(inrast_chan7chan);
- Rast_close_cell(infd_chan7chan);
+ Rast_close(infd_chan7chan);
}
G_free(outrast);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
/* Color from -1.0 to +1.0 in grey */
Rast_init_colors(&colors);
Modified: grass/trunk/imagery/i.vpoints/drawcell.c
===================================================================
--- grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.vpoints/drawcell.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -79,7 +79,7 @@
if (view == VIEW_MAP2 || view == VIEW_MAP2_ZOOM)
cellmap_present = 1; /* for drawcell */
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(dcell);
Modified: grass/trunk/imagery/i.zc/main.c
===================================================================
--- grass/trunk/imagery/i.zc/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/imagery/i.zc/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -159,7 +159,7 @@
*(data[0] + (i * size) + j) = (double)cell_row[j];
}
/* close input cell map and release the row buffer */
- Rast_close_cell(inputfd);
+ Rast_close(inputfd);
G_free(cell_row);
/* take the del**2g of image */
@@ -184,7 +184,7 @@
}
Rast_put_raster_row(zcfd, cell_row, CELL_TYPE);
}
- Rast_close_cell(zcfd);
+ Rast_close(zcfd);
G_free(cell_row);
Modified: grass/trunk/include/raster.h
===================================================================
--- grass/trunk/include/raster.h 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/include/raster.h 2009-06-28 16:44:45 UTC (rev 38106)
@@ -81,8 +81,8 @@
void (*)(CELL, CELL, CELL));
/* closecell.c */
-int Rast_close_cell(int);
-int Rast_unopen_cell(int);
+int Rast_close(int);
+int Rast_unopen(int);
/* color_compat.c */
void Rast_make_ryg_colors(struct Colors *, CELL, CELL);
Modified: grass/trunk/lib/gpde/N_arrays_io.c
===================================================================
--- grass/trunk/lib/gpde/N_arrays_io.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/lib/gpde/N_arrays_io.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -101,7 +101,7 @@
G_percent(y, rows - 1, 10);
if (!Rast_get_raster_row(map, rast, y, type)) {
- Rast_close_cell(map);
+ Rast_close(map);
G_fatal_error(_("Could not get raster row"));
}
@@ -159,7 +159,7 @@
}
/* Close file */
- if (Rast_close_cell(map) < 0)
+ if (Rast_close(map) < 0)
G_fatal_error(_("Unable to close input map"));
return data;
@@ -225,23 +225,23 @@
}
if (type == CELL_TYPE)
if (!Rast_put_c_raster_row(map, rast)) {
- Rast_unopen_cell(map); /*unopen the new raster map */
+ 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)) {
- Rast_unopen_cell(map); /*unopen the new raster map */
+ 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)) {
- Rast_unopen_cell(map); /*unopen the new raster map */
+ Rast_unopen(map); /*unopen the new raster map */
G_fatal_error(_("Unable to write raster row %i"), y);
}
}
/* Close file */
- if (Rast_close_cell(map) < 0)
+ if (Rast_close(map) < 0)
G_fatal_error(_("Unable to close input map"));
return;
Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/lib/ogsf/Gs3.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -160,7 +160,7 @@
G_debug(4, " has_null=%d", *has_null);
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
G_free(nullflags);
@@ -234,7 +234,7 @@
}
G_percent(1, 1, 1);
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
G_free(nullflags);
@@ -413,7 +413,7 @@
}
G_percent(1, 1, 1);
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
G_free(tmp_buf);
G_free(nullflags);
@@ -530,7 +530,7 @@
}
G_percent(1, 1, 1);
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
G_free(tmp_buf);
G_free(nullflags);
@@ -605,7 +605,7 @@
}
}
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
G_free(tmp_buf);
G_free(nullflags);
@@ -885,7 +885,7 @@
/* TODO: may want to keep these around for multiple queries */
Rast_free_cats(&cats);
- Rast_close_cell(fd);
+ Rast_close(fd);
return (1);
}
Modified: grass/trunk/lib/raster/auto_mask.c
===================================================================
--- grass/trunk/lib/raster/auto_mask.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/lib/raster/auto_mask.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -60,7 +60,7 @@
}
}
- Rast_unopen_cell(R__.mask_fd);
+ Rast_unopen(R__.mask_fd);
R__.mask_fd = Rast__open_cell_old("MASK", G_mapset());
if (R__.mask_fd < 0) {
R__.auto_mask = 0;
@@ -85,7 +85,7 @@
void Rast_suppress_masking(void)
{
if (R__.auto_mask > 0) {
- Rast_close_cell(R__.mask_fd);
+ Rast_close(R__.mask_fd);
/* G_free (R__.mask_buf); */
R__.mask_fd = -1;
}
Modified: grass/trunk/lib/raster/closecell.c
===================================================================
--- grass/trunk/lib/raster/closecell.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/lib/raster/closecell.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -67,7 +67,7 @@
* \return -1 on error
* \return 1 on success
*/
-int Rast_close_cell(int fd)
+int Rast_close(int fd)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
@@ -100,7 +100,7 @@
* \return -1 on error
* \return 1 on success
*/
-int Rast_unopen_cell(int fd)
+int Rast_unopen(int fd)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
Modified: grass/trunk/lib/raster/opencell.c
===================================================================
--- grass/trunk/lib/raster/opencell.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/lib/raster/opencell.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -362,7 +362,7 @@
The file must be written sequentially. Use Rast_open_cell_new_random()
for non sequential writes.
- Note: the open actually creates a temporary file Rast_close_cell() will
+ Note: the open actually creates a temporary file Rast_close() will
move the temporary file to the cell file and write out the necessary
support files (cellhd, cats, hist, etc.).
Modified: grass/trunk/lib/raster/set_window.c
===================================================================
--- grass/trunk/lib/raster/set_window.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/lib/raster/set_window.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -64,7 +64,7 @@
/* close the mask */
if (R__.auto_mask > 0) {
- Rast_close_cell(maskfd);
+ Rast_close(maskfd);
/* G_free (R__.mask_buf); */
R__.mask_fd = -1;
R__.auto_mask = -1; /* turn off masking */
Modified: grass/trunk/lib/rst/interp_float/output2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/output2d.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/lib/rst/interp_float/output2d.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -245,17 +245,17 @@
}
if (cf1)
- Rast_close_cell(cf1);
+ Rast_close(cf1);
if (cf2)
- Rast_close_cell(cf2);
+ Rast_close(cf2);
if (cf3)
- Rast_close_cell(cf3);
+ Rast_close(cf3);
if (cf4)
- Rast_close_cell(cf4);
+ Rast_close(cf4);
if (cf5)
- Rast_close_cell(cf5);
+ Rast_close(cf5);
if (cf6)
- Rast_close_cell(cf6);
+ Rast_close(cf6);
/* colortable for elevations */
Modified: grass/trunk/lib/rst/interp_float/resout2d.c
===================================================================
--- grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/lib/rst/interp_float/resout2d.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -247,17 +247,17 @@
}
if (cf1)
- Rast_close_cell(cf1);
+ Rast_close(cf1);
if (cf2)
- Rast_close_cell(cf2);
+ Rast_close(cf2);
if (cf3)
- Rast_close_cell(cf3);
+ Rast_close(cf3);
if (cf4)
- Rast_close_cell(cf4);
+ Rast_close(cf4);
if (cf5)
- Rast_close_cell(cf5);
+ Rast_close(cf5);
if (cf6)
- Rast_close_cell(cf6);
+ Rast_close(cf6);
/* write colormaps and history for output cell files */
/* colortable for elevations */
Modified: grass/trunk/ps/ps.map/outl_io.c
===================================================================
--- grass/trunk/ps/ps.map/outl_io.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/ps/ps.map/outl_io.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -78,7 +78,7 @@
int o_close_file(void)
{
- Rast_close_cell(in_file_d);
+ Rast_close(in_file_d);
return 0;
}
Modified: grass/trunk/ps/ps.map/ps_raster.c
===================================================================
--- grass/trunk/ps/ps.map/ps_raster.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/ps/ps.map/ps_raster.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -194,13 +194,13 @@
if (PS.do_raster) {
if (!PS.do_colortable)
Rast_free_colors(&PS.colors);
- Rast_close_cell(PS.cell_fd);
+ Rast_close(PS.cell_fd);
G_free(cellbuf);
}
else {
for (i = 0; i < 3; i++) {
Rast_free_colors(&(grp.colors[i]));
- Rast_close_cell(grp.fd[i]);
+ Rast_close(grp.fd[i]);
G_free(cbuf[i]);
}
I_free_group_ref(&grp.ref);
Modified: grass/trunk/ps/ps.map/r_cell.c
===================================================================
--- grass/trunk/ps/ps.map/r_cell.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/ps/ps.map/r_cell.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -15,7 +15,7 @@
PS.do_colortable = 0;
if (PS.cell_fd >= 0) {
- Rast_close_cell(PS.cell_fd);
+ Rast_close(PS.cell_fd);
G_free(PS.cell_name);
Rast_free_colors(&PS.colors);
PS.cell_fd = -1;
Modified: grass/trunk/ps/ps.map/r_group.c
===================================================================
--- grass/trunk/ps/ps.map/r_group.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/ps/ps.map/r_group.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -19,7 +19,7 @@
PS.do_raster = 0;
PS.do_colortable = 0;
if (PS.cell_fd >= 0) {
- Rast_close_cell(PS.cell_fd);
+ Rast_close(PS.cell_fd);
G_free(PS.cell_name);
Rast_free_colors(&PS.colors);
PS.cell_fd = -1;
Modified: grass/trunk/ps/ps.map/r_rgb.c
===================================================================
--- grass/trunk/ps/ps.map/r_rgb.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/ps/ps.map/r_rgb.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -24,7 +24,7 @@
PS.do_raster = 0;
PS.do_colortable = 0;
if (PS.cell_fd >= 0) {
- Rast_close_cell(PS.cell_fd);
+ Rast_close(PS.cell_fd);
G_free(PS.cell_name);
Rast_free_colors(&PS.colors);
PS.cell_fd = -1;
Modified: grass/trunk/raster/r.basins.fill/main.c
===================================================================
--- grass/trunk/raster/r.basins.fill/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.basins.fill/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -156,7 +156,7 @@
Rast_put_raster_row(partfd, drain + (row * ncols), CELL_TYPE);
G_message(_("Creating support files for <%s>..."), part_name);
- Rast_close_cell(partfd);
+ Rast_close(partfd);
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/raster/r.basins.fill/read_map.c
===================================================================
--- grass/trunk/raster/r.basins.fill/read_map.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.basins.fill/read_map.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -51,7 +51,7 @@
}
G_percent(nrows, nrows, 10);
- Rast_close_cell(fd);
+ Rast_close(fd);
return map;
}
Modified: grass/trunk/raster/r.bitpattern/main.c
===================================================================
--- grass/trunk/raster/r.bitpattern/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.bitpattern/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -146,8 +146,8 @@
G_free(inrast);
G_free(outrast);
- Rast_close_cell(infd);
- Rast_close_cell(outfd);
+ Rast_close(infd);
+ Rast_close(outfd);
return (EXIT_SUCCESS);
}
Modified: grass/trunk/raster/r.buffer/read_map.c
===================================================================
--- grass/trunk/raster/r.buffer/read_map.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.buffer/read_map.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -100,7 +100,7 @@
cell -= window.cols;
}
G_percent(row, window.rows, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(cell);
return 0;
Modified: grass/trunk/raster/r.buffer/write_map.c
===================================================================
--- grass/trunk/raster/r.buffer/write_map.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.buffer/write_map.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -84,9 +84,9 @@
G_free(cell);
if (offset)
- Rast_close_cell(fd_in);
+ Rast_close(fd_in);
- Rast_close_cell(fd_out);
+ Rast_close(fd_out);
return 0;
}
Modified: grass/trunk/raster/r.carve/main.c
===================================================================
--- grass/trunk/raster/r.carve/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.carve/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -179,8 +179,8 @@
enforce_downstream(infd, outfd, &Map, &outMap, &parm);
- Rast_close_cell(infd);
- Rast_close_cell(outfd);
+ Rast_close(infd);
+ Rast_close(outfd);
close_vect(&Map, 0);
if (parm.outvect->answer)
Modified: grass/trunk/raster/r.category/cats.c
===================================================================
--- grass/trunk/raster/r.category/cats.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.category/cats.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -60,7 +60,7 @@
/* done */
if (G_verbose() > G_verbose_std())
G_percent(row, nrows, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(cell);
Rast_rewind_cell_stats(&statf);
Modified: grass/trunk/raster/r.category/main.c
===================================================================
--- grass/trunk/raster/r.category/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.category/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -160,7 +160,7 @@
G_message(_("Category table for <%s> set from <%s>"), name,
parm.raster->answer);
- Rast_close_cell(fd);
+ Rast_close(fd);
}
/* load cats from rules file */
Modified: grass/trunk/raster/r.circle/main.c
===================================================================
--- grass/trunk/raster/r.circle/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.circle/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -148,7 +148,7 @@
}
}
G_free(int_buf);
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
Rast_short_history(out_file->answer, "raster", &history);
Rast_command_history(&history);
Rast_write_history(out_file->answer, &history);
Modified: grass/trunk/raster/r.clump/main.c
===================================================================
--- grass/trunk/raster/r.clump/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.clump/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -81,8 +81,8 @@
G_debug(1, "Creating support files...");
- Rast_close_cell(in_fd);
- Rast_close_cell(out_fd);
+ Rast_close(in_fd);
+ Rast_close(out_fd);
/* build title */
Modified: grass/trunk/raster/r.colors/stats.c
===================================================================
--- grass/trunk/raster/r.colors/stats.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.colors/stats.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -49,7 +49,7 @@
Rast_update_cell_stats(cell, ncols, statf);
}
G_percent(row, nrows, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(cell);
return 1;
@@ -136,6 +136,6 @@
}
G_percent(row, nrows, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(dcell);
}
Modified: grass/trunk/raster/r.composite/main.c
===================================================================
--- grass/trunk/raster/r.composite/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.composite/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -254,10 +254,10 @@
/* Close the input files */
for (i = 0; i < 3; i++)
- Rast_close_cell(B[i].file);
+ Rast_close(B[i].file);
/* Close the output file */
- Rast_close_cell(out_file);
+ Rast_close(out_file);
Rast_write_colors(out_name, G_mapset(), &out_colors);
Rast_short_history(out_name, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/raster/r.compress/main.c
===================================================================
--- grass/trunk/raster/r.compress/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.compress/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -224,15 +224,15 @@
break;
}
G_free(rast);
- Rast_close_cell(old);
+ Rast_close(old);
if (row < nrows) {
- Rast_unopen_cell(new);
+ Rast_unopen(new);
return 1;
}
- Rast_close_cell(new);
+ Rast_close(new);
newsize = 0;
old = Rast_open_cell_old(name, G_mapset());
newsize = lseek(old, (off_t) 0, SEEK_END);
- Rast_close_cell(old);
+ Rast_close(old);
return 0;
}
Modified: grass/trunk/raster/r.cost/main.c
===================================================================
--- grass/trunk/raster/r.cost/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.cost/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -675,7 +675,7 @@
}
G_percent(1, 1, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(cell2);
if (!got_one)
@@ -1120,10 +1120,10 @@
if (dir == 1) {
segment_release(&out_seg2);
}
- Rast_close_cell(cost_fd);
- Rast_close_cell(cum_fd);
+ Rast_close(cost_fd);
+ Rast_close(cum_fd);
if (dir == 1) {
- Rast_close_cell(dir_fd);
+ Rast_close(dir_fd);
}
close(in_fd); /* close all files */
close(out_fd);
Modified: grass/trunk/raster/r.cross/main.c
===================================================================
--- grass/trunk/raster/r.cross/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.cross/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -146,8 +146,8 @@
/* now close all files */
for (i = 0; i < nfiles; i++)
- Rast_close_cell(fd[i]);
- Rast_close_cell(outfd);
+ Rast_close(fd[i]);
+ Rast_close(outfd);
if (result <= 0)
exit(0);
@@ -176,8 +176,8 @@
renumber(fd[0], outfd);
G_message(_("Creating support files for <%s>..."), output);
- Rast_close_cell(fd[0]);
- Rast_close_cell(outfd);
+ Rast_close(fd[0]);
+ Rast_close(outfd);
Rast_write_cats(output, &pcats);
Rast_free_cats(&pcats);
if (result > 0) {
Modified: grass/trunk/raster/r.describe/describe.c
===================================================================
--- grass/trunk/raster/r.describe/describe.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.describe/describe.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -127,7 +127,7 @@
Rast_update_cell_stats(buf, ncols, &statf);
}
G_percent(nrows, nrows, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(buf);
if (range) {
Modified: grass/trunk/raster/r.distance/distance.c
===================================================================
--- grass/trunk/raster/r.distance/distance.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.distance/distance.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -150,8 +150,8 @@
G_free(inrast2);
/* closing raster maps */
- Rast_close_cell(mapd1);
- Rast_close_cell(mapd2);
+ Rast_close(mapd1);
+ Rast_close(mapd2);
return 1;
}
}
@@ -161,8 +161,8 @@
G_free(inrast2);
/* closing raster maps */
- Rast_close_cell(mapd1);
- Rast_close_cell(mapd2);
+ Rast_close(mapd1);
+ Rast_close(mapd2);
return 0;
}
Modified: grass/trunk/raster/r.distance/edges.c
===================================================================
--- grass/trunk/raster/r.distance/edges.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.distance/edges.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -86,7 +86,7 @@
}
G_percent(row, nrows, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(buf0);
G_free(buf1);
Modified: grass/trunk/raster/r.drain/main.c
===================================================================
--- grass/trunk/raster/r.drain/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.drain/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -357,7 +357,7 @@
get_row(map_id, in_buf, i);
write(fe, in_buf, bnd.sz);
}
- Rast_close_cell(map_id);
+ Rast_close(map_id);
if (costmode == 1) {
dir_buf = Rast_allocate_d_buf();
@@ -369,7 +369,7 @@
Rast_get_d_raster_row(dir_id, dir_buf, i);
write(dir_fd, dir_buf, ncols * sizeof(DCELL));
}
- Rast_close_cell(dir_id);
+ Rast_close(dir_id);
}
/* only necessary for non-dir drain */
@@ -546,7 +546,7 @@
}
/* close files and free buffers */
- Rast_close_cell(new_id);
+ Rast_close(new_id);
Rast_put_cell_title(new_map_name, "Surface flow trace");
Modified: grass/trunk/raster/r.fill.dir/main.c
===================================================================
--- grass/trunk/raster/r.fill.dir/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.fill.dir/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -216,7 +216,7 @@
get_row(map_id, in_buf, i);
write(fe, in_buf, bnd.sz);
}
- Rast_close_cell(map_id);
+ Rast_close(map_id);
/* fill single-cell holes and take a first stab at flow directions */
G_message(_("Filling sinks..."));
@@ -268,7 +268,7 @@
Rast_put_raster_row(bas_id, out_buf, CELL_TYPE);
}
- Rast_close_cell(bas_id);
+ Rast_close(bas_id);
close(fm);
}
@@ -285,10 +285,10 @@
}
- Rast_close_cell(new_id);
+ Rast_close(new_id);
close(fe);
- Rast_close_cell(dir_id);
+ Rast_close(dir_id);
close(fd);
G_free(in_buf);
Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.flow/io.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -89,7 +89,7 @@
}
if (parm.seg)
segment_flush(el.seg);
- Rast_close_cell(fd);
+ Rast_close(fd);
if (parm.aspin) {
G_message(_("Reading input files: aspect"));
@@ -106,7 +106,7 @@
}
if (parm.seg)
segment_flush(as.seg);
- Rast_close_cell(fd);
+ Rast_close(fd);
}
if (parm.barin) {
@@ -122,7 +122,7 @@
put(ds, row, col, -1);
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
}
}
@@ -180,7 +180,7 @@
close(ds.sfd);
}
/* if (parm.lgout)
- Rast_close_cell(lgfd); */
+ Rast_close(lgfd); */
if (parm.flout) {
Vect_build(&fl);
Vect_close(&fl);
@@ -208,7 +208,7 @@
if (ds.buf[row][col] > dsmax)
dsmax = ds.buf[row][col];
}
- Rast_close_cell(dsfd);
+ Rast_close(dsfd);
Rast_init_colors(&colors);
Modified: grass/trunk/raster/r.flow/main.c
===================================================================
--- grass/trunk/raster/r.flow/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.flow/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -396,7 +396,7 @@
Vect_destroy_cats_struct(cats);
if (parm.lgout)
- Rast_close_cell(lgfd);
+ Rast_close(lgfd);
}
int main(int argc, char *argv[])
Modified: grass/trunk/raster/r.grow/main.c
===================================================================
--- grass/trunk/raster/r.grow/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.grow/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -276,8 +276,8 @@
G_percent(row, nrows, 2);
- Rast_close_cell(in_fd);
- Rast_close_cell(out_fd);
+ Rast_close(in_fd);
+ Rast_close(out_fd);
if (Rast_write_cats(out_name, &cats) == -1)
G_warning(_("Error writing category file for <%s>"), out_name);
Modified: grass/trunk/raster/r.grow.distance/main.c
===================================================================
--- grass/trunk/raster/r.grow.distance/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.grow.distance/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -296,7 +296,7 @@
G_percent(row, nrows, 2);
- Rast_close_cell(in_fd);
+ Rast_close(in_fd);
Rast_set_c_null_value(old_x_row, ncols);
Rast_set_c_null_value(old_y_row, ncols);
@@ -351,9 +351,9 @@
remove(temp_name);
if (dist_name)
- Rast_close_cell(dist_fd);
+ Rast_close(dist_fd);
if (val_name)
- Rast_close_cell(val_fd);
+ Rast_close(val_fd);
if (val_name) {
if (Rast_read_colors(in_name, "", &colors) < 0)
Modified: grass/trunk/raster/r.his/main.c
===================================================================
--- grass/trunk/raster/r.his/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.his/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -271,14 +271,14 @@
G_percent(window.rows, window.rows, 5);
/* Close the cell files */
- Rast_close_cell(hue_file);
+ Rast_close(hue_file);
if (int_used)
- Rast_close_cell(int_file);
+ Rast_close(int_file);
if (sat_used)
- Rast_close_cell(sat_file);
+ Rast_close(sat_file);
if (r_used) {
- Rast_close_cell(r_file);
+ Rast_close(r_file);
Rast_write_colors(name_r, G_mapset(), &gray_colors);
Rast_short_history(name_r, "raster", &history);
Rast_command_history(&history);
@@ -286,7 +286,7 @@
Rast_put_cell_title(name_r, "Red extracted from HIS");
}
if (g_used) {
- Rast_close_cell(g_file);
+ Rast_close(g_file);
Rast_write_colors(name_g, G_mapset(), &gray_colors);
Rast_short_history(name_g, "raster", &history);
Rast_command_history(&history);
@@ -294,7 +294,7 @@
Rast_put_cell_title(name_g, "Green extracted from HIS");
}
if (b_used) {
- Rast_close_cell(b_file);
+ Rast_close(b_file);
Rast_write_colors(name_b, G_mapset(), &gray_colors);
Rast_short_history(name_b, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/raster/r.horizon/main.c
===================================================================
--- grass/trunk/raster/r.horizon/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.horizon/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -568,7 +568,7 @@
}
}
- Rast_close_cell(fd1);
+ Rast_close(fd1);
/*create low resolution array 100 */
for (i = 0; i < m100; i++) {
@@ -647,7 +647,7 @@
} /* End loop over rows. */
- Rast_close_cell(fd1);
+ Rast_close(fd1);
Modified: grass/trunk/raster/r.in.arc/main.c
===================================================================
--- grass/trunk/raster/r.in.arc/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.in.arc/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -158,7 +158,7 @@
G_percent(row, nrows, 5);
for (col = 0; col < ncols; col++) {
if (fscanf(fd, "%lf", &x) != 1) {
- Rast_unopen_cell(cf);
+ Rast_unopen(cf);
G_fatal_error(_("Data conversion failed at row %d, col %d"),
row + 1, col + 1);
}
@@ -199,7 +199,7 @@
}
}
/* G_message(_("CREATING SUPPORT FILES FOR %s"), output); */
- Rast_close_cell(cf);
+ Rast_close(cf);
if (title)
Rast_put_cell_title(output, title);
Rast_short_history(output, "raster", &history);
Modified: grass/trunk/raster/r.in.ascii/main.c
===================================================================
--- grass/trunk/raster/r.in.ascii/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.in.ascii/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -209,7 +209,7 @@
G_percent(row, nrows, 2);
for (col = 0; col < ncols; col++) {
if (fscanf(fd, "%s", y) != 1) {
- Rast_unopen_cell(cf);
+ Rast_unopen(cf);
G_fatal_error(_("Data conversion failed at row %d, col %d"),
row + 1, col + 1);
}
@@ -252,7 +252,7 @@
fclose(ft);
unlink(temp);
- Rast_close_cell(cf);
+ Rast_close(cf);
if (title)
Rast_put_cell_title(output, title);
Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.in.bin/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -515,7 +515,7 @@
for (row = 0; row < grass_nrows; row++) {
if (fread(x_v, bytes * ncols, 1, fd) != 1) {
- Rast_unopen_cell(cf);
+ Rast_unopen(cf);
G_fatal_error(_("Conversion failed at row %d"), row);
exit(EXIT_FAILURE);
}
@@ -581,7 +581,7 @@
}
G_debug(1, "Creating support files for %s", output);
- Rast_close_cell(cf);
+ Rast_close(cf);
if (title)
Rast_put_cell_title(output, title);
Modified: grass/trunk/raster/r.in.gdal/main.c
===================================================================
--- grass/trunk/raster/r.in.gdal/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.in.gdal/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -863,13 +863,13 @@
/* -------------------------------------------------------------------- */
if (complex) {
G_debug(1, "Creating support files for %s", outputReal);
- Rast_close_cell(cfR);
+ Rast_close(cfR);
Rast_short_history((char *)outputReal, "raster", &history);
Rast_command_history(&history);
Rast_write_history((char *)outputReal, &history);
G_debug(1, "Creating support files for %s", outputImg);
- Rast_close_cell(cfI);
+ Rast_close(cfI);
Rast_short_history((char *)outputImg, "raster", &history);
Rast_command_history(&history);
Rast_write_history((char *)outputImg, &history);
@@ -878,7 +878,7 @@
}
else {
G_debug(1, "Creating support files for %s", output);
- Rast_close_cell(cf);
+ Rast_close(cf);
Rast_short_history((char *)output, "raster", &history);
Rast_command_history(&history);
Rast_write_history((char *)output, &history);
Modified: grass/trunk/raster/r.in.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.in.gridatb/file_io.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.in.gridatb/file_io.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -64,7 +64,7 @@
}
G_percent(i, cellhd.rows, 2);
fclose(fp);
- Rast_close_cell(fd);
+ Rast_close(fd);
Rast_put_cell_title(oname, buf);
Rast_put_cellhd(oname, &cellhd);
Modified: grass/trunk/raster/r.in.mat/main.c
===================================================================
--- grass/trunk/raster/r.in.mat/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.in.mat/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -448,7 +448,7 @@
map_type);
break;
default:
- Rast_close_cell(cf);
+ Rast_close(cf);
G_fatal_error(_("Please contact the GRASS development team"));
}
}
@@ -471,7 +471,7 @@
#endif
if (1 != Rast_put_raster_row(cf, raster, map_type)) {
- Rast_close_cell(cf);
+ Rast_close(cf);
G_fatal_error(_("Writing raster map, row %d"), row);
}
@@ -480,7 +480,7 @@
G_percent(row, mrows, 5); /* finish it off */
- Rast_close_cell(cf);
+ Rast_close(cf);
G_free(array_data);
G_free(raster);
Modified: grass/trunk/raster/r.in.poly/poly2rast.c
===================================================================
--- grass/trunk/raster/r.in.poly/poly2rast.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.in.poly/poly2rast.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -81,11 +81,11 @@
*/
if (stat < 0) {
- Rast_unopen_cell(rfd);
+ Rast_unopen(rfd);
return 1;
}
- Rast_close_cell(rfd);
+ Rast_close(rfd);
Rast_write_cats(raster_map, &labels);
Rast_short_history(raster_map, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/raster/r.in.xyz/main.c
===================================================================
--- grass/trunk/raster/r.in.xyz/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.in.xyz/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -1012,7 +1012,7 @@
/* write out line of raster data */
if (1 != Rast_put_raster_row(out_fd, raster_row, rtype)) {
- Rast_close_cell(out_fd);
+ Rast_close(out_fd);
G_fatal_error(_("Writing map, row %d"),
((pass - 1) * rows) + row);
}
@@ -1047,7 +1047,7 @@
fclose(in_fp);
/* close raster file & write history */
- Rast_close_cell(out_fd);
+ Rast_close(out_fd);
sprintf(title, "Raw x,y,z data binned into a raster grid by cell %s",
method_opt->answer);
Modified: grass/trunk/raster/r.lake/main.c
===================================================================
--- grass/trunk/raster/r.lake/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.lake/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -285,7 +285,7 @@
/* Close seed map for reading. */
if (smap_opt->answer)
- Rast_close_cell(out_fd);
+ Rast_close(out_fd);
/* Open output map for writing. */
if (lakemap) {
@@ -368,8 +368,8 @@
G_warning(_("Volume is correct only if lake depth (terrain raster map) is in meters"));
/* Close all files. Lake map gets written only now. */
- Rast_close_cell(in_terran_fd);
- Rast_close_cell(out_fd);
+ Rast_close(in_terran_fd);
+ Rast_close(out_fd);
/* Add blue color gradient from light bank to dark depth */
Rast_init_colors(&colr);
Modified: grass/trunk/raster/r.le/r.le.patch/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.le/r.le.patch/driver.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -122,7 +122,7 @@
/* when everything is done, close the raster map
and print a completion message */
- Rast_close_cell(finput);
+ Rast_close(finput);
fputs("\nR.LE.PATCH IS DONE; ", stderr);
if (choice->wrum != 'm')
fputs("OUTPUT FILES IN SUBDIRECTORY \"r.le.out\"\n", stderr);
@@ -1964,259 +1964,259 @@
if (choice->att[1]) {
- Rast_close_cell(a1);
+ Rast_close(a1);
set_colors("a1");
sprintf(cmdbuf, "%s %s", "r.compress", "a1");
system(cmdbuf);
}
if (choice->att[2]) {
- Rast_close_cell(a2);
+ Rast_close(a2);
set_colors("a2");
sprintf(cmdbuf, "%s %s", "r.compress", "a2");
system(cmdbuf);
}
if (choice->att[3]) {
- Rast_close_cell(a3);
+ Rast_close(a3);
set_colors("a3");
sprintf(cmdbuf, "%s %s", "r.compress", "a3");
system(cmdbuf);
}
if (choice->att[4]) {
- Rast_close_cell(a4);
+ Rast_close(a4);
set_colors("a4");
sprintf(cmdbuf, "%s %s", "r.compress", "a4");
system(cmdbuf);
}
if (choice->att[5]) {
- Rast_close_cell(a5);
+ Rast_close(a5);
set_colors("a5");
sprintf(cmdbuf, "%s %s", "r.compress", "a5");
system(cmdbuf);
}
if (choice->att[6]) {
- Rast_close_cell(a6);
+ Rast_close(a6);
set_colors("a6");
sprintf(cmdbuf, "%s %s", "r.compress", "a6");
system(cmdbuf);
}
if (choice->att[7]) {
- Rast_close_cell(a7);
+ Rast_close(a7);
set_colors("a7");
sprintf(cmdbuf, "%s %s", "r.compress", "a7");
system(cmdbuf);
}
if (choice->att[8]) {
- Rast_close_cell(a8);
+ Rast_close(a8);
set_colors("a8");
sprintf(cmdbuf, "%s %s", "r.compress", "a8");
system(cmdbuf);
}
if (choice->size[1]) {
- Rast_close_cell(s1);
+ Rast_close(s1);
set_colors("s1");
sprintf(cmdbuf, "%s %s", "r.compress", "s1");
system(cmdbuf);
}
if (choice->size[2]) {
- Rast_close_cell(s2);
+ Rast_close(s2);
set_colors("s2");
sprintf(cmdbuf, "%s %s", "r.compress", "s2");
system(cmdbuf);
}
if (choice->size[3]) {
- Rast_close_cell(s3);
+ Rast_close(s3);
set_colors("s3");
sprintf(cmdbuf, "%s %s", "r.compress", "s3");
system(cmdbuf);
}
if (choice->size[4]) {
- Rast_close_cell(s4);
+ Rast_close(s4);
set_colors("s4");
sprintf(cmdbuf, "%s %s", "r.compress", "s4");
system(cmdbuf);
}
if (choice->size[5]) {
- Rast_close_cell(s5);
+ Rast_close(s5);
set_colors("s5");
sprintf(cmdbuf, "%s %s", "r.compress", "s5");
system(cmdbuf);
}
if (choice->size[6]) {
- Rast_close_cell(s6);
+ Rast_close(s6);
set_colors("s6");
sprintf(cmdbuf, "%s %s", "r.compress", "s6");
system(cmdbuf);
}
if (choice->size[7]) {
- Rast_close_cell(s7);
+ Rast_close(s7);
set_colors("s7");
sprintf(cmdbuf, "%s %s", "r.compress", "s7");
system(cmdbuf);
}
if (choice->size[8]) {
- Rast_close_cell(s8);
+ Rast_close(s8);
set_colors("s8");
sprintf(cmdbuf, "%s %s", "r.compress", "s8");
system(cmdbuf);
}
if (choice->core[1]) {
- Rast_close_cell(c1);
+ Rast_close(c1);
set_colors("c1");
sprintf(cmdbuf, "%s %s", "r.compress", "c1");
system(cmdbuf);
}
if (choice->core[2]) {
- Rast_close_cell(c2);
+ Rast_close(c2);
set_colors("c2");
sprintf(cmdbuf, "%s %s", "r.compress", "c2");
system(cmdbuf);
}
if (choice->core[3]) {
- Rast_close_cell(c3);
+ Rast_close(c3);
set_colors("c3");
sprintf(cmdbuf, "%s %s", "r.compress", "c3");
system(cmdbuf);
}
if (choice->core[4]) {
- Rast_close_cell(c4);
+ Rast_close(c4);
set_colors("c4");
sprintf(cmdbuf, "%s %s", "r.compress", "c4");
system(cmdbuf);
}
if (choice->core[5]) {
- Rast_close_cell(c5);
+ Rast_close(c5);
set_colors("c5");
sprintf(cmdbuf, "%s %s", "r.compress", "c5");
system(cmdbuf);
}
if (choice->core[6]) {
- Rast_close_cell(c6);
+ Rast_close(c6);
set_colors("c6");
sprintf(cmdbuf, "%s %s", "r.compress", "c6");
system(cmdbuf);
}
if (choice->core[7]) {
- Rast_close_cell(c7);
+ Rast_close(c7);
set_colors("c7");
sprintf(cmdbuf, "%s %s", "r.compress", "c7");
system(cmdbuf);
}
if (choice->core[8]) {
- Rast_close_cell(c8);
+ Rast_close(c8);
set_colors("c8");
sprintf(cmdbuf, "%s %s", "r.compress", "c8");
system(cmdbuf);
}
if (choice->core[9]) {
- Rast_close_cell(c9);
+ Rast_close(c9);
set_colors("c9");
sprintf(cmdbuf, "%s %s", "r.compress", "c9");
system(cmdbuf);
}
if (choice->core[10]) {
- Rast_close_cell(c10);
+ Rast_close(c10);
set_colors("c10");
sprintf(cmdbuf, "%s %s", "r.compress", "c10");
system(cmdbuf);
}
if (choice->shape[1]) {
- Rast_close_cell(h1);
+ Rast_close(h1);
set_colors("h1");
sprintf(cmdbuf, "%s %s", "r.compress", "h1");
system(cmdbuf);
}
if (choice->shape[2]) {
- Rast_close_cell(h2);
+ Rast_close(h2);
set_colors("h2");
sprintf(cmdbuf, "%s %s", "r.compress", "h2");
system(cmdbuf);
}
if (choice->shape[3]) {
- Rast_close_cell(h3);
+ Rast_close(h3);
set_colors("h3");
sprintf(cmdbuf, "%s %s", "r.compress", "h3");
system(cmdbuf);
}
if (choice->shape[4]) {
- Rast_close_cell(h4);
+ Rast_close(h4);
set_colors("h4");
sprintf(cmdbuf, "%s %s", "r.compress", "h4");
system(cmdbuf);
}
if (choice->shape[5]) {
- Rast_close_cell(h5);
+ Rast_close(h5);
set_colors("h5");
sprintf(cmdbuf, "%s %s", "r.compress", "h5");
system(cmdbuf);
}
if (choice->shape[6]) {
- Rast_close_cell(h6);
+ Rast_close(h6);
set_colors("h6");
sprintf(cmdbuf, "%s %s", "r.compress", "h6");
system(cmdbuf);
}
if (choice->boundary[1]) {
- Rast_close_cell(n1);
+ Rast_close(n1);
set_colors("n1");
sprintf(cmdbuf, "%s %s", "r.compress", "n1");
system(cmdbuf);
}
if (choice->boundary[2]) {
- Rast_close_cell(n2);
+ Rast_close(n2);
set_colors("n2");
sprintf(cmdbuf, "%s %s", "r.compress", "n2");
system(cmdbuf);
}
if (choice->boundary[3]) {
- Rast_close_cell(n3);
+ Rast_close(n3);
set_colors("n3");
sprintf(cmdbuf, "%s %s", "r.compress", "n3");
system(cmdbuf);
}
if (choice->boundary[4]) {
- Rast_close_cell(n4);
+ Rast_close(n4);
set_colors("n4");
sprintf(cmdbuf, "%s %s", "r.compress", "n4");
system(cmdbuf);
}
if (choice->perim[1]) {
- Rast_close_cell(p1);
+ Rast_close(p1);
set_colors("p1");
sprintf(cmdbuf, "%s %s", "r.compress", "p1");
system(cmdbuf);
}
if (choice->perim[2]) {
- Rast_close_cell(p2);
+ Rast_close(p2);
set_colors("p2");
sprintf(cmdbuf, "%s %s", "r.compress", "p2");
system(cmdbuf);
}
if (choice->perim[3]) {
- Rast_close_cell(p3);
+ Rast_close(p3);
set_colors("p3");
sprintf(cmdbuf, "%s %s", "r.compress", "p3");
system(cmdbuf);
}
if (choice->perim[4]) {
- Rast_close_cell(p4);
+ Rast_close(p4);
set_colors("p4");
sprintf(cmdbuf, "%s %s", "r.compress", "p4");
system(cmdbuf);
}
if (choice->perim[5]) {
- Rast_close_cell(p5);
+ Rast_close(p5);
set_colors("p5");
sprintf(cmdbuf, "%s %s", "r.compress", "p5");
system(cmdbuf);
}
if (choice->perim[6]) {
- Rast_close_cell(p6);
+ Rast_close(p6);
set_colors("p6");
sprintf(cmdbuf, "%s %s", "r.compress", "p6");
system(cmdbuf);
}
- Rast_close_cell(fmask);
+ Rast_close(fmask);
return;
}
@@ -2713,7 +2713,7 @@
}
Rast_put_raster_row(fd, unit_buf, CELL_TYPE);
}
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(unit_buf);
}
}
@@ -2872,7 +2872,7 @@
0.0);
ptrthis = ptrthis->next;
}
- Rast_close_cell(fr);
+ Rast_close(fr);
G_free(row_buf);
G_free(ptrnew);
}
Modified: grass/trunk/raster/r.le/r.le.patch/trace.c
===================================================================
--- grass/trunk/raster/r.le/r.le.patch/trace.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.le/r.le.patch/trace.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -356,7 +356,7 @@
memory allocated for it */
if (choice->patchmap) {
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(pat_buf);
}
@@ -367,7 +367,7 @@
memory allocated for the cor_buf */
if (choice->coremap) {
- Rast_close_cell(fe);
+ Rast_close(fe);
Rast_rewind_cell_stats(&stats);
Rast_rewind_cats(&cats);
@@ -773,7 +773,7 @@
}
if (choice->wrum == 'r') {
G_free(tmp1);
- Rast_close_cell(fr);
+ Rast_close(fr);
}
return;
}
Modified: grass/trunk/raster/r.le/r.le.pixel/cellclip.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/cellclip.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.le/r.le.pixel/cellclip.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -437,7 +437,7 @@
}
if (choice->wrum == 'r') {
G_free(tmp1);
- Rast_close_cell(fr);
+ Rast_close(fr);
}
G_free(nulltmp);
return;
Modified: grass/trunk/raster/r.le/r.le.pixel/driver.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.le/r.le.pixel/driver.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -138,7 +138,7 @@
unit_driver();
}
- Rast_close_cell(finput);
+ Rast_close(finput);
fputs("R.LE.PIXEL IS DONE; ", stderr);
@@ -980,109 +980,109 @@
if (choice->att[1]) {
- Rast_close_cell(b1);
+ Rast_close(b1);
set_colors("b1");
sprintf(cmdbuf, "%s %s", "r.compress", "b1");
system(cmdbuf);
}
if (choice->att[2]) {
- Rast_close_cell(b2);
+ Rast_close(b2);
set_colors("b2");
sprintf(cmdbuf, "%s %s", "r.compress", "b2");
system(cmdbuf);
}
if (choice->att[3]) {
- Rast_close_cell(b3);
+ Rast_close(b3);
set_colors("b3");
sprintf(cmdbuf, "%s %s", "r.compress", "b3");
system(cmdbuf);
}
if (choice->att[4]) {
- Rast_close_cell(b4);
+ Rast_close(b4);
set_colors("b4");
sprintf(cmdbuf, "%s %s", "r.compress", "b4");
system(cmdbuf);
}
if (choice->div[1]) {
- Rast_close_cell(d1);
+ Rast_close(d1);
set_colors("d1");
sprintf(cmdbuf, "%s %s", "r.compress", "d1");
system(cmdbuf);
}
if (choice->div[2]) {
- Rast_close_cell(d2);
+ Rast_close(d2);
set_colors("d2");
sprintf(cmdbuf, "%s %s", "r.compress", "d2");
system(cmdbuf);
}
if (choice->div[3]) {
- Rast_close_cell(d3);
+ Rast_close(d3);
set_colors("d3");
sprintf(cmdbuf, "%s %s", "r.compress", "d3");
system(cmdbuf);
}
if (choice->div[4]) {
- Rast_close_cell(d4);
+ Rast_close(d4);
set_colors("d4");
sprintf(cmdbuf, "%s %s", "r.compress", "d4");
system(cmdbuf);
}
if (choice->te2[1]) {
- Rast_close_cell(t1);
+ Rast_close(t1);
set_colors("t1");
sprintf(cmdbuf, "%s %s", "r.compress", "t1");
system(cmdbuf);
}
if (choice->te2[2]) {
- Rast_close_cell(t2);
+ Rast_close(t2);
set_colors("t2");
sprintf(cmdbuf, "%s %s", "r.compress", "t2");
system(cmdbuf);
}
if (choice->te2[3]) {
- Rast_close_cell(t3);
+ Rast_close(t3);
set_colors("t3");
sprintf(cmdbuf, "%s %s", "r.compress", "t3");
system(cmdbuf);
}
if (choice->te2[4]) {
- Rast_close_cell(t4);
+ Rast_close(t4);
set_colors("t4");
sprintf(cmdbuf, "%s %s", "r.compress", "t4");
system(cmdbuf);
}
if (choice->te2[5]) {
- Rast_close_cell(t5);
+ Rast_close(t5);
set_colors("t5");
sprintf(cmdbuf, "%s %s", "r.compress", "t5");
system(cmdbuf);
}
if (choice->jux[1]) {
- Rast_close_cell(j1);
+ Rast_close(j1);
set_colors("j1");
sprintf(cmdbuf, "%s %s", "r.compress", "j1");
system(cmdbuf);
}
if (choice->jux[2]) {
- Rast_close_cell(j2);
+ Rast_close(j2);
set_colors("j2");
sprintf(cmdbuf, "%s %s", "r.compress", "j2");
system(cmdbuf);
}
if (choice->edg[1]) {
- Rast_close_cell(e1);
+ Rast_close(e1);
set_colors("e1");
sprintf(cmdbuf, "%s %s", "r.compress", "e1");
system(cmdbuf);
}
if (choice->edg[2]) {
- Rast_close_cell(e2);
+ Rast_close(e2);
set_colors("e2");
sprintf(cmdbuf, "%s %s", "r.compress", "e2");
system(cmdbuf);
}
- Rast_close_cell(fmask);
+ Rast_close(fmask);
return;
}
@@ -1535,7 +1535,7 @@
}
Rast_put_raster_row(fd, unit_buf, CELL_TYPE);
}
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(unit_buf);
}
}
@@ -1805,7 +1805,7 @@
cntwhole, 0.0);
ptrthis = ptrthis->next;
}
- Rast_close_cell(fr);
+ Rast_close(fr);
G_free(row_buf);
G_free(ptrnew);
}
Modified: grass/trunk/raster/r.le/r.le.pixel/texture.c
===================================================================
--- grass/trunk/raster/r.le/r.le.pixel/texture.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.le/r.le.pixel/texture.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -526,7 +526,7 @@
for (i = 0; i < nrows + 3; i++)
G_free(edgenull[i]);
G_free(edgenull);
- Rast_close_cell(fc);
+ Rast_close(fc);
}
/* if the zscore map was requested */
@@ -547,7 +547,7 @@
Rast_put_raster_row(fd, zscor_buf, DCELL_TYPE);
}
G_free(zscor_buf);
- Rast_close_cell(fd);
+ Rast_close(fd);
}
/* open the output files and
Modified: grass/trunk/raster/r.le/r.le.setup/mv_wind.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/mv_wind.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.le/r.le.setup/mv_wind.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -337,7 +337,7 @@
t = t0;
}
- Rast_close_cell(fmask);
+ Rast_close(fmask);
}
/* if neither, then exit */
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-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.le/r.le.setup/polytocell/bmf_to_cll.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -94,7 +94,7 @@
Rast_put_map_row(newmap, record);
atrow++;
}
- Rast_close_cell(newmap);
+ Rast_close(newmap);
goto finish;
}
@@ -116,7 +116,7 @@
Rast_put_map_row(newmap, record);
}
- fprintf(stderr, "Close: %d\n", Rast_close_cell(newmap));
+ fprintf(stderr, "Close: %d\n", Rast_close(newmap));
finish:
G_suppress_warnings(1);
Modified: grass/trunk/raster/r.le/r.le.setup/sample.c
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.le/r.le.setup/sample.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -117,7 +117,7 @@
else if (d == 2)
graph_unit(t0, b0, l0, r0, name, name1, name2, msc, fmask);
- Rast_close_cell(fmask);
+ Rast_close(fmask);
}
/* if neither, then exit */
else
@@ -363,7 +363,7 @@
}
}
G_free(row_buf);
- Rast_close_cell(fr);
+ Rast_close(fr);
cnt = (double)(count);
if (cnt)
cnt = sqrt(cnt);
@@ -420,7 +420,7 @@
}
}
G_free(row_buf);
- Rast_close_cell(fr);
+ Rast_close(fr);
cnt = (double)(count);
if (cnt)
cnt = sqrt(cnt);
Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -268,7 +268,7 @@
write_raster(mv_fd, random_access, g);
close(random_access);
unlink(random_access_name);
- Rast_close_cell(mv_fd);
+ Rast_close(mv_fd);
Rast_short_history(output, "raster", &history);
Rast_command_history(&history);
Rast_write_history(output, &history);
Modified: grass/trunk/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -210,7 +210,7 @@
receive(rec_ch, &toReceive);
}
/* close raster map */
- Rast_close_cell(fd);
+ Rast_close(fd);
/* close channels */
close(rec_ch);
Modified: grass/trunk/raster/r.los/main.c
===================================================================
--- grass/trunk/raster/r.los/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.los/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -398,12 +398,12 @@
close(out_fd);
unlink(in_name); /* remove temp files as well */
unlink(out_name);
- Rast_close_cell(old);
- Rast_close_cell(new);
+ Rast_close(old);
+ Rast_close(new);
if (patt_flag == TRUE) {
close(patt_fd);
- Rast_close_cell(patt);
+ Rast_close(patt);
}
/* create category file for output map */
Modified: grass/trunk/raster/r.mapcalc/map.c
===================================================================
--- grass/trunk/raster/r.mapcalc/map.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.mapcalc/map.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -431,7 +431,7 @@
if (m->fd < 0)
return;
- if (Rast_close_cell(m->fd) < 0)
+ if (Rast_close(m->fd) < 0)
G_fatal_error(_("Unable to close raster map <%s@%s>"),
m->name, m->mapset);
@@ -675,13 +675,13 @@
void close_output_map(int fd)
{
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_fatal_error(_("Unable to close raster map"));
}
void unopen_output_map(int fd)
{
- Rast_unopen_cell(fd);
+ Rast_unopen(fd);
}
/****************************************************************************/
Modified: grass/trunk/raster/r.mfilter/perform.c
===================================================================
--- grass/trunk/raster/r.mfilter/perform.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.mfilter/perform.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -46,7 +46,7 @@
G_debug(1, "Closing raster map");
- Rast_close_cell(in);
+ Rast_close(in);
in = out;
close(creat(tmp2 = G_tempfile(), 0666));
out = open(tmp2, 2);
@@ -73,7 +73,7 @@
}
if (count == 1)
- Rast_close_cell(in);
+ Rast_close(in);
else if (count > 1)
close(in);
@@ -90,14 +90,14 @@
Rast_put_d_raster_row(out, cell);
}
- /* remove the temporary files before closing so that the Rast_close_cell()
+ /* remove the temporary files before closing so that the Rast_close()
has more disk to work with
*/
if (count > 0)
unlink(tmp1);
if (count > 1)
unlink(tmp2);
- Rast_close_cell(out);
+ Rast_close(out);
return 0;
}
Modified: grass/trunk/raster/r.neighbors/main.c
===================================================================
--- grass/trunk/raster/r.neighbors/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.neighbors/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -330,8 +330,8 @@
}
G_percent(row, nrows, 2);
- Rast_close_cell(out_fd);
- Rast_close_cell(in_fd);
+ Rast_close(out_fd);
+ Rast_close(in_fd);
/* put out category info */
null_cats();
Modified: grass/trunk/raster/r.null/main.c
===================================================================
--- grass/trunk/raster/r.null/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.null/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -347,12 +347,12 @@
}
G_percent(row, cellhd.rows, 1);
G_free(rast);
- Rast_close_cell(old);
+ Rast_close(old);
if (row < cellhd.rows) {
- Rast_unopen_cell(new);
+ Rast_unopen(new);
return 1;
}
- Rast_close_cell(new);
+ Rast_close(new);
return 0;
}
Modified: grass/trunk/raster/r.out.arc/main.c
===================================================================
--- grass/trunk/raster/r.out.arc/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.arc/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -216,7 +216,7 @@
/* make sure it got to 100% */
G_percent(1, 1, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
fclose(fp);
exit(EXIT_SUCCESS);
Modified: grass/trunk/raster/r.out.ascii/main.c
===================================================================
--- grass/trunk/raster/r.out.ascii/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.ascii/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -195,7 +195,7 @@
}
/* tidy up and go away */
- Rast_close_cell(fd);
+ Rast_close(fd);
fclose(fp);
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/raster/r.out.bin/main.c
===================================================================
--- grass/trunk/raster/r.out.bin/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.bin/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -383,7 +383,7 @@
}
G_percent(row, nrows, 2); /* finish it off */
- Rast_close_cell(fd);
+ Rast_close(fd);
fclose(fp);
exit(EXIT_SUCCESS);
Modified: grass/trunk/raster/r.out.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -56,7 +56,7 @@
switch (data_type) {
case CELL_TYPE:
if (Rast_get_c_raster_row(fd, cell, row) < 0) {
- Rast_close_cell(fd);
+ Rast_close(fd);
exit(1);
}
@@ -71,7 +71,7 @@
break;
case FCELL_TYPE:
if (Rast_get_f_raster_row(fd, fcell, row) < 0) {
- Rast_close_cell(fd);
+ Rast_close(fd);
exit(1);
}
@@ -86,7 +86,7 @@
break;
case DCELL_TYPE:
if (Rast_get_d_raster_row(fd, dcell, row) < 0) {
- Rast_close_cell(fd);
+ Rast_close(fd);
exit(1);
}
@@ -101,7 +101,7 @@
break;
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
return;
}
Modified: grass/trunk/raster/r.out.mpeg/main.c
===================================================================
--- grass/trunk/raster/r.out.mpeg/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.mpeg/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -315,7 +315,7 @@
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
}
yfiles[cnt] = G_tempfile();
Modified: grass/trunk/raster/r.out.png/main.c
===================================================================
--- grass/trunk/raster/r.out.png/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.png/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -302,7 +302,7 @@
G_free(ogrn);
G_free(oblu);
G_free(set);
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
Modified: grass/trunk/raster/r.out.pov/main.c
===================================================================
--- grass/trunk/raster/r.out.pov/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.pov/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -220,7 +220,7 @@
(void)processProfiles(fd, outf);
fclose(outf);
- Rast_close_cell(fd);
+ Rast_close(fd);
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/raster/r.out.ppm/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.ppm/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -217,7 +217,7 @@
G_free(ogrn);
G_free(oblu);
G_free(set);
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
/*
if(!do_stdout)
*/
Modified: grass/trunk/raster/r.out.ppm3/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm3/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.ppm3/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -191,7 +191,7 @@
G_free(B[i].array);
G_free(B[i].buf);
G_free(B[i].mask);
- Rast_close_cell(B[i].file);
+ Rast_close(B[i].file);
}
exit(EXIT_SUCCESS);
Modified: grass/trunk/raster/r.out.vrml/main.c
===================================================================
--- grass/trunk/raster/r.out.vrml/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.vrml/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -162,9 +162,9 @@
vrml_end(vout);
- Rast_close_cell(elevfd);
+ Rast_close(elevfd);
if (color_ok)
- Rast_close_cell(colorfd);
+ Rast_close(colorfd);
return (EXIT_SUCCESS);
Modified: grass/trunk/raster/r.out.vtk/main.c
===================================================================
--- grass/trunk/raster/r.out.vtk/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.out.vtk/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -151,7 +151,7 @@
region, out_type, null_value,
scale, polytype, digits);
}
- Rast_close_cell(fd);
+ Rast_close(fd);
}
else {
/*Should pointdata or celldata be written */
@@ -194,7 +194,7 @@
/*Now write the data */
write_vtk_data(fd, fp, param.input->answers[i], region, out_type,
null_value, digits);
- Rast_close_cell(fd);
+ Rast_close(fd);
}
}
@@ -236,7 +236,7 @@
/*Close the maps */
for (i = 0; i < 3; i++)
- Rast_close_cell(rgbfd[i]);
+ Rast_close(rgbfd[i]);
}
}
@@ -279,7 +279,7 @@
/*Close the maps */
for (i = 0; i < 3; i++)
- Rast_close_cell(vectfd[i]);
+ Rast_close(vectfd[i]);
}
}
Modified: grass/trunk/raster/r.param.scale/close_down.c
===================================================================
--- grass/trunk/raster/r.param.scale/close_down.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.param.scale/close_down.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -18,10 +18,10 @@
char map_title[RECORD_LEN], map_type[32];
/* Close connection with existing input raster. */
- Rast_unopen_cell(fd_in);
+ Rast_unopen(fd_in);
/* Write output raster map and close connection. */
- Rast_close_cell(fd_out);
+ Rast_close(fd_out);
/* write out map metadata */
Rast_short_history(rast_out_name, "raster", &history);
Modified: grass/trunk/raster/r.patch/main.c
===================================================================
--- grass/trunk/raster/r.patch/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.patch/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -154,7 +154,7 @@
G_free(patch);
G_free(presult);
for (i = 0; i < nfiles; i++)
- Rast_close_cell(infd[i]);
+ Rast_close(infd[i]);
/*
* build the new cats and colors. do this before closing the new
* file, in case the new file is one of the patching files as well.
@@ -163,7 +163,7 @@
support(names, statf, nfiles, &cats, &cats_ok, &colr, &colr_ok, out_type);
/* now close (and create) the result */
- Rast_close_cell(outfd);
+ Rast_close(outfd);
if (cats_ok)
Rast_write_cats(new_name, &cats);
if (colr_ok)
Modified: grass/trunk/raster/r.profile/main.c
===================================================================
--- grass/trunk/raster/r.profile/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.profile/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -213,7 +213,7 @@
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
fclose(fp);
if (clr)
Modified: grass/trunk/raster/r.proj/main.c
===================================================================
--- grass/trunk/raster/r.proj/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.proj/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -392,7 +392,7 @@
fdi = Rast_open_cell_old(inmap->answer, setname);
cell_type = Rast_get_raster_map_type(fdi);
ibuffer = readcell(fdi, memory->answer);
- Rast_close_cell(fdi);
+ Rast_close(fdi);
G__switch_env();
Rast_set_window(&outcellhd);
@@ -448,7 +448,7 @@
G_percent(row, outcellhd.rows - 1, 2);
}
- Rast_close_cell(fdo);
+ Rast_close(fdo);
if (have_colors > 0) {
Rast_write_colors(mapname, G_mapset(), &colr);
Modified: grass/trunk/raster/r.quantile/main.c
===================================================================
--- grass/trunk/raster/r.quantile/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.quantile/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -332,7 +332,7 @@
values = G_calloc(num_values, sizeof(DCELL));
fill_bins(infile);
- Rast_close_cell(infile);
+ Rast_close(infile);
G_free(slot_bins);
sort_bins();
Modified: grass/trunk/raster/r.random/random.c
===================================================================
--- grass/trunk/raster/r.random/random.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.random/random.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -247,9 +247,9 @@
theState->nRand - nt);
/* close files */
- Rast_close_cell(infd);
+ Rast_close(infd);
if (theState->docover == 1)
- Rast_close_cell(cinfd);
+ Rast_close(cinfd);
if (theState->outvector) {
db_commit_transaction(driver);
db_close_database_shutdown_driver(driver);
@@ -258,7 +258,7 @@
Vect_close(&Out);
}
if (theState->outraster)
- Rast_close_cell(outfd);
+ Rast_close(outfd);
return 0;
} /* execute_random() */
Modified: grass/trunk/raster/r.random.cells/indep.c
===================================================================
--- grass/trunk/raster/r.random.cells/indep.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.random.cells/indep.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -145,7 +145,7 @@
}
G_percent(1, 1, 1);
- Rast_close_cell(OutFD);
+ Rast_close(OutFD);
Rast_short_history(Output->answer, "raster", &history);
Rast_command_history(&history);
Rast_write_history(Output->answer, &history);
Modified: grass/trunk/raster/r.random.cells/init.c
===================================================================
--- grass/trunk/raster/r.random.cells/init.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.random.cells/init.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -55,7 +55,7 @@
}
}
}
- Rast_close_cell(FD);
+ Rast_close(FD);
}
}
else {
Modified: grass/trunk/raster/r.random.surface/save.c
===================================================================
--- grass/trunk/raster/r.random.surface/save.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.random.surface/save.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -174,7 +174,7 @@
}
G_percent(1, 1, 1);
- Rast_close_cell(OutFD);
+ Rast_close(OutFD);
Rast_short_history(OutNames[NumMap], "raster", &history);
Rast_command_history(&history);
Rast_write_history(OutNames[NumMap], &history);
Modified: grass/trunk/raster/r.recode/recode.c
===================================================================
--- grass/trunk/raster/r.recode/recode.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.recode/recode.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -55,8 +55,8 @@
PROCESS_ROW(row);
}
G_percent(row, nrows, 2);
- Rast_close_cell(in_fd);
- Rast_close_cell(out_fd);
+ Rast_close(in_fd);
+ Rast_close(out_fd);
/* writing history file */
Rast_short_history(result, "raster", &hist);
Modified: grass/trunk/raster/r.resamp.interp/main.c
===================================================================
--- grass/trunk/raster/r.resamp.interp/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.resamp.interp/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -294,8 +294,8 @@
G_percent(dst_w.rows, dst_w.rows, 2);
- Rast_close_cell(infile);
- Rast_close_cell(outfile);
+ Rast_close(infile);
+ Rast_close(outfile);
/* record map metadata/history info */
Modified: grass/trunk/raster/r.resamp.rst/main.c
===================================================================
--- grass/trunk/raster/r.resamp.rst/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.resamp.rst/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -528,9 +528,9 @@
clean();
if (fd4)
fclose(fd4);
- Rast_close_cell(fdinp);
+ Rast_close(fdinp);
if (smooth != NULL)
- Rast_close_cell(fdsmooth);
+ Rast_close(fdsmooth);
G_done_msg("");
exit(EXIT_SUCCESS);
Modified: grass/trunk/raster/r.resamp.stats/main.c
===================================================================
--- grass/trunk/raster/r.resamp.stats/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.resamp.stats/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -364,8 +364,8 @@
G_percent(dst_w.rows, dst_w.rows, 2);
- Rast_close_cell(infile);
- Rast_close_cell(outfile);
+ Rast_close(infile);
+ Rast_close(outfile);
/* record map metadata/history info */
sprintf(title, "Aggregate resample by %s", parm.method->answer);
Modified: grass/trunk/raster/r.resample/main.c
===================================================================
--- grass/trunk/raster/r.resample/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.resample/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -127,11 +127,11 @@
G_percent(row, nrows, 2);
- Rast_close_cell(infd);
+ Rast_close(infd);
G_message(_("Creating support files for <%s>..."), result);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
Rast_rewind_cats(&cats);
Modified: grass/trunk/raster/r.rescale/get_range.c
===================================================================
--- grass/trunk/raster/r.rescale/get_range.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.rescale/get_range.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -32,7 +32,7 @@
Rast_update_range(cell[col], &range);
}
G_percent(row, nrows, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(cell);
}
Modified: grass/trunk/raster/r.rescale.eq/get_stats.c
===================================================================
--- grass/trunk/raster/r.rescale.eq/get_stats.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.rescale.eq/get_stats.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -27,7 +27,7 @@
}
if (row < nrows)
exit(1);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(cell);
G_percent(row, nrows, 2);
Modified: grass/trunk/raster/r.ros/main.c
===================================================================
--- grass/trunk/raster/r.ros/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.ros/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -864,28 +864,28 @@
}
G_percent(row, nrows, 2);
- Rast_close_cell(fuel_fd);
+ Rast_close(fuel_fd);
if (parm.mois_1h->answer)
- Rast_close_cell(mois_1h_fd);
+ Rast_close(mois_1h_fd);
if (parm.mois_10h->answer)
- Rast_close_cell(mois_10h_fd);
+ Rast_close(mois_10h_fd);
if (parm.mois_100h->answer)
- Rast_close_cell(mois_100h_fd);
- Rast_close_cell(mois_live_fd);
+ Rast_close(mois_100h_fd);
+ Rast_close(mois_live_fd);
if (parm.vel->answer)
- Rast_close_cell(vel_fd);
+ Rast_close(vel_fd);
if (parm.dir->answer)
- Rast_close_cell(dir_fd);
+ Rast_close(dir_fd);
if (parm.slope->answer)
- Rast_close_cell(slope_fd);
+ Rast_close(slope_fd);
if (parm.aspect->answer)
- Rast_close_cell(aspect_fd);
- Rast_close_cell(base_fd);
- Rast_close_cell(max_fd);
- Rast_close_cell(maxdir_fd);
+ Rast_close(aspect_fd);
+ Rast_close(base_fd);
+ Rast_close(max_fd);
+ Rast_close(maxdir_fd);
if (spotting) {
- Rast_close_cell(spotdist_fd);
- Rast_close_cell(spotdist_fd);
+ Rast_close(spotdist_fd);
+ Rast_close(spotdist_fd);
G_free(map_elev);
}
Modified: grass/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.series/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -279,7 +279,7 @@
for (i = 0; i < num_outputs; i++) {
struct output *out = &outputs[i];
- Rast_close_cell(out->fd);
+ Rast_close(out->fd);
Rast_short_history(out->name, "raster", &history);
Rast_command_history(&history);
@@ -287,7 +287,7 @@
}
for (i = 0; i < num_inputs; i++)
- Rast_close_cell(inputs[i].fd);
+ Rast_close(inputs[i].fd);
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/raster/r.slope.aspect/main.c
===================================================================
--- grass/trunk/raster/r.slope.aspect/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.slope.aspect/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -991,7 +991,7 @@
G_percent(row, nrows, 2);
- Rast_close_cell(elevation_fd);
+ Rast_close(elevation_fd);
G_debug(1, "Creating support files...");
G_verbose_message(_("Elevation products for mapset <%s> in <%s>"),
@@ -1003,7 +1003,7 @@
Rast_set_null_value(asp_raster, G_window_cols(), data_type);
Rast_put_raster_row(aspect_fd, asp_raster, data_type);
- Rast_close_cell(aspect_fd);
+ Rast_close(aspect_fd);
if (out_type != CELL_TYPE)
Rast_quantize_fp_map_range(aspect_name, G_mapset(), 0., 360., 0,
@@ -1093,7 +1093,7 @@
Rast_set_null_value(slp_raster, G_window_cols(), data_type);
Rast_put_raster_row(slope_fd, slp_raster, data_type);
- Rast_close_cell(slope_fd);
+ Rast_close(slope_fd);
if (out_type != CELL_TYPE) {
/* INCR_BY_ONE
@@ -1223,7 +1223,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_close_cell(pcurv_fd);
+ Rast_close(pcurv_fd);
Rast_write_colors(pcurv_name, G_mapset(), &colors);
@@ -1250,7 +1250,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_close_cell(tcurv_fd);
+ Rast_close(tcurv_fd);
Rast_write_colors(tcurv_name, G_mapset(), &colors);
@@ -1277,7 +1277,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_close_cell(dx_fd);
+ Rast_close(dx_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dx_name, G_mapset());
@@ -1302,7 +1302,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_close_cell(dy_fd);
+ Rast_close(dy_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dy_name, G_mapset());
@@ -1327,7 +1327,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_close_cell(dxx_fd);
+ Rast_close(dxx_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dxx_name, G_mapset());
@@ -1352,7 +1352,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_close_cell(dyy_fd);
+ Rast_close(dyy_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dyy_name, G_mapset());
@@ -1377,7 +1377,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_close_cell(dxy_fd);
+ Rast_close(dxy_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dxy_name, G_mapset());
Modified: grass/trunk/raster/r.spread/main.c
===================================================================
--- grass/trunk/raster/r.spread/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.spread/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -521,19 +521,19 @@
G_free(map_velocity);
}
- Rast_close_cell(max_fd);
- Rast_close_cell(dir_fd);
- Rast_close_cell(base_fd);
- Rast_close_cell(start_fd);
- Rast_close_cell(cum_fd);
+ Rast_close(max_fd);
+ Rast_close(dir_fd);
+ Rast_close(base_fd);
+ Rast_close(start_fd);
+ Rast_close(cum_fd);
if (x_out)
- Rast_close_cell(x_fd);
+ Rast_close(x_fd);
if (y_out)
- Rast_close_cell(y_fd);
+ Rast_close(y_fd);
if (spotting) {
- Rast_close_cell(spotdist_fd);
- Rast_close_cell(velocity_fd);
- Rast_close_cell(mois_fd);
+ Rast_close(spotdist_fd);
+ Rast_close(velocity_fd);
+ Rast_close(mois_fd);
}
/* close graphics */
Modified: grass/trunk/raster/r.spreadpath/main.c
===================================================================
--- grass/trunk/raster/r.spreadpath/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.spreadpath/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -305,7 +305,7 @@
} /* loop over cols */
} /* loop over rows */
- Rast_close_cell(path_fd);
+ Rast_close(path_fd);
}
/* loop over the starting points to find the least cost paths */
@@ -346,9 +346,9 @@
close(in_col_fd);
close(out_fd);
- Rast_close_cell(path_fd);
- Rast_close_cell(backrow_fd);
- Rast_close_cell(backcol_fd);
+ Rast_close(path_fd);
+ Rast_close(backrow_fd);
+ Rast_close(backcol_fd);
unlink(in_row_file); /* remove submatrix files */
unlink(in_col_file);
Modified: grass/trunk/raster/r.statistics2/main.c
===================================================================
--- grass/trunk/raster/r.statistics2/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.statistics2/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -519,7 +519,7 @@
G_percent(row, rows, 2);
- Rast_close_cell(out_fd);
+ Rast_close(out_fd);
if (Rast_read_colors(covermap, "", &colors) > 0)
Rast_write_colors(output, G_mapset(), &colors);
Modified: grass/trunk/raster/r.statistics3/main.c
===================================================================
--- grass/trunk/raster/r.statistics3/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.statistics3/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -361,7 +361,7 @@
G_percent(row, rows, 2);
for (quant = 0; quant < num_quants; quant++) {
- Rast_close_cell(out_fd[quant]);
+ Rast_close(out_fd[quant]);
if (have_colors)
Rast_write_colors(outputs[quant], mapset, &colors);
}
@@ -520,8 +520,8 @@
else
do_output(base_fd, outputs, covermap);
- Rast_close_cell(cover_fd);
- Rast_close_cell(base_fd);
+ Rast_close(cover_fd);
+ Rast_close(base_fd);
return (EXIT_SUCCESS);
}
Modified: grass/trunk/raster/r.sun/main.c
===================================================================
--- grass/trunk/raster/r.sun/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.sun/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -638,19 +638,19 @@
}
}
- Rast_close_cell(fd1);
- Rast_close_cell(fd2);
- Rast_close_cell(fd3);
+ Rast_close(fd1);
+ Rast_close(fd2);
+ Rast_close(fd3);
if (linkein != NULL)
- Rast_close_cell(fd4);
+ Rast_close(fd4);
if (albedo != NULL)
- Rast_close_cell(fd5);
+ Rast_close(fd5);
if (latin != NULL)
- Rast_close_cell(fd6);
+ Rast_close(fd6);
if (coefbh != NULL)
- Rast_close_cell(fr1);
+ Rast_close(fr1);
if (coefdh != NULL)
- Rast_close_cell(fr2);
+ Rast_close(fr2);
/*******transformation of angles from 0 to east counterclock
to 0 to north clocwise, for ori=0 upslope flowlines
@@ -798,23 +798,23 @@
}
if (incidout != NULL) {
- Rast_close_cell(fd7);
+ Rast_close(fd7);
Rast_write_history(incidout, &hist);
}
if (beam_rad != NULL) {
- Rast_close_cell(fd8);
+ Rast_close(fd8);
Rast_write_history(beam_rad, &hist);
}
if (diff_rad != NULL) {
- Rast_close_cell(fd9);
+ Rast_close(fd9);
Rast_write_history(diff_rad, &hist);
}
if (refl_rad != NULL) {
- Rast_close_cell(fd10);
+ Rast_close(fd10);
Rast_write_history(refl_rad, &hist);
}
if (insol_time != NULL) {
- Rast_close_cell(fd11);
+ Rast_close(fd11);
Rast_write_history(insol_time, &hist);
}
@@ -1464,7 +1464,7 @@
hist.edlinecnt++;
Rast_command_history(&hist);
- /* don't call Rast_write_history() until after Rast_close_cell() or it just gets overwritten */
+ /* don't call Rast_write_history() until after Rast_close() or it just gets overwritten */
}
double com_sol_const(int no_of_day)
Modified: grass/trunk/raster/r.sun2/main.c
===================================================================
--- grass/trunk/raster/r.sun2/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.sun2/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -1066,46 +1066,46 @@
}
}
- Rast_close_cell(fd1);
+ Rast_close(fd1);
G_free(cell1);
if (aspin != NULL) {
G_free(cell2);
- Rast_close_cell(fd2);
+ Rast_close(fd2);
}
if (slopein != NULL) {
G_free(cell3);
- Rast_close_cell(fd3);
+ Rast_close(fd3);
}
if (linkein != NULL) {
G_free(cell4);
- Rast_close_cell(fd4);
+ Rast_close(fd4);
}
if (albedo != NULL) {
G_free(cell5);
- Rast_close_cell(fd5);
+ Rast_close(fd5);
}
if (latin != NULL) {
G_free(cell6);
- Rast_close_cell(fd6);
+ Rast_close(fd6);
}
if (longin != NULL) {
G_free(cell7);
- Rast_close_cell(fd7);
+ Rast_close(fd7);
}
if (coefbh != NULL) {
G_free(rast1);
- Rast_close_cell(fr1);
+ Rast_close(fr1);
}
if (coefdh != NULL) {
G_free(rast2);
- Rast_close_cell(fr2);
+ Rast_close(fr2);
}
if (useHorizonData()) {
for (i = 0; i < arrayNumInt; i++) {
- Rast_close_cell(fd_shad[i]);
+ Rast_close(fd_shad[i]);
G_free(horizonbuf[i]);
}
}
@@ -1277,27 +1277,27 @@
}
if (incidout != NULL) {
- Rast_close_cell(fd7);
+ Rast_close(fd7);
Rast_write_history(incidout, &hist);
}
if (beam_rad != NULL) {
- Rast_close_cell(fd8);
+ Rast_close(fd8);
Rast_write_history(beam_rad, &hist);
}
if (diff_rad != NULL) {
- Rast_close_cell(fd9);
+ Rast_close(fd9);
Rast_write_history(diff_rad, &hist);
}
if (refl_rad != NULL) {
- Rast_close_cell(fd10);
+ Rast_close(fd10);
Rast_write_history(refl_rad, &hist);
}
if (insol_time != NULL) {
- Rast_close_cell(fd11);
+ Rast_close(fd11);
Rast_write_history(insol_time, &hist);
}
if (glob_rad != NULL) {
- Rast_close_cell(fd12);
+ Rast_close(fd12);
Rast_write_history(glob_rad, &hist);
}
@@ -2062,7 +2062,7 @@
hist.edlinecnt++;
Rast_command_history(&hist);
- /* don't call Rast_write_history() until after Rast_close_cell() or it just gets overwritten */
+ /* don't call Rast_write_history() until after Rast_close() or it just gets overwritten */
} /* End of ) function */
Modified: grass/trunk/raster/r.sunmask/main.c
===================================================================
--- grass/trunk/raster/r.sunmask/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.sunmask/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -535,8 +535,8 @@
row1 += 1;
}
- Rast_close_cell(output_fd);
- Rast_close_cell(elev_fd);
+ Rast_close(output_fd);
+ Rast_close(elev_fd);
/* writing history file */
Rast_short_history(outname, "raster", &hist);
Modified: grass/trunk/raster/r.support/histo.c
===================================================================
--- grass/trunk/raster/r.support/histo.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.support/histo.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -43,7 +43,7 @@
Rast_write_histogram_cs(name, &statf);
Rast_free_cell_stats(&statf);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(cell);
if (row < nrows)
Modified: grass/trunk/raster/r.support/main.c
===================================================================
--- grass/trunk/raster/r.support/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.support/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -292,7 +292,7 @@
if (Rast_write_cats(infile, &cats) >= 0)
G_message(_("cats table for [%s] set to %s"), infile,
map_opt->answer);
- Rast_close_cell(fd);
+ Rast_close(fd);
Rast_free_cats(&cats);
}
Modified: grass/trunk/raster/r.support.stats/histo.c
===================================================================
--- grass/trunk/raster/r.support.stats/histo.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.support.stats/histo.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -62,7 +62,7 @@
Rast_write_histogram_cs(name, &statf);
Rast_free_cell_stats(&statf);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(cell);
if (row == nrows)
Modified: grass/trunk/raster/r.surf.area/main.c
===================================================================
--- grass/trunk/raster/r.surf.area/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.surf.area/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -147,7 +147,7 @@
G_free(cell_buf[0]);
G_free(cell_buf[1]);
- Rast_close_cell(cellfile);
+ Rast_close(cellfile);
{ /* report */
double reg_area, flat_area, estavg;
Modified: grass/trunk/raster/r.surf.contour/main.c
===================================================================
--- grass/trunk/raster/r.surf.contour/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.surf.contour/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -103,7 +103,7 @@
if (!alt_row[c])
FLAG_SET(mask, r, c);
}
- Rast_close_cell(file_fd);
+ Rast_close(file_fd);
}
zero = (NODE *) G_malloc(INIT_AR * sizeof(NODE));
minc = minr = 0;
@@ -136,7 +136,7 @@
free_cell(con);
flag_destroy(seen);
flag_destroy(mask);
- Rast_close_cell(file_fd);
+ Rast_close(file_fd);
Rast_short_history(alt_name, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/raster/r.surf.contour/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.contour/read_cell.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.surf.contour/read_cell.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -26,7 +26,7 @@
name, mapset);
}
- Rast_close_cell(fd);
+ Rast_close(fd);
return idx;
}
Modified: grass/trunk/raster/r.surf.fractal/write_rast.c
===================================================================
--- grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -72,7 +72,7 @@
Rast_put_raster_row(fd_out, (DCELL *) row_out, DCELL_TYPE);
}
- Rast_close_cell(fd_out);
+ Rast_close(fd_out);
Rast_short_history(file_name, "raster", &history);
Rast_command_history(&history);
Rast_write_history(file_name, &history);
Modified: grass/trunk/raster/r.surf.gauss/gaussurf.c
===================================================================
--- grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -58,7 +58,7 @@
/****** CLOSE THE CELL FILE ******/
- Rast_close_cell(fd_out);
+ Rast_close(fd_out);
Rast_short_history(out, "raster", &history);
Rast_command_history(&history);
Rast_write_history(out, &history);
Modified: grass/trunk/raster/r.surf.idw/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.surf.idw/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -160,7 +160,7 @@
/* Store input data in array-indexed doubly-linked lists and close input file */
rowlist = row_lists(nrows, ncols, &datarows, &n, fd, cell);
- Rast_close_cell(fd);
+ Rast_close(fd);
if (npoints > n)
npoints = n;
@@ -179,7 +179,7 @@
G_free(collook);
if (ll)
free_dist_params();
- Rast_close_cell(fd);
+ Rast_close(fd);
/* writing history file */
Rast_short_history(output, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/raster/r.surf.idw2/main.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.surf.idw2/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -182,7 +182,7 @@
G_free(points);
G_free(cell);
- Rast_close_cell(fd);
+ Rast_close(fd);
/* writing history file */
Rast_short_history(parm.output->answer, "raster", &history);
Modified: grass/trunk/raster/r.surf.idw2/read_cell.c
===================================================================
--- grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.surf.idw2/read_cell.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -43,7 +43,7 @@
}
G_percent(row, window.rows, 1);
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(cell);
/* reset the window */
Modified: grass/trunk/raster/r.surf.random/randsurf.c
===================================================================
--- grass/trunk/raster/r.surf.random/randsurf.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.surf.random/randsurf.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -61,7 +61,7 @@
Rast_put_d_raster_row(fd_out, (DCELL *) row_out_D);
}
- Rast_close_cell(fd_out);
+ Rast_close(fd_out);
return 0;
}
Modified: grass/trunk/raster/r.terraflow/grass2str.h
===================================================================
--- grass/trunk/raster/r.terraflow/grass2str.h 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.terraflow/grass2str.h 2009-06-28 16:44:45 UTC (rev 38106)
@@ -139,7 +139,7 @@
/* delete buffers */
G_free(inrast);
/* close map files */
- Rast_close_cell (infd);
+ Rast_close (infd);
assert(nrows * ncols == str->stream_len());
rt_stop(rt);
@@ -219,7 +219,7 @@
G_percent(1, 1, 2); /* finish it */
G_free(outrast);
- Rast_close_cell (outfd);
+ Rast_close (outfd);
rt_stop(rt);
stats->recordTime("writing raster map", rt);
@@ -298,7 +298,7 @@
G_percent(1, 1, 2); /* finish it */
G_free(outrast);
- Rast_close_cell (outfd);
+ Rast_close (outfd);
rt_stop(rt);
stats->recordTime("writing raster map", rt);
@@ -372,7 +372,7 @@
G_percent(1, 1, 2); /* finish it */
G_free(outrast);
- Rast_close_cell (outfd);
+ Rast_close (outfd);
rt_stop(rt);
stats->recordTime("writing raster map", rt);
@@ -484,9 +484,9 @@
G_percent(1, 1, 2); /* finish it */
G_free(rast1);
- Rast_close_cell (fd1);
+ Rast_close (fd1);
G_free(rast2);
- Rast_close_cell (fd2);
+ Rast_close (fd2);
rt_stop(rt);
Modified: grass/trunk/raster/r.texture/main.c
===================================================================
--- grass/trunk/raster/r.texture/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.texture/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -247,7 +247,7 @@
}
/* close input cell map and release the row buffer */
- Rast_close_cell(infd);
+ Rast_close(infd);
G_free(cell_row);
/* Now raster map is into memory. */
@@ -348,7 +348,7 @@
G_fatal_error(_("Failed writing raster map <%s> row %d"),
result, row);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
strcpy(mapname, filename);
strcat(mapname, suffixes[t_measure]);
G_important_message(_("Calculated measure #%d <%s> (56 measures available)"),
Modified: grass/trunk/raster/r.thin/io.c
===================================================================
--- grass/trunk/raster/r.thin/io.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.thin/io.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -146,7 +146,7 @@
}
n_rows += (PAD << 1);
G_free(buf);
- Rast_close_cell(cell_file);
+ Rast_close(cell_file);
rowio_setup(&row_io, work_file, MAX_ROW, n_cols * sizeof(CELL), read_row,
write_row);
@@ -178,7 +178,7 @@
}
Rast_put_raster_row(cell_file, buf + PAD, CELL_TYPE);
}
- Rast_close_cell(cell_file);
+ Rast_close(cell_file);
rowio_flush(&row_io);
close(rowio_fileno(&row_io));
rowio_release(&row_io);
Modified: grass/trunk/raster/r.to.rast3/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.to.rast3/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -362,6 +362,6 @@
/* ************************************************************************* */
void close_input_raster_map(int fd)
{
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_fatal_error(_("Unable to close input map"));
}
Modified: grass/trunk/raster/r.to.rast3elev/main.c
===================================================================
--- grass/trunk/raster/r.to.rast3elev/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.to.rast3elev/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -126,7 +126,7 @@
/* ************************************************************************* */
void close_input_raster_map(int fd)
{
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_fatal_error(_("Unable to close input map"));
}
Modified: grass/trunk/raster/r.to.vect/main.c
===================================================================
--- grass/trunk/raster/r.to.vect/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.to.vect/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -234,7 +234,7 @@
extract_points(z_flg->answer);
}
- Rast_close_cell(input_fd);
+ Rast_close(input_fd);
if (!no_topol->answer)
Vect_build(&Map);
Modified: grass/trunk/raster/r.topidx/file_io.c
===================================================================
--- grass/trunk/raster/r.topidx/file_io.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.topidx/file_io.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -42,7 +42,7 @@
if (data_type == CELL_TYPE) {
if (Rast_get_c_raster_row(fd, ccell, i) < 0) {
- Rast_close_cell(fd);
+ Rast_close(fd);
}
for (j = 0; j < window.cols; j++) {
if (Rast_is_c_null_value(&ccell[j]))
@@ -53,7 +53,7 @@
}
else if (data_type == FCELL_TYPE) {
if (Rast_get_f_raster_row(fd, fcell, i) < 0) {
- Rast_close_cell(fd);
+ Rast_close(fd);
}
for (j = 0; j < window.cols; j++) {
if (Rast_is_f_null_value(&fcell[j]))
@@ -63,7 +63,7 @@
}
}
else if (Rast_get_d_raster_row(fd, cell[i], i) < 0) {
- Rast_close_cell(fd);
+ Rast_close(fd);
G_fatal_error(_("Unable to read raster map <%s> row %d"), iname,
i);
}
@@ -73,7 +73,7 @@
else if (data_type == FCELL_TYPE)
G_free(fcell);
G_percent(i, window.rows, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
}
@@ -92,7 +92,7 @@
Rast_put_d_raster_row(fd, atb[i]);
}
G_percent(i, window.rows, 2);
- Rast_close_cell(fd);
+ Rast_close(fd);
Rast_short_history(oname, "raster", &history);
strncpy(history.datsrc_1, iname, RECORD_LEN);
Modified: grass/trunk/raster/r.uslek/main.c
===================================================================
--- grass/trunk/raster/r.uslek/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.uslek/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -172,12 +172,12 @@
G_free(inrast_psilt);
G_free(inrast_pclay);
G_free(inrast_pomat);
- Rast_close_cell(infd_psand);
- Rast_close_cell(infd_psilt);
- Rast_close_cell(infd_pclay);
- Rast_close_cell(infd_pomat);
+ Rast_close(infd_psand);
+ Rast_close(infd_psilt);
+ Rast_close(infd_pclay);
+ Rast_close(infd_pomat);
G_free(outrast);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
Rast_short_history(result, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/raster/r.usler/main.c
===================================================================
--- grass/trunk/raster/r.usler/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.usler/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -135,9 +135,9 @@
result, row);
}
G_free(inrast_annual_pmm);
- Rast_close_cell(infd_annual_pmm);
+ Rast_close(infd_annual_pmm);
G_free(outrast);
- Rast_close_cell(outfd);
+ Rast_close(outfd);
Rast_short_history(result, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/raster/r.walk/main.c
===================================================================
--- grass/trunk/raster/r.walk/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.walk/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -925,7 +925,7 @@
G_percent(row, nrows, 2);
- Rast_close_cell(cum_fd);
+ Rast_close(cum_fd);
G_free(cell2);
}
@@ -1596,11 +1596,11 @@
segment_release(&out_seg);
if (dir == 1)
segment_release(&out_seg2);
- Rast_close_cell(dtm_fd);
- Rast_close_cell(cost_fd);
- Rast_close_cell(cum_fd);
+ Rast_close(dtm_fd);
+ Rast_close(cost_fd);
+ Rast_close(cum_fd);
if (dir == 1)
- Rast_close_cell(dir_fd);
+ Rast_close(dir_fd);
close(dtm_in_fd); /* close all files */
close(out_fd);
close(cost_in_fd);
Modified: grass/trunk/raster/r.water.outlet/main.c
===================================================================
--- grass/trunk/raster/r.water.outlet/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.water.outlet/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -165,7 +165,7 @@
}
G_free(bas);
G_free(cell_buf);
- if (Rast_close_cell(basin_fd) < 0)
+ if (Rast_close(basin_fd) < 0)
G_fatal_error(_("Unable to close new basin map layer"));
return 0;
Modified: grass/trunk/raster/r.watershed/ram/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -63,7 +63,7 @@
Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
}
}
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
stddev =
@@ -150,7 +150,7 @@
}
Rast_put_raster_row(fd, buf, CELL_TYPE);
}
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
}
Rast_init_colors(&colors);
@@ -183,7 +183,7 @@
}
Rast_put_raster_row(fd, buf, CELL_TYPE);
}
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
}
Rast_init_colors(&colors);
@@ -208,7 +208,7 @@
}
Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
}
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
}
G_free(l_s);
@@ -228,7 +228,7 @@
}
Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
}
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
}
}
@@ -248,7 +248,7 @@
}
Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
}
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
}
G_free(s_g);
Modified: grass/trunk/raster/r.watershed/ram/close_maps2.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps2.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/ram/close_maps2.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -93,7 +93,7 @@
}
Rast_put_raster_row(map_fd, cellrow, CELL_TYPE);
}
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
Rast_write_colors(seg_name, this_mapset, &colors);
}
@@ -108,7 +108,7 @@
}
Rast_put_raster_row(map_fd, cellrow, CELL_TYPE);
}
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
Rast_write_colors(bas_name, this_mapset, &colors);
}
@@ -123,7 +123,7 @@
}
Rast_put_raster_row(map_fd, cellrow, CELL_TYPE);
}
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
Rast_write_colors(haf_name, this_mapset, &colors);
}
Modified: grass/trunk/raster/r.watershed/ram/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/init_vars.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/ram/init_vars.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -195,7 +195,7 @@
ptr = G_incr_void_ptr(ptr, ele_size);
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(elebuf);
if (do_points < nrows * ncols)
MASK_flag = 1;
@@ -226,7 +226,7 @@
wat[SEG_INDEX(wat_seg, r, c)] = buf[c];
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
}
else {
/* ... with 1.0 */
@@ -259,7 +259,7 @@
asp[SEG_INDEX(asp_seg, r, c)] = 1;
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
}
/* this is also creating streams... */
@@ -276,7 +276,7 @@
FLAG_SET(swale, r, c);
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
}
G_free(buf);
Modified: grass/trunk/raster/r.watershed/ram/sg_factor.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/sg_factor.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/ram/sg_factor.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -47,7 +47,7 @@
if (ril_flag) {
G_free(ril_buf);
- Rast_close_cell(ril_fd);
+ Rast_close(ril_fd);
}
return 0;
Modified: grass/trunk/raster/r.watershed/seg/bseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_read.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/seg/bseg_read.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -29,7 +29,7 @@
for (row = 0; row < nrows; row++) {
if (Rast_get_c_raster_row(map_fd, buffer, row) < 0) {
G_free(buffer);
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
sprintf(msg, "%s(): unable to read file [%s] in [%s], %d %d",
me, map_name, mapset, row, nrows);
G_warning(msg);
@@ -40,7 +40,7 @@
}
}
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
G_free(buffer);
bseg->name = G_store(map_name);
Modified: grass/trunk/raster/r.watershed/seg/bseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/bseg_write.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/seg/bseg_write.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -27,13 +27,13 @@
}
if (Rast_put_raster_row(map_fd, buffer, CELL_TYPE) < 0) {
G_free(buffer);
- Rast_unopen_cell(map_fd);
+ Rast_unopen(map_fd);
G_warning("%s(): unable to write new map layer [%s], row %d",
me, map_name, row);
return -2;
}
}
G_free(buffer);
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
return 0;
}
Modified: grass/trunk/raster/r.watershed/seg/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -40,7 +40,7 @@
}
Rast_put_raster_row(fd, dbuf, DCELL_TYPE);
}
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_warning(_("Close failed."));
}
else {
Modified: grass/trunk/raster/r.watershed/seg/close_maps2.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/close_maps2.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/seg/close_maps2.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -84,7 +84,7 @@
Rast_put_raster_row(map_fd, cellrow, CELL_TYPE);
}
G_free(cellrow);
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
Rast_write_colors(seg_name, this_mapset, &colors);
}
Modified: grass/trunk/raster/r.watershed/seg/cseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_read.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/seg/cseg_read.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -27,7 +27,7 @@
for (row = 0; row < nrows; row++) {
if (Rast_get_c_raster_row(map_fd, buffer, row) < 0) {
G_free(buffer);
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
sprintf(msg, "%s(): unable to read file [%s] in [%s], %d %d",
me, map_name, mapset, row, nrows);
G_warning(msg);
@@ -35,7 +35,7 @@
}
if (segment_put_row(&(cseg->seg), buffer, row) < 0) {
G_free(buffer);
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
sprintf(msg, "%s(): unable to segment put row for [%s] in [%s]",
me, map_name, mapset);
G_warning(msg);
@@ -43,7 +43,7 @@
}
}
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
G_free(buffer);
cseg->name = G_store(map_name);
Modified: grass/trunk/raster/r.watershed/seg/cseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/cseg_write.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/seg/cseg_write.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -23,13 +23,13 @@
segment_get_row(&(cseg->seg), buffer, row);
if (Rast_put_raster_row(map_fd, buffer, CELL_TYPE) < 0) {
G_free(buffer);
- Rast_unopen_cell(map_fd);
+ Rast_unopen(map_fd);
G_warning("%s(): unable to write new map layer [%s], row %d",
me, map_name, row);
return -2;
}
}
G_free(buffer);
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
return 0;
}
Modified: grass/trunk/raster/r.watershed/seg/dseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -28,7 +28,7 @@
for (row = 0; row < nrows; row++) {
if (Rast_get_d_raster_row(map_fd, dbuffer, row) < 0) {
G_free(dbuffer);
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
sprintf(msg, "%s(): unable to read file [%s] in [%s], %d %d",
me, map_name, mapset, row, nrows);
G_warning(msg);
@@ -36,7 +36,7 @@
}
if (segment_put_row(&(dseg->seg), (DCELL *) dbuffer, row) < 0) {
G_free(dbuffer);
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
sprintf(msg, "%s(): unable to segment put row for [%s] in [%s]",
me, map_name, mapset);
G_warning(msg);
@@ -44,7 +44,7 @@
}
}
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
G_free(dbuffer);
dseg->name = G_store(map_name);
Modified: grass/trunk/raster/r.watershed/seg/dseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -24,13 +24,13 @@
segment_get_row(&(dseg->seg), (DCELL *) dbuffer, row);
if (Rast_put_raster_row(map_fd, dbuffer, DCELL_TYPE) < 0) {
G_free(dbuffer);
- Rast_unopen_cell(map_fd);
+ Rast_unopen(map_fd);
G_warning("%s(): unable to write new map layer [%s], row %d",
me, map_name, row);
return -2;
}
}
G_free(dbuffer);
- Rast_close_cell(map_fd);
+ Rast_close(map_fd);
return 0;
}
Modified: grass/trunk/raster/r.watershed/seg/init_vars.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/init_vars.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/seg/init_vars.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -236,7 +236,7 @@
ptr = G_incr_void_ptr(ptr, ele_size);
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(elebuf);
if (do_points < nrows * ncols)
MASK_flag = 1;
@@ -291,7 +291,7 @@
}
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(buf);
}
else {
@@ -320,7 +320,7 @@
}
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
G_free(buf);
}
else {
Modified: grass/trunk/raster/r.watershed/shed/read.c
===================================================================
--- grass/trunk/raster/r.watershed/shed/read.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/r.watershed/shed/read.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -67,7 +67,7 @@
}
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
}
}
Modified: grass/trunk/raster/simwe/simlib/input.c
===================================================================
--- grass/trunk/raster/simwe/simlib/input.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/simwe/simlib/input.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -446,34 +446,34 @@
}
}
}
- Rast_close_cell(fd1);
- Rast_close_cell(fd2);
- Rast_close_cell(fd3);
+ Rast_close(fd1);
+ Rast_close(fd2);
+ Rast_close(fd3);
if (rain != NULL)
- Rast_close_cell(fd4);
+ Rast_close(fd4);
if (infil != NULL)
- Rast_close_cell(fd4a);
+ Rast_close(fd4a);
if (traps != NULL)
- Rast_close_cell(fd4b);
+ Rast_close(fd4b);
/* Maybe a conditional to manin!=NULL here ! */
- Rast_close_cell(fd5);
+ Rast_close(fd5);
/****************/
if (detin != NULL)
- Rast_close_cell(fd9);
+ Rast_close(fd9);
if (tranin != NULL)
- Rast_close_cell(fd10);
+ Rast_close(fd10);
if (tauin != NULL)
- Rast_close_cell(fd11);
+ Rast_close(fd11);
if (wdepth != NULL)
- Rast_close_cell(fd12);
+ Rast_close(fd12);
return 1;
}
Modified: grass/trunk/raster/simwe/simlib/output.c
===================================================================
--- grass/trunk/raster/simwe/simlib/output.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster/simwe/simlib/output.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -268,17 +268,17 @@
}
if (depth != NULL)
- Rast_close_cell(fd6);
+ Rast_close(fd6);
if (disch != NULL)
- Rast_close_cell(fd7);
+ Rast_close(fd7);
if (err != NULL)
- Rast_close_cell(fd8);
+ Rast_close(fd8);
if (conc != NULL)
- Rast_close_cell(fd14);
+ Rast_close(fd14);
if (flux != NULL)
- Rast_close_cell(fd15);
+ Rast_close(fd15);
if (erdep != NULL)
- Rast_close_cell(fd16);
+ Rast_close(fd16);
if (depth != NULL) {
@@ -692,10 +692,10 @@
if (tc != NULL)
- Rast_close_cell(fd13);
+ Rast_close(fd13);
if (et != NULL)
- Rast_close_cell(fd17);
+ Rast_close(fd17);
if (et != NULL) {
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -58,7 +58,7 @@
/*unopen the output map */
if (outfd != -1)
- Rast_unopen_cell(outfd);
+ Rast_unopen(outfd);
if (elevfd != -1)
close_output_map(elevfd);
@@ -74,7 +74,7 @@
/* ************************************************************************* */
void close_output_map(int fd)
{
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_fatal_error(_("Unable to close output map"));
}
@@ -380,9 +380,9 @@
G3d_maskOff(map);
}
- if (Rast_close_cell(outfd) < 0)
+ if (Rast_close(outfd) < 0)
fatal_error(map, elevfd, -1, _("Unable to close output map"));
- if (Rast_close_cell(elevfd) < 0)
+ if (Rast_close(elevfd) < 0)
fatal_error(map, -1, -1, _("Unable to close elevation map"));
}
Modified: grass/trunk/raster3d/r3.out.vtk/errorHandling.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/errorHandling.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster3d/r3.out.vtk/errorHandling.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -49,7 +49,7 @@
int CloseInputRasterMap(int fd)
{
if (fd != -1)
- if (Rast_close_cell(fd) < 0) {
+ if (Rast_close(fd) < 0) {
G_warning(_("unable to close input raster map"));
return 1;
}
Modified: grass/trunk/raster3d/r3.out.vtk/main.c
===================================================================
--- grass/trunk/raster3d/r3.out.vtk/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster3d/r3.out.vtk/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -490,12 +490,12 @@
write_vtk_unstructured_grid_cells(fp, region);
}
- if (Rast_close_cell(in->top) < 0) {
+ if (Rast_close(in->top) < 0) {
G_fatal_error(_("unable to close top raster map"));
}
in->top = -1;
- if (Rast_close_cell(in->bottom) < 0) {
+ if (Rast_close(in->bottom) < 0) {
G_fatal_error(_("unable to close bottom raster map"));
}
in->bottom = -1;
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -58,7 +58,7 @@
if (fd != NULL) {
for (i = 0; i < depths; i++)
- Rast_unopen_cell(fd[i]);
+ Rast_unopen(fd[i]);
}
G3d_fatalError(errorMsg);
@@ -191,7 +191,7 @@
/* ************************************************************************* */
void close_output_map(int fd)
{
- if (Rast_close_cell(fd) < 0)
+ if (Rast_close(fd) < 0)
G_fatal_error(_("Unable to close output map"));
}
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-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/swig/perl/R_slope_aspect/r_slope_aspect/r_slope_aspect.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -1017,7 +1017,7 @@
G_percent(row, nrows, 2);
- Rast_close_cell(elevation_fd);
+ Rast_close(elevation_fd);
G_message(_("Creating support files..."));
G_message(_("Elevation products for mapset [%s] in [%s]"),
@@ -1029,7 +1029,7 @@
Rast_set_null_value(asp_raster, G_window_cols(), data_type);
Rast_put_raster_row(aspect_fd, asp_raster, data_type);
- Rast_close_cell(aspect_fd);
+ Rast_close(aspect_fd);
if (out_type != CELL_TYPE)
Rast_quantize_fp_map_range(aspect_name, G_mapset(), 0., 360., 0,
@@ -1117,7 +1117,7 @@
Rast_set_null_value(slp_raster, G_window_cols(), data_type);
Rast_put_raster_row(slope_fd, slp_raster, data_type);
- Rast_close_cell(slope_fd);
+ Rast_close(slope_fd);
if (out_type != CELL_TYPE) {
/* INCR_BY_ONE
@@ -1245,7 +1245,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_close_cell(pcurv_fd);
+ Rast_close(pcurv_fd);
Rast_write_colors(pcurv_name, G_mapset(), &colors);
@@ -1271,7 +1271,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_close_cell(tcurv_fd);
+ Rast_close(tcurv_fd);
Rast_write_colors(tcurv_name, G_mapset(), &colors);
@@ -1297,7 +1297,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_close_cell(dx_fd);
+ Rast_close(dx_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dx_name, G_mapset());
@@ -1321,7 +1321,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_close_cell(dy_fd);
+ Rast_close(dy_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dy_name, G_mapset());
@@ -1345,7 +1345,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_close_cell(dxx_fd);
+ Rast_close(dxx_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dxx_name, G_mapset());
@@ -1369,7 +1369,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_close_cell(dyy_fd);
+ Rast_close(dyy_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dyy_name, G_mapset());
@@ -1393,7 +1393,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_close_cell(dxy_fd);
+ Rast_close(dxy_fd);
if (out_type != CELL_TYPE)
Rast_round_fp_map(dxy_name, G_mapset());
Modified: grass/trunk/vector/lidar/v.surf.bspline/main.c
===================================================================
--- grass/trunk/vector/lidar/v.surf.bspline/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/vector/lidar/v.surf.bspline/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -346,7 +346,7 @@
Vect_close(&Out);
if (map)
- Rast_close_cell(raster);
+ Rast_close(raster);
G_done_msg(_("Cross Validation was success!"));
exit(EXIT_SUCCESS);
@@ -731,7 +731,7 @@
Vect_close(&Out);
if (map) {
- Rast_close_cell(raster);
+ Rast_close(raster);
/* set map title */
sprintf(title, "%s interpolation with Tykhonov regularization",
Modified: grass/trunk/vector/v.drape/main.c
===================================================================
--- grass/trunk/vector/v.drape/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/vector/v.drape/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -369,7 +369,7 @@
} /* end working on type=lines */
/* close elevation raster: */
- Rast_close_cell(fdrast);
+ Rast_close(fdrast);
/* build topology for output vector */
if (out_num > 0) {
Modified: grass/trunk/vector/v.kernel/main.c
===================================================================
--- grass/trunk/vector/v.kernel/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/vector/v.kernel/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -420,7 +420,7 @@
Rast_put_raster_row(fdout, output_cell, DCELL_TYPE);
}
- Rast_close_cell(fdout);
+ Rast_close(fdout);
}
G_message(_("Maximum value in output: %e."), gausmax);
Modified: grass/trunk/vector/v.neighbors/main.c
===================================================================
--- grass/trunk/vector/v.neighbors/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/vector/v.neighbors/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -146,7 +146,7 @@
G_percent(row, nrows, 1);
Vect_close(&In);
- Rast_close_cell(out_fd);
+ Rast_close(out_fd);
exit(EXIT_SUCCESS);
}
Modified: grass/trunk/vector/v.sample/main.c
===================================================================
--- grass/trunk/vector/v.sample/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/vector/v.sample/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -280,7 +280,7 @@
db_close_database_shutdown_driver(Driver);
- Rast_close_cell(fdrast);
+ Rast_close(fdrast);
Vect_close(&In);
Modified: grass/trunk/vector/v.surf.idw/main.c
===================================================================
--- grass/trunk/vector/v.surf.idw/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/vector/v.surf.idw/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -397,7 +397,7 @@
}
Rast_put_d_raster_row(fd, dcell);
}
- Rast_close_cell(fd);
+ Rast_close(fd);
/* writing history file */
Rast_short_history(parm.output->answer, "raster", &history);
Rast_command_history(&history);
Modified: grass/trunk/vector/v.to.rast/support.c
===================================================================
--- grass/trunk/vector/v.to.rast/support.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/vector/v.to.rast/support.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -486,7 +486,7 @@
break;
}
- Rast_close_cell(fd);
+ Rast_close(fd);
if (Rast_write_cats(rast_name, &rast_cats) <= 0)
G_warning(_("Unable to write categories for raster map <%s>"),
rast_name);
Modified: grass/trunk/vector/v.to.rast/vect2rast.c
===================================================================
--- grass/trunk/vector/v.to.rast/vect2rast.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/vector/v.to.rast/vect2rast.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -187,7 +187,7 @@
Vect_destroy_line_struct(Points);
if (stat < 0) {
- Rast_unopen_cell(fd);
+ Rast_unopen(fd);
return 1;
}
@@ -195,7 +195,7 @@
Vect_close(&Map);
G_verbose_message(_("Creating support files for raster map..."));
- Rast_close_cell(fd);
+ Rast_close(fd);
update_hist(raster_map, vector_map, Map.head.orig_scale);
/* colors */
Modified: grass/trunk/vector/v.vol.rst/main.c
===================================================================
--- grass/trunk/vector/v.vol.rst/main.c 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/vector/v.vol.rst/main.c 2009-06-28 16:44:45 UTC (rev 38106)
@@ -843,7 +843,7 @@
OUTGR();
if ((cellinp != NULL)) {
- Rast_close_cell(fdcout);
+ Rast_close(fdcout);
if ((cellout != NULL)) {
Rast_short_history(cellout, "raster", &hist);
/* TODO: next lines need to be verified! */
@@ -864,7 +864,7 @@
fclose(Tmp_fd_cell);
unlink(Tmp_file_cell);
}
- Rast_close_cell(fdcell);
+ Rast_close(fdcell);
}
if (outz != NULL) {
fclose(Tmp_fd_z);
Modified: grass/trunk/visualization/xganim/main.cc
===================================================================
--- grass/trunk/visualization/xganim/main.cc 2009-06-28 10:59:10 UTC (rev 38105)
+++ grass/trunk/visualization/xganim/main.cc 2009-06-28 16:44:45 UTC (rev 38106)
@@ -260,7 +260,7 @@
}
}
- Rast_close_cell(fd);
+ Rast_close(fd);
}
wxBitmap *bmp = new wxBitmap(img);
More information about the grass-commit
mailing list