alloc_cell.c updated, see http://trac.osgeo.org/grass/wiki/Grass7/Ras…

…terLib * Rast_raster_size -> Rast_cell_size * Rast_allocate_cell_buf removed * Rast_allocate_c_raster_buf -> Rast_allocate_c_buf * Rast_allocate_f_raster_buf -> Rast_allocare_f_buf * Rast_allocate_d_raster_buf -> Rast_allocate_d_buf Modules updated git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38082 15284696-431f-4ddb-bdfa-cd5b030d7da7
DaveEslinger · Jun 25, 2009 · 8daf2e7 · 8daf2e7
1 parent 36975ba
commit 8daf2e7
Show file tree

Hide file tree

Showing 222 changed files with 840 additions and 851 deletions.
diff --git a/display/d.his/main.c b/display/d.his/main.c
@@ -173,9 +173,9 @@ int main(int argc, char **argv)
 	    G_fatal_error(_("Color file for <%s> not available"), name_s);
     }
 
-    r_array = Rast_allocate_cell_buf();
-    g_array = Rast_allocate_cell_buf();
-    b_array = Rast_allocate_cell_buf();
+    r_array = Rast_allocate_c_buf();
+    g_array = Rast_allocate_c_buf();
+    b_array = Rast_allocate_c_buf();
 
     /* Make color table */
     make_gray_scale(&gray_colors);

diff --git a/display/d.nviz/main.c b/display/d.nviz/main.c
@@ -442,7 +442,7 @@ int read_rast
 
 
     if (data_type == CELL_TYPE) {
-	cell = Rast_allocate_c_raster_buf();
+	cell = Rast_allocate_c_buf();
 	if (Rast_get_c_raster_row(fd, cell, row) < 0)
 	    exit(1);
 
@@ -453,7 +453,7 @@ int read_rast
     }
 
     if (data_type == FCELL_TYPE) {
-	fcell = Rast_allocate_f_raster_buf();
+	fcell = Rast_allocate_f_buf();
 	if (Rast_get_f_raster_row(fd, fcell, row) < 0)
 	    exit(1);
 	if (Rast_is_f_null_value(&fcell[col]))
@@ -463,7 +463,7 @@ int read_rast
     }
 
     if (data_type == DCELL_TYPE) {
-	dcell = Rast_allocate_d_raster_buf();
+	dcell = Rast_allocate_c_buf();
 	if (Rast_get_d_raster_row(fd, dcell, row) < 0)
 	    exit(1);
 	if (Rast_is_d_null_value(&dcell[col]))

diff --git a/display/d.profile/main.c b/display/d.profile/main.c
@@ -38,7 +38,7 @@ struct point
 
 static void get_region_range(int fd)
 {
-    DCELL *buf = Rast_allocate_d_raster_buf();
+    DCELL *buf = Rast_allocate_c_buf();
     int nrows = G_window_rows();
     int ncols = G_window_cols();
     int row, col;
@@ -123,8 +123,8 @@ static int get_cell(DCELL *result, int fd, double x, double y)
     DCELL *tmp;
 
     if (!row1) {
-	row1 = Rast_allocate_d_raster_buf();
-	row2 = Rast_allocate_d_raster_buf();
+	row1 = Rast_allocate_c_buf();
+	row2 = Rast_allocate_c_buf();
     }
 
     col = (int)floor(x - 0.5);

diff --git a/display/d.rast.arrow/main.c b/display/d.rast.arrow/main.c
@@ -297,7 +297,7 @@ int main(int argc, char **argv)
     raster_type = Rast_get_raster_map_type(layer_fd);
 
     /* allocate the cell array */
-    raster_row = Rast_allocate_raster_buf(raster_type);
+    raster_row = Rast_allocate_buf(raster_type);
 
 
     if (opt7->answer) {
@@ -309,7 +309,7 @@ int main(int argc, char **argv)
 	mag_raster_type = Rast_get_raster_map_type(mag_fd);
 
 	/* allocate the cell array */
-	mag_raster_row = Rast_allocate_raster_buf(mag_raster_type);
+	mag_raster_row = Rast_allocate_buf(mag_raster_type);
     }
 
 
@@ -367,11 +367,11 @@ int main(int argc, char **argv)
 	    }
 
 	    if (no_arrow) {
-		ptr = G_incr_void_ptr(ptr, Rast_raster_size(raster_type));
+		ptr = G_incr_void_ptr(ptr, Rast_cell_size(raster_type));
 		if (opt7->answer)
 		    mag_ptr =
 			G_incr_void_ptr(mag_ptr,
-					Rast_raster_size(mag_raster_type));
+					Rast_cell_size(mag_raster_type));
 		no_arrow = FALSE;
 		continue;
 	    }
