Przeglądaj źródła

fix wrongly renamed Rast_allocate_d_buf () in https://trac.osgeo.org/grass/changeset/38082

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38083 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 16 lat temu
rodzic
commit
1d21c4d89e
49 zmienionych plików z 80 dodań i 80 usunięć
  1. 1 1
      lib/ogsf/Gs3.c
  2. 1 1
      lib/raster/get_row.c
  3. 4 4
      lib/raster/sample.c
  4. 1 1
      raster/r.colors/stats.c
  5. 1 1
      raster/r.covar/main.c
  6. 2 2
      raster/r.drain/main.c
  7. 1 1
      raster/r.drain/tinf.c
  8. 1 1
      raster/r.fill.dir/tinf.c
  9. 1 1
      raster/r.flow/io.c
  10. 5 5
      raster/r.grow.distance/main.c
  11. 2 2
      raster/r.grow/main.c
  12. 1 1
      raster/r.in.arc/main.c
  13. 1 1
      raster/r.in.bin/main.c
  14. 2 2
      raster/r.li/r.li.cwed/cwed.c
  15. 1 1
      raster/r.li/r.li.daemon/daemon.c
  16. 1 1
      raster/r.li/r.li.daemon/worker.c
  17. 2 2
      raster/r.li/r.li.edgedensity/edgedensity.c
  18. 2 2
      raster/r.li/r.li.mps/mps.c
  19. 2 2
      raster/r.li/r.li.padcv/padcv.c
  20. 2 2
      raster/r.li/r.li.padrange/padrange.c
  21. 2 2
      raster/r.li/r.li.padsd/padsd.c
  22. 1 1
      raster/r.mfilter/perform.c
  23. 1 1
      raster/r.neighbors/main.c
  24. 1 1
      raster/r.out.gridatb/file_io.c
  25. 1 1
      raster/r.out.png/main.c
  26. 1 1
      raster/r.out.ppm/main.c
  27. 1 1
      raster/r.profile/read_rast.c
  28. 2 2
      raster/r.quantile/main.c
  29. 2 2
      raster/r.resamp.interp/main.c
  30. 2 2
      raster/r.resamp.stats/main.c
  31. 2 2
      raster/r.series/main.c
  32. 2 2
      raster/r.statistics2/main.c
  33. 3 3
      raster/r.statistics3/main.c
  34. 1 1
      raster/r.surf.fractal/write_rast.c
  35. 1 1
      raster/r.surf.gauss/gaussurf.c
  36. 1 1
      raster/r.surf.random/randsurf.c
  37. 1 1
      raster/r.to.vect/points.c
  38. 5 5
      raster/r.uslek/main.c
  39. 2 2
      raster/r.usler/main.c
  40. 1 1
      raster/r.watershed/ram/close_maps.c
  41. 1 1
      raster/r.watershed/seg/close_maps.c
  42. 1 1
      raster/r.watershed/seg/dseg_read.c
  43. 1 1
      raster/r.watershed/seg/dseg_write.c
  44. 1 1
      raster/r.what/main.c
  45. 5 5
      raster/simwe/simlib/input.c
  46. 1 1
      raster3d/r3.cross.rast/main.c
  47. 1 1
      raster3d/r3.to.rast/main.c
  48. 1 1
      vector/v.surf.idw/main.c
  49. 1 1
      vector/v.what.rast/main.c

+ 1 - 1
lib/ogsf/Gs3.c

