rasterlib: fns from zero_cell.c renamed, see

http://trac.osgeo.org/grass/wiki/Grass7/RasterLib


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

include/raster.h

@@ -506,7 +506,7 @@ void Rast__create_window_mapping(int);
 int Rast_row_repeat_nomask(int, int);
 
 /* zero_cell.c */
-void Rast_zero_cell_buf(CELL *);
-void Rast_zero_raster_buf(void *, RASTER_MAP_TYPE);
+void Rast_zero_c_buf(CELL *);
+void Rast_zero_buf(void *, RASTER_MAP_TYPE);
 
 #endif

lib/raster/closecell.c

@@ -241,7 +241,7 @@ static int close_new_gdal(int fd, int ok)
 	if (fcb->cur_row < fcb->cellhd.rows) {
 	    int row;
 
-	    Rast_zero_raster_buf(fcb->data, fcb->map_type);
+	    Rast_zero_buf(fcb->data, fcb->map_type);
 	    for (row = fcb->cur_row; row < fcb->cellhd.rows; row++)
 		Rast_put_row(fd, fcb->data, fcb->map_type);
 	    G_free(fcb->data);
@@ -332,7 +332,7 @@ static int close_new(int fd, int ok)
 	}
 
 	if (fcb->cur_row < fcb->cellhd.rows) {
-	    Rast_zero_raster_buf(fcb->data, fcb->map_type);
+	    Rast_zero_buf(fcb->data, fcb->map_type);
 	    for (row = fcb->cur_row; row < fcb->cellhd.rows; row++)
 		Rast_put_row(fd, fcb->data, fcb->map_type);
 	    G_free(fcb->data);

lib/raster/get_row.c

@@ -588,7 +588,7 @@ static int get_map_row_nomask(int fd, void *rast, int row,
 
     if (rowStatus <= 0) {
 	fcb->cur_row = -1;
-	Rast_zero_raster_buf(rast, data_type);
+	Rast_zero_buf(rast, data_type);
 	return rowStatus;
     }
 
@@ -597,7 +597,7 @@ static int get_map_row_nomask(int fd, void *rast, int row,
 	fcb->cur_row = r;
 
 	if (read_data(fd, fcb->cur_row, fcb->data, &fcb->cur_nbytes) < 0) {
-	    Rast_zero_raster_buf(rast, data_type);
+	    Rast_zero_buf(rast, data_type);
 
 	    if (!fcb->io_error) {
 		if (fcb->cellhd.compressed)

lib/raster/zero_cell.c

@@ -24,7 +24,7 @@
  * \param buf data buffer
  */
 
-void Rast_zero_cell_buf(CELL * buf)
+void Rast_zero_c_buf(CELL * buf)
 {
     int i = G_window_cols();
 
@@ -42,7 +42,7 @@ void Rast_zero_cell_buf(CELL * buf)
  * \param rast data buffer
  * \param data_type raster type (CELL, FCELL, DCELL)
  */
-void Rast_zero_raster_buf(void *rast, RASTER_MAP_TYPE data_type)
+void Rast_zero_buf(void *rast, RASTER_MAP_TYPE data_type)
 {
     int i;
     unsigned char *ptr;

raster/r.le/r.le.patch/driver.c

@@ -955,7 +955,7 @@ void mv_driver()
 	   process */
 
 	if (fmask > 0) {
-	    Rast_zero_raster_buf(row_buf, CELL_TYPE);
+	    Rast_zero_buf(row_buf, CELL_TYPE);
 	    Rast_get_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
 				    CELL_TYPE);
 
@@ -1010,7 +1010,7 @@ void mv_driver()
 	nulltmp = Rast_allocate_null_buf();
 
 	if (choice->att[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1033,7 +1033,7 @@ void mv_driver()
 	}
 
 	if (choice->att[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1055,7 +1055,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->att[3]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1077,7 +1077,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->att[4]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1099,7 +1099,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->att[5]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1121,7 +1121,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->att[6]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1143,7 +1143,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->att[7]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1165,7 +1165,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->size[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1187,7 +1187,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->size[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1209,7 +1209,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->size[3]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1231,7 +1231,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->size[4]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1253,7 +1253,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->size[5]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1275,7 +1275,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->size[6]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1297,7 +1297,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1319,7 +1319,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1341,7 +1341,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[3]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1363,7 +1363,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[4]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1385,7 +1385,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[5]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1407,7 +1407,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[6]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1429,7 +1429,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[7]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1451,7 +1451,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[8]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1473,7 +1473,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[9]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1495,7 +1495,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->core[10]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1517,7 +1517,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->shape[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1539,7 +1539,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->shape[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1561,7 +1561,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->shape[3]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1583,7 +1583,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->shape[4]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1605,7 +1605,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->shape[5]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1627,7 +1627,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->shape[6]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1649,7 +1649,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->boundary[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1671,7 +1671,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->perim[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1693,7 +1693,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->perim[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1715,7 +1715,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->perim[3]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1737,7 +1737,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->perim[4]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1759,7 +1759,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->perim[5]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1781,7 +1781,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->perim[6]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1804,7 +1804,7 @@ void mv_driver()
 	}
 
 	if (choice->att[8]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1827,7 +1827,7 @@ void mv_driver()
 	}
 
 	if (choice->size[7]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1850,7 +1850,7 @@ void mv_driver()
 	}
 
 	if (choice->size[8]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1873,7 +1873,7 @@ void mv_driver()
 	}
 
 	if (choice->boundary[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1896,7 +1896,7 @@ void mv_driver()
 	}
 
 	if (choice->boundary[3]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1919,7 +1919,7 @@ void mv_driver()
 	}
 
 	if (choice->boundary[4]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -2705,7 +2705,7 @@ void unit_driver()
 	    fd = Rast_open_new(unitname, CELL_TYPE);
 	    unit_buf = Rast_allocate_buf(CELL_TYPE);
 	    for (k = 1; k < wind.rows + 1; k++) {
-		Rast_zero_raster_buf(unit_buf, CELL_TYPE);
+		Rast_zero_buf(unit_buf, CELL_TYPE);
 		Rast_set_null_value(unit_buf, wind.cols + 1, CELL_TYPE);
 		for (m = 1; m < wind.cols + 1; m++) {
 		    if (*(*(units + k) + m))
@@ -2820,7 +2820,7 @@ void whole_reg_driver()
 	fr = Rast_open_old(choice->reg, G_mapset());
 	row_buf = Rast_allocate_buf(CELL_TYPE);
 	for (i = 0; i < nrows; i++) {
-	    Rast_zero_raster_buf(row_buf, CELL_TYPE);
+	    Rast_zero_buf(row_buf, CELL_TYPE);
 	    Rast_get_row(fr, row_buf, i, CELL_TYPE);
 	    for (j = 0; j < ncols; j++) {
 		if (*(row_buf + j) > 0) {

raster/r.le/r.le.patch/trace.c

@@ -212,7 +212,7 @@ void cell_clip_drv(int col0, int row0, int ncols, int nrows, double **value,
 	    cor_cell_buf = Rast_allocate_buf(CELL_TYPE);
 	    fe = Rast_open_new("interior", CELL_TYPE);
 	    for (i = 1; i < nrows + 1; i++) {
-		Rast_zero_raster_buf(cor_cell_buf, CELL_TYPE);
+		Rast_zero_buf(cor_cell_buf, CELL_TYPE);
 		for (j = 1; j < ncols + 1; j++)
 		    *(cor_cell_buf + j - 1) = (int)(*(*(cor + i) + j));
 
@@ -226,7 +226,7 @@ void cell_clip_drv(int col0, int row0, int ncols, int nrows, double **value,
 	    cor_fcell_buf = Rast_allocate_buf(FCELL_TYPE);
 	    fe = Rast_open_new("interior", FCELL_TYPE);
 	    for (i = 1; i < nrows + 1; i++) {
-		Rast_zero_raster_buf(cor_fcell_buf, FCELL_TYPE);
+		Rast_zero_buf(cor_fcell_buf, FCELL_TYPE);
 		for (j = 1; j < ncols + 1; j++) {
 		    *(cor_fcell_buf + j - 1) = (float)(*(*(cor + i) + j));
 		}
@@ -239,7 +239,7 @@ void cell_clip_drv(int col0, int row0, int ncols, int nrows, double **value,
 	    cor_dcell_buf = Rast_allocate_buf(DCELL_TYPE);
 	    fe = Rast_open_new("interior", DCELL_TYPE);
 	    for (i = 1; i < nrows + 1; i++) {
-		Rast_zero_raster_buf(cor_dcell_buf, DCELL_TYPE);
+		Rast_zero_buf(cor_dcell_buf, DCELL_TYPE);
 		for (j = 1; j < ncols + 1; j++)
 		    *(cor_dcell_buf + j - 1) = (double)(*(*(cor + i) + j));
 
@@ -258,7 +258,7 @@ void cell_clip_drv(int col0, int row0, int ncols, int nrows, double **value,
 	fd = Rast_open_new("num", CELL_TYPE);
 	for (i = 1; i < nrows + 1; i++) {
 	    pat_buf = Rast_allocate_buf(CELL_TYPE);
-	    Rast_zero_raster_buf(pat_buf, CELL_TYPE);
+	    Rast_zero_buf(pat_buf, CELL_TYPE);
 	    for (j = 1; j < ncols + 1; j++)
 		*(pat_buf + j - 1) = *(*(pat + i) + j);
 
@@ -541,7 +541,7 @@ void cell_clip(DCELL ** buf, DCELL ** null_buf, int row0, int col0, int nrows,
 	    exit(EXIT_FAILURE);
 	}
 	tmp1 = Rast_allocate_buf(CELL_TYPE);
-	Rast_zero_raster_buf(tmp1, CELL_TYPE);
+	Rast_zero_buf(tmp1, CELL_TYPE);
 	fprintf(stderr, "Analyzing region number %d...\n", index);
     }
 
@@ -606,15 +606,15 @@ void cell_clip(DCELL ** buf, DCELL ** null_buf, int row0, int col0, int nrows,
 
 	switch (data_type) {
 	case CELL_TYPE:
-	    Rast_zero_raster_buf(tmp, data_type);
+	    Rast_zero_buf(tmp, data_type);
 	    Rast_get_row(finput, tmp, i, data_type);
 	    break;
 	case FCELL_TYPE:
-	    Rast_zero_raster_buf(ftmp, data_type);
+	    Rast_zero_buf(ftmp, data_type);
 	    Rast_get_row(finput, ftmp, i, data_type);
 	    break;
 	case DCELL_TYPE:
-	    Rast_zero_raster_buf(dtmp, data_type);
+	    Rast_zero_buf(dtmp, data_type);
 	    Rast_get_row(finput, dtmp, i, data_type);
 	    break;
 	}

raster/r.le/r.le.pixel/cellclip.c

@@ -292,7 +292,7 @@ void cell_clip(DCELL ** buf, DCELL ** null_buf, int row0, int col0, int nrows,
 	    exit(1);
 	}
 	tmp1 = Rast_allocate_buf(CELL_TYPE);
-	Rast_zero_raster_buf(tmp1, CELL_TYPE);
+	Rast_zero_buf(tmp1, CELL_TYPE);
 	fprintf(stderr, "Analyzing region number %d...\n", index);
     }
 
@@ -350,15 +350,15 @@ void cell_clip(DCELL ** buf, DCELL ** null_buf, int row0, int col0, int nrows,
 
 	switch (data_type) {
 	case CELL_TYPE:
-	    Rast_zero_raster_buf(tmp, data_type);
+	    Rast_zero_buf(tmp, data_type);
 	    Rast_get_row(finput, tmp, i, CELL_TYPE);
 	    break;
 	case FCELL_TYPE:
-	    Rast_zero_raster_buf(ftmp, data_type);
+	    Rast_zero_buf(ftmp, data_type);
 	    Rast_get_row(finput, ftmp, i, FCELL_TYPE);
 	    break;
 	case DCELL_TYPE:
-	    Rast_zero_raster_buf(dtmp, data_type);
+	    Rast_zero_buf(dtmp, data_type);
 	    Rast_get_row(finput, dtmp, i, DCELL_TYPE);
 	    break;
 	}

raster/r.le/r.le.pixel/driver.c

@@ -442,15 +442,15 @@ void mv_driver()
 
 	    switch (data_type) {
 	    case (CELL_TYPE):
-		Rast_zero_raster_buf(tmp, CELL_TYPE);
+		Rast_zero_buf(tmp, CELL_TYPE);
 		Rast_get_row(finput, tmp, i, CELL_TYPE);
 		break;
 	    case (FCELL_TYPE):
-		Rast_zero_raster_buf(ftmp, FCELL_TYPE);
+		Rast_zero_buf(ftmp, FCELL_TYPE);
 		Rast_get_row(finput, ftmp, i, FCELL_TYPE);
 		break;
 	    case (DCELL_TYPE):
-		Rast_zero_raster_buf(dtmp, DCELL_TYPE);
+		Rast_zero_buf(dtmp, DCELL_TYPE);
 		Rast_get_row(finput, dtmp, i, DCELL_TYPE);
 		break;
 	    }
@@ -524,7 +524,7 @@ void mv_driver()
 	   process */
 
 	if (fmask > 0) {
-	    Rast_zero_raster_buf(row_buf, CELL_TYPE);
+	    Rast_zero_buf(row_buf, CELL_TYPE);
 	    Rast_get_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
 				    CELL_TYPE);
 
@@ -582,7 +582,7 @@ void mv_driver()
 	nulltmp = Rast_allocate_null_buf();
 
 	if (choice->att[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -604,7 +604,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->att[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -626,7 +626,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->att[3]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -648,7 +648,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->att[4]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -670,7 +670,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->div[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -692,7 +692,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->div[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -714,7 +714,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->div[3]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -736,7 +736,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->div[4]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -758,7 +758,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->te2[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -780,7 +780,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->te2[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -802,7 +802,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->te2[3]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -824,7 +824,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->te2[4]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -846,7 +846,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->te2[5]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -868,7 +868,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->jux[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -890,7 +890,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->jux[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -912,7 +912,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->edg[1]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -934,7 +934,7 @@ void mv_driver()
 	    }
 	}
 	if (choice->edg[2]) {
-	    Rast_zero_raster_buf(tmp_buf, DCELL_TYPE);
+	    Rast_zero_buf(tmp_buf, DCELL_TYPE);
 	    Rast_set_null_value(tmp_buf, x0 + nc + u_w, DCELL_TYPE);
 	    if (i == 0) {
 		for (b = 0; b < u_l / 2; b++)
@@ -1365,15 +1365,15 @@ void unit_driver()
 
 	    switch (data_type) {
 	    case (CELL_TYPE):
-		Rast_zero_raster_buf(tmp, CELL_TYPE);
+		Rast_zero_buf(tmp, CELL_TYPE);
 		Rast_get_row(finput, tmp, i, CELL_TYPE);
 		break;
 	    case (FCELL_TYPE):
-		Rast_zero_raster_buf(ftmp, FCELL_TYPE);
+		Rast_zero_buf(ftmp, FCELL_TYPE);
 		Rast_get_row(finput, ftmp, i, FCELL_TYPE);
 		break;
 	    case (DCELL_TYPE):
-		Rast_zero_raster_buf(dtmp, DCELL_TYPE);
+		Rast_zero_buf(dtmp, DCELL_TYPE);
 		Rast_get_row(finput, dtmp, i, DCELL_TYPE);
 		break;
 	    }
@@ -1527,7 +1527,7 @@ void unit_driver()
 	    fd = Rast_open_new(unitname, CELL_TYPE);
 	    unit_buf = Rast_allocate_buf(CELL_TYPE);
 	    for (k = 1; k < wind.rows + 1; k++) {
-		Rast_zero_raster_buf(unit_buf, CELL_TYPE);
+		Rast_zero_buf(unit_buf, CELL_TYPE);
 		Rast_set_null_value(unit_buf, wind.cols + 1, CELL_TYPE);
 		for (m = 1; m < wind.cols + 3; m++) {
 		    if (*(*(units + k) + m))
@@ -1684,15 +1684,15 @@ void whole_reg_driver()
 
 	    switch (data_type) {
 	    case (CELL_TYPE):
-		Rast_zero_raster_buf(tmp, CELL_TYPE);
+		Rast_zero_buf(tmp, CELL_TYPE);
 		Rast_get_row(finput, tmp, i, CELL_TYPE);
 		break;
 	    case (FCELL_TYPE):
-		Rast_zero_raster_buf(ftmp, FCELL_TYPE);
+		Rast_zero_buf(ftmp, FCELL_TYPE);
 		Rast_get_row(finput, ftmp, i, FCELL_TYPE);
 		break;
 	    case (DCELL_TYPE):
-		Rast_zero_raster_buf(dtmp, DCELL_TYPE);
+		Rast_zero_buf(dtmp, DCELL_TYPE);
 		Rast_get_row(finput, dtmp, i, DCELL_TYPE);
 		break;
 	    }
@@ -1753,7 +1753,7 @@ void whole_reg_driver()
 	fr = Rast_open_old(choice->reg, G_mapset());
 	row_buf = Rast_allocate_buf(CELL_TYPE);
 	for (i = 0; i < nrows; i++) {
-	    Rast_zero_raster_buf(row_buf, CELL_TYPE);
+	    Rast_zero_buf(row_buf, CELL_TYPE);
 	    Rast_get_row(fr, row_buf, i, CELL_TYPE);
 	    for (j = 0; j < ncols; j++) {
 		if (*(row_buf + j)) {

raster/r.le/r.le.pixel/texture.c

@@ -469,7 +469,7 @@ void df_texture(int nrows, int ncols, double **buf, double **null_buf,
 	case (CELL_TYPE):
 	    edge_buf_c = Rast_allocate_buf(CELL_TYPE);
 	    for (i = 1; i < nrows + 1; i++) {
-		Rast_zero_raster_buf(edge_buf_c, CELL_TYPE);
+		Rast_zero_buf(edge_buf_c, CELL_TYPE);
 		Rast_set_null_value(edge_buf_c, ncols + 1, CELL_TYPE);
 		for (j = 1; j < ncols + 1; j++) {
 		    if (*(*(edgenull + i) + j) == 0)
@@ -481,7 +481,7 @@ void df_texture(int nrows, int ncols, double **buf, double **null_buf,
 	case (FCELL_TYPE):
 	    edge_buf_f = Rast_allocate_buf(FCELL_TYPE);
 	    for (i = 1; i < nrows + 1; i++) {
-		Rast_zero_raster_buf(edge_buf_f, FCELL_TYPE);
+		Rast_zero_buf(edge_buf_f, FCELL_TYPE);
 		Rast_set_null_value(edge_buf_f, ncols + 1, FCELL_TYPE);
 		for (j = 1; j < ncols + 1; j++) {
 		    if (*(*(edgenull + i) + j) == 0)
@@ -493,7 +493,7 @@ void df_texture(int nrows, int ncols, double **buf, double **null_buf,
 	case (DCELL_TYPE):
 	    edge_buf_d = Rast_allocate_buf(DCELL_TYPE);
 	    for (i = 1; i < nrows + 1; i++) {
-		Rast_zero_raster_buf(edge_buf_d, DCELL_TYPE);
+		Rast_zero_buf(edge_buf_d, DCELL_TYPE);
 		Rast_set_null_value(edge_buf_d, ncols + 1, DCELL_TYPE);
 		for (j = 1; j < ncols + 1; j++) {
 		    if (*(*(edgenull + i) + j) == 0)
@@ -535,7 +535,7 @@ void df_texture(int nrows, int ncols, double **buf, double **null_buf,
 	fd = Rast_open_new("zscores", DCELL_TYPE);
 	zscor_buf = Rast_allocate_buf(DCELL_TYPE);
 	for (i = 1; i < nrows + 1; i++) {
-	    Rast_zero_raster_buf(zscor_buf, DCELL_TYPE);
+	    Rast_zero_buf(zscor_buf, DCELL_TYPE);
 	    Rast_set_null_value(zscor_buf, ncols + 1, DCELL_TYPE);
 	    for (j = 1; j < ncols + 1; j++) {
 		if (attr[1] > 0.0)

raster/r.le/r.le.setup/sample.c

@@ -355,7 +355,7 @@ static void man_unit(int t, int b, int l, int r, char *n1, char *n2, char *n3,
 		    row_buf = Rast_allocate_buf(CELL_TYPE);
 		    fr = Rast_open_old(n1, G_mapset());
 		    for (j = t; j < b; j++) {
-			Rast_zero_raster_buf(row_buf, CELL_TYPE);
+			Rast_zero_buf(row_buf, CELL_TYPE);
 			Rast_get_row(fr, row_buf, j, CELL_TYPE);
 			for (k = l; k < r; k++) {
 			    if (*(row_buf + k))
@@ -412,7 +412,7 @@ static void man_unit(int t, int b, int l, int r, char *n1, char *n2, char *n3,
 			row_buf = Rast_allocate_buf(CELL_TYPE);
 			fr = Rast_open_old(n1, G_mapset());
 			for (j = t; j < b; j++) {
-			    Rast_zero_raster_buf(row_buf, CELL_TYPE);
+			    Rast_zero_buf(row_buf, CELL_TYPE);
 			    Rast_get_row(fr, row_buf, j, CELL_TYPE);
 			    for (k = l; k < r; k++) {
 				if (*(row_buf + k))
@@ -961,7 +961,7 @@ static int calc_unit_loc(double radius, int top, int bot, int left, int right,
 			(*(row_buf + l + left1) &&
 			 *(row_buf + l + left1 + u_w - 1)))
 			goto back;
-		    Rast_zero_cell_buf(row_buf);
+		    Rast_zero_c_buf(row_buf);
 		    Rast_get_c_row_nomask(fmask, row_buf, t + top1 + u_l - 1);
 		    if (!
 			(*(row_buf + l + left1) &&
@@ -1416,7 +1416,7 @@ static void graph_unit(int t, int b, int l, int r, char *n1, char *n2,
 			G_free(row_buf);
 			goto back1;
 		    }
-		    Rast_zero_cell_buf(row_buf);
+		    Rast_zero_c_buf(row_buf);
 		    Rast_get_c_row_nomask(fmask, row_buf, ab - 1);
 		    if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
 			fprintf(stderr,
@@ -1538,7 +1538,7 @@ static void graph_unit(int t, int b, int l, int r, char *n1, char *n2,
 			G_free(row_buf);
 			goto back2;
 		    }
-		    Rast_zero_cell_buf(row_buf);
+		    Rast_zero_c_buf(row_buf);
 		    Rast_get_c_row_nomask(fmask, row_buf, ab - 1);
 		    if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
 			fprintf(stderr,

raster/r.le/r.le.trace/main.c

@@ -608,15 +608,15 @@ void cell_clip(DCELL ** buf, DCELL ** null_buf, int row0, int col0, int nrows,
 
 	switch (data_type) {
 	case CELL_TYPE:
-	    Rast_zero_raster_buf(tmp, data_type);
+	    Rast_zero_buf(tmp, data_type);
 	    Rast_get_row(finput, tmp, i, data_type);
 	    break;
 	case FCELL_TYPE:
-	    Rast_zero_raster_buf(ftmp, data_type);
+	    Rast_zero_buf(ftmp, data_type);
 	    Rast_get_row(finput, ftmp, i, data_type);
 	    break;
 	case DCELL_TYPE:
-	    Rast_zero_raster_buf(dtmp, data_type);
+	    Rast_zero_buf(dtmp, data_type);
 	    Rast_get_row(finput, dtmp, i, data_type);
 	    break;
 	}

raster/r.random.cells/init.c

@@ -36,7 +36,7 @@ void Init()
     Out = (CELL **) G_malloc(sizeof(CELL *) * Rs);
     for (row = 0; row < Rs; row++) {
 	Out[row] = Rast_allocate_c_buf();
-	Rast_zero_cell_buf(Out[row]);
+	Rast_zero_c_buf(Out[row]);
     }
 
     Cells = FlagCreate(Rs, Cs);