@@ -494,10 +494,10 @@ int main(int argc, char **argv)
 		}
 	    }
 
-	    ptr = G_incr_void_ptr(ptr, Rast_raster_size(raster_type));
+	    ptr = G_incr_void_ptr(ptr, Rast_cell_size(raster_type));
 	    if (opt7->answer)
 		mag_ptr =
-		    G_incr_void_ptr(mag_ptr, Rast_raster_size(mag_raster_type));
+		    G_incr_void_ptr(mag_ptr, Rast_cell_size(mag_raster_type));
 	}
     }
 

diff --git a/display/d.rast.num/main.c b/display/d.rast.num/main.c
@@ -216,7 +216,7 @@ int main(int argc, char **argv)
     }
 
     /* allocate the cell array */
-    cell = Rast_allocate_raster_buf(map_type);
+    cell = Rast_allocate_buf(map_type);
 
     /* read the color table in the color structures of the displayed map */
     if (Rast_read_colors(map_name, "", &colors) == -1)

diff --git a/display/d.rast/display.c b/display/d.rast/display.c
@@ -61,7 +61,7 @@ static int cell_draw(const char *name,
 	G_fatal_error(_("Unable to open raster map <%s>"), name);
 
     /* Allocate space for cell buffer */
-    xarray = Rast_allocate_raster_buf(data_type);
+    xarray = Rast_allocate_buf(data_type);
 
     D_cell_draw_begin();
 

diff --git a/display/d.rgb/main.c b/display/d.rgb/main.c
@@ -98,7 +98,7 @@ int main(int argc, char **argv)
 	if (Rast_read_colors(name, "", &B[i].colors) == -1)
 	    G_fatal_error(_("Color file for <%s> not available"), name);
 
-	B[i].array = Rast_allocate_raster_buf(B[i].type);
+	B[i].array = Rast_allocate_buf(B[i].type);
     }
 
     /* read in current window */

diff --git a/display/d.what.rast/what.c b/display/d.what.rast/what.c
@@ -22,8 +22,8 @@ int what(int once, int terse, int colrow, char *fs, int width, int mwidth)
     G_get_set_window(&window);
     nrows = window.rows;
     ncols = window.cols;
-    buf = Rast_allocate_c_raster_buf();
-    dbuf = Rast_allocate_d_raster_buf();
+    buf = Rast_allocate_c_buf();
+    dbuf = Rast_allocate_c_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;

diff --git a/doc/raster/r.example/main.c b/doc/raster/r.example/main.c
@@ -127,12 +127,12 @@ int main(int argc, char *argv[])
     G_debug(3, "number of rows %d", cellhd.rows);
 
     /* Allocate input buffer */
-    inrast = Rast_allocate_raster_buf(data_type);
+    inrast = Rast_allocate_buf(data_type);
 
     /* Allocate output buffer, use input map data_type */
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast = Rast_allocate_raster_buf(data_type);
+    outrast = Rast_allocate_buf(data_type);
 
     /* controlling, if we can write the raster */
     if ((outfd = Rast_open_raster_new(result, data_type)) < 0)

diff --git a/general/g.region/zoom.c b/general/g.region/zoom.c
@@ -24,7 +24,7 @@ int zoom(struct Cell_head *window, const char *name, const char *mapset)
 	G_fatal_error(_("Unable to open raster map <%s> in <%s>"),
 		      name, mapset);
     map_type = Rast_get_raster_map_type(fd);
-    raster = Rast_allocate_raster_buf(map_type);
+    raster = Rast_allocate_buf(map_type);
 
     /* find first non-null row */
     top = nrows;
@@ -37,7 +37,7 @@ int zoom(struct Cell_head *window, const char *name, const char *mapset)
 	for (col = 0; col < ncols; col++) {
 	    if (!Rast_is_null_value(rast_ptr, map_type))
 		break;
-	    rast_ptr = G_incr_void_ptr(rast_ptr, Rast_raster_size(map_type));
+	    rast_ptr = G_incr_void_ptr(rast_ptr, Rast_cell_size(map_type));
 	}
 	if (col == ncols)
 	    continue;
@@ -50,7 +50,7 @@ int zoom(struct Cell_head *window, const char *name, const char *mapset)
 	for (mark = col; col < ncols; col++) {
 	    if (!Rast_is_null_value(rast_ptr, map_type))
 		mark = col;
-	    rast_ptr = G_incr_void_ptr(rast_ptr, Rast_raster_size(map_type));
+	    rast_ptr = G_incr_void_ptr(rast_ptr, Rast_cell_size(map_type));
 	}
 	if (mark > right)
 	    right = mark;

