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

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38084 15284696-431f-4ddb-bdfa-cd5b030d7da7

display/d.nviz/main.c

@@ -463,7 +463,7 @@ int read_rast
     }
 
     if (data_type == DCELL_TYPE) {
-	dcell = Rast_allocate_c_buf();
+	dcell = Rast_allocate_d_buf();
 	if (Rast_get_d_raster_row(fd, dcell, row) < 0)
 	    exit(1);
 	if (Rast_is_d_null_value(&dcell[col]))

display/d.profile/main.c

@@ -38,7 +38,8 @@ struct point
 
 static void get_region_range(int fd)
 {
-    DCELL *buf = Rast_allocate_c_buf();
+    DCELL *buf = Rast_allocate_d_buf();
+
     int nrows = G_window_rows();
     int ncols = G_window_cols();
     int row, col;
@@ -123,8 +124,8 @@ static int get_cell(DCELL *result, int fd, double x, double y)
     DCELL *tmp;
 
     if (!row1) {
-	row1 = Rast_allocate_c_buf();
-	row2 = Rast_allocate_c_buf();
+	row1 = Rast_allocate_d_buf();
+	row2 = Rast_allocate_d_buf();
     }
 
     col = (int)floor(x - 0.5);

display/d.what.rast/what.c

@@ -23,7 +23,7 @@ int what(int once, int terse, int colrow, char *fs, int width, int mwidth)
     nrows = window.rows;
     ncols = window.cols;
     buf = Rast_allocate_c_buf();
-    dbuf = Rast_allocate_c_buf();
+    dbuf = Rast_allocate_d_buf();
 
     screen_x = ((int)D_get_d_west() + (int)D_get_d_east()) / 2;
     screen_y = ((int)D_get_d_north() + (int)D_get_d_south()) / 2;

imagery/i.biomass/main.c

@@ -99,31 +99,31 @@ int main(int argc, char *argv[])
     /***************************************************/ 
     if ((infd_fpar = Rast_open_cell_old(fpar, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), fpar);
-    inrast_fpar = Rast_allocate_c_buf();
+    inrast_fpar = Rast_allocate_d_buf();
 
     if ((infd_luf = Rast_open_cell_old(luf, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), luf);
-    inrast_luf = Rast_allocate_c_buf();
+    inrast_luf = Rast_allocate_d_buf();
     
     if ((infd_lat = Rast_open_cell_old(lat, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), lat);
-    inrast_lat = Rast_allocate_c_buf();
+    inrast_lat = Rast_allocate_d_buf();
     
     if ((infd_doy = Rast_open_cell_old(doy, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), doy);
-    inrast_doy = Rast_allocate_c_buf();
-    
+    inrast_doy = Rast_allocate_d_buf();
+
     if ((infd_tsw = Rast_open_cell_old(tsw, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), tsw);
-    inrast_tsw = Rast_allocate_c_buf();
+    inrast_tsw = Rast_allocate_d_buf();
     
     if ((infd_wa = Rast_open_cell_old(wa, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), wa);
-    inrast_wa = Rast_allocate_c_buf();
+    inrast_wa = Rast_allocate_d_buf();
     
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast1 = Rast_allocate_c_buf();
+    outrast1 = Rast_allocate_d_buf();
     
     /* Create New raster files */ 
     if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)

imagery/i.class/draw_cell.c

@@ -43,9 +43,8 @@ int draw_cell(View * view, int overlay)
 	Rast_free_colors(&colr);
 	return 0;
     }
-    dcell = Rast_allocate_c_buf();
-
-
+    dcell = Rast_allocate_d_buf();
+    
     sprintf(msg, "Plotting %s ...", view->cell.name);
     Menu_msg(msg);
 

imagery/i.cluster/open_files.c

@@ -50,7 +50,8 @@ int open_files(void)
     cell = (DCELL **) G_malloc(ref.nfiles * sizeof(DCELL *));
     cellfd = (int *)G_malloc(ref.nfiles * sizeof(int));
     for (n = 0; n < ref.nfiles; n++) {
-	cell[n] = Rast_allocate_c_buf();
+	cell[n] = Rast_allocate_d_buf();
+	
 	name = ref.file[n].name;
 	mapset = ref.file[n].mapset;
 	if ((cellfd[n] = Rast_open_cell_old(name, mapset)) < 0)

imagery/i.eb.eta/main.c

@@ -78,19 +78,19 @@ int main(int argc, char *argv[])
     
     if ((infd_rnetday = Rast_open_cell_old(rnetday, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), rnetday);
-    inrast_rnetday = Rast_allocate_c_buf();
+    inrast_rnetday = Rast_allocate_d_buf();
     
     if ((infd_evapfr = Rast_open_cell_old(evapfr, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), evapfr);
-    inrast_evapfr = Rast_allocate_c_buf();
+    inrast_evapfr = Rast_allocate_d_buf();
     
     if ((infd_tempk = Rast_open_cell_old(tempk, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), tempk);
-    inrast_tempk = Rast_allocate_c_buf();
+    inrast_tempk = Rast_allocate_d_buf();
     
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast1 = Rast_allocate_c_buf();
+    outrast1 = Rast_allocate_d_buf();
     
     if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
         G_fatal_error(_("Unable to create raster map <%s>"), result1);

imagery/i.eb.evapfr/main.c

@@ -97,24 +97,25 @@ int main(int argc, char *argv[])
     /***************************************************/ 
     if ((infd_rnet = Rast_open_cell_old(rnet, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), rnet);
-    inrast_rnet = Rast_allocate_c_buf();
+    inrast_rnet = Rast_allocate_d_buf();
     
     /***************************************************/ 
     if ((infd_g0 = Rast_open_cell_old(g0, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), g0);
-    inrast_g0 = Rast_allocate_c_buf();
+    inrast_g0 = Rast_allocate_d_buf();
     
     /***************************************************/ 
     if ((infd_h0 = Rast_open_cell_old(h0, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), h0);
-    inrast_h0 = Rast_allocate_c_buf();
+    inrast_h0 = Rast_allocate_d_buf();
     
     /***************************************************/ 
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast1 = Rast_allocate_c_buf();
+    outrast1 = Rast_allocate_d_buf();
+
     if (makin) 
-	outrast2 = Rast_allocate_c_buf();
+	outrast2 = Rast_allocate_d_buf();
     
     /* Create New raster files */ 
     if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)

imagery/i.eb.h_SEBAL01/main.c

@@ -223,10 +223,10 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("Unable to read header of raster map <%s>"), t0dem);
 
     /* Allocate input buffer */
-    inrast_Rn = Rast_allocate_c_buf();
-    inrast_g0 = Rast_allocate_c_buf();
-    inrast_z0m = Rast_allocate_c_buf();
-    inrast_t0dem = Rast_allocate_c_buf();
+    inrast_Rn = Rast_allocate_d_buf();
+    inrast_g0 = Rast_allocate_d_buf();
+    inrast_z0m = Rast_allocate_d_buf();
+    inrast_t0dem = Rast_allocate_d_buf();
 
     /***************************************************/
     /* Setup pixel location variables */
@@ -245,7 +245,7 @@ int main(int argc, char *argv[])
     /***************************************************/
     /* Allocate output buffer */
     /***************************************************/
-    outrast = Rast_allocate_c_buf();
+    outrast = Rast_allocate_d_buf();
 
     if ((outfd = Rast_open_raster_new(h0, DCELL_TYPE)) < 0)
 	G_fatal_error(_("Unable to create raster map <%s>"), h0);

imagery/i.eb.soilheatflux/main.c

@@ -95,27 +95,27 @@ int main(int argc, char *argv[])
 
     if ((infd_albedo = Rast_open_cell_old(albedo, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), albedo);
-    inrast_albedo = Rast_allocate_c_buf();
+    inrast_albedo = Rast_allocate_d_buf();
 
     if ((infd_ndvi = Rast_open_cell_old(ndvi, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), ndvi);
-    inrast_ndvi = Rast_allocate_c_buf();
+    inrast_ndvi = Rast_allocate_d_buf();
 
     if ((infd_tempk = Rast_open_cell_old(tempk, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), tempk);
-    inrast_tempk = Rast_allocate_c_buf();
+    inrast_tempk = Rast_allocate_d_buf();
 
     if ((infd_rnet = Rast_open_cell_old(rnet, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), rnet);
-    inrast_rnet = Rast_allocate_c_buf();
+    inrast_rnet = Rast_allocate_d_buf();
 
     if ((infd_time = Rast_open_cell_old(time, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), time);
-    inrast_time = Rast_allocate_c_buf();
+    inrast_time = 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)

imagery/i.emissivity/main.c

@@ -64,12 +64,12 @@ int main(int argc, char *argv[])
     /***************************************************/ 
     if ((infd = Rast_open_cell_old(ndvi, "")) < 0)
 	G_fatal_error(_("Cannot open cell file [%s]"), ndvi);
-    inr = Rast_allocate_c_buf();
+    inr = Rast_allocate_d_buf();
     
     /***************************************************/ 
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outr = Rast_allocate_c_buf();
+    outr = Rast_allocate_d_buf();
     
     /* Create New raster files */ 
     if ((outfd = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)

imagery/i.evapo.time_integration/main.c

@@ -249,7 +249,7 @@ int main(int argc, char *argv[])
 	if ((Rast_get_cellhd(name2, mapset, &cellhd)) < 0) {
 	    G_fatal_error(_("Unable to read file header of raster map <%s>"), name2);
 	}
-	inrast2[nfiles2] = Rast_allocate_c_buf();
+	inrast2[nfiles2] = Rast_allocate_d_buf();
 	nfiles2++;
     }
     nfiles2--;

imagery/i.fft/main.c

@@ -122,8 +122,8 @@ int main(int argc, char *argv[])
     data = G_malloc(rows * cols * 2 * sizeof(double));
 
     /* allocate the space for one row of cell map data */
-    cell_real = Rast_allocate_c_buf();
-    cell_imag = Rast_allocate_c_buf();
+    cell_real = Rast_allocate_d_buf();
+    cell_imag = Rast_allocate_d_buf();
 
 #define C(i, j) ((i) * cols + (j))
 

imagery/i.gensig/openfiles.c

@@ -43,7 +43,7 @@ int openfiles(struct parms *parms, struct files *files)
 	if (files->band_fd[n] < 0)
 	    G_fatal_error(_("Unable to open training map <%s in %s>"),
 			  Ref.file[n].name, Ref.file[n].mapset);
-	files->band_cell[n] = Rast_allocate_c_buf();
+	files->band_cell[n] = Rast_allocate_d_buf();
     }
 
     return 0;

imagery/i.gensigset/openfiles.c

@@ -43,7 +43,7 @@ int openfiles(struct parms *parms, struct files *files)
 	if (files->band_fd[n] < 0)
 	    G_fatal_error(_("Unable to open training map <%s in %s>"),
 			  Ref.file[n].name, Ref.file[n].mapset);
-	files->band_cell[n] = Rast_allocate_c_buf();
+	files->band_cell[n] = Rast_allocate_d_buf();
     }
 
     return 0;

imagery/i.ifft/main.c

@@ -139,9 +139,9 @@ int main(int argc, char *argv[])
     data = G_malloc(rows * cols * 2 * sizeof(double));
 
     /* allocate the space for one row of cell map data */
-    cell_real = Rast_allocate_c_buf();
-    cell_imag = Rast_allocate_c_buf();
-
+    cell_real = Rast_allocate_d_buf();
+    cell_imag = Rast_allocate_d_buf();
+    
 #define C(i, j) ((i) * cols + (j))
 
     /* Read in cell map values */

imagery/i.latlong/main.c

@@ -82,7 +82,7 @@ int main(int argc, char *argv[])
 	G_fatal_error(_("Cannot open cell file [%s]"), in);
     if (Rast_get_cellhd(in, "", &cellhd) < 0)
 	G_fatal_error(_("Cannot read file header of [%s])"), in);
-    inrast = Rast_allocate_c_buf();
+    inrast = Rast_allocate_d_buf();
     
     /***************************************************/ 
     stepx = cellhd.ew_res;
@@ -117,7 +117,7 @@ int main(int argc, char *argv[])
 	    G_fatal_error(_("Unable to set up lat/long projection parameters"));
     }	/* End of stolen from r.sun */
 
-    outrast1 = Rast_allocate_c_buf();
+    outrast1 = Rast_allocate_d_buf();
 
     if ((outfd1 = Rast_open_raster_new(result1,DCELL_TYPE)) < 0)
 	G_fatal_error(_("Could not open <%s>"), result1);

imagery/i.maxlik/open.c

@@ -35,7 +35,7 @@ int open_files(void)
     cellfd = (int *)G_malloc(Ref.nfiles * sizeof(int));
     P = (double *)G_malloc(Ref.nfiles * sizeof(double));
     for (n = 0; n < Ref.nfiles; n++) {
-	cell[n] = Rast_allocate_c_buf();
+	cell[n] = Rast_allocate_d_buf();
 	name = Ref.file[n].name;
 	mapset = Ref.file[n].mapset;
 	if ((cellfd[n] = Rast_open_cell_old(name, mapset)) < 0)

imagery/i.points/drawcell.c

@@ -52,7 +52,7 @@ int drawcell(View * view)
     fd = Rast_open_cell_old(view->cell.name, view->cell.mapset);
     if (fd < 0)
 	return 0;
-    dcell = Rast_allocate_c_buf();
+    dcell = Rast_allocate_d_buf();
 
     sprintf(msg, "Plotting %s ...", view->cell.name);
     Menu_msg(msg);

imagery/i.smap/openfiles.c

@@ -23,8 +23,9 @@ int openfiles(struct parms *parms, struct files *files)
 		      parms->subgroup, parms->group);
 
     /* allocate file descriptors, and io buffer */
-    files->cellbuf = Rast_allocate_c_buf();
+    files->cellbuf = Rast_allocate_d_buf();
     files->outbuf = Rast_allocate_c_buf();
+
     files->isdata = G_malloc(G_window_cols());
 
     files->nbands = Ref.nfiles;

imagery/i.sunhours/main.c

@@ -72,18 +72,19 @@ int main(int argc, char *argv[])
     /***************************************************/ 
     if ((infd_doy = Rast_open_cell_old(doy, "")) < 0)
 	G_fatal_error(_("Cannot open cell file [%s]"), doy);
-    inrast_doy = Rast_allocate_c_buf();
+    inrast_doy = Rast_allocate_d_buf();
 
     /***************************************************/ 
     if ((infd_lat = Rast_open_cell_old(lat, "")) < 0)
 	G_fatal_error(_("Cannot open cell file [%s]"), lat);
-    inrast_lat = Rast_allocate_c_buf();
+    inrast_lat = Rast_allocate_d_buf();
 
     /***************************************************/ 
     nrows = G_window_rows();
     ncols = G_window_cols();
 
-    outrast1 = Rast_allocate_c_buf();
+    outrast1 = Rast_allocate_d_buf();
+
     if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
 	G_fatal_error(_("Could not open <%s>"), result1);
 

imagery/i.vi/main.c

@@ -211,41 +211,41 @@ int main(int argc, char *argv[])
 
     if ((infd_redchan = Rast_open_cell_old(redchan, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), redchan);
-    inrast_redchan = Rast_allocate_c_buf();
+    inrast_redchan = Rast_allocate_d_buf();
 
     if (nirchan) {
         if ((infd_nirchan = Rast_open_cell_old(nirchan, "")) < 0)
             G_fatal_error(_("Unable to open raster map <%s>"), nirchan);
-        inrast_nirchan = Rast_allocate_c_buf();
+        inrast_nirchan = Rast_allocate_d_buf();
     }
 
     if (greenchan) {
 	if ((infd_greenchan = Rast_open_cell_old(greenchan, "")) < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"), greenchan);
-	inrast_greenchan = Rast_allocate_c_buf();
+	inrast_greenchan = Rast_allocate_d_buf();
     }
 
     if (bluechan) {
 	if ((infd_bluechan = Rast_open_cell_old(bluechan, "")) < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"), bluechan);
-	inrast_bluechan = Rast_allocate_c_buf();
+	inrast_bluechan = Rast_allocate_d_buf();
     }
 
     if (chan5chan) {
 	if ((infd_chan5chan = Rast_open_cell_old(chan5chan, "")) < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"), chan5chan);
-	inrast_chan5chan = Rast_allocate_c_buf();
+	inrast_chan5chan = Rast_allocate_d_buf();
     }
 
     if (chan7chan) {
 	if ((infd_chan7chan = Rast_open_cell_old(chan7chan, "")) < 0)
 	    G_fatal_error(_("Unable to open raster map <%s>"), chan7chan);
-	inrast_chan7chan = Rast_allocate_c_buf();
+	inrast_chan7chan = 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)

imagery/i.vpoints/drawcell.c

@@ -62,7 +62,7 @@ int drawcell(View * view, int initflag)
     fd = Rast_open_cell_old(view->cell.name, view->cell.mapset);
     if (fd < 0)
 	return 0;
-    dcell = Rast_allocate_c_buf();
+    dcell = Rast_allocate_d_buf();
 
     sprintf(msg, "Displaying %s ...", view->cell.name);
     Menu_msg(msg);