[GRASS-SVN] r38083 - in grass/trunk: lib/ogsf lib/raster
raster/r.colors raster/r.covar raster/r.drain
raster/r.fill.dir raster/r.flow raster/r.grow
raster/r.grow.distance raster/r.in.arc raster/r.in.bin
raster/r.li/r.li.cwed raster/r.li/r.li.daemon
raster/r.li/r.li.edgedensity raster/r.li/r.li.mps
raster/r.li/r.li.padcv raster/r.li/r.li.padrange
raster/r.li/r.li.padsd raster/r.mfilter raster/r.neighbors
raster/r.out.gridatb raster/r.out.png raster/r.out.ppm
raster/r.profile raster/r.quantile raster/r.resamp.interp
raster/r.resamp.stats raster/r.series raster/r.statistics2
raster/r.statistics3 raster/r.surf.fractal
raster/r.surf.gauss raster/r.surf.random raster/r.to.vect
raster/r.uslek raster/r.usler raster/r.watershed/ram
raster/r.watershed/seg raster/r.what raster/simwe/simlib
raster3d/r3.cross.rast raster3d/r3.to.rast vector/v.surf.idw
vector/v.what.rast
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Jun 25 17:44:00 EDT 2009
Author: martinl
Date: 2009-06-25 17:43:59 -0400 (Thu, 25 Jun 2009)
New Revision: 38083
Modified:
grass/trunk/lib/ogsf/Gs3.c
grass/trunk/lib/raster/get_row.c
grass/trunk/lib/raster/sample.c
grass/trunk/raster/r.colors/stats.c
grass/trunk/raster/r.covar/main.c
grass/trunk/raster/r.drain/main.c
grass/trunk/raster/r.drain/tinf.c
grass/trunk/raster/r.fill.dir/tinf.c
grass/trunk/raster/r.flow/io.c
grass/trunk/raster/r.grow.distance/main.c
grass/trunk/raster/r.grow/main.c
grass/trunk/raster/r.in.arc/main.c
grass/trunk/raster/r.in.bin/main.c
grass/trunk/raster/r.li/r.li.cwed/cwed.c
grass/trunk/raster/r.li/r.li.daemon/daemon.c
grass/trunk/raster/r.li/r.li.daemon/worker.c
grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
grass/trunk/raster/r.li/r.li.mps/mps.c
grass/trunk/raster/r.li/r.li.padcv/padcv.c
grass/trunk/raster/r.li/r.li.padrange/padrange.c
grass/trunk/raster/r.li/r.li.padsd/padsd.c
grass/trunk/raster/r.mfilter/perform.c
grass/trunk/raster/r.neighbors/main.c
grass/trunk/raster/r.out.gridatb/file_io.c
grass/trunk/raster/r.out.png/main.c
grass/trunk/raster/r.out.ppm/main.c
grass/trunk/raster/r.profile/read_rast.c
grass/trunk/raster/r.quantile/main.c
grass/trunk/raster/r.resamp.interp/main.c
grass/trunk/raster/r.resamp.stats/main.c
grass/trunk/raster/r.series/main.c
grass/trunk/raster/r.statistics2/main.c
grass/trunk/raster/r.statistics3/main.c
grass/trunk/raster/r.surf.fractal/write_rast.c
grass/trunk/raster/r.surf.gauss/gaussurf.c
grass/trunk/raster/r.surf.random/randsurf.c
grass/trunk/raster/r.to.vect/points.c
grass/trunk/raster/r.uslek/main.c
grass/trunk/raster/r.usler/main.c
grass/trunk/raster/r.watershed/ram/close_maps.c
grass/trunk/raster/r.watershed/seg/close_maps.c
grass/trunk/raster/r.watershed/seg/dseg_read.c
grass/trunk/raster/r.watershed/seg/dseg_write.c
grass/trunk/raster/r.what/main.c
grass/trunk/raster/simwe/simlib/input.c
grass/trunk/raster3d/r3.cross.rast/main.c
grass/trunk/raster3d/r3.to.rast/main.c
grass/trunk/vector/v.surf.idw/main.c
grass/trunk/vector/v.what.rast/main.c
Log:
fix wrongly renamed Rast_allocate_d_buf () in r38082
Modified: grass/trunk/lib/ogsf/Gs3.c
===================================================================
--- grass/trunk/lib/ogsf/Gs3.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/lib/ogsf/Gs3.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -861,7 +861,7 @@
else {
/* fp map */
- dbuf = Rast_allocate_c_buf();
+ dbuf = Rast_allocate_d_buf();
if (Rast_get_d_raster_row(fd, dbuf, drow) < 0) {
sprintf(catstr, "error");
Modified: grass/trunk/lib/raster/get_row.c
===================================================================
--- grass/trunk/lib/raster/get_row.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/lib/raster/get_row.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -1099,7 +1099,7 @@
static void get_null_value_row_gdal(int fd, char *flags, int row)
{
struct fileinfo *fcb = &R__.fileinfo[fd];
- DCELL *tmp_buf = Rast_allocate_c_buf();
+ DCELL *tmp_buf = Rast_allocate_d_buf();
int i;
if (get_map_row_nomask(fd, tmp_buf, row, DCELL_TYPE) <= 0) {
Modified: grass/trunk/lib/raster/sample.c
===================================================================
--- grass/trunk/lib/raster/sample.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/lib/raster/sample.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -95,7 +95,7 @@
{
int row, col;
DCELL result;
- DCELL *maprow = Rast_allocate_c_buf();
+ DCELL *maprow = Rast_allocate_d_buf();
/* convert northing and easting to row and col, resp */
row = (int)floor(G_northing_to_row(north, window));
@@ -153,8 +153,8 @@
{
int row, col;
double grid[2][2];
- DCELL *arow = Rast_allocate_c_buf();
- DCELL *brow = Rast_allocate_c_buf();
+ DCELL *arow = Rast_allocate_d_buf();
+ DCELL *brow = Rast_allocate_d_buf();
double frow, fcol, trow, tcol;
DCELL result;
@@ -247,7 +247,7 @@
DCELL result;
for (i = 0; i < 4; i++)
- rows[i] = Rast_allocate_c_buf();
+ rows[i] = Rast_allocate_d_buf();
frow = G_northing_to_row(north, window);
fcol = G_easting_to_col(east, window);
Modified: grass/trunk/raster/r.colors/stats.c
===================================================================
--- grass/trunk/raster/r.colors/stats.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.colors/stats.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -67,7 +67,7 @@
G_fatal_error("Unable to open raster map <%s>",
G_fully_qualified_name(name, mapset));
- dcell = Rast_allocate_c_buf();
+ dcell = Rast_allocate_d_buf();
nrows = G_window_rows();
ncols = G_window_cols();
Modified: grass/trunk/raster/r.covar/main.c
===================================================================
--- grass/trunk/raster/r.covar/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.covar/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -74,7 +74,7 @@
sum2 = (double **)G_malloc(nfiles * sizeof(double *));
for (i = 0; i < nfiles; i++) {
sum2[i] = (double *)G_calloc(nfiles, sizeof(double));
- dcell[i] = Rast_allocate_c_buf();
+ dcell[i] = Rast_allocate_d_buf();
name = maps->answers[i];
fd[i] = Rast_open_cell_old(name, "");
if (fd[i] < 0)
Modified: grass/trunk/raster/r.drain/main.c
===================================================================
--- grass/trunk/raster/r.drain/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.drain/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -360,7 +360,7 @@
Rast_close_cell(map_id);
if (costmode == 1) {
- dir_buf = Rast_allocate_c_buf();
+ dir_buf = Rast_allocate_d_buf();
dir_id = Rast_open_cell_old(dir_name, "");
tempfile3 = G_tempfile();
dir_fd = open(tempfile3, O_RDWR | O_CREAT, 0666);
@@ -644,7 +644,7 @@
DCELL direction;
DCELL *dir_buf;
- dir_buf = Rast_allocate_c_buf();
+ dir_buf = Rast_allocate_d_buf();
next_row = list->row;
next_col = list->col;
Modified: grass/trunk/raster/r.drain/tinf.c
===================================================================
--- grass/trunk/raster/r.drain/tinf.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.drain/tinf.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -241,7 +241,7 @@
void *get_buf_d(void)
{
- return (void *)Rast_allocate_c_buf();
+ return (void *)Rast_allocate_d_buf();
}
/* initialize memory to a minimum value */
Modified: grass/trunk/raster/r.fill.dir/tinf.c
===================================================================
--- grass/trunk/raster/r.fill.dir/tinf.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.fill.dir/tinf.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -222,7 +222,7 @@
void *get_buf_d()
{
- return (void *)Rast_allocate_c_buf();
+ return (void *)Rast_allocate_d_buf();
}
/* initialize memory to a minimum value */
Modified: grass/trunk/raster/r.flow/io.c
===================================================================
--- grass/trunk/raster/r.flow/io.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.flow/io.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -111,7 +111,7 @@
if (parm.barin) {
G_message(_("Reading input files: barrier"));
- barc = Rast_allocate_c_buf();
+ barc = Rast_allocate_d_buf();
fd = open_existing_cell_file(parm.barin, &hd);
for (row = 0; row < region.rows; row++) {
Modified: grass/trunk/raster/r.grow/main.c
===================================================================
--- grass/trunk/raster/r.grow/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.grow/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -213,9 +213,9 @@
in_rows = G_malloc((size * 2 + 1) * sizeof(DCELL *));
for (row = 0; row <= size * 2; row++)
- in_rows[row] = Rast_allocate_c_buf();
+ in_rows[row] = Rast_allocate_d_buf();
- out_row = Rast_allocate_c_buf();
+ out_row = Rast_allocate_d_buf();
for (row = 0; row < size; row++)
Rast_get_d_raster_row(in_fd, in_rows[size + row], row);
Modified: grass/trunk/raster/r.grow.distance/main.c
===================================================================
--- grass/trunk/raster/r.grow.distance/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.grow.distance/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -234,20 +234,20 @@
xres = window.ew_res;
yres = window.ns_res;
- in_row = Rast_allocate_c_buf();
+ in_row = Rast_allocate_d_buf();
- old_val_row = Rast_allocate_c_buf();
- new_val_row = Rast_allocate_c_buf();
+ old_val_row = Rast_allocate_d_buf();
+ new_val_row = Rast_allocate_d_buf();
old_x_row = Rast_allocate_c_buf();
old_y_row = Rast_allocate_c_buf();
new_x_row = Rast_allocate_c_buf();
new_y_row = Rast_allocate_c_buf();
- dist_row = Rast_allocate_c_buf();
+ dist_row = Rast_allocate_d_buf();
if (dist_name && strcmp(opt.met->answer, "euclidean") == 0)
- out_row = Rast_allocate_c_buf();
+ out_row = Rast_allocate_d_buf();
else
out_row = dist_row;
Modified: grass/trunk/raster/r.in.arc/main.c
===================================================================
--- grass/trunk/raster/r.in.arc/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.in.arc/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -147,7 +147,7 @@
fcell = Rast_allocate_f_buf();
break;
case DCELL_TYPE:
- dcell = Rast_allocate_c_buf();
+ dcell = Rast_allocate_d_buf();
break;
}
cf = Rast_open_raster_new(output, rtype);
Modified: grass/trunk/raster/r.in.bin/main.c
===================================================================
--- grass/trunk/raster/r.in.bin/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.in.bin/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -486,7 +486,7 @@
}
else if (flag.d->answer) {
map_type = DCELL_TYPE;
- dcell = Rast_allocate_c_buf();
+ dcell = Rast_allocate_d_buf();
}
else {
cell = Rast_allocate_c_buf();
Modified: grass/trunk/raster/r.li/r.li.cwed/cwed.c
===================================================================
--- grass/trunk/raster/r.li/r.li.cwed/cwed.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.li/r.li.cwed/cwed.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -484,7 +484,7 @@
}
- buf_sup = Rast_allocate_c_buf();
+ buf_sup = Rast_allocate_d_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
@@ -493,7 +493,7 @@
c1.t = DCELL_TYPE;
c2.t = DCELL_TYPE;
- buf_corr = Rast_allocate_c_buf();
+ buf_corr = Rast_allocate_d_buf();
Rast_set_d_null_value(buf_sup + ad->x, ad->cl); /*the first time buf_sup is all null */
Modified: grass/trunk/raster/r.li/r.li.daemon/daemon.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.li/r.li.daemon/daemon.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -687,7 +687,7 @@
file_buf = malloc(cols * sizeof(double));
lseek(random_access, 0, SEEK_SET);
- cell_buf = Rast_allocate_c_buf();
+ cell_buf = Rast_allocate_d_buf();
Rast_set_d_null_value(cell_buf, G_window_cols() + 1);
for (i = 0; i < g->sf_y + ((int)g->rl / 2); i++) {
Rast_put_raster_row(mv_fd, cell_buf, DCELL_TYPE);
Modified: grass/trunk/raster/r.li/r.li.daemon/worker.c
===================================================================
--- grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.li/r.li.daemon/worker.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -167,7 +167,7 @@
break;
case DCELL_TYPE:{
for (i = 0; i < ad->rl - used; i++) {
- dm->cache[used + i] = Rast_allocate_c_buf();
+ dm->cache[used + i] = Rast_allocate_d_buf();
}
}
break;
Modified: grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c
===================================================================
--- grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.li/r.li.edgedensity/edgedensity.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -431,7 +431,7 @@
masked = TRUE;
}
- buf_sup = Rast_allocate_c_buf();
+ buf_sup = Rast_allocate_d_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
@@ -453,7 +453,7 @@
buf_inf = RLI_get_dcell_raster_row(fd, 1 + j + ad->y, ad);
}
else {
- buf_inf = Rast_allocate_c_buf();
+ buf_inf = Rast_allocate_d_buf();
if (buf_inf == NULL) {
G_fatal_error("malloc buf_inf failed");
return RLI_ERRORE;
Modified: grass/trunk/raster/r.li/r.li.mps/mps.c
===================================================================
--- grass/trunk/raster/r.li/r.li.mps/mps.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.li/r.li.mps/mps.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -537,13 +537,13 @@
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_c_buf();
+ buf_sup = Rast_allocate_d_buf();
if (buf_sup == NULL) {
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_c_buf();
+ buf = Rast_allocate_d_buf();
if (buf == NULL) {
G_fatal_error("malloc buf failed");
return RLI_ERRORE;
Modified: grass/trunk/raster/r.li/r.li.padcv/padcv.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padcv/padcv.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.li/r.li.padcv/padcv.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -578,13 +578,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_c_buf();
+ buf_sup = Rast_allocate_d_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_c_buf();
+ buf = Rast_allocate_d_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
Modified: grass/trunk/raster/r.li/r.li.padrange/padrange.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padrange/padrange.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.li/r.li.padrange/padrange.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -564,13 +564,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_c_buf();
+ buf_sup = Rast_allocate_d_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_c_buf();
+ buf = Rast_allocate_d_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
Modified: grass/trunk/raster/r.li/r.li.padsd/padsd.c
===================================================================
--- grass/trunk/raster/r.li/r.li.padsd/padsd.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.li/r.li.padsd/padsd.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -577,13 +577,13 @@
G_fatal_error("malloc mask_patch_corr failed");
return RLI_ERRORE;
}
- buf_sup = Rast_allocate_c_buf();
+ buf_sup = Rast_allocate_d_buf();
if (buf_sup == NULL)
{
G_fatal_error("malloc buf_sup failed");
return RLI_ERRORE;
}
- buf = Rast_allocate_c_buf();
+ buf = Rast_allocate_d_buf();
if (buf == NULL)
{
G_fatal_error("malloc buf failed");
Modified: grass/trunk/raster/r.mfilter/perform.c
===================================================================
--- grass/trunk/raster/r.mfilter/perform.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.mfilter/perform.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -21,7 +21,7 @@
DCELL *cell;
- cell = Rast_allocate_c_buf();
+ cell = Rast_allocate_d_buf();
count = 0;
for (pass = 0; pass < repeat; pass++) {
Modified: grass/trunk/raster/r.neighbors/main.c
===================================================================
--- grass/trunk/raster/r.neighbors/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.neighbors/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -268,7 +268,7 @@
/* allocate the cell buffers */
allocate_bufs();
- result = Rast_allocate_c_buf();
+ result = Rast_allocate_d_buf();
/* get title, initialize the category and stat info */
if (parm.title->answer)
Modified: grass/trunk/raster/r.out.gridatb/file_io.c
===================================================================
--- grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.out.gridatb/file_io.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -27,7 +27,7 @@
fcell = Rast_allocate_f_buf();
break;
case DCELL_TYPE:
- dcell = Rast_allocate_c_buf();
+ dcell = Rast_allocate_d_buf();
break;
}
Modified: grass/trunk/raster/r.out.png/main.c
===================================================================
--- grass/trunk/raster/r.out.png/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.out.png/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -157,7 +157,7 @@
cell_buf = Rast_allocate_c_buf();
fcell_buf = Rast_allocate_f_buf();
- dcell_buf = Rast_allocate_c_buf();
+ dcell_buf = Rast_allocate_d_buf();
ored = G_malloc(w.cols);
ogrn = G_malloc(w.cols);
Modified: grass/trunk/raster/r.out.ppm/main.c
===================================================================
--- grass/trunk/raster/r.out.ppm/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.out.ppm/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -102,7 +102,7 @@
cell_buf = Rast_allocate_c_buf();
fcell_buf = Rast_allocate_f_buf();
- dcell_buf = Rast_allocate_c_buf();
+ dcell_buf = Rast_allocate_d_buf();
ored = G_malloc(w.cols);
ogrn = G_malloc(w.cols);
Modified: grass/trunk/raster/r.profile/read_rast.c
===================================================================
--- grass/trunk/raster/r.profile/read_rast.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.profile/read_rast.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -25,7 +25,7 @@
if (!dcell) {
Rast_set_c_null_value(&nullcell, 1);
- dcell = Rast_allocate_c_buf();
+ dcell = Rast_allocate_d_buf();
G_get_window(&window);
nrows = window.rows;
ncols = window.cols;
Modified: grass/trunk/raster/r.quantile/main.c
===================================================================
--- grass/trunk/raster/r.quantile/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.quantile/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -57,7 +57,7 @@
static void get_slot_counts(int infile)
{
- DCELL *inbuf = Rast_allocate_c_buf();
+ DCELL *inbuf = Rast_allocate_d_buf();
int row, col;
G_message(_("Computing histogram"));
@@ -128,7 +128,7 @@
static void fill_bins(int infile)
{
- DCELL *inbuf = Rast_allocate_c_buf();
+ DCELL *inbuf = Rast_allocate_d_buf();
int row, col;
G_message(_("Binning data"));
Modified: grass/trunk/raster/r.resamp.interp/main.c
===================================================================
--- grass/trunk/raster/r.resamp.interp/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.resamp.interp/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -125,7 +125,7 @@
/* allocate buffers for input rows */
for (row = 0; row < neighbors; row++)
- bufs[row] = Rast_allocate_c_buf();
+ bufs[row] = Rast_allocate_d_buf();
cur_row = -100;
@@ -137,7 +137,7 @@
/* reset window to current region */
Rast_set_window(&dst_w);
- outbuf = Rast_allocate_c_buf();
+ outbuf = Rast_allocate_d_buf();
/* open new map */
outfile = Rast_open_raster_new(rastout->answer, DCELL_TYPE);
Modified: grass/trunk/raster/r.resamp.stats/main.c
===================================================================
--- grass/trunk/raster/r.resamp.stats/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.resamp.stats/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -334,7 +334,7 @@
/* allocate buffers for input rows */
bufs = G_malloc(row_scale * sizeof(DCELL *));
for (row = 0; row < row_scale; row++)
- bufs[row] = Rast_allocate_c_buf();
+ bufs[row] = Rast_allocate_d_buf();
/* open old map */
infile = Rast_open_cell_old(parm.rastin->answer, "");
@@ -346,7 +346,7 @@
Rast_set_window(&dst_w);
/* allocate output buffer */
- outbuf = Rast_allocate_c_buf();
+ outbuf = Rast_allocate_d_buf();
/* open new map */
outfile = Rast_open_raster_new(parm.rastout->answer, DCELL_TYPE);
Modified: grass/trunk/raster/r.series/main.c
===================================================================
--- grass/trunk/raster/r.series/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.series/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -192,7 +192,7 @@
if (p->fd < 0)
G_fatal_error(_("Unable to open raster map <%s>"),
p->name);
- p->buf = Rast_allocate_c_buf();
+ p->buf = Rast_allocate_d_buf();
}
/* process the output maps */
@@ -218,7 +218,7 @@
out->quantile = (parm.quantile->answer && parm.quantile->answers[i])
? atof(parm.quantile->answers[i])
: 0;
- out->buf = Rast_allocate_c_buf();
+ out->buf = Rast_allocate_d_buf();
out->fd = Rast_open_raster_new(
output_name, menu[method].is_int ? CELL_TYPE : DCELL_TYPE);
if (out->fd < 0)
Modified: grass/trunk/raster/r.statistics2/main.c
===================================================================
--- grass/trunk/raster/r.statistics2/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.statistics2/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -246,7 +246,7 @@
max[i] = -1e300;
base_buf = Rast_allocate_c_buf();
- cover_buf = Rast_allocate_c_buf();
+ cover_buf = Rast_allocate_d_buf();
G_message(_("First pass"));
@@ -501,7 +501,7 @@
if (out_fd < 0)
G_fatal_error(_("Unable to open output map <%s>"), output);
- out_buf = Rast_allocate_c_buf();
+ out_buf = Rast_allocate_d_buf();
for (row = 0; row < rows; row++) {
Rast_get_c_raster_row(base_fd, base_buf, row);
Modified: grass/trunk/raster/r.statistics3/main.c
===================================================================
--- grass/trunk/raster/r.statistics3/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.statistics3/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -70,7 +70,7 @@
static void get_slot_counts(int basefile, int coverfile)
{
CELL *basebuf = Rast_allocate_c_buf();
- DCELL *coverbuf = Rast_allocate_c_buf();
+ DCELL *coverbuf = Rast_allocate_d_buf();
int row, col;
G_message(_("Computing histograms"));
@@ -160,7 +160,7 @@
static void fill_bins(int basefile, int coverfile)
{
CELL *basebuf = Rast_allocate_c_buf();
- DCELL *coverbuf = Rast_allocate_c_buf();
+ DCELL *coverbuf = Rast_allocate_d_buf();
int row, col;
G_message(_("Binning data"));
@@ -323,7 +323,7 @@
{
int *out_fd = G_malloc(num_quants * sizeof(int));
CELL *base_buf = Rast_allocate_c_buf();
- DCELL *out_buf = Rast_allocate_c_buf();
+ DCELL *out_buf = Rast_allocate_d_buf();
const char *mapset = G_mapset();
struct Colors colors;
int have_colors;
Modified: grass/trunk/raster/r.surf.fractal/write_rast.c
===================================================================
--- grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.surf.fractal/write_rast.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -43,7 +43,7 @@
nrows = G_window_rows(); /* Find out the number of rows and */
ncols = G_window_cols(); /* columns of the raster view. */
- row_out = Rast_allocate_c_buf();
+ row_out = Rast_allocate_d_buf();
/*------------------------------------------------------------------*/
/* Open new file and set the output file descriptor. */
Modified: grass/trunk/raster/r.surf.gauss/gaussurf.c
===================================================================
--- grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.surf.gauss/gaussurf.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -41,7 +41,7 @@
nrows = G_window_rows();
ncols = G_window_cols();
- row_out = Rast_allocate_c_buf();
+ row_out = Rast_allocate_d_buf();
/****** PASS THROUGH EACH CELL ASSIGNING RANDOM VALUE ******/
Modified: grass/trunk/raster/r.surf.random/randsurf.c
===================================================================
--- grass/trunk/raster/r.surf.random/randsurf.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.surf.random/randsurf.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -39,7 +39,7 @@
if (int_map)
row_out_C = Rast_allocate_c_buf();
else
- row_out_D = Rast_allocate_c_buf();
+ row_out_D = Rast_allocate_d_buf();
/****** PASS THROUGH EACH CELL ASSIGNING RANDOM VALUE ******/
for (row_count = 0; row_count < nrows; row_count++) {
Modified: grass/trunk/raster/r.to.vect/points.c
===================================================================
--- grass/trunk/raster/r.to.vect/points.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.to.vect/points.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -29,7 +29,7 @@
fcellbuf = Rast_allocate_f_buf();
break;
case DCELL_TYPE:
- dcellbuf = Rast_allocate_c_buf();
+ dcellbuf = Rast_allocate_d_buf();
break;
}
Modified: grass/trunk/raster/r.uslek/main.c
===================================================================
--- grass/trunk/raster/r.uslek/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.uslek/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -90,23 +90,23 @@
/***************************************************/
if ((infd_psand = Rast_open_cell_old(psand, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), psand);
- inrast_psand = Rast_allocate_c_buf();
+ inrast_psand = Rast_allocate_d_buf();
if ((infd_psilt = Rast_open_cell_old(psilt, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), psilt);
- inrast_psilt = Rast_allocate_c_buf();
+ inrast_psilt = Rast_allocate_d_buf();
if ((infd_pclay = Rast_open_cell_old(pclay, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), pclay);
- inrast_pclay = Rast_allocate_c_buf();
+ inrast_pclay = Rast_allocate_d_buf();
if ((infd_pomat = Rast_open_cell_old(pomat, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), pomat);
- inrast_pomat = Rast_allocate_c_buf();
+ inrast_pomat = Rast_allocate_d_buf();
/***************************************************/
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_c_buf();
+ outrast = Rast_allocate_d_buf();
/* Create New raster files */
if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
Modified: grass/trunk/raster/r.usler/main.c
===================================================================
--- grass/trunk/raster/r.usler/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.usler/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -84,12 +84,12 @@
/***************************************************/
if ((infd_annual_pmm = Rast_open_cell_old(annual_pmm, "")) < 0)
G_fatal_error(_("Unable to open raster map <%s>"), annual_pmm);
- inrast_annual_pmm = Rast_allocate_c_buf();
+ inrast_annual_pmm = Rast_allocate_d_buf();
/***************************************************/
nrows = G_window_rows();
ncols = G_window_cols();
- outrast = Rast_allocate_c_buf();
+ outrast = Rast_allocate_d_buf();
/* Create New raster files */
if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
Modified: grass/trunk/raster/r.watershed/ram/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.watershed/ram/close_maps.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -19,7 +19,7 @@
if (asp_flag || dis_flag)
buf = Rast_allocate_c_buf();
if (wat_flag || ls_flag || sl_flag || sg_flag)
- dbuf = Rast_allocate_c_buf();
+ dbuf = Rast_allocate_d_buf();
G_free(alt);
if (ls_flag || sg_flag)
G_free(r_h);
Modified: grass/trunk/raster/r.watershed/seg/close_maps.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.watershed/seg/close_maps.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -18,7 +18,7 @@
cseg_close(&alt);
if (wat_flag) {
sum = sum_sqr = stddev = 0.0;
- dbuf = Rast_allocate_c_buf();
+ dbuf = Rast_allocate_d_buf();
if (abs_acc) {
G_warning("Writing out only positive flow accumulation values.");
G_warning("Cells with a likely underestimate for flow accumulation can no longer be identified.");
Modified: grass/trunk/raster/r.watershed/seg/dseg_read.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.watershed/seg/dseg_read.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -24,7 +24,7 @@
}
nrows = G_window_rows();
ncols = G_window_cols();
- dbuffer = Rast_allocate_c_buf();
+ dbuffer = Rast_allocate_d_buf();
for (row = 0; row < nrows; row++) {
if (Rast_get_d_raster_row(map_fd, dbuffer, row) < 0) {
G_free(dbuffer);
Modified: grass/trunk/raster/r.watershed/seg/dseg_write.c
===================================================================
--- grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.watershed/seg/dseg_write.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -18,7 +18,7 @@
}
nrows = G_window_rows();
ncols = G_window_cols();
- dbuffer = Rast_allocate_c_buf();
+ dbuffer = Rast_allocate_d_buf();
segment_flush(&(dseg->seg));
for (row = 0; row < nrows; row++) {
segment_get_row(&(dseg->seg), (DCELL *) dbuffer, row);
Modified: grass/trunk/raster/r.what/main.c
===================================================================
--- grass/trunk/raster/r.what/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/r.what/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -215,7 +215,7 @@
cell[i] = Rast_allocate_c_buf();
if (out_type[i] != CELL_TYPE)
- dcell[i] = Rast_allocate_c_buf();
+ dcell[i] = Rast_allocate_d_buf();
}
G_get_window(&window);
Modified: grass/trunk/raster/simwe/simlib/input.c
===================================================================
--- grass/trunk/raster/simwe/simlib/input.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster/simwe/simlib/input.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -87,14 +87,14 @@
/* Allocate raster buffers */
cell1 = Rast_allocate_f_buf();
- cell2 = Rast_allocate_c_buf();
- cell3 = Rast_allocate_c_buf();
+ cell2 = Rast_allocate_d_buf();
+ cell3 = Rast_allocate_d_buf();
if (rain != NULL)
- cell4 = Rast_allocate_c_buf();
+ cell4 = Rast_allocate_d_buf();
if (infil != NULL)
- cell4a = Rast_allocate_c_buf();
+ cell4a = Rast_allocate_d_buf();
if (traps != NULL)
cell4b = Rast_allocate_f_buf();
@@ -110,7 +110,7 @@
cell11 = Rast_allocate_f_buf();
if (wdepth != NULL)
- cell12 = Rast_allocate_c_buf();
+ cell12 = Rast_allocate_d_buf();
/* Allocate some double dimension arrays for each input */
/* with length of matrix Y */
Modified: grass/trunk/raster3d/r3.cross.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster3d/r3.cross.rast/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -149,7 +149,7 @@
if (typeIntern == FCELL_TYPE)
fcell = Rast_allocate_f_buf();
else if (typeIntern == DCELL_TYPE)
- dcell = Rast_allocate_c_buf();
+ dcell = Rast_allocate_d_buf();
/*Mem for the input map row */
elevrast = Rast_allocate_buf(globalElevMapType);
Modified: grass/trunk/raster3d/r3.to.rast/main.c
===================================================================
--- grass/trunk/raster3d/r3.to.rast/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/raster3d/r3.to.rast/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -121,7 +121,7 @@
if (typeIntern == FCELL_TYPE)
fcell = Rast_allocate_f_buf();
else if (typeIntern == DCELL_TYPE)
- dcell = Rast_allocate_c_buf();
+ dcell = Rast_allocate_d_buf();
pos = 0;
/*Every Rastermap */
Modified: grass/trunk/vector/v.surf.idw/main.c
===================================================================
--- grass/trunk/vector/v.surf.idw/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/vector/v.surf.idw/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -240,7 +240,7 @@
/* allocate buffers, etc. */
- dcell = Rast_allocate_c_buf();
+ dcell = Rast_allocate_d_buf();
if ((maskfd = Rast_maskfd()) >= 0)
mask = Rast_allocate_c_buf();
Modified: grass/trunk/vector/v.what.rast/main.c
===================================================================
--- grass/trunk/vector/v.what.rast/main.c 2009-06-25 21:10:29 UTC (rev 38082)
+++ grass/trunk/vector/v.what.rast/main.c 2009-06-25 21:43:59 UTC (rev 38083)
@@ -250,7 +250,7 @@
if (out_type == CELL_TYPE)
cell = Rast_allocate_c_buf();
else
- dcell = Rast_allocate_c_buf();
+ dcell = Rast_allocate_d_buf();
/* Extract raster values from file and store in cache */
G_debug(1, "Extracting raster values");
More information about the grass-commit
mailing list