diff --git a/imagery/i.albedo/main.c b/imagery/i.albedo/main.c
@@ -161,7 +161,7 @@ int main(int argc, char *argv[])
 	if ((Rast_get_cellhd(name, "", &cellhd)) < 0)
 	    G_fatal_error(_("Unable to read header of raster map <%s>"), name);
 
-	inrast[nfiles] = Rast_allocate_raster_buf(in_data_type[nfiles]);
+	inrast[nfiles] = Rast_allocate_buf(in_data_type[nfiles]);
 	nfiles++;
     }
     nfiles--;
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
     /* Allocate output buffer, use input map data_type */
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast = Rast_allocate_raster_buf(out_data_type);
+    outrast = Rast_allocate_buf(out_data_type);
 
     /* Create New raster files */
     if ((outfd = Rast_open_raster_new(result, 1)) < 0)

diff --git a/imagery/i.biomass/main.c b/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_d_raster_buf();
+    inrast_fpar = Rast_allocate_c_buf();
 
     if ((infd_luf = Rast_open_cell_old(luf, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), luf);
-    inrast_luf = Rast_allocate_d_raster_buf();
+    inrast_luf = Rast_allocate_c_buf();
 
     if ((infd_lat = Rast_open_cell_old(lat, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), lat);
-    inrast_lat = Rast_allocate_d_raster_buf();
+    inrast_lat = Rast_allocate_c_buf();
 
     if ((infd_doy = Rast_open_cell_old(doy, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), doy);
-    inrast_doy = Rast_allocate_d_raster_buf();
+    inrast_doy = Rast_allocate_c_buf();
 
     if ((infd_tsw = Rast_open_cell_old(tsw, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), tsw);
-    inrast_tsw = Rast_allocate_d_raster_buf();
+    inrast_tsw = Rast_allocate_c_buf();
 
     if ((infd_wa = Rast_open_cell_old(wa, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), wa);
-    inrast_wa = Rast_allocate_d_raster_buf();
+    inrast_wa = Rast_allocate_c_buf();
 
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast1 = Rast_allocate_d_raster_buf();
+    outrast1 = Rast_allocate_c_buf();
 
     /* Create New raster files */ 
     if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)

diff --git a/imagery/i.cca/transform.c b/imagery/i.cca/transform.c
@@ -15,7 +15,7 @@ transform(int datafds[MX], int outfds[MX], int rows, int cols,
 
     /* allocate row buffers for each band */
     for (i = 1; i <= bands; i++)
-	if ((rowbufs[i] = Rast_allocate_cell_buf()) == NULL)
+	if ((rowbufs[i] = Rast_allocate_c_buf()) == NULL)
 	    G_fatal_error(_("Unable to allocate cell buffers."));
 
     for (i = 0; i < rows; i++) {

diff --git a/imagery/i.class/band_files.c b/imagery/i.class/band_files.c
@@ -15,7 +15,7 @@ int open_band_files(void)
     Bandbuf = (CELL **) G_malloc(nbands * sizeof(CELL *));
     Bandfd = (int *)G_malloc(nbands * sizeof(int));
     for (n = 0; n < nbands; n++) {
-	Bandbuf[n] = Rast_allocate_cell_buf();
+	Bandbuf[n] = Rast_allocate_c_buf();
 	name = Refer.file[n].name;
 	mapset = Refer.file[n].mapset;
 	if ((Bandfd[n] = Rast_open_cell_old(name, mapset)) < 0)

diff --git a/imagery/i.class/draw_cell.c b/imagery/i.class/draw_cell.c
@@ -43,7 +43,7 @@ int draw_cell(View * view, int overlay)
 	Rast_free_colors(&colr);
 	return 0;
     }
-    dcell = Rast_allocate_d_raster_buf();
+    dcell = Rast_allocate_c_buf();
 
 
     sprintf(msg, "Plotting %s ...", view->cell.name);

diff --git a/imagery/i.class/signature.c b/imagery/i.class/signature.c
@@ -274,7 +274,7 @@ int display_signature(void)
 
 	if ((fd = Rast_open_cell_new(MASK)) < 0)
 	    G_fatal_error(_("Unable to open the cell map MASK."));
-	if ((buffer = Rast_allocate_cell_buf()) == NULL)
+	if ((buffer = Rast_allocate_c_buf()) == NULL)
 	    G_fatal_error(_("Unable to allocate the cell buffer in display_signature()."));
 	nrows = G_window_rows();
 	ncols = G_window_cols();

diff --git a/imagery/i.cluster/open_files.c b/imagery/i.cluster/open_files.c
@@ -50,7 +50,7 @@ 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_d_raster_buf();
+	cell[n] = Rast_allocate_c_buf();
 	name = ref.file[n].name;
 	mapset = ref.file[n].mapset;
 	if ((cellfd[n] = Rast_open_cell_old(name, mapset)) < 0)

diff --git a/imagery/i.eb.eta/main.c b/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_d_raster_buf();
+    inrast_rnetday = Rast_allocate_c_buf();
 
     if ((infd_evapfr = Rast_open_cell_old(evapfr, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), evapfr);
-    inrast_evapfr = Rast_allocate_d_raster_buf();
+    inrast_evapfr = Rast_allocate_c_buf();
 
     if ((infd_tempk = Rast_open_cell_old(tempk, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), tempk);
-    inrast_tempk = Rast_allocate_d_raster_buf();
+    inrast_tempk = Rast_allocate_c_buf();
 
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast1 = Rast_allocate_d_raster_buf();
+    outrast1 = Rast_allocate_c_buf();
 
     if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)
         G_fatal_error(_("Unable to create raster map <%s>"), result1);

diff --git a/imagery/i.eb.evapfr/main.c b/imagery/i.eb.evapfr/main.c
@@ -97,24 +97,24 @@ 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_d_raster_buf();
+    inrast_rnet = Rast_allocate_c_buf();
 
     /***************************************************/ 
     if ((infd_g0 = Rast_open_cell_old(g0, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), g0);
-    inrast_g0 = Rast_allocate_d_raster_buf();
+    inrast_g0 = Rast_allocate_c_buf();
 
     /***************************************************/ 
     if ((infd_h0 = Rast_open_cell_old(h0, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), h0);
-    inrast_h0 = Rast_allocate_d_raster_buf();
+    inrast_h0 = Rast_allocate_c_buf();
 
     /***************************************************/ 
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast1 = Rast_allocate_d_raster_buf();
+    outrast1 = Rast_allocate_c_buf();
     if (makin) 
-	outrast2 = Rast_allocate_d_raster_buf();
+	outrast2 = Rast_allocate_c_buf();
 
     /* Create New raster files */ 
     if ((outfd1 = Rast_open_raster_new(result1, DCELL_TYPE)) < 0)

diff --git a/imagery/i.eb.h_SEBAL01/main.c b/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_d_raster_buf();
-    inrast_g0 = Rast_allocate_d_raster_buf();
-    inrast_z0m = Rast_allocate_d_raster_buf();
-    inrast_t0dem = Rast_allocate_d_raster_buf();
+    inrast_Rn = Rast_allocate_c_buf();
+    inrast_g0 = Rast_allocate_c_buf();
+    inrast_z0m = Rast_allocate_c_buf();
+    inrast_t0dem = Rast_allocate_c_buf();
 
     /***************************************************/
     /* Setup pixel location variables */
@@ -245,7 +245,7 @@ int main(int argc, char *argv[])
     /***************************************************/
     /* Allocate output buffer */
     /***************************************************/
-    outrast = Rast_allocate_d_raster_buf();
+    outrast = Rast_allocate_c_buf();
 
     if ((outfd = Rast_open_raster_new(h0, DCELL_TYPE)) < 0)
 	G_fatal_error(_("Unable to create raster map <%s>"), h0);

diff --git a/imagery/i.eb.soilheatflux/main.c b/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_d_raster_buf();
+    inrast_albedo = Rast_allocate_c_buf();
 
     if ((infd_ndvi = Rast_open_cell_old(ndvi, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), ndvi);
-    inrast_ndvi = Rast_allocate_d_raster_buf();
+    inrast_ndvi = Rast_allocate_c_buf();
 
     if ((infd_tempk = Rast_open_cell_old(tempk, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), tempk);
-    inrast_tempk = Rast_allocate_d_raster_buf();
+    inrast_tempk = Rast_allocate_c_buf();
 
     if ((infd_rnet = Rast_open_cell_old(rnet, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), rnet);
-    inrast_rnet = Rast_allocate_d_raster_buf();
+    inrast_rnet = Rast_allocate_c_buf();
 
     if ((infd_time = Rast_open_cell_old(time, "")) < 0)
 	G_fatal_error(_("Unable to open raster map <%s>"), time);
-    inrast_time = Rast_allocate_d_raster_buf();
+    inrast_time = Rast_allocate_c_buf();
 
     nrows = G_window_rows();
     ncols = G_window_cols();
-    outrast = Rast_allocate_d_raster_buf();
+    outrast = Rast_allocate_c_buf();
 
     /* Create New raster files */ 
     if ((outfd = Rast_open_raster_new(result,DCELL_TYPE)) < 0)