@@ -861,7 +861,7 @@ int Gs_get_cat_label(const char *filename, int drow, int dcol, char *catstr)
 
 
 	else {
 	else {
 	    /* fp map */
 	    /* fp map */
-	    dbuf = Rast_allocate_c_buf();
+	    dbuf = Rast_allocate_d_buf();
 
 
 	    if (Rast_get_d_raster_row(fd, dbuf, drow) < 0) {
 	    if (Rast_get_d_raster_row(fd, dbuf, drow) < 0) {
 		sprintf(catstr, "error");
 		sprintf(catstr, "error");

+ 1 - 1
lib/raster/get_row.c

@@ -1099,7 +1099,7 @@ static void get_null_value_row_nomask(int fd, char *flags, int row)
 static void get_null_value_row_gdal(int fd, char *flags, int row)
 static void get_null_value_row_gdal(int fd, char *flags, int row)
 {
 {
     struct fileinfo *fcb = &R__.fileinfo[fd];
     struct fileinfo *fcb = &R__.fileinfo[fd];
-    DCELL *tmp_buf = Rast_allocate_c_buf();
+    DCELL *tmp_buf = Rast_allocate_d_buf();
     int i;
     int i;
 
 
     if (get_map_row_nomask(fd, tmp_buf, row, DCELL_TYPE) <= 0) {
     if (get_map_row_nomask(fd, tmp_buf, row, DCELL_TYPE) <= 0) {

+ 4 - 4
lib/raster/sample.c

@@ -95,7 +95,7 @@ DCELL Rast_get_raster_sample_nearest(int fd,
 {
 {
     int row, col;
     int row, col;
     DCELL result;
     DCELL result;
-    DCELL *maprow = Rast_allocate_c_buf();
+    DCELL *maprow = Rast_allocate_d_buf();
 
 
     /* convert northing and easting to row and col, resp */
     /* convert northing and easting to row and col, resp */
     row = (int)floor(G_northing_to_row(north, window));
     row = (int)floor(G_northing_to_row(north, window));
@@ -153,8 +153,8 @@ DCELL Rast_get_raster_sample_bilinear(int fd,
 {
 {
     int row, col;
     int row, col;
     double grid[2][2];
     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;
     double frow, fcol, trow, tcol;
     DCELL result;
     DCELL result;
 
 
@@ -247,7 +247,7 @@ DCELL Rast_get_raster_sample_cubic(int fd,
     DCELL result;
     DCELL result;
 
 
     for (i = 0; i < 4; i++)
     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);
     frow = G_northing_to_row(north, window);
     fcol = G_easting_to_col(east, window);
     fcol = G_easting_to_col(east, window);

+ 1 - 1
raster/r.colors/stats.c

@@ -67,7 +67,7 @@ void get_fp_stats(const char *name, const char *mapset,
 	G_fatal_error("Unable to open raster map <%s>",
 	G_fatal_error("Unable to open raster map <%s>",
 		      G_fully_qualified_name(name, mapset));
 		      G_fully_qualified_name(name, mapset));
 
 
-    dcell = Rast_allocate_c_buf();
+    dcell = Rast_allocate_d_buf();
     nrows = G_window_rows();
     nrows = G_window_rows();
     ncols = G_window_cols();
     ncols = G_window_cols();
 
 

+ 1 - 1
raster/r.covar/main.c

@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
     sum2 = (double **)G_malloc(nfiles * sizeof(double *));
     sum2 = (double **)G_malloc(nfiles * sizeof(double *));
     for (i = 0; i < nfiles; i++) {
     for (i = 0; i < nfiles; i++) {
 	sum2[i] = (double *)G_calloc(nfiles, sizeof(double));
 	sum2[i] = (double *)G_calloc(nfiles, sizeof(double));
-	dcell[i] = Rast_allocate_c_buf();
+	dcell[i] = Rast_allocate_d_buf();
 	name = maps->answers[i];
 	name = maps->answers[i];
 	fd[i] = Rast_open_cell_old(name, "");
 	fd[i] = Rast_open_cell_old(name, "");
 	if (fd[i] < 0)
 	if (fd[i] < 0)

+ 2 - 2
raster/r.drain/main.c

@@ -360,7 +360,7 @@ int main(int argc, char **argv)
     Rast_close_cell(map_id);
     Rast_close_cell(map_id);
 
 
     if (costmode == 1) {
     if (costmode == 1) {
-	dir_buf = Rast_allocate_c_buf();
+	dir_buf = Rast_allocate_d_buf();
 	dir_id = Rast_open_cell_old(dir_name, "");
 	dir_id = Rast_open_cell_old(dir_name, "");
 	tempfile3 = G_tempfile();
 	tempfile3 = G_tempfile();
 	dir_fd = open(tempfile3, O_RDWR | O_CREAT, 0666);
 	dir_fd = open(tempfile3, O_RDWR | O_CREAT, 0666);
@@ -644,7 +644,7 @@ struct point *drain_cost(int dir_fd, struct point *list, int nrow, int ncol)
     DCELL direction;
     DCELL direction;
     DCELL *dir_buf;
     DCELL *dir_buf;
 
 
-    dir_buf = Rast_allocate_c_buf();
+    dir_buf = Rast_allocate_d_buf();
 
 
     next_row = list->row;
     next_row = list->row;
     next_col = list->col;
     next_col = list->col;

+ 1 - 1
raster/r.drain/tinf.c

@@ -241,7 +241,7 @@ void *get_buf_f(void)
 
 
 void *get_buf_d(void)
 void *get_buf_d(void)
 {
 {
-    return (void *)Rast_allocate_c_buf();
+    return (void *)Rast_allocate_d_buf();
 }
 }
 
 
 /* initialize memory to a minimum value */
 /* initialize memory to a minimum value */

+ 1 - 1
raster/r.fill.dir/tinf.c

@@ -222,7 +222,7 @@ void *get_buf_f()
 
 
 void *get_buf_d()
 void *get_buf_d()
 {
 {
-    return (void *)Rast_allocate_c_buf();
+    return (void *)Rast_allocate_d_buf();
 }
 }
 
 
 /* initialize memory to a minimum value */
 /* initialize memory to a minimum value */

+ 1 - 1
raster/r.flow/io.c

@@ -111,7 +111,7 @@ void read_input_files(void)
 
 
     if (parm.barin) {
     if (parm.barin) {
 	G_message(_("Reading input files: barrier"));
 	G_message(_("Reading input files: barrier"));
-	barc = Rast_allocate_c_buf();
+	barc = Rast_allocate_d_buf();
 	fd = open_existing_cell_file(parm.barin, &hd);
 	fd = open_existing_cell_file(parm.barin, &hd);
 
 
 	for (row = 0; row < region.rows; row++) {
 	for (row = 0; row < region.rows; row++) {

+ 5 - 5
raster/r.grow.distance/main.c

@@ -234,20 +234,20 @@ int main(int argc, char **argv)
     xres = window.ew_res;
     xres = window.ew_res;
     yres = window.ns_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_x_row = Rast_allocate_c_buf();
     old_y_row = Rast_allocate_c_buf();
     old_y_row = Rast_allocate_c_buf();
     new_x_row = Rast_allocate_c_buf();
     new_x_row = Rast_allocate_c_buf();
     new_y_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)
     if (dist_name && strcmp(opt.met->answer, "euclidean") == 0)
-	out_row = Rast_allocate_c_buf();
+	out_row = Rast_allocate_d_buf();
     else
     else
 	out_row = dist_row;
 	out_row = dist_row;
 
 

+ 2 - 2
raster/r.grow/main.c

@@ -213,9 +213,9 @@ int main(int argc, char **argv)
     in_rows = G_malloc((size * 2 + 1) * sizeof(DCELL *));
     in_rows = G_malloc((size * 2 + 1) * sizeof(DCELL *));
 
 
     for (row = 0; row <= size * 2; row++)
     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++)
     for (row = 0; row < size; row++)
 	Rast_get_d_raster_row(in_fd, in_rows[size + row], row);
 	Rast_get_d_raster_row(in_fd, in_rows[size + row], row);

+ 1 - 1
raster/r.in.arc/main.c

@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
 	fcell = Rast_allocate_f_buf();
 	fcell = Rast_allocate_f_buf();
 	break;
 	break;
     case DCELL_TYPE:
     case DCELL_TYPE:
-	dcell = Rast_allocate_c_buf();
+	dcell = Rast_allocate_d_buf();
 	break;
 	break;
     }
     }
     cf = Rast_open_raster_new(output, rtype);
     cf = Rast_open_raster_new(output, rtype);

+ 1 - 1
raster/r.in.bin/main.c

@@ -486,7 +486,7 @@ int main(int argc, char *argv[])
     }
     }
     else if (flag.d->answer) {
     else if (flag.d->answer) {
 	map_type = DCELL_TYPE;
 	map_type = DCELL_TYPE;
-	dcell = Rast_allocate_c_buf();
+	dcell = Rast_allocate_d_buf();
     }
     }
     else {
     else {
 	cell = Rast_allocate_c_buf();
 	cell = Rast_allocate_c_buf();

+ 2 - 2
raster/r.li/r.li.cwed/cwed.c

@@ -484,7 +484,7 @@ int calculateD(int fd, area_des ad, Coppie * cc, long totCoppie,
     }
     }
 
 
 
 
-    buf_sup = Rast_allocate_c_buf();
+    buf_sup = Rast_allocate_d_buf();
     if (buf_sup == NULL) {
     if (buf_sup == NULL) {
 	G_fatal_error("malloc buf_sup failed");
 	G_fatal_error("malloc buf_sup failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;
@@ -493,7 +493,7 @@ int calculateD(int fd, area_des ad, Coppie * cc, long totCoppie,
     c1.t = DCELL_TYPE;
     c1.t = DCELL_TYPE;
     c2.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 */
     Rast_set_d_null_value(buf_sup + ad->x, ad->cl);	/*the first time buf_sup is all null */
 
 

+ 1 - 1
raster/r.li/r.li.daemon/daemon.c

@@ -687,7 +687,7 @@ int write_raster(int mv_fd, int random_access, g_areas g)
 
 
     file_buf = malloc(cols * sizeof(double));
     file_buf = malloc(cols * sizeof(double));
     lseek(random_access, 0, SEEK_SET);
     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);
     Rast_set_d_null_value(cell_buf, G_window_cols() + 1);
     for (i = 0; i < g->sf_y + ((int)g->rl / 2); i++) {
     for (i = 0; i < g->sf_y + ((int)g->rl / 2); i++) {
 	Rast_put_raster_row(mv_fd, cell_buf, DCELL_TYPE);
 	Rast_put_raster_row(mv_fd, cell_buf, DCELL_TYPE);

+ 1 - 1
raster/r.li/r.li.daemon/worker.c

@@ -167,7 +167,7 @@ void worker(char *raster, int f(int, char **, area_des, double *),
 		break;
 		break;
 	    case DCELL_TYPE:{
 	    case DCELL_TYPE:{
 		    for (i = 0; i < ad->rl - used; i++) {
 		    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;
 		break;

+ 2 - 2
raster/r.li/r.li.edgedensity/edgedensity.c

@@ -431,7 +431,7 @@ int calculateD(int fd, area_des ad, char **valore, double *result)
 	masked = TRUE;
 	masked = TRUE;
     }
     }
 
 
-    buf_sup = Rast_allocate_c_buf();
+    buf_sup = Rast_allocate_d_buf();
     if (buf_sup == NULL) {
     if (buf_sup == NULL) {
 	G_fatal_error("malloc buf_sup failed");
 	G_fatal_error("malloc buf_sup failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;
@@ -453,7 +453,7 @@ int calculateD(int fd, area_des ad, char **valore, double *result)
 	    buf_inf = RLI_get_dcell_raster_row(fd, 1 + j + ad->y, ad);
 	    buf_inf = RLI_get_dcell_raster_row(fd, 1 + j + ad->y, ad);
 	}
 	}
 	else {
 	else {
-	    buf_inf = Rast_allocate_c_buf();
+	    buf_inf = Rast_allocate_d_buf();
 	    if (buf_inf == NULL) {
 	    if (buf_inf == NULL) {
 		G_fatal_error("malloc buf_inf failed");
 		G_fatal_error("malloc buf_inf failed");
 		return RLI_ERRORE;
 		return RLI_ERRORE;

+ 2 - 2
raster/r.li/r.li.mps/mps.c

@@ -537,13 +537,13 @@ int calculateD(int fd, area_des ad, struct Cell_head hd, double *result)
 	return RLI_ERRORE;
 	return RLI_ERRORE;
     }
     }
 
 
-    buf_sup = Rast_allocate_c_buf();
+    buf_sup = Rast_allocate_d_buf();
     if (buf_sup == NULL) {
     if (buf_sup == NULL) {
 	G_fatal_error("malloc buf_sup failed");
 	G_fatal_error("malloc buf_sup failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;
     }
     }
 
 
-    buf = Rast_allocate_c_buf();
+    buf = Rast_allocate_d_buf();
     if (buf == NULL) {
     if (buf == NULL) {
 	G_fatal_error("malloc buf failed");
 	G_fatal_error("malloc buf failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;

+ 2 - 2
raster/r.li/r.li.padcv/padcv.c

@@ -578,13 +578,13 @@ int calculateD(int fd, area_des ad, double *result)
 	G_fatal_error("malloc mask_patch_corr failed");
 	G_fatal_error("malloc mask_patch_corr failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;
     }
     }
-    buf_sup = Rast_allocate_c_buf();
+    buf_sup = Rast_allocate_d_buf();
     if (buf_sup == NULL)
     if (buf_sup == NULL)
     {
     {
 	G_fatal_error("malloc buf_sup failed");
 	G_fatal_error("malloc buf_sup failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;
     }
     }
-    buf = Rast_allocate_c_buf();
+    buf = Rast_allocate_d_buf();
     if (buf == NULL)
     if (buf == NULL)
     {
     {
 	G_fatal_error("malloc buf failed");
 	G_fatal_error("malloc buf failed");

+ 2 - 2
raster/r.li/r.li.padrange/padrange.c

@@ -564,13 +564,13 @@ int calculateD(int fd, area_des ad, double *result)
 	G_fatal_error("malloc mask_patch_corr failed");
 	G_fatal_error("malloc mask_patch_corr failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;
     }
     }
-    buf_sup = Rast_allocate_c_buf();
+    buf_sup = Rast_allocate_d_buf();
     if (buf_sup == NULL)
     if (buf_sup == NULL)
     {
     {
 	G_fatal_error("malloc buf_sup failed");
 	G_fatal_error("malloc buf_sup failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;
     }
     }
-    buf = Rast_allocate_c_buf();
+    buf = Rast_allocate_d_buf();
     if (buf == NULL)
     if (buf == NULL)
     {
     {
 	G_fatal_error("malloc buf failed");
 	G_fatal_error("malloc buf failed");

+ 2 - 2
raster/r.li/r.li.padsd/padsd.c

@@ -577,13 +577,13 @@ int calculateD(int fd, area_des ad, double *result)
 	G_fatal_error("malloc mask_patch_corr failed");
 	G_fatal_error("malloc mask_patch_corr failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;
     }
     }
-    buf_sup = Rast_allocate_c_buf();
+    buf_sup = Rast_allocate_d_buf();
     if (buf_sup == NULL)
     if (buf_sup == NULL)
     {
     {
 	G_fatal_error("malloc buf_sup failed");
 	G_fatal_error("malloc buf_sup failed");
 	return RLI_ERRORE;
 	return RLI_ERRORE;
     }
     }
-    buf = Rast_allocate_c_buf();
+    buf = Rast_allocate_d_buf();
     if (buf == NULL)
     if (buf == NULL)
     {
     {
 	G_fatal_error("malloc buf failed");
 	G_fatal_error("malloc buf failed");

+ 1 - 1
raster/r.mfilter/perform.c

@@ -21,7 +21,7 @@ int perform_filter(const char *in_name, const char *out_name,
     DCELL *cell;
     DCELL *cell;
 
 
 
 
-    cell = Rast_allocate_c_buf();
+    cell = Rast_allocate_d_buf();
 
 
     count = 0;
     count = 0;
     for (pass = 0; pass < repeat; pass++) {
     for (pass = 0; pass < repeat; pass++) {

+ 1 - 1
raster/r.neighbors/main.c

@@ -268,7 +268,7 @@ int main(int argc, char *argv[])
 
 
     /* allocate the cell buffers */
     /* allocate the cell buffers */
     allocate_bufs();
     allocate_bufs();
-    result = Rast_allocate_c_buf();
+    result = Rast_allocate_d_buf();
 
 
     /* get title, initialize the category and stat info */
     /* get title, initialize the category and stat info */
     if (parm.title->answer)
     if (parm.title->answer)

+ 1 - 1
raster/r.out.gridatb/file_io.c

@@ -27,7 +27,7 @@ void rdwr_gridatb(void)
 	fcell = Rast_allocate_f_buf();
 	fcell = Rast_allocate_f_buf();
 	break;
 	break;
     case DCELL_TYPE:
     case DCELL_TYPE:
-	dcell = Rast_allocate_c_buf();
+	dcell = Rast_allocate_d_buf();
 	break;
 	break;
     }
     }
 
 

+ 1 - 1
raster/r.out.png/main.c

@@ -157,7 +157,7 @@ int main(int argc, char *argv[])
 
 
     cell_buf = Rast_allocate_c_buf();
     cell_buf = Rast_allocate_c_buf();
     fcell_buf = Rast_allocate_f_buf();
     fcell_buf = Rast_allocate_f_buf();
-    dcell_buf = Rast_allocate_c_buf();
+    dcell_buf = Rast_allocate_d_buf();
 
 
     ored = G_malloc(w.cols);
     ored = G_malloc(w.cols);
     ogrn = G_malloc(w.cols);
     ogrn = G_malloc(w.cols);

+ 1 - 1
raster/r.out.ppm/main.c

@@ -102,7 +102,7 @@ int main(int argc, char *argv[])
 
 
     cell_buf = Rast_allocate_c_buf();
     cell_buf = Rast_allocate_c_buf();
     fcell_buf = Rast_allocate_f_buf();
     fcell_buf = Rast_allocate_f_buf();
-    dcell_buf = Rast_allocate_c_buf();
+    dcell_buf = Rast_allocate_d_buf();
 
 
     ored = G_malloc(w.cols);
     ored = G_malloc(w.cols);
     ogrn = G_malloc(w.cols);
     ogrn = G_malloc(w.cols);

+ 1 - 1
raster/r.profile/read_rast.c

@@ -25,7 +25,7 @@ int read_rast(double east, double north, double dist, int fd, int coords,
 
 
     if (!dcell) {
     if (!dcell) {
 	Rast_set_c_null_value(&nullcell, 1);
 	Rast_set_c_null_value(&nullcell, 1);
-	dcell = Rast_allocate_c_buf();
+	dcell = Rast_allocate_d_buf();
 	G_get_window(&window);
 	G_get_window(&window);
 	nrows = window.rows;
 	nrows = window.rows;
 	ncols = window.cols;
 	ncols = window.cols;

+ 2 - 2
raster/r.quantile/main.c

@@ -57,7 +57,7 @@ static inline double get_quantile(int n)
 
 
 static void get_slot_counts(int infile)
 static void get_slot_counts(int infile)
 {
 {
-    DCELL *inbuf = Rast_allocate_c_buf();
+    DCELL *inbuf = Rast_allocate_d_buf();
     int row, col;
     int row, col;
 
 
     G_message(_("Computing histogram"));
     G_message(_("Computing histogram"));
@@ -128,7 +128,7 @@ static void initialize_bins(void)
 
 
 static void fill_bins(int infile)
 static void fill_bins(int infile)
 {
 {
-    DCELL *inbuf = Rast_allocate_c_buf();
+    DCELL *inbuf = Rast_allocate_d_buf();
     int row, col;
     int row, col;
 
 
     G_message(_("Binning data"));
     G_message(_("Binning data"));

+ 2 - 2
raster/r.resamp.interp/main.c

@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
 
 
     /* allocate buffers for input rows */
     /* allocate buffers for input rows */
     for (row = 0; row < neighbors; row++)
     for (row = 0; row < neighbors; row++)
-	bufs[row] = Rast_allocate_c_buf();
+	bufs[row] = Rast_allocate_d_buf();
 
 
     cur_row = -100;
     cur_row = -100;
 
 
@@ -137,7 +137,7 @@ int main(int argc, char *argv[])
     /* reset window to current region */
     /* reset window to current region */
     Rast_set_window(&dst_w);
     Rast_set_window(&dst_w);
 
 
-    outbuf = Rast_allocate_c_buf();
+    outbuf = Rast_allocate_d_buf();
 
 
     /* open new map */
     /* open new map */
     outfile = Rast_open_raster_new(rastout->answer, DCELL_TYPE);
     outfile = Rast_open_raster_new(rastout->answer, DCELL_TYPE);

+ 2 - 2
raster/r.resamp.stats/main.c

@@ -334,7 +334,7 @@ int main(int argc, char *argv[])
     /* allocate buffers for input rows */
     /* allocate buffers for input rows */
     bufs = G_malloc(row_scale * sizeof(DCELL *));
     bufs = G_malloc(row_scale * sizeof(DCELL *));
     for (row = 0; row < row_scale; row++)
     for (row = 0; row < row_scale; row++)
-	bufs[row] = Rast_allocate_c_buf();
+	bufs[row] = Rast_allocate_d_buf();
 
 
     /* open old map */
     /* open old map */
     infile = Rast_open_cell_old(parm.rastin->answer, "");
     infile = Rast_open_cell_old(parm.rastin->answer, "");
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
     Rast_set_window(&dst_w);
     Rast_set_window(&dst_w);
 
 
     /* allocate output buffer */
     /* allocate output buffer */
-    outbuf = Rast_allocate_c_buf();
+    outbuf = Rast_allocate_d_buf();
 
 
     /* open new map */
     /* open new map */
     outfile = Rast_open_raster_new(parm.rastout->answer, DCELL_TYPE);
     outfile = Rast_open_raster_new(parm.rastout->answer, DCELL_TYPE);

+ 2 - 2
raster/r.series/main.c

@@ -192,7 +192,7 @@ int main(int argc, char *argv[])
 	if (p->fd < 0)
 	if (p->fd < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 	    G_fatal_error(_("Unable to open raster map <%s>"),
 			  p->name);
 			  p->name);
-	p->buf = Rast_allocate_c_buf();
+	p->buf = Rast_allocate_d_buf();
     }
     }
 
 
     /* process the output maps */
     /* process the output maps */
@@ -218,7 +218,7 @@ int main(int argc, char *argv[])
 	out->quantile = (parm.quantile->answer && parm.quantile->answers[i])
 	out->quantile = (parm.quantile->answer && parm.quantile->answers[i])
 	    ? atof(parm.quantile->answers[i])
 	    ? atof(parm.quantile->answers[i])
 	    : 0;
 	    : 0;
-	out->buf = Rast_allocate_c_buf();
+	out->buf = Rast_allocate_d_buf();
 	out->fd = Rast_open_raster_new(
 	out->fd = Rast_open_raster_new(
 	    output_name, menu[method].is_int ? CELL_TYPE : DCELL_TYPE);
 	    output_name, menu[method].is_int ? CELL_TYPE : DCELL_TYPE);
 	if (out->fd < 0)
 	if (out->fd < 0)

+ 2 - 2
raster/r.statistics2/main.c

@@ -246,7 +246,7 @@ int main(int argc, char **argv)
 	    max[i] = -1e300;
 	    max[i] = -1e300;
 
 
     base_buf = Rast_allocate_c_buf();
     base_buf = Rast_allocate_c_buf();
-    cover_buf = Rast_allocate_c_buf();
+    cover_buf = Rast_allocate_d_buf();
 
 
     G_message(_("First pass"));
     G_message(_("First pass"));
 
 
@@ -501,7 +501,7 @@ int main(int argc, char **argv)
 	if (out_fd < 0)
 	if (out_fd < 0)
 	    G_fatal_error(_("Unable to open output map <%s>"), output);
 	    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++) {
 	for (row = 0; row < rows; row++) {
 	    Rast_get_c_raster_row(base_fd, base_buf, row);
 	    Rast_get_c_raster_row(base_fd, base_buf, row);

+ 3 - 3
raster/r.statistics3/main.c

@@ -70,7 +70,7 @@ static inline double get_quantile(struct basecat *bc, int n)
 static void get_slot_counts(int basefile, int coverfile)
 static void get_slot_counts(int basefile, int coverfile)
 {
 {
     CELL *basebuf = Rast_allocate_c_buf();
     CELL *basebuf = Rast_allocate_c_buf();
-    DCELL *coverbuf = Rast_allocate_c_buf();
+    DCELL *coverbuf = Rast_allocate_d_buf();
     int row, col;
     int row, col;
 
 
     G_message(_("Computing histograms"));
     G_message(_("Computing histograms"));
@@ -160,7 +160,7 @@ static void initialize_bins(void)
 static void fill_bins(int basefile, int coverfile)
 static void fill_bins(int basefile, int coverfile)
 {
 {
     CELL *basebuf = Rast_allocate_c_buf();
     CELL *basebuf = Rast_allocate_c_buf();
-    DCELL *coverbuf = Rast_allocate_c_buf();
+    DCELL *coverbuf = Rast_allocate_d_buf();
     int row, col;
     int row, col;
 
 
     G_message(_("Binning data"));
     G_message(_("Binning data"));
@@ -323,7 +323,7 @@ static void do_output(int base_fd, char **outputs, const char *covermap)
 {
 {
     int *out_fd = G_malloc(num_quants * sizeof(int));
     int *out_fd = G_malloc(num_quants * sizeof(int));
     CELL *base_buf = Rast_allocate_c_buf();
     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();
     const char *mapset = G_mapset();
     struct Colors colors;
     struct Colors colors;
     int have_colors;
     int have_colors;

+ 1 - 1
raster/r.surf.fractal/write_rast.c

@@ -43,7 +43,7 @@ int write_rast(double *data[2],	/* Array holding complex data.          */
     nrows = G_window_rows();	/* Find out the number of rows and      */
     nrows = G_window_rows();	/* Find out the number of rows and      */
     ncols = G_window_cols();	/* columns of the raster view.          */
     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.        */
     /*         Open new file and set the output file descriptor.        */

+ 1 - 1
raster/r.surf.gauss/gaussurf.c

@@ -41,7 +41,7 @@ int gaussurf(char *out,		/* Name of raster maps to be opened.    */
     nrows = G_window_rows();
     nrows = G_window_rows();
     ncols = G_window_cols();
     ncols = G_window_cols();
 
 
-    row_out = Rast_allocate_c_buf();
+    row_out = Rast_allocate_d_buf();
 
 
 
 
 	/****** PASS THROUGH EACH CELL ASSIGNING RANDOM VALUE ******/
 	/****** PASS THROUGH EACH CELL ASSIGNING RANDOM VALUE ******/

+ 1 - 1
raster/r.surf.random/randsurf.c

@@ -39,7 +39,7 @@ int randsurf(char *out,		/* Name of raster maps to be opened.    */
     if (int_map)
     if (int_map)
 	row_out_C = Rast_allocate_c_buf();
 	row_out_C = Rast_allocate_c_buf();
     else
     else
-	row_out_D = Rast_allocate_c_buf();
+	row_out_D = Rast_allocate_d_buf();
 
 
 	/****** PASS THROUGH EACH CELL ASSIGNING RANDOM VALUE ******/
 	/****** PASS THROUGH EACH CELL ASSIGNING RANDOM VALUE ******/
     for (row_count = 0; row_count < nrows; row_count++) {
     for (row_count = 0; row_count < nrows; row_count++) {

+ 1 - 1
raster/r.to.vect/points.c

@@ -29,7 +29,7 @@ int extract_points(int z_flag)
 	fcellbuf = Rast_allocate_f_buf();
 	fcellbuf = Rast_allocate_f_buf();
 	break;
 	break;
     case DCELL_TYPE:
     case DCELL_TYPE:
-	dcellbuf = Rast_allocate_c_buf();
+	dcellbuf = Rast_allocate_d_buf();
 	break;
 	break;
     }
     }
 
 

+ 5 - 5
raster/r.uslek/main.c

@@ -90,23 +90,23 @@ int main(int argc, char *argv[])
     /***************************************************/ 
     /***************************************************/ 
     if ((infd_psand = Rast_open_cell_old(psand, "")) < 0)
     if ((infd_psand = Rast_open_cell_old(psand, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), psand);
 	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)
     if ((infd_psilt = Rast_open_cell_old(psilt, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), psilt);
 	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)
     if ((infd_pclay = Rast_open_cell_old(pclay, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), pclay);
 	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)
     if ((infd_pomat = Rast_open_cell_old(pomat, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), pomat);
 	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();
     nrows = G_window_rows();
     ncols = G_window_cols();
     ncols = G_window_cols();
-    outrast = Rast_allocate_c_buf();
+    outrast = Rast_allocate_d_buf();
     
     
     /* Create New raster files */ 
     /* Create New raster files */ 
     if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
     if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)

+ 2 - 2
raster/r.usler/main.c

@@ -84,12 +84,12 @@ int main(int argc, char *argv[])
     /***************************************************/ 
     /***************************************************/ 
     if ((infd_annual_pmm = Rast_open_cell_old(annual_pmm, "")) < 0)
     if ((infd_annual_pmm = Rast_open_cell_old(annual_pmm, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), annual_pmm);
 	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();
     nrows = G_window_rows();
     ncols = G_window_cols();
     ncols = G_window_cols();
-    outrast = Rast_allocate_c_buf();
+    outrast = Rast_allocate_d_buf();
     
     
     /* Create New raster files */ 
     /* Create New raster files */ 
     if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)
     if ((outfd = Rast_open_raster_new(result, DCELL_TYPE)) < 0)

+ 1 - 1
raster/r.watershed/ram/close_maps.c

@@ -19,7 +19,7 @@ int close_maps(void)
     if (asp_flag || dis_flag)
     if (asp_flag || dis_flag)
 	buf = Rast_allocate_c_buf();
 	buf = Rast_allocate_c_buf();
     if (wat_flag || ls_flag || sl_flag || sg_flag)
     if (wat_flag || ls_flag || sl_flag || sg_flag)
-	dbuf = Rast_allocate_c_buf();
+	dbuf = Rast_allocate_d_buf();
     G_free(alt);
     G_free(alt);
     if (ls_flag || sg_flag)
     if (ls_flag || sg_flag)
 	G_free(r_h);
 	G_free(r_h);

+ 1 - 1
raster/r.watershed/seg/close_maps.c

@@ -18,7 +18,7 @@ int close_maps(void)
     cseg_close(&alt);
     cseg_close(&alt);
     if (wat_flag) {
     if (wat_flag) {
 	sum = sum_sqr = stddev = 0.0;
 	sum = sum_sqr = stddev = 0.0;
-	dbuf = Rast_allocate_c_buf();
+	dbuf = Rast_allocate_d_buf();
 	if (abs_acc) {
 	if (abs_acc) {
 	    G_warning("Writing out only positive flow accumulation values.");
 	    G_warning("Writing out only positive flow accumulation values.");
 	    G_warning("Cells with a likely underestimate for flow accumulation can no longer be identified.");
 	    G_warning("Cells with a likely underestimate for flow accumulation can no longer be identified.");

+ 1 - 1
raster/r.watershed/seg/dseg_read.c

@@ -24,7 +24,7 @@ int dseg_read_cell(DSEG * dseg, char *map_name, char *mapset)
     }
     }
     nrows = G_window_rows();
     nrows = G_window_rows();
     ncols = G_window_cols();
     ncols = G_window_cols();
-    dbuffer = Rast_allocate_c_buf();
+    dbuffer = Rast_allocate_d_buf();
     for (row = 0; row < nrows; row++) {
     for (row = 0; row < nrows; row++) {
 	if (Rast_get_d_raster_row(map_fd, dbuffer, row) < 0) {
 	if (Rast_get_d_raster_row(map_fd, dbuffer, row) < 0) {
 	    G_free(dbuffer);
 	    G_free(dbuffer);

+ 1 - 1
raster/r.watershed/seg/dseg_write.c

@@ -18,7 +18,7 @@ int dseg_write_cellfile(DSEG * dseg, char *map_name)
     }
     }
     nrows = G_window_rows();
     nrows = G_window_rows();
     ncols = G_window_cols();
     ncols = G_window_cols();
-    dbuffer = Rast_allocate_c_buf();
+    dbuffer = Rast_allocate_d_buf();
     segment_flush(&(dseg->seg));
     segment_flush(&(dseg->seg));
     for (row = 0; row < nrows; row++) {
     for (row = 0; row < nrows; row++) {
 	segment_get_row(&(dseg->seg), (DCELL *) dbuffer, row);
 	segment_get_row(&(dseg->seg), (DCELL *) dbuffer, row);

+ 1 - 1
raster/r.what/main.c

@@ -215,7 +215,7 @@ int main(int argc, char *argv[])
 
 
 	cell[i] = Rast_allocate_c_buf();
 	cell[i] = Rast_allocate_c_buf();
 	if (out_type[i] != CELL_TYPE)
 	if (out_type[i] != CELL_TYPE)
-	    dcell[i] = Rast_allocate_c_buf();
+	    dcell[i] = Rast_allocate_d_buf();
     }
     }
 
 
     G_get_window(&window);
     G_get_window(&window);

+ 5 - 5
raster/simwe/simlib/input.c

@@ -87,14 +87,14 @@ int input_data(void)
 
 
     /* Allocate raster buffers */
     /* Allocate raster buffers */
     cell1 = Rast_allocate_f_buf();
     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)
     if (rain != NULL)
-	cell4 = Rast_allocate_c_buf();
+	cell4 = Rast_allocate_d_buf();
 
 
     if (infil != NULL)
     if (infil != NULL)
-	cell4a = Rast_allocate_c_buf();
+	cell4a = Rast_allocate_d_buf();
 
 
     if (traps != NULL)
     if (traps != NULL)
 	cell4b = Rast_allocate_f_buf();
 	cell4b = Rast_allocate_f_buf();
@@ -110,7 +110,7 @@ int input_data(void)
 	cell11 = Rast_allocate_f_buf();
 	cell11 = Rast_allocate_f_buf();
 
 
     if (wdepth != NULL)
     if (wdepth != NULL)
-	cell12 = Rast_allocate_c_buf();
+	cell12 = Rast_allocate_d_buf();
 
 
     /* Allocate some double dimension arrays for each input */
     /* Allocate some double dimension arrays for each input */
     /* with length of matrix Y */
     /* with length of matrix Y */

+ 1 - 1
raster3d/r3.cross.rast/main.c

@@ -149,7 +149,7 @@ void rast3d_cross_section(void *map, G3D_Region region, int elevfd, int outfd)
     if (typeIntern == FCELL_TYPE)
     if (typeIntern == FCELL_TYPE)
 	fcell = Rast_allocate_f_buf();
 	fcell = Rast_allocate_f_buf();
     else if (typeIntern == DCELL_TYPE)
     else if (typeIntern == DCELL_TYPE)
-	dcell = Rast_allocate_c_buf();
+	dcell = Rast_allocate_d_buf();
 
 
     /*Mem for the input map row */
     /*Mem for the input map row */
     elevrast = Rast_allocate_buf(globalElevMapType);
     elevrast = Rast_allocate_buf(globalElevMapType);

+ 1 - 1
raster3d/r3.to.rast/main.c

@@ -121,7 +121,7 @@ void g3d_to_raster(void *map, G3D_Region region, int *fd)
     if (typeIntern == FCELL_TYPE)
     if (typeIntern == FCELL_TYPE)
 	fcell = Rast_allocate_f_buf();
 	fcell = Rast_allocate_f_buf();
     else if (typeIntern == DCELL_TYPE)
     else if (typeIntern == DCELL_TYPE)
-	dcell = Rast_allocate_c_buf();
+	dcell = Rast_allocate_d_buf();
 
 
     pos = 0;
     pos = 0;
     /*Every Rastermap */
     /*Every Rastermap */

+ 1 - 1
vector/v.surf.idw/main.c

@@ -240,7 +240,7 @@ int main(int argc, char *argv[])
 
 
     /* allocate buffers, etc. */
     /* allocate buffers, etc. */
 
 
-    dcell = Rast_allocate_c_buf();
+    dcell = Rast_allocate_d_buf();
 
 
     if ((maskfd = Rast_maskfd()) >= 0)
     if ((maskfd = Rast_maskfd()) >= 0)
 	mask = Rast_allocate_c_buf();
 	mask = Rast_allocate_c_buf();

+ 1 - 1
vector/v.what.rast/main.c

@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
     if (out_type == CELL_TYPE)
     if (out_type == CELL_TYPE)
 	cell = Rast_allocate_c_buf();
 	cell = Rast_allocate_c_buf();
     else
     else
-	dcell = Rast_allocate_c_buf();
+	dcell = Rast_allocate_d_buf();
 
 
     /* Extract raster values from file and store in cache */
     /* Extract raster values from file and store in cache */
     G_debug(1, "Extracting raster values");
     G_debug(1, "Extracting raster values");