rasterlib: fns from get_row.c renamed, see

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


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

display/d.his/main.c

@@ -190,17 +190,17 @@ int main(int argc, char **argv)
     for (atrow = 0; atrow < window.rows;) {
 	G_percent(atrow, window.rows, 2);
 
-	if (Rast_get_raster_row_colors
+	if (Rast_get_row_colors
 	    (hue_file, atrow, &hue_colors, hue_r, hue_g, hue_b, hue_n) < 0)
 	    G_fatal_error(_("Error reading hue data"));
 
 	if (int_used &&
-	    (Rast_get_raster_row_colors
+	    (Rast_get_row_colors
 	     (int_file, atrow, &int_colors, int_r, dummy, dummy, int_n) < 0))
 	    G_fatal_error(_("Error reading intensity data"));
 
 	if (sat_used &&
-	    (Rast_get_raster_row_colors
+	    (Rast_get_row_colors
 	     (sat_file, atrow, &sat_colors, sat_r, dummy, dummy, sat_n) < 0))
 	    G_fatal_error(_("Error reading saturation data"));
 

display/d.nviz/main.c

@@ -443,7 +443,7 @@ int read_rast
 
     if (data_type == CELL_TYPE) {
 	cell = Rast_allocate_c_buf();
-	if (Rast_get_c_raster_row(fd, cell, row) < 0)
+	if (Rast_get_c_row(fd, cell, row) < 0)
 	    exit(1);
 
 	if (Rast_is_c_null_value(&cell[col]))
@@ -454,7 +454,7 @@ int read_rast
 
     if (data_type == FCELL_TYPE) {
 	fcell = Rast_allocate_f_buf();
-	if (Rast_get_f_raster_row(fd, fcell, row) < 0)
+	if (Rast_get_f_row(fd, fcell, row) < 0)
 	    exit(1);
 	if (Rast_is_f_null_value(&fcell[col]))
 	    camera_height = (double)9999.;
@@ -464,7 +464,7 @@ int read_rast
 
     if (data_type == DCELL_TYPE) {
 	dcell = Rast_allocate_d_buf();
-	if (Rast_get_d_raster_row(fd, dcell, row) < 0)
+	if (Rast_get_d_row(fd, dcell, row) < 0)
 	    exit(1);
 	if (Rast_is_d_null_value(&dcell[col]))
 	    camera_height = (double)9999.;

display/d.profile/main.c

@@ -48,7 +48,7 @@ static void get_region_range(int fd)
     max = -1e300;
 
     for (row = 0; row < nrows; row++) {
-	Rast_get_d_raster_row(fd, buf, row);
+	Rast_get_d_row(fd, buf, row);
 	for (col = 0; col < ncols; col++) {
 	    if (min > buf[col])
 		min = buf[col];
@@ -142,15 +142,15 @@ static int get_cell(DCELL *result, int fd, double x, double y)
     if (cur_row != row) {
 	if (cur_row == row + 1) {
 	    tmp = row1; row1 = row2; row2 = tmp;
-	    Rast_get_d_raster_row(fd, row1, row);
+	    Rast_get_d_row(fd, row1, row);
 	}
 	else if (cur_row == row - 1) {
 	    tmp = row1; row1 = row2; row2 = tmp;
-	    Rast_get_d_raster_row(fd, row2, row + 1);
+	    Rast_get_d_row(fd, row2, row + 1);
 	}
 	else {
-	    Rast_get_d_raster_row(fd, row1, row);
-	    Rast_get_d_raster_row(fd, row2, row + 1);
+	    Rast_get_d_row(fd, row1, row);
+	    Rast_get_d_row(fd, row2, row + 1);
 	}
 	cur_row = row;
     }

display/d.rast.arrow/main.c

@@ -317,11 +317,11 @@ int main(int argc, char **argv)
        and call appropriate function to draw an arrow on the cell */
 
     for (row = 0; row < nrows; row++) {
-	Rast_get_raster_row(layer_fd, raster_row, row, raster_type);
+	Rast_get_row(layer_fd, raster_row, row, raster_type);
 	ptr = raster_row;
 
 	if (opt7->answer) {
-	    Rast_get_raster_row(mag_fd, mag_raster_row, row, mag_raster_type);
+	    Rast_get_row(mag_fd, mag_raster_row, row, mag_raster_type);
 	    mag_ptr = mag_raster_row;
 	}
 

display/d.rast.num/main.c

@@ -228,7 +228,7 @@ int main(int argc, char **argv)
 
     /* loop through cells, find value, and draw text for value */
     for (row = 0; row < nrows; row++) {
-	Rast_get_raster_row(layer_fd, cell, row, map_type);
+	Rast_get_row(layer_fd, cell, row, map_type);
 
 	for (col = 0; col < ncols; col++) {
 

display/d.rast/display.c

@@ -69,7 +69,7 @@ static int cell_draw(const char *name,
     for (cur_A_row = 0; cur_A_row != -1;) {
 	G_percent(cur_A_row, nrows, 2);
 	/* Get window (array) row currently required */
-	Rast_get_raster_row(cellfile, xarray, cur_A_row, data_type);
+	Rast_get_row(cellfile, xarray, cur_A_row, data_type);
 	mask_raster_array(xarray, ncols, invert, data_type);
 
 	/* Draw the cell row, and get the next row number */

display/d.rgb/main.c

@@ -111,7 +111,7 @@ int main(int argc, char **argv)
 	G_percent(row, window.rows, 5);
 
 	for (i = 0; i < 3; i++)
-	    if (Rast_get_raster_row(B[i].file, B[i].array, row, B[i].type) < 0)
+	    if (Rast_get_row(B[i].file, B[i].array, row, B[i].type) < 0)
 		G_fatal_error(_("Error reading row of data"));
 
 	if (row == next_row)

display/d.what.rast/what.c

@@ -56,7 +56,7 @@ int what(int once, int terse, int colrow, char *fs, int width, int mwidth)
 		G_message(_("You are clicking outside the map"));
 		continue;
 	    }
-	    if (Rast_get_c_raster_row(fd[i], buf, row) < 0)
+	    if (Rast_get_c_row(fd[i], buf, row) < 0)
 		show_cat(width, mwidth, name[i], mapset[i], null_cell,
 			 "ERROR reading raster map", terse, fs, map_type[i]);
 	    else if (map_type[i] == CELL_TYPE) {
@@ -74,7 +74,7 @@ int what(int once, int terse, int colrow, char *fs, int width, int mwidth)
 	    if (map_type[i] == CELL_TYPE)
 		continue;
 
-	    if (Rast_get_d_raster_row(fd[i], dbuf, row) < 0)
+	    if (Rast_get_d_row(fd[i], dbuf, row) < 0)
 		show_dval(width, mwidth, name[i], mapset[i], null_dcell,
 			  "ERROR reading fcell file", terse, fs);
 	    else

doc/raster/r.example/main.c

@@ -148,7 +148,7 @@ int main(int argc, char *argv[])
 	    G_percent(row, nrows, 2);
 
 	/* read input map */
-	if (Rast_get_raster_row(infd, inrast, row, data_type) < 0)
+	if (Rast_get_row(infd, inrast, row, data_type) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), name,
 			  row);
 

general/g.region/zoom.c

@@ -32,7 +32,7 @@ int zoom(struct Cell_head *window, const char *name, const char *mapset)
     left = ncols;
     right = -1;
     for (row = 0; row < nrows; row++) {
-	if (Rast_get_raster_row(fd, rast_ptr = raster, row, map_type) < 0)
+	if (Rast_get_row(fd, rast_ptr = raster, row, map_type) < 0)
 	    G_fatal_error(_("Could not read from <%s>"), name);
 	for (col = 0; col < ncols; col++) {
 	    if (!Rast_is_null_value(rast_ptr, map_type))

imagery/i.albedo/main.c

@@ -193,7 +193,7 @@ int main(int argc, char *argv[])
 	    G_percent(row, nrows, 2);
 	    /* read input map */
 	    for (i = 1; i <= nfiles; i++) {
-		if ((Rast_get_raster_row(
+		if ((Rast_get_row(
 			 infd[i], inrast[i], row, in_data_type[i])) < 0)
 		    G_fatal_error(_("Unable to read raster map <%s> row %d >"),
 				  name, row);
@@ -351,7 +351,7 @@ int main(int argc, char *argv[])
 	G_percent(row, nrows, 2);
 	/* read input map */
 	for (i = 1; i <= nfiles; i++) {
-	    if ((Rast_get_raster_row(
+	    if ((Rast_get_row(
 		     infd[i], inrast[i], row, in_data_type[i])) < 0)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      name, row);

imagery/i.atcorr/main.cpp

@@ -306,19 +306,19 @@ static void process_raster (int ifd, InputMask imask, ScaleRange iscale,
 	G_percent(row, nrows, 1);     /* keep the user informed of our progress */
 		
         /* read the next row */
-	if(Rast_get_raster_row(ifd, buf, row, FCELL_TYPE) < 0)
+	if(Rast_get_row(ifd, buf, row, FCELL_TYPE) < 0)
 	    G_fatal_error (_("Unable to read input raster map row %d"),
 			     row);
 
         /* read the next row of elevation values */
         if(ialt_fd >= 0)
-	    if(Rast_get_raster_row(ialt_fd, alt, row, FCELL_TYPE) < 0)
+	    if(Rast_get_row(ialt_fd, alt, row, FCELL_TYPE) < 0)
 		G_fatal_error (_("Unable to read elevation raster map row %d"),
 			       row);
 
         /* read the next row of elevation values */
         if(ivis_fd >= 0)
-	    if(Rast_get_raster_row(ivis_fd, vis, row, FCELL_TYPE) < 0)
+	    if(Rast_get_row(ivis_fd, vis, row, FCELL_TYPE) < 0)
 		G_fatal_error (_("Unable to read visibility raster map row %d"),
 			       row);
 

imagery/i.biomass/main.c

@@ -145,17 +145,17 @@ int main(int argc, char *argv[])
 	G_percent(row, nrows, 2);
 	
         /* read input maps */ 
-        if (Rast_get_d_raster_row(infd_fpar, inrast_fpar, row)< 0)
+        if (Rast_get_d_row(infd_fpar, inrast_fpar, row)< 0)
 	    G_fatal_error(_("Unable to read from <%s> row %d"),fpar,row);
-	if (Rast_get_d_raster_row(infd_luf,inrast_luf,row)<0)
+	if (Rast_get_d_row(infd_luf,inrast_luf,row)<0)
 	    G_fatal_error(_("Unable to read from <%s> row %d"),luf,row);
-	if (Rast_get_d_raster_row(infd_lat, inrast_lat, row) < 0)
+	if (Rast_get_d_row(infd_lat, inrast_lat, row) < 0)
 	    G_fatal_error(_("Unable to read from <%s> row %d"),lat,row);
-	if (Rast_get_d_raster_row(infd_doy, inrast_doy, row) < 0)
+	if (Rast_get_d_row(infd_doy, inrast_doy, row) < 0)
 	    G_fatal_error(_("Unable to read from <%s> row %d"),doy,row);
-	if (Rast_get_d_raster_row(infd_tsw, inrast_tsw, row) < 0)
+	if (Rast_get_d_row(infd_tsw, inrast_tsw, row) < 0)
 	    G_fatal_error(_("Unable to read from <%s> row %d"),tsw,row);
-	if (Rast_get_d_raster_row(infd_wa,inrast_wa,row)<0)
+	if (Rast_get_d_row(infd_wa,inrast_wa,row)<0)
 	    G_fatal_error(_("Unable to read from <%s> row %d"),wa,row); 
         /*process the data */ 
         for (col = 0; col < ncols; col++)

imagery/i.cca/transform.c

@@ -21,7 +21,7 @@ transform(int datafds[MX], int outfds[MX], int rows, int cols,
     for (i = 0; i < rows; i++) {
 	/* get one row of data */
 	for (j = 1; j <= bands; j++)
-	    if (Rast_get_map_row(datafds[j], rowbufs[j], i) < 0)
+	    if (Rast_get_c_row(datafds[j], rowbufs[j], i) < 0)
 		G_fatal_error(_("Error reading cell map during transform."));
 
 	/* transform each cell in the row */

imagery/i.class/draw_cell.c

@@ -51,7 +51,7 @@ int draw_cell(View * view, int overlay)
     D_set_overlay_mode(!overlay);
     D_cell_draw_setup(top, top + nrows, left, left + ncols);
     for (row = 0; row < nrows; row++) {
-	if (Rast_get_d_raster_row_nomask(fd, dcell, row) < 0)
+	if (Rast_get_d_row_nomask(fd, dcell, row) < 0)
 	    break;
 	D_draw_d_raster(row, dcell, &colr);
     }

imagery/i.class/readbands.c

@@ -8,7 +8,7 @@ int readbands(int nbands, int cur)
     register int i;
 
     for (i = 0; i < nbands; i++)
-	if (Rast_get_map_row_nomask(Bandfd[i], Bandbuf[i], cur) < 0)
+	if (Rast_get_c_row_nomask(Bandfd[i], Bandbuf[i], cur) < 0)
 	    G_fatal_error(_("Error reading raster map in function readbands."));
 
     return 0;

imagery/i.cluster/main.c

@@ -277,7 +277,7 @@ int main(int argc, char *argv[])
     for (row = sample_rows - 1; row < nrows; row += sample_rows) {
 	G_percent(row, nrows, 2);
 	for (n = 0; n < ref.nfiles; n++)
-	    if (Rast_get_d_raster_row(cellfd[n], cell[n], row) < 0)
+	    if (Rast_get_d_row(cellfd[n], cell[n], row) < 0)
 		G_fatal_error(_("Unable to read raster map row %d"),
 			      row);
 	for (col = sample_cols - 1; col < ncols; col += sample_cols) {

imagery/i.eb.eta/main.c

@@ -105,11 +105,11 @@ int main(int argc, char *argv[])
 	G_percent(row, nrows, 2);
 	
 	/* read input maps */ 
-	if (Rast_get_d_raster_row(infd_rnetday,inrast_rnetday,row)<0)
+	if (Rast_get_d_row(infd_rnetday,inrast_rnetday,row)<0)
 	    G_fatal_error(_("Unable to read from <%s> row %d"), rnetday, row);
-	if (Rast_get_d_raster_row(infd_evapfr,inrast_evapfr,row)<0)
+	if (Rast_get_d_row(infd_evapfr,inrast_evapfr,row)<0)
 	    G_fatal_error(_("Unable to read from <%s> row %d"), evapfr, row);
-	if (Rast_get_d_raster_row(infd_tempk,inrast_tempk,row)<0)
+	if (Rast_get_d_row(infd_tempk,inrast_tempk,row)<0)
 	    G_fatal_error(_("Unable to read from <%s> row %d"), tempk, row);
 	
     /*process the data */ 

imagery/i.eb.evapfr/main.c

@@ -134,11 +134,11 @@ int main(int argc, char *argv[])
 	G_percent(row, nrows, 2);
 	
         /* read input maps */ 
-        if (Rast_get_d_raster_row(infd_rnet, inrast_rnet, row)<0)
+        if (Rast_get_d_row(infd_rnet, inrast_rnet, row)<0)
 	  G_fatal_error(_("Unable to read raster map <%s> row %d"), rnet, row);
-	if (Rast_get_d_raster_row(infd_g0, inrast_g0, row) < 0)
+	if (Rast_get_d_row(infd_g0, inrast_g0, row) < 0)
 	  G_fatal_error(_("Unable to read raster map <%s> row %d"), g0, row);
-	if (Rast_get_d_raster_row(infd_h0, inrast_h0, row) < 0)
+	if (Rast_get_d_row(infd_h0, inrast_h0, row) < 0)
 	  G_fatal_error(_("Unable to read raster map <%s> row %d"), h0, row);
 	
         /*process the data */ 

imagery/i.eb.h_SEBAL01/main.c

@@ -280,11 +280,11 @@ int main(int argc, char *argv[])
 	for (row = 0; row < nrows; row++) {
 	    DCELL d_t0dem;
 	    G_percent(row, nrows, 2);
-	    if (Rast_get_d_raster_row(infd_t0dem,inrast_t0dem,row)<0)
+	    if (Rast_get_d_row(infd_t0dem,inrast_t0dem,row)<0)
 	      G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
-	    if (Rast_get_d_raster_row(infd_Rn,inrast_Rn,row)<0)
+	    if (Rast_get_d_row(infd_Rn,inrast_Rn,row)<0)
 	      G_fatal_error(_("Unable to read raster map <%s> row %d"), Rn, row);
-	    if (Rast_get_d_raster_row(infd_g0,inrast_g0,row)<0)
+	    if (Rast_get_d_row(infd_g0,inrast_g0,row)<0)
 	      G_fatal_error(_("Unable to read raster map <%s> row %d"), g0, row);
 	    /*process the data */
 	    for (col = 0; col < ncols; col++) {
@@ -353,11 +353,11 @@ int main(int argc, char *argv[])
     }
     rowDry = row;
     colDry = col;
-    if (Rast_get_d_raster_row(infd_Rn, inrast_Rn, row) < 0)
+    if (Rast_get_d_row(infd_Rn, inrast_Rn, row) < 0)
 	G_fatal_error(_("Unable to read raster map <%s> row %d"), Rn, row);
-    if (Rast_get_d_raster_row(infd_g0, inrast_g0, row) < 0)
+    if (Rast_get_d_row(infd_g0, inrast_g0, row) < 0)
 	G_fatal_error(_("Unable to read raster map <%s> row %d"), g0, row);
-    if (Rast_get_d_raster_row(infd_t0dem, inrast_t0dem, row) < 0)
+    if (Rast_get_d_row(infd_t0dem, inrast_t0dem, row) < 0)
 	G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
     d_Rn_dry = ((DCELL *) inrast_Rn)[col];
     d_g0_dry = ((DCELL *) inrast_g0)[col];
@@ -376,7 +376,7 @@ int main(int argc, char *argv[])
     }
     rowWet = row;
     colWet = col;
-    if (Rast_get_d_raster_row(infd_t0dem, inrast_t0dem, row) < 0)
+    if (Rast_get_d_row(infd_t0dem, inrast_t0dem, row) < 0)
 	G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
     d_t0dem_wet = ((DCELL *) inrast_t0dem)[col];
     /* END OF MANUAL WET/DRY PIXELS */
@@ -398,9 +398,9 @@ int main(int argc, char *argv[])
 	DCELL d_u5;
 	G_percent(row, nrows, 2);
 	/* read a line input maps into buffers */
-	if (Rast_get_d_raster_row(infd_z0m, inrast_z0m, row) < 0)
+	if (Rast_get_d_row(infd_z0m, inrast_z0m, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), z0m, row);
-	if (Rast_get_d_raster_row(infd_t0dem, inrast_t0dem,row)<0)
+	if (Rast_get_d_row(infd_t0dem, inrast_t0dem,row)<0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
 	/* read every cell in the line buffers */
 	for (col = 0; col < ncols; col++) {
@@ -461,9 +461,9 @@ int main(int argc, char *argv[])
 	DCELL d_u5;
 	G_percent(row, nrows, 2);
 	/* read a line input maps into buffers */
-	if (Rast_get_d_raster_row(infd_z0m, inrast_z0m, row) < 0)
+	if (Rast_get_d_row(infd_z0m, inrast_z0m, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), z0m, row);
-	if (Rast_get_d_raster_row(infd_t0dem, inrast_t0dem,row)<0)
+	if (Rast_get_d_row(infd_t0dem, inrast_t0dem,row)<0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
 	/* read every cell in the line buffers */
 	for (col = 0; col < ncols; col++) {
@@ -530,9 +530,9 @@ int main(int argc, char *argv[])
 	DCELL d_u5;
 	G_percent(row, nrows, 2);
 	/* read a line input maps into buffers */
-	if (Rast_get_d_raster_row(infd_z0m,inrast_z0m,row)<0)
+	if (Rast_get_d_row(infd_z0m,inrast_z0m,row)<0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), z0m, row);
-	if (Rast_get_d_raster_row(infd_t0dem,inrast_t0dem,row)<0)
+	if (Rast_get_d_row(infd_t0dem,inrast_t0dem,row)<0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
 	/* read every cell in the line buffers */
 	for (col = 0; col < ncols; col++) {
@@ -600,9 +600,9 @@ int main(int argc, char *argv[])
 	DCELL d;		/* Output pixel */
 	G_percent(row, nrows, 2);
 	/* read a line input maps into buffers */
-	if (Rast_get_d_raster_row(infd_z0m, inrast_z0m, row) < 0)
+	if (Rast_get_d_row(infd_z0m, inrast_z0m, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), z0m, row);
-	if (Rast_get_d_raster_row(infd_t0dem,inrast_t0dem,row)<0)
+	if (Rast_get_d_row(infd_t0dem,inrast_t0dem,row)<0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), t0dem, row);
 	/* read every cell in the line buffers */
 	for (col = 0; col < ncols; col++) {

imagery/i.eb.soilheatflux/main.c

@@ -133,19 +133,19 @@ int main(int argc, char *argv[])
 	DCELL d_time;
 	G_percent(row, nrows, 2);	
         /* read input maps */ 
-        if (Rast_get_d_raster_row(infd_albedo, inrast_albedo, row) < 0)
+        if (Rast_get_d_row(infd_albedo, inrast_albedo, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  albedo, row);
-	if (Rast_get_d_raster_row(infd_ndvi, inrast_ndvi, row)<0)
+	if (Rast_get_d_row(infd_ndvi, inrast_ndvi, row)<0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  ndvi, row);
-	if (Rast_get_d_raster_row(infd_tempk, inrast_tempk, row)< 0)
+	if (Rast_get_d_row(infd_tempk, inrast_tempk, row)< 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  tempk, row);
-	if (Rast_get_d_raster_row(infd_rnet, inrast_rnet, row)<0)
+	if (Rast_get_d_row(infd_rnet, inrast_rnet, row)<0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  rnet, row);
-	if (Rast_get_d_raster_row(infd_time, inrast_time, row)<0)
+	if (Rast_get_d_row(infd_time, inrast_time, row)<0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  time, row);
         /*process the data */ 

imagery/i.emissivity/main.c

@@ -83,7 +83,7 @@ int main(int argc, char *argv[])
 	G_percent(row, nrows, 2);
 	
         /* read input maps */ 
-        if (Rast_get_raster_row(infd,inr,row,DCELL_TYPE)< 0)
+        if (Rast_get_row(infd,inr,row,DCELL_TYPE)< 0)
 	    G_fatal_error(_("Could not read from <%s>"), ndvi);
 	
         /*process the data */ 

imagery/i.evapo.time_integration/main.c

@@ -283,15 +283,15 @@ int main(int argc, char *argv[])
 
 	/* read input map */
 	for (i = 1; i <= nfiles; i++) 
-	    if ((Rast_get_d_raster_row(infd[i], inrast[i], row)) <	0) 
+	    if ((Rast_get_d_row(infd[i], inrast[i], row)) <	0) 
 		G_fatal_error(_("Unable to read raster map <%s> row %d"), name, row);
 	
 	for (i = 1; i <= nfiles1; i++) 
-	    if ((Rast_get_d_raster_row(infd1[i], inrast1[i], row)) < 0) 
+	    if ((Rast_get_d_row(infd1[i], inrast1[i], row)) < 0) 
 		G_fatal_error(_("Unable to read raster map <%s> row %d"), name1, row);
 
 	for (i = 1; i <= nfiles2; i++) 
-	    if ((Rast_get_d_raster_row (infd2[i], inrast2[i], row)) < 0) 
+	    if ((Rast_get_d_row (infd2[i], inrast2[i], row)) < 0) 
 		G_fatal_error(_("Unable to read raster map <%s> row %d"), name2, row);
 
 	/*process the data */

imagery/i.fft/main.c

@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
     G_message(_("Reading the raster map <%s>..."),
 	      Cellmap_orig);
     for (i = 0; i < rows; i++) {
-	if (Rast_get_d_raster_row(inputfd, cell_real, i) < 0)
+	if (Rast_get_d_row(inputfd, cell_real, i) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  Cellmap_orig, i);
 	for (j = 0; j < cols; j++) {

imagery/i.gensig/covariance.c

@@ -33,7 +33,7 @@ int compute_covariances(struct files *files, struct Signature *S)
 	G_percent(row, nrows, 2);
 	read_training_map(class, row, ncols, files);
 	for (b = 0; b < files->nbands; b++)	/* NOTE: files->nbands == S->nbands */
-	    if (Rast_get_d_raster_row(files->band_fd[b], files->band_cell[b], row) < 0)
+	    if (Rast_get_d_row(files->band_fd[b], files->band_cell[b], row) < 0)
 		G_fatal_error(_("Unable to read raster map row %d"),
 			      row);
 	for (b1 = 0; b1 < files->nbands; b1++) {

imagery/i.gensig/get_train.c

@@ -32,7 +32,7 @@ int get_training_classes(struct files *files, struct Signature *S)
     G_message(_("Finding training classes..."));
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 2);
-	if (Rast_get_c_raster_row(fd, cell, row) < 0)
+	if (Rast_get_c_row(fd, cell, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), cell,
 			  row);
 	Rast_update_cell_stats(cell, ncols, &cell_stats);

imagery/i.gensig/means.c

@@ -29,7 +29,7 @@ int compute_means(struct files *files, struct Signature *S)
 	G_percent(row, nrows, 2);
 	read_training_map(class, row, ncols, files);
 	for (b = 0; b < files->nbands; b++) {	/* NOTE: files->nbands == S->nbands */
-	    if (Rast_get_d_raster_row(files->band_fd[b], cell = files->band_cell[b], row) < 0)
+	    if (Rast_get_d_row(files->band_fd[b], cell = files->band_cell[b], row) < 0)
 		exit(1);
 	    for (col = 0; col < ncols; col++) {
 		if (Rast_is_d_null_value(&cell[col])) {

imagery/i.gensig/read_train.c

@@ -9,7 +9,7 @@
 
 int read_training_map(CELL * class, int row, int ncols, struct files *files)
 {
-    if (Rast_get_c_raster_row(files->train_fd, files->train_cell, row) < 0)
+    if (Rast_get_c_row(files->train_fd, files->train_cell, row) < 0)
 	G_fatal_error(_("Unable to read raster map row %d"),
 		      row);
     lookup_class(files->train_cell, ncols, files->training_cats, files->ncats,

imagery/i.gensigset/get_train.c

@@ -35,7 +35,7 @@ int get_training_classes(struct parms *parms,
     G_message(_("Finding training classes..."));
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 2);
-	if (Rast_get_c_raster_row(fd, cell, row) < 0)
+	if (Rast_get_c_row(fd, cell, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), cell,
 			  row);
 	Rast_update_cell_stats(cell, ncols, &cell_stats);

imagery/i.gensigset/read_data.c

@@ -25,7 +25,7 @@ int read_data(struct files *files, struct SigSet *S)
 	G_percent(row, nrows, 2);
 	read_training_map(class, row, ncols, files);
 	for (b = 0; b < files->nbands; b++)
-	    if (Rast_get_d_raster_row
+	    if (Rast_get_d_row
 		(files->band_fd[b], files->band_cell[b], row) < 0)
 		G_fatal_error(_("Unable to read raster map row %d"),
 			      row);

imagery/i.gensigset/read_train.c

@@ -9,7 +9,7 @@
 
 int read_training_map(CELL * class, int row, int ncols, struct files *files)
 {
-    if (Rast_get_c_raster_row(files->train_fd, files->train_cell, row) < 0)
+    if (Rast_get_c_row(files->train_fd, files->train_cell, row) < 0)
 	G_fatal_error(_("Unable to read raster map row %d"),
 		      row);
     lookup_class(files->train_cell, ncols, files->training_cats, files->ncats,

imagery/i.his.rgb/main.c

@@ -94,7 +94,7 @@ int main(int argc, char **argv)
 
 	/* read in a row from each cell map */
 	for (band = 0; band < 3; band++)
-	    if (Rast_get_map_row(fd_input[band], rowbuffer[band], i) < 0)
+	    if (Rast_get_c_row(fd_input[band], rowbuffer[band], i) < 0)
 		G_fatal_error(_("Unable to read raster map row %d"), i);
 
 	/* process this row of the map */

imagery/i.ifft/main.c

@@ -147,10 +147,10 @@ int main(int argc, char *argv[])
     /* Read in cell map values */
     G_message(_("Reading raster maps..."));
     for (i = 0; i < rows; i++) {
-	if (Rast_get_d_raster_row(realfd, cell_real, i) < 0)
+	if (Rast_get_d_row(realfd, cell_real, i) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  Cellmap_real, i);
-	if (Rast_get_d_raster_row(imagfd, cell_imag, i) < 0)
+	if (Rast_get_d_row(imagfd, cell_imag, i) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  Cellmap_imag, i);
 	for (j = 0; j < cols; j++) {
@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
 	maskbuf = Rast_allocate_c_buf();
 
 	for (i = 0; i < rows; i++) {
-	    Rast_get_map_row(maskfd, maskbuf, i);
+	    Rast_get_c_row(maskfd, maskbuf, i);
 	    for (j = 0; j < cols; j++) {
 		if (maskbuf[j] == 0) {
 		    data[C(i, j)][0] = 0.0;

imagery/i.latlong/main.c

@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
     {
 	G_percent(row, nrows, 2);
 
-	if (Rast_get_d_raster_row(infd, inrast, row) < 0)
+	if (Rast_get_d_row(infd, inrast, row) < 0)
 	    G_fatal_error(_("Could not read from <%s>"), in);
 
 	for (col = 0; col < ncols; col++)

imagery/i.maxlik/main.c

@@ -109,7 +109,7 @@ int main(int argc, char *argv[])
 	G_percent(row, nrows, 2);
 
 	for (band = 0; band < Ref.nfiles; band++)
-	    if (Rast_get_d_raster_row(cellfd[band], cell[band], row) < 0)
+	    if (Rast_get_d_row(cellfd[band], cell[band], row) < 0)
 		G_fatal_error(_("Unable to read raster map row %d"),
 			      row);
 	

imagery/i.modis.qc/main.c

@@ -219,7 +219,7 @@ int main(int argc, char *argv[])
     {
 	CELL c;
 	G_percent(row, nrows, 2);
-	if (Rast_get_c_raster_row(infd, inrast, row) < 0)
+	if (Rast_get_c_row(infd, inrast, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  qcchan, row);
 

imagery/i.pca/main.c

@@ -254,7 +254,7 @@ static int calc_mu(int *fds, double *mu, int bands)
 	    if(G_verbose() > G_verbose_std())
 		G_percent(row, rows - 1, 2);
 
-	    if (Rast_get_raster_row(fds[i], rowbuf, row, maptype) < 0)
+	    if (Rast_get_row(fds[i], rowbuf, row, maptype) < 0)
 		G_fatal_error(_("Unable to read raster map row %d"), row);
 
 	    for (col = 0; col < cols; col++) {
@@ -305,7 +305,7 @@ static int calc_covariance(int *fds, double **covar, double *mu, int bands)
 	    if(G_verbose() > G_verbose_std())
 		G_percent(row, rows - 1, 2);
 
-	    if (Rast_get_raster_row(fds[j], rowbuf1, row, maptype) < 0)
+	    if (Rast_get_row(fds[j], rowbuf1, row, maptype) < 0)
 		G_fatal_error(_("Unable to read raster map row %d"), row);
 
 	    for (k = j; k < bands; k++) {
@@ -317,7 +317,7 @@ static int calc_covariance(int *fds, double **covar, double *mu, int bands)
 		if ((rowbuf2 = Rast_allocate_buf(maptype2)) == NULL)
 		    G_fatal_error(_("Unable to allocate memory for row buffer"));
 
-		if (Rast_get_raster_row(fds[k], rowbuf2, row, maptype2) < 0)
+		if (Rast_get_row(fds[k], rowbuf2, row, maptype2) < 0)
 		    G_fatal_error(_("Unable to read raster map row %d"), row);
 
 		ptr1 = rowbuf1;
@@ -432,7 +432,7 @@ write_pca(double **eigmat, int *inp_fd, char *out_basename,
 		    if (!(rowbuf = Rast_allocate_buf(maptype)))
 			G_fatal_error(_("Unable allocate memory for row buffer"));
 
-		    if (Rast_get_raster_row(inp_fd[j], rowbuf, row, maptype) < 0)
+		    if (Rast_get_row(inp_fd[j], rowbuf, row, maptype) < 0)
 			G_fatal_error(_("Unable to read raster map row %d"), row);
 
 		    rowptr = rowbuf;

imagery/i.points/drawcell.c

@@ -59,7 +59,7 @@ int drawcell(View * view)
 
     D_cell_draw_setup(top, top + nrows, left, left + ncols);
     for (row = 0; row < nrows; row++) {
-	if (Rast_get_d_raster_row_nomask(fd, dcell, row) < 0)
+	if (Rast_get_d_row_nomask(fd, dcell, row) < 0)
 	    break;
 	D_draw_d_raster(row, dcell, colors);
     }

imagery/i.rectify/perform.c

@@ -39,7 +39,7 @@ int perform_georef(int infd, void *rast)
 	   fprintf (stderr, "read row %d\n", row);
 	 */
 
-	if (Rast_get_raster_row_nomask
+	if (Rast_get_row_nomask
 	    (infd, G_incr_void_ptr(rast, rast_size), row, map_type) < 0)
 	    return 0;
 

imagery/i.rgb.his/main.c

@@ -92,7 +92,7 @@ int main(int argc, char **argv)
 	G_percent(i, rows, 2);
 
 	for (band = 0; band < 3; band++)
-	    if (Rast_get_map_row(fd_input[band], rowbuffer[band], i) < 0)
+	    if (Rast_get_c_row(fd_input[band], rowbuffer[band], i) < 0)
 		G_fatal_error(_("Unable to read raster map row %d"), i);
 
 	/* process this row of the map */

imagery/i.smap/read_block.c

@@ -14,7 +14,7 @@ int read_block(DCELL *** img,	/* img[band][row[col] */
 
     for (band = 0; band < files->nbands; band++) {
 	for (row = region->ymin; row < region->ymax; row++) {
-	    if (Rast_get_d_raster_row(files->band_fd[band], files->cellbuf, row)
+	    if (Rast_get_d_row(files->band_fd[band], files->cellbuf, row)
 		< 0)
 		G_fatal_error(_("Unable to read raster map row %d"),
 			      row);

imagery/i.sunhours/main.c

@@ -99,9 +99,9 @@ int main(int argc, char *argv[])
 	DCELL d_doy;
 	G_percent(row, nrows, 2);
 
-	if (Rast_get_raster_row(infd_doy, inrast_doy, row, DCELL_TYPE) < 0)
+	if (Rast_get_row(infd_doy, inrast_doy, row, DCELL_TYPE) < 0)
 	    G_fatal_error(_("Could not read from <%s>"), doy);
-	if (Rast_get_raster_row(infd_lat, inrast_lat, row, DCELL_TYPE) < 0)
+	if (Rast_get_row(infd_lat, inrast_lat, row, DCELL_TYPE) < 0)
 	    G_fatal_error(_("Could not read from <%s>"), lat);
 
 	for (col = 0; col < ncols; col++)

imagery/i.vi/main.c

@@ -264,31 +264,31 @@ int main(int argc, char *argv[])
 
 	G_percent(row, nrows, 2);
 
-	if (Rast_get_d_raster_row(infd_redchan, inrast_redchan, row) < 0)
+	if (Rast_get_d_row(infd_redchan, inrast_redchan, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  redchan, row);
 	if (nirchan) {
-	    if (Rast_get_d_raster_row(infd_nirchan, inrast_nirchan, row) < 0)
+	    if (Rast_get_d_row(infd_nirchan, inrast_nirchan, row) < 0)
 	        G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      nirchan, row);
         }
 	if (greenchan) {
-	    if (Rast_get_d_raster_row(infd_greenchan, inrast_greenchan, row) < 0)
+	    if (Rast_get_d_row(infd_greenchan, inrast_greenchan, row) < 0)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      greenchan, row);
 	}
 	if (bluechan) {
-	    if (Rast_get_d_raster_row(infd_bluechan, inrast_bluechan, row) < 0)
+	    if (Rast_get_d_row(infd_bluechan, inrast_bluechan, row) < 0)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      bluechan, row);
 	}
 	if (chan5chan) {
-	    if (Rast_get_d_raster_row(infd_chan5chan, inrast_chan5chan, row) < 0)
+	    if (Rast_get_d_row(infd_chan5chan, inrast_chan5chan, row) < 0)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      chan5chan, row);
 	}
 	if (chan7chan) {
-	    if (Rast_get_d_raster_row(infd_chan7chan, inrast_chan7chan, row) < 0)
+	    if (Rast_get_d_row(infd_chan7chan, inrast_chan7chan, row) < 0)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      chan7chan, row);
 	}

imagery/i.vpoints/drawcell.c

@@ -69,7 +69,7 @@ int drawcell(View * view, int initflag)
 
     D_cell_draw_setup(top, top + nrows, left, left + ncols);
     for (row = 0; row < nrows; row++) {
-	if (Rast_get_d_raster_row_nomask(fd, dcell, row) < 0)
+	if (Rast_get_d_row_nomask(fd, dcell, row) < 0)
 	    break;
 	D_draw_d_raster(row, dcell, colors);
     }

imagery/i.zc/main.c

@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
     /* Read in cell map values */
     G_message(_("Reading raster map..."));
     for (i = 0; i < or; i++) {
-	if (Rast_get_map_row(inputfd, cell_row, i) < 0)
+	if (Rast_get_c_row(inputfd, cell_row, i) < 0)
 	    G_fatal_error(_("Error while reading input raster map."));
 
 	for (j = 0; j < oc; j++)

include/raster.h

@@ -296,20 +296,18 @@ int Rast_close_gdal_write_link(struct GDAL_link *);
 int Rast_get_cellhd(const char *, const char *, struct Cell_head *);
 
 /* get_row.c */
-int Rast_get_map_row_nomask(int, CELL *, int);
-int Rast_get_raster_row_nomask(int, void *, int, RASTER_MAP_TYPE);
-int Rast_get_c_raster_row_nomask(int, CELL *, int);
-int Rast_get_f_raster_row_nomask(int, FCELL *, int);
-int Rast_get_d_raster_row_nomask(int, DCELL *, int);
-int Rast_get_map_row(int, CELL *, int);
-int Rast_get_raster_row(int, void *, int, RASTER_MAP_TYPE);
-int Rast_get_c_raster_row(int, CELL *, int);
-int Rast_get_f_raster_row(int, FCELL *, int);
-int Rast_get_d_raster_row(int, DCELL *, int);
+int Rast_get_row_nomask(int, void *, int, RASTER_MAP_TYPE);
+int Rast_get_c_row_nomask(int, CELL *, int);
+int Rast_get_f_row_nomask(int, FCELL *, int);
+int Rast_get_d_row_nomask(int, DCELL *, int);
+int Rast_get_row(int, void *, int, RASTER_MAP_TYPE);
+int Rast_get_c_row(int, CELL *, int);
+int Rast_get_f_row(int, FCELL *, int);
+int Rast_get_d_row(int, DCELL *, int);
 int Rast_get_null_value_row(int, char *, int);
 
 /* get_row_colr.c */
-int Rast_get_raster_row_colors(int, int, struct Colors *,
+int Rast_get_row_colors(int, int, struct Colors *,
 			    unsigned char *, unsigned char *, unsigned char *,
 			    unsigned char *);
 /* histo_eq.c */

lib/gpde/N_arrays_io.c

@@ -100,7 +100,7 @@ N_array_2d *N_read_rast_to_array_2d(char *name, N_array_2d * array)
     for (y = 0; y < rows; y++) {
 	G_percent(y, rows - 1, 10);
 
-	if (!Rast_get_raster_row(map, rast, y, type)) {
+	if (!Rast_get_row(map, rast, y, type)) {
 	    Rast_close(map);
 	    G_fatal_error(_("Could not get raster row"));
 	}

lib/ogsf/Gs3.c

@@ -143,7 +143,7 @@ int Gs_loadmap_as_float(struct Cell_head *wind, const char *map_name,
 
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
-	Rast_get_f_raster_row(cellfile, &(buff[offset]), row);
+	Rast_get_f_row(cellfile, &(buff[offset]), row);
 	Rast_get_null_value_row(cellfile, nullflags, row);
 
 	G_percent(row, wind->rows, 2);
@@ -218,7 +218,7 @@ int Gs_loadmap_as_int(struct Cell_head *wind, const char *map_name, int *buff,
 
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
-	Rast_get_c_raster_row(cellfile, &(buff[offset]), row);
+	Rast_get_c_row(cellfile, &(buff[offset]), row);
 	Rast_get_null_value_row(cellfile, nullflags, row);
 
 	G_percent(row, wind->rows, 2);
@@ -381,7 +381,7 @@ int Gs_loadmap_as_short(struct Cell_head *wind, const char *map_name,
 
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
-	Rast_get_c_raster_row(cellfile, tmp_buf, row);
+	Rast_get_c_row(cellfile, tmp_buf, row);
 	Rast_get_null_value_row(cellfile, nullflags, row);
 
 	G_percent(row, wind->rows, 2);
@@ -497,7 +497,7 @@ int Gs_loadmap_as_char(struct Cell_head *wind, const char *map_name,
 
     for (row = 0; row < wind->rows; row++) {
 	offset = row * wind->cols;
-	Rast_get_c_raster_row(cellfile, tmp_buf, row);
+	Rast_get_c_row(cellfile, tmp_buf, row);
 	Rast_get_null_value_row(cellfile, nullflags, row);
 	tc = (unsigned char *)&(buff[offset]);
 	ti = tmp_buf;
@@ -844,7 +844,7 @@ int Gs_get_cat_label(const char *filename, int drow, int dcol, char *catstr)
 	if (map_type == CELL_TYPE) {
 	    buf = Rast_allocate_c_buf();
 
-	    if (Rast_get_c_raster_row(fd, buf, drow) < 0) {
+	    if (Rast_get_c_row(fd, buf, drow) < 0) {
 		sprintf(catstr, "error");
 	    }
 	    else if (Rast_is_c_null_value(&buf[dcol])) {
@@ -863,7 +863,7 @@ int Gs_get_cat_label(const char *filename, int drow, int dcol, char *catstr)
 	    /* fp map */
 	    dbuf = Rast_allocate_d_buf();
 
-	    if (Rast_get_d_raster_row(fd, dbuf, drow) < 0) {
+	    if (Rast_get_d_row(fd, dbuf, drow) < 0) {
 		sprintf(catstr, "error");
 	    }
 	    else if (Rast_is_d_null_value(&dbuf[dcol])) {

lib/raster/get_row.c

@@ -685,13 +685,13 @@ static int get_map_row(int fd, void *rast, int row, RASTER_MAP_TYPE data_type,
 }
 
 /*!
- * \brief Read raster row without masking (this routine is deprecated)
+ * \brief Read raster row without masking
  *
  * This routine reads the specified <em>row</em> from the raster map
  * open on file descriptor <em>fd</em> into the <em>buf</em> buffer
- * like Rast_get_map_row() does. The difference is that masking is
- * suppressed. If the user has a mask set, Rast_get_map_row() will apply
- * the mask but Rast_get_map_row_nomask() will ignore it. This routine
+ * like Rast_get_c_row() does. The difference is that masking is
+ * suppressed. If the user has a mask set, Rast_get_c_row() will apply
+ * the mask but Rast_get_c_row_nomask() will ignore it. This routine
  * prints a diagnostic message and returns -1 if there is an error
  * reading the raster map. Otherwise a nonnegative value is returned.
  *
@@ -704,27 +704,6 @@ static int get_map_row(int fd, void *rast, int row, RASTER_MAP_TYPE data_type,
  * the region. However, the number of GRASS modules which do this
  * should be minimal. See Mask for more information about the mask.
  *
- * <b>This routine is deprecated! Use Rast_get_raster_row_nomask()
- * instead.</b>
- *
- * \param fd file descriptor for the opened raster map
- * \param buf buffer for the row to be placed into
- * \param row data row desired
- *
- * \return 1 on success
- * \return 0 row requested not within window
- * \return -1 on error
- */
-int Rast_get_map_row_nomask(int fd, CELL * buf, int row)
-{
-    return get_map_row(fd, buf, row, CELL_TYPE, 1, 0);
-}
-
-/*!
- * \brief Read raster row without masking
- *
- *  Same as Rast_get_raster_row() except no masking occurs.
- *
  * \param fd file descriptor for the opened raster map
  * \param buf buffer for the row to be placed into
  * \param row data row desired
@@ -734,8 +713,8 @@ int Rast_get_map_row_nomask(int fd, CELL * buf, int row)
  * \return 0 row requested not within window
  * \return -1 on error
  */
-int Rast_get_raster_row_nomask(int fd, void *buf, int row,
-			    RASTER_MAP_TYPE data_type)
+int Rast_get_row_nomask(int fd, void *buf, int row,
+			  RASTER_MAP_TYPE data_type)
 {
     return get_map_row(fd, buf, row, data_type, 0, 0);
 }
@@ -743,7 +722,7 @@ int Rast_get_raster_row_nomask(int fd, void *buf, int row,
 /*!
  * \brief Read raster row without masking (CELL type)
  *
- *  Same as Rast_get_c_raster_row() except no masking occurs.
+ *  Same as Rast_get_c_row() except no masking occurs.
  *
  * \param fd file descriptor for the opened raster map
  * \param buf buffer for the row to be placed into
@@ -754,15 +733,15 @@ int Rast_get_raster_row_nomask(int fd, void *buf, int row,
  * \return 0 row requested not within window
  * \return -1 on error
  */
-int Rast_get_c_raster_row_nomask(int fd, CELL * buf, int row)
+int Rast_get_c_row_nomask(int fd, CELL *buf, int row)
 {
-    return Rast_get_raster_row_nomask(fd, buf, row, CELL_TYPE);
+    return Rast_get_row_nomask(fd, buf, row, CELL_TYPE);
 }
 
 /*!
  * \brief Read raster row without masking (FCELL type)
  *
- *  Same as Rast_get_f_raster_row() except no masking occurs.
+ *  Same as Rast_get_f_row() except no masking occurs.
  *
  * \param fd file descriptor for the opened raster map
  * \param buf buffer for the row to be placed into
@@ -773,15 +752,15 @@ int Rast_get_c_raster_row_nomask(int fd, CELL * buf, int row)
  * \return 0 row requested not within window
  * \return -1 on error
  */
-int Rast_get_f_raster_row_nomask(int fd, FCELL * buf, int row)
+int Rast_get_f_row_nomask(int fd, FCELL * buf, int row)
 {
-    return Rast_get_raster_row_nomask(fd, buf, row, FCELL_TYPE);
+    return Rast_get_row_nomask(fd, buf, row, FCELL_TYPE);
 }
 
 /*!
  * \brief Read raster row without masking (DCELL type)
  *
- *  Same as Rast_get_d_raster_row() except no masking occurs.
+ *  Same as Rast_get_d_row() except no masking occurs.
  *
  * \param fd file descriptor for the opened raster map
  * \param buf buffer for the row to be placed into
@@ -792,42 +771,18 @@ int Rast_get_f_raster_row_nomask(int fd, FCELL * buf, int row)
  * \return 0 row requested not within window
  * \return -1 on error
  */
-int Rast_get_d_raster_row_nomask(int fd, DCELL * buf, int row)
-{
-    return Rast_get_raster_row_nomask(fd, buf, row, DCELL_TYPE);
-}
-
-/*!
- * \brief Get raster row (this routine is deprecated!)
- *
- * If the map is floating-point, quantize the floating-point values to
- * integer using the quantization rules established for the map when
- * the map was opened for reading (this quantization is read from
- * cell_misc/name/f_quant file, but can be reset after opening raster
- * map by Rast_set_quant_rules()). NULL values are converted to zeros.
- *
- * <b>This routine is deprecated! Use Rast_get_raster_row() instead.</b>
- *
- * \param fd file descriptor for the opened raster map
- * \param buf buffer for the row to be placed into
- * \param row data row desired
- *
- * \return 1 on success
- * \return 0 row requested not within window
- * \return -1 on error
- */
-int Rast_get_map_row(int fd, CELL * buf, int row)
+int Rast_get_d_row_nomask(int fd, DCELL * buf, int row)
 {
-    return get_map_row(fd, buf, row, CELL_TYPE, 1, 1);
+    return Rast_get_row_nomask(fd, buf, row, DCELL_TYPE);
 }
 
 /*!
  * \brief Get raster row
  *
  * If <em>data_type</em> is
- *  - CELL_TYPE, calls Rast_get_c_raster_row()
- *  - FCELL_TYPE, calls Rast_get_f_raster_row()
- *  - DCELL_TYPE, calls Rast_get_d_raster_row()
+ *  - CELL_TYPE, calls Rast_get_c_row()
+ *  - FCELL_TYPE, calls Rast_get_f_row()
+ *  - DCELL_TYPE, calls Rast_get_d_row()
  *
  *   Reads appropriate information into the buffer <em>buf</em> associated 
  *   with the requested row <em>row</em>. <em>buf</em> is associated with the
@@ -849,9 +804,9 @@ int Rast_get_map_row(int fd, CELL * buf, int row)
  *            mask exists. (the MASK is taken care of by null values
  *            (if the null file doesn't exist for this map, then the null row
  *            is simulated by assuming that all zero are nulls *** in case
- *            of Rast_get_raster_row() and assuming that all data is valid 
+ *            of Rast_get_row() and assuming that all data is valid 
  *            in case of G_get_f/d_raster_row(). In case of deprecated function
- *            Rast_get_map_row() all nulls are converted to zeros (so there are
+ *            Rast_get_c_row() all nulls are converted to zeros (so there are
  *            no embedded nulls at all). Also all masked out cells become zeros.
  *
  * \param fd file descriptor for the opened raster map
@@ -863,7 +818,7 @@ int Rast_get_map_row(int fd, CELL * buf, int row)
  * \return 0 row requested not within window
  * \return -1 on error
  */
-int Rast_get_raster_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
+int Rast_get_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
 {
     return get_map_row(fd, buf, row, data_type, 0, 1);
 }
@@ -872,7 +827,7 @@ int Rast_get_raster_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
  * \brief Get raster row (CELL type)
  *
  * Reads a row of raster data and leaves the NULL values intact. (As
- * opposed to the deprecated function Rast_get_map_row() which
+ * opposed to the deprecated function Rast_get_c_row() which
  * converts NULL values to zero.) 
  *
  * <b>NOTE.</b> When the raster map is old and null file doesn't
@@ -889,9 +844,9 @@ int Rast_get_raster_row(int fd, void *buf, int row, RASTER_MAP_TYPE data_type)
  * \return 0 row requested not within window
  * \return -1 on error
  */
-int Rast_get_c_raster_row(int fd, CELL * buf, int row)
+int Rast_get_c_row(int fd, CELL * buf, int row)
 {
-    return Rast_get_raster_row(fd, buf, row, CELL_TYPE);
+    return Rast_get_row(fd, buf, row, CELL_TYPE);
 }
 
 /*!
@@ -911,15 +866,15 @@ int Rast_get_c_raster_row(int fd, CELL * buf, int row)
  * \return 0 row requested not within window
  * \return -1 on error
  */
-int Rast_get_f_raster_row(int fd, FCELL * buf, int row)
+int Rast_get_f_row(int fd, FCELL * buf, int row)
 {
-    return Rast_get_raster_row(fd, buf, row, FCELL_TYPE);
+    return Rast_get_row(fd, buf, row, FCELL_TYPE);
 }
 
 /*!
  * \brief Get raster row (DCELL type)
  *
- * Same as Rast_get_f_raster_row() except that the array <em>dcell</em>
+ * Same as Rast_get_f_row() except that the array <em>dcell</em>
  * is <tt>double</tt>.
  *
  * \param fd file descriptor for the opened raster map
@@ -930,9 +885,9 @@ int Rast_get_f_raster_row(int fd, FCELL * buf, int row)
  * \return 0 row requested not within window
  * \return -1 on error
  */
-int Rast_get_d_raster_row(int fd, DCELL * buf, int row)
+int Rast_get_d_row(int fd, DCELL * buf, int row)
 {
-    return Rast_get_raster_row(fd, buf, row, DCELL_TYPE);
+    return Rast_get_row(fd, buf, row, DCELL_TYPE);
 }
 
 static int open_null_read(int fd)
@@ -1191,12 +1146,6 @@ static int embed_nulls(int fd, void *buf, int row, RASTER_MAP_TYPE map_type,
     return 1;
 }
 
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
-/*--------------------------------------------------------------------------*/
-
 /*!
    \brief Read or simmulate null value row
 

lib/raster/get_row_colr.c

@@ -37,7 +37,7 @@
  *  \return -1 on error
  *  \return 0 on success
  */
-int Rast_get_raster_row_colors(int fd, int row, struct Colors *colors,
+int Rast_get_row_colors(int fd, int row, struct Colors *colors,
 			    unsigned char *red, unsigned char *grn,
 			    unsigned char *blu, unsigned char *nul)
 {
@@ -51,7 +51,7 @@ int Rast_get_raster_row_colors(int fd, int row, struct Colors *colors,
 
     array = G__alloca(cols * size);
 
-    if (Rast_get_raster_row(fd, array, row, type) < 0) {
+    if (Rast_get_row(fd, array, row, type) < 0) {
 	G__freea(array);
 	return -1;
     }

lib/raster/opencell.c

@@ -62,7 +62,7 @@ static struct fileinfo *new_fileinfo(int fd)
  * map. If no NULL-value bitmap exists, arrange for the production of
  * NULL-values based on zeros in the raster map. If the map is
  * floating-point, arrange for quantization to integer for
- * Rast_get_c_raster_row(), et. al., by reading the quantization rules
+ * Rast_get_c_row(), et. al., by reading the quantization rules
  * for the map using Rast_read_quant(). If the programmer wants to read
  * the floating point map using uing quant rules other than the ones
  * stored in map's quant file, he/she should call Rast_set_quant_rules()
@@ -83,7 +83,7 @@ static int G__open_raster_new(const char *name, int open_mode,
   \brief Open an existing integer raster map (cell)
   
   Opens the existing cell file <i>name</i> in the <i>mapset</i> for
-  reading by Rast_get_raster_row() with mapping into the current window.
+  reading by Rast_get_row() with mapping into the current window.
 
   This routine opens the raster map <i>name</i> in <i>mapset</i> for
   reading. A nonnegative file descriptor is returned if the open is
@@ -933,7 +933,7 @@ int Rast_open_raster_new_uncompressed(const char *name, RASTER_MAP_TYPE wr_type)
   reading.
 
   Returned by Rast_open_cell_old(). After calling this function,
-  Rast_get_c_raster_row() and Rast_get_map_row() will use rules defined by q
+  Rast_get_c_row() and Rast_get_c_row() will use rules defined by q
   (instead of using rules defined in map's quant file) to convert floats to
   ints.
   

lib/raster/put_row.c

@@ -15,7 +15,7 @@
  *   file.
  *
  *   *** NOTE *** 
- *   A map cannot be copied using Rast_get_raster_row() and Rast_put_raster_row().
+ *   A map cannot be copied using Rast_get_row() and Rast_put_raster_row().
  *   The former resamples the data of the original map into a row buffer
  *   that matches the current window.  The later writes out rows associated
  *   with the window.
@@ -46,7 +46,7 @@
  *   writing) 
  *
  *   *** NOTE *** 
- *   A map cannot be copied using Rast_get_map_row() and Rast_put_map_row().
+ *   A map cannot be copied using Rast_get_c_row() and Rast_put_map_row().
  *   The former resamples the data of the original map into a row buffer
  *   that matches the current window.  The later writes out rows associated
  *   with the window.

lib/raster/sample.c

@@ -107,7 +107,7 @@ DCELL Rast_get_raster_sample_nearest(int fd,
 	goto done;
     }
 
-    if (Rast_get_d_raster_row(fd, maprow, row) < 0)
+    if (Rast_get_d_row(fd, maprow, row) < 0)
 	raster_row_error(window, north, east);
 
     if (Rast_is_d_null_value(&maprow[col])) {
@@ -174,9 +174,9 @@ DCELL Rast_get_raster_sample_bilinear(int fd,
 	goto done;
     }
 
-    if (Rast_get_d_raster_row(fd, arow, row) < 0)
+    if (Rast_get_d_row(fd, arow, row) < 0)
 	raster_row_error(window, north, east);
-    if (Rast_get_d_raster_row(fd, brow, row + 1) < 0)
+    if (Rast_get_d_row(fd, brow, row + 1) < 0)
 	raster_row_error(window, north, east);
 
     if (Rast_is_d_null_value(&arow[col]) || Rast_is_d_null_value(&arow[col + 1]) ||
@@ -266,7 +266,7 @@ DCELL Rast_get_raster_sample_cubic(int fd,
     }
 
     for (i = 0; i < 4; i++)
-	if (Rast_get_d_raster_row(fd, rows[i], row + i) < 0)
+	if (Rast_get_d_row(fd, rows[i], row + i) < 0)
 	    raster_row_error(window, north, east);
 
     for (i = 0; i < 4; i++)

lib/rst/interp_float/input2d.c

@@ -58,9 +58,9 @@ struct BM *IL_create_bitmask(struct interp_params *params)
 	for (i = 0; i < params->nsizr; i++) {
 	    irev = params->nsizr - i - 1;
 	    if (cellmask)
-		Rast_get_map_row(cfmask, cellmask, i);
+		Rast_get_c_row(cfmask, cellmask, i);
 	    if (MASK)
-		Rast_get_map_row(MASKfd, MASK, i);
+		Rast_get_c_row(MASKfd, MASK, i);
 	    for (j = 0; j < params->nsizc; j++) {
 		if ((cellmask && cellmask[j] == 0) || (MASK && MASK[j] == 0))
 		    BM_set(bitmask, j, irev, 0);

lib/rst/interp_float/ressegm2d.c

@@ -493,7 +493,7 @@ static int input_data(struct interp_params *params,
 {
     double x, y, sm;		/* input data and smoothing */
     int m1, m2;			/* loop counters */
-    int ret_val, ret_val1;	/* return values of Rast_get_map_row */
+    int ret_val, ret_val1;	/* return values of Rast_get_c_row */
     static FCELL *cellinp = NULL;	/* cell buffer for input data */
     static FCELL *cellsmooth = NULL;	/* cell buffer for smoothing */
 
@@ -505,7 +505,7 @@ static int input_data(struct interp_params *params,
 
     for (m1 = 0; m1 <= last_row - first_row; m1++) {
 	ret_val =
-	    Rast_get_f_raster_row(fdinp, cellinp, inp_rows - m1 - first_row);
+	    Rast_get_f_row(fdinp, cellinp, inp_rows - m1 - first_row);
 	if (ret_val < 0) {
 	    fprintf(stderr, "Cannot get row %d (return value = %d)\n", m1,
 		    ret_val);
@@ -513,7 +513,7 @@ static int input_data(struct interp_params *params,
 	}
 	if (fdsmooth >= 0) {
 	    ret_val1 =
-		Rast_get_f_raster_row(fdsmooth, cellsmooth,
+		Rast_get_f_row(fdsmooth, cellsmooth,
 				   inp_rows - m1 - first_row);
 	    if (ret_val1 < 0) {
 		fprintf(stderr, "Cannot get smoothing row\n");

ps/ps.map/outl_io.c

@@ -44,7 +44,7 @@ int o_read_row(void *buf)
 	    Rast_set_null_value(ptr, 1, map_type);
 	    ptr = G_incr_void_ptr(ptr, raster_size);
 
-	    Rast_get_raster_row(in_file_d, ptr, row_count++, map_type);
+	    Rast_get_row(in_file_d, ptr, row_count++, map_type);
 
 	    ptr = G_incr_void_ptr(ptr, raster_size * (row_length + 1));
 	    Rast_set_null_value(ptr, 1, map_type);

ps/ps.map/ps_raster.c

@@ -2,7 +2,7 @@
  **
  ** Author: Paul W. Carlson     3/92
  ** 
- ** ps_get_map_row is substituted by Rast_get_map_row_nomask
+ ** ps_get_map_row is substituted by Rast_get_c_row_nomask
  ** writing mask file is done separately by function ps_write_mask_row
  ** which used code previously in ps_get_map_row. This is done because
  ** sometimes the raster map is not drawn, but we still need a mask
@@ -50,7 +50,7 @@ int PS_make_mask(void)
 	PS.b0 = (double)b / 255.0;
 
 	for (row = 0; row < PS.w.rows; row++) {
-	    Rast_get_map_row_nomask(maskfd, maskbuf, row);
+	    Rast_get_c_row_nomask(maskfd, maskbuf, row);
 	    ps_write_mask_row(maskbuf);
 	}
 	fclose(ps_mask_fp);
@@ -112,7 +112,7 @@ int PS_raster_plot(void)
 	cellbuf = Rast_allocate_buf(map_type);
 	n = 0;
 	for (row = 0; row < PS.w.rows; row++) {
-	    Rast_get_raster_row(PS.cell_fd, cellbuf, row, map_type);
+	    Rast_get_row(PS.cell_fd, cellbuf, row, map_type);
 	    if ((row % PS.row_delta) == 0) {
 		ptr = cellbuf;
 		for (col = 0; col < PS.w.cols; col += PS.col_delta) {
@@ -155,7 +155,7 @@ int PS_raster_plot(void)
 	n = 0;
 	for (row = 0; row < PS.w.rows; row++) {
 	    for (i = 0; i < 3; i++) {
-		Rast_get_raster_row(grp.fd[i], cbuf[i], row, grp_map_type[i]);
+		Rast_get_row(grp.fd[i], cbuf[i], row, grp_map_type[i]);
 		cptr[i] = cbuf[i];
 	    }
 

raster/r.basins.fill/read_map.c

@@ -40,9 +40,9 @@ CELL *read_map(const char *name, int nomask, int nrows, int ncols)
     G_message(_("Reading <%s> ... "), name);
 
     if (nomask)
-	get_row = Rast_get_map_row_nomask;
+	get_row = Rast_get_c_row_nomask;
     else
-	get_row = Rast_get_map_row;
+	get_row = Rast_get_c_row;
 
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 10);

raster/r.bitpattern/main.c

@@ -124,7 +124,7 @@ int main(int argc, char *argv[])
 	    G_percent(row, nrows, 2);
 
 	/* read input map */
-	if (Rast_get_raster_row(infd, inrast, row, data_type) < 0)
+	if (Rast_get_row(infd, inrast, row, data_type) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"), name,
 			  row);
 

raster/r.buffer/read_map.c

@@ -60,7 +60,7 @@ int read_input_map(char *input, char *mapset, int ZEROFLAG)
 	hit = 0;
 	G_percent(row, window.rows, 2);
 
-	if (Rast_get_c_raster_row(fd, cell, row) < 0)
+	if (Rast_get_c_row(fd, cell, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  G_fully_qualified_name(input, mapset), row);
 

raster/r.buffer/write_map.c

@@ -58,7 +58,7 @@ int write_output_map(char *output, int offset)
 		*cell++ = (CELL) * ptr++;
 	}
 	else {
-	    if (Rast_get_map_row_nomask(fd_in, cell, row) < 0)
+	    if (Rast_get_c_row_nomask(fd_in, cell, row) < 0)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      output, row);
 

raster/r.carve/raster.c

@@ -15,7 +15,7 @@ void *read_raster(void *buf, const int fd, const RASTER_MAP_TYPE rtype)
     for (i = 0; i < rows; i++) {
 	G_percent(i + 1, rows, 10);
 
-	Rast_get_raster_row(fd, tmpbuf, i, rtype);
+	Rast_get_row(fd, tmpbuf, i, rtype);
 	tmpbuf =
 	    G_incr_void_ptr(tmpbuf, Rast_cell_size(rtype) * G_window_cols());
     }

raster/r.category/cats.c

@@ -53,7 +53,7 @@ int get_cats(const char *name, const char *mapset)
     for (row = 0; row < nrows; row++) {
 	if (G_verbose() > G_verbose_std())
 	    G_percent(row, nrows, 2);
-	if (Rast_get_c_raster_row_nomask(fd, cell, row) < 0)
+	if (Rast_get_c_row_nomask(fd, cell, row) < 0)
 	    exit(EXIT_SUCCESS);
 	Rast_update_cell_stats(cell, ncols, &statf);
     }

raster/r.clump/clump.c

@@ -98,7 +98,7 @@ CELL clump(int in_fd, int out_fd)
 
 	G_message(_("Pass %d..."), pass);
 	for (row = 0; row < nrows; row++) {
-	    if (Rast_get_map_row(in_fd, cur_in + 1, row) < 0)
+	    if (Rast_get_c_row(in_fd, cur_in + 1, row) < 0)
 		G_fatal_error(_("Unable to read raster map row %d "),
 			      row);
 	    

raster/r.colors/stats.c

@@ -43,7 +43,7 @@ int get_stats(const char *name, const char *mapset, struct Cell_stats *statf)
 		      G_fully_qualified_name(name, mapset));
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 2);
-	if (Rast_get_c_raster_row(fd, cell, row) < 0)
+	if (Rast_get_c_row(fd, cell, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  G_fully_qualified_name(name, mapset), row);
 	Rast_update_cell_stats(cell, ncols, statf);
@@ -110,7 +110,7 @@ void get_fp_stats(const char *name, const char *mapset,
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 2);
 
-	if (Rast_get_d_raster_row(fd, dcell, row) < 0)
+	if (Rast_get_d_row(fd, dcell, row) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  G_fully_qualified_name(name, mapset), row);
 	

raster/r.composite/main.c

@@ -197,7 +197,7 @@ int main(int argc, char **argv)
 	for (i = 0; i < 3; i++) {
 	    struct band *b = &B[i];
 
-	    if (Rast_get_raster_row_colors(b->file, atrow, &b->colors,
+	    if (Rast_get_row_colors(b->file, atrow, &b->colors,
 					b->array[0],
 					b->array[1], b->array[2], nulls) < 0)
 		G_fatal_error(_("Error reading raster map <%s>"),

raster/r.compress/main.c

@@ -218,7 +218,7 @@ static int doit(char *name, int uncompress, RASTER_MAP_TYPE map_type)
     /* the null file is written automatically */
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 2);
-	if (Rast_get_raster_row_nomask(old, rast, row, map_type) < 0)
+	if (Rast_get_row_nomask(old, rast, row, map_type) < 0)
 	    break;
 	if (Rast_put_raster_row(new, rast, map_type) < 0)
 	    break;

raster/r.contour/main.c

@@ -223,7 +223,7 @@ DCELL **get_z_array(int fd, int nrow, int ncol)
 
     for (i = 0; i < nrow; i++) {
 	z_array[i] = (DCELL *) G_malloc(ncol * sizeof(DCELL));
-	Rast_get_d_raster_row(fd, z_array[i], i);
+	Rast_get_d_row(fd, z_array[i], i);
 	G_percent(i + 1, nrow, 2);
     }
     return z_array;

raster/r.cost/main.c

@@ -427,7 +427,7 @@ int main(int argc, char *argv[])
 
 	for (row = 0; row < nrows; row++) {
 	    G_percent(row, nrows, 2);
-	    if (Rast_get_raster_row(cost_fd, cell, row, data_type) < 0)
+	    if (Rast_get_row(cost_fd, cell, row, data_type) < 0)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      cost_layer, row);
 
@@ -649,7 +649,7 @@ int main(int argc, char *argv[])
 	G_message(_("Reading raster map <%s>..."), opt9->answer);
 	for (row = 0; row < nrows; row++) {
 	    G_percent(row, nrows, 2);
-	    if (Rast_get_raster_row(fd, cell2, row, data_type2) < 0)
+	    if (Rast_get_row(fd, cell2, row, data_type2) < 0)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      opt9->answer, row);
 	    ptr2 = cell2;
@@ -1005,7 +1005,7 @@ int main(int argc, char *argv[])
 	for (row = 0; row < nrows; row++) {
 	    G_percent(row, nrows, 2);
 	    if (keep_nulls) {
-		if (Rast_get_raster_row(cost_fd, cell2, row, data_type) < 0)
+		if (Rast_get_row(cost_fd, cell2, row, data_type) < 0)
 		    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 				  cost_layer, row);
 	    }
@@ -1038,7 +1038,7 @@ int main(int argc, char *argv[])
 	for (row = 0; row < nrows; row++) {
 	    G_percent(row, nrows, 2);
 	    if (keep_nulls) {
-		if (Rast_get_raster_row(cost_fd, cell2, row, data_type) < 0)
+		if (Rast_get_row(cost_fd, cell2, row, data_type) < 0)
 		    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 				  cost_layer, row);
 	    }
@@ -1071,7 +1071,7 @@ int main(int argc, char *argv[])
 	for (row = 0; row < nrows; row++) {
 	    G_percent(row, nrows, 2);
 	    if (keep_nulls) {
-		if (Rast_get_raster_row(cost_fd, cell2, row, data_type) < 0)
+		if (Rast_get_row(cost_fd, cell2, row, data_type) < 0)
 		    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 				  cost_layer, row);
 	    }

raster/r.covar/main.c

@@ -89,7 +89,7 @@ int main(int argc, char *argv[])
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 2);
 	for (i = 0; i < nfiles; i++) {
-	    if (Rast_get_d_raster_row(fd[i], dcell[i], row) < 0)
+	    if (Rast_get_d_row(fd[i], dcell[i], row) < 0)
 		exit(1);
 	}
 	for (col = 0; col < ncols; col++) {

raster/r.cross/cross.c

@@ -55,13 +55,13 @@ CELL cross(int fd[], int non_zero, int primary, int outfd)
 	G_percent(row, nrows, 5);
 
 	/* read the primary file first, even if not first in the list */
-	if (Rast_get_map_row(fd[primary], cell[0], row) < 0)
+	if (Rast_get_c_row(fd[primary], cell[0], row) < 0)
 	    exit(1);
 
 	/* read the others */
 	col = 1;
 	for (i = 0; i < nfiles; i++)
-	    if (i != primary && Rast_get_map_row(fd[i], cell[col++], row) < 0)
+	    if (i != primary && Rast_get_c_row(fd[i], cell[col++], row) < 0)
 		exit(1);
 	for (col = 0; col < ncols; col++) {
 	    zero = 1;

raster/r.cross/renumber.c

@@ -33,7 +33,7 @@ int renumber(int in, int out)
     G_message(_("%s: STEP 3 ... "), G_program_name());
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 5);
-	if (Rast_get_map_row(in, c = cell, row) < 0)
+	if (Rast_get_c_row(in, c = cell, row) < 0)
 	    exit(1);
 	col = ncols;
 	while (col-- > 0) {

raster/r.describe/describe.c

@@ -40,14 +40,14 @@ int describe(const char *name, int compact, char *no_data_str,
     int (*get_row)(int, CELL *, int);
 
     if (windowed) {
-	get_row = Rast_get_c_raster_row;
+	get_row = Rast_get_c_row;
     }
     else {
 	if (Rast_get_cellhd(name, "", &window) < 0)
 	    G_fatal_error(_("Unable to get cell header for <%s>"), name);
 
 	Rast_set_window(&window);
-	get_row = Rast_get_c_raster_row_nomask;
+	get_row = Rast_get_c_row_nomask;
     }
     fd = Rast_open_cell_old(name, "");
     if (fd < 0)

raster/r.distance/distance.c

@@ -107,9 +107,9 @@ int null_distance(const char *name1, const char *name2, int *zerro_row, int *zer
 
 	G_percent(row, nrows, 2);
 
-	if (Rast_get_raster_row(mapd1, inrast1, row, maptype1) < 0)
+	if (Rast_get_row(mapd1, inrast1, row, maptype1) < 0)
 	    G_fatal_error("Could not read from <%s>", name1);
-	if (Rast_get_raster_row(mapd2, inrast2, row, maptype2) < 0)
+	if (Rast_get_row(mapd2, inrast2, row, maptype2) < 0)
 	    G_fatal_error("Could not read from <%s>", name2);
 
 	for (col = 0; col < ncols; col++) {

raster/r.distance/edges.c

@@ -72,7 +72,7 @@ void find_edge_cells(struct Map *map)
 	buf2 = tmp;
 
 	/* read a row */
-	if (Rast_get_map_row(fd, &buf1[1], row) < 0)
+	if (Rast_get_c_row(fd, &buf1[1], row) < 0)
 	    exit(1);
 
 	for (col = 1; col <= ncols; col++) {

raster/r.drain/main.c

@@ -366,7 +366,7 @@ int main(int argc, char **argv)
 	dir_fd = open(tempfile3, O_RDWR | O_CREAT, 0666);
 
 	for (i = 0; i < nrows; i++) {
-	    Rast_get_d_raster_row(dir_id, dir_buf, i);
+	    Rast_get_d_row(dir_id, dir_buf, i);
 	    write(dir_fd, dir_buf, ncols * sizeof(DCELL));
 	}
 	Rast_close(dir_id);

raster/r.drain/tinf.c

@@ -199,17 +199,17 @@ void *get_max_d(void *v1, void *v2)
 /* Read one line from a raster map */
 int get_row_c(int fd, void *row, int n)
 {
-    return Rast_get_c_raster_row(fd, (CELL *) row, n);
+    return Rast_get_c_row(fd, (CELL *) row, n);
 }
 
 int get_row_f(int fd, void *row, int n)
 {
-    return Rast_get_f_raster_row(fd, (FCELL *) row, n);
+    return Rast_get_f_row(fd, (FCELL *) row, n);
 }
 
 int get_row_d(int fd, void *row, int n)
 {
-    return Rast_get_d_raster_row(fd, (DCELL *) row, n);
+    return Rast_get_d_row(fd, (DCELL *) row, n);
 }
 
 /* Write one row to a raster map */

raster/r.fill.dir/tinf.c

@@ -180,17 +180,17 @@ void *get_max_d(void *v1, void *v2)
 /* Read one line from a raster map */
 int get_row_c(int fd, void *row, int n)
 {
-    return Rast_get_c_raster_row(fd, (CELL *) row, n);
+    return Rast_get_c_row(fd, (CELL *) row, n);
 }
 
 int get_row_f(int fd, void *row, int n)
 {
-    return Rast_get_f_raster_row(fd, (FCELL *) row, n);
+    return Rast_get_f_row(fd, (FCELL *) row, n);
 }
 
 int get_row_d(int fd, void *row, int n)
 {
-    return Rast_get_d_raster_row(fd, (DCELL *) row, n);
+    return Rast_get_d_row(fd, (DCELL *) row, n);
 }
 
 /* Write one row to a raster map */

raster/r.flow/io.c

@@ -83,7 +83,7 @@ void read_input_files(void)
 	G_fatal_error(_("Elevation file's resolution differs from current region resolution"));
 
     for (row = 0; row < region.rows; row++) {
-	Rast_get_d_raster_row(fd, el.buf[row], row);
+	Rast_get_d_row(fd, el.buf[row], row);
 	if (parm.seg)
 	    put_row_seg(el, row);
     }
@@ -100,7 +100,7 @@ void read_input_files(void)
 			    "current region resolution"));
 
 	for (row = 0; row < region.rows; row++) {
-	    Rast_get_d_raster_row(fd, as.buf[row], row);
+	    Rast_get_d_row(fd, as.buf[row], row);
 	    if (parm.seg)
 		put_row_seg(as, row);
 	}
@@ -115,7 +115,7 @@ void read_input_files(void)
 	fd = open_existing_cell_file(parm.barin, &hd);
 
 	for (row = 0; row < region.rows; row++) {
-	    Rast_get_d_raster_row(fd, barc, row);
+	    Rast_get_d_row(fd, barc, row);
 	    for (col = 0; col < region.cols; col++) {
 		BM_set(bitbar, col, row, (barc[col] != 0));
 		if (parm.dsout && barc[col] != 0)

raster/r.grow.distance/main.c

@@ -264,7 +264,7 @@ int main(int argc, char **argv)
 
 	Rast_set_d_null_value(dist_row, ncols);
 
-	Rast_get_d_raster_row(in_fd, in_row, irow);
+	Rast_get_d_row(in_fd, in_row, irow);
 
 	for (col = 0; col < ncols; col++)
 	    if (!Rast_is_d_null_value(&in_row[col])) {

raster/r.grow/main.c

@@ -218,14 +218,14 @@ int main(int argc, char **argv)
     out_row = Rast_allocate_d_buf();
 
     for (row = 0; row < size; row++)
-	Rast_get_d_raster_row(in_fd, in_rows[size + row], row);
+	Rast_get_d_row(in_fd, in_rows[size + row], row);
 
     for (row = 0; row < nrows; row++) {
 	DCELL *tmp;
 	int i;
 
 	if (row + size < nrows)
-	    Rast_get_d_raster_row(in_fd, in_rows[size * 2], row + size);
+	    Rast_get_d_row(in_fd, in_rows[size * 2], row + size);
 
 	for (col = 0; col < ncols; col++) {
 	    DCELL *c = &in_rows[size][col];

raster/r.his/main.c

@@ -221,15 +221,15 @@ int main(int argc, char **argv)
     for (atrow = 0; atrow < window.rows; atrow++) {
 	G_percent(atrow, window.rows, 2);
 
-	if (Rast_get_raster_row_colors
+	if (Rast_get_row_colors
 	    (hue_file, atrow, &hue_colors, hue_r, hue_g, hue_b, hue_n) < 0)
 	    G_fatal_error(_("Error reading 'hue' map"));
 	if (int_used &&
-	    (Rast_get_raster_row_colors
+	    (Rast_get_row_colors
 	     (int_file, atrow, &int_colors, int_r, dummy, dummy, int_n) < 0))
 	    G_fatal_error(_("Error reading 'intensity' map"));
 	if (sat_used &&
-	    (Rast_get_raster_row_colors
+	    (Rast_get_row_colors
 	     (sat_file, atrow, &sat_colors, sat_r, dummy, dummy, sat_n) < 0))
 	    G_fatal_error(_("Error reading 'saturation' map"));
 

raster/r.horizon/main.c

@@ -556,7 +556,7 @@ int INPUT(void)
     fd1 = Rast_open_cell_old(elevin, mapset);
 
     for (row = 0; row < m; row++) {
-	Rast_get_f_raster_row(fd1, cell1, row);
+	Rast_get_f_row(fd1, cell1, row);
 
 	for (j = 0; j < n; j++) {
 	    row_rev = m - row - 1;

raster/r.lake/main.c

@@ -263,12 +263,12 @@ int main(int argc, char *argv[])
 	out_water[row] = (FCELL *) G_calloc(cols, sizeof(FCELL));
 
 	/* In newly created space load data from file. */
-	if (Rast_get_f_raster_row(in_terran_fd, in_terran[row], row) != 1)
+	if (Rast_get_f_row(in_terran_fd, in_terran[row], row) != 1)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  terrainmap, row);
 
 	if (smap_opt->answer)
-	    if (Rast_get_f_raster_row(out_fd, out_water[row], row) != 1)
+	    if (Rast_get_f_row(out_fd, out_water[row], row) != 1)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      seedmap, row);
 

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

@@ -956,7 +956,7 @@ void mv_driver()
 
 	if (fmask > 0) {
 	    Rast_zero_raster_buf(row_buf, CELL_TYPE);
-	    Rast_get_raster_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
+	    Rast_get_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
 				    CELL_TYPE);
 
 	    /* for each cell whose value is "1"
@@ -2821,7 +2821,7 @@ void whole_reg_driver()
 	row_buf = Rast_allocate_buf(CELL_TYPE);
 	for (i = 0; i < nrows; i++) {
 	    Rast_zero_raster_buf(row_buf, CELL_TYPE);
-	    Rast_get_raster_row(fr, row_buf, i, CELL_TYPE);
+	    Rast_get_row(fr, row_buf, i, CELL_TYPE);
 	    for (j = 0; j < ncols; j++) {
 		if (*(row_buf + j) > 0) {
 		    if (regcnt == 0)

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

@@ -596,7 +596,7 @@ void cell_clip(DCELL ** buf, DCELL ** null_buf, int row0, int col0, int nrows,
 	   map row in the region file */
 
 	if (choice->wrum == 'r')
-	    Rast_get_raster_row_nomask(fr, tmp1, i, CELL_TYPE);
+	    Rast_get_row_nomask(fr, tmp1, i, CELL_TYPE);
 
 	/* initialize each element of the
 	   row buffer to 0; this row buffer
@@ -607,15 +607,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_get_raster_row(finput, tmp, i, data_type);
+	    Rast_get_row(finput, tmp, i, data_type);
 	    break;
 	case FCELL_TYPE:
 	    Rast_zero_raster_buf(ftmp, data_type);
-	    Rast_get_raster_row(finput, ftmp, i, data_type);
+	    Rast_get_row(finput, ftmp, i, data_type);
 	    break;
 	case DCELL_TYPE:
 	    Rast_zero_raster_buf(dtmp, data_type);
-	    Rast_get_raster_row(finput, dtmp, i, data_type);
+	    Rast_get_row(finput, dtmp, i, data_type);
 	    break;
 	}
 

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

@@ -339,7 +339,7 @@ void cell_clip(DCELL ** buf, DCELL ** null_buf, int row0, int col0, int nrows,
 	   map row in the region file */
 
 	if (choice->wrum == 'r')
-	    Rast_get_raster_row_nomask(fr, tmp1, i, CELL_TYPE);
+	    Rast_get_row_nomask(fr, tmp1, i, CELL_TYPE);
 
 	/* initialize each element of the
 	   row buffer to 0; this row buffer
@@ -351,15 +351,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_get_raster_row(finput, tmp, i, CELL_TYPE);
+	    Rast_get_row(finput, tmp, i, CELL_TYPE);
 	    break;
 	case FCELL_TYPE:
 	    Rast_zero_raster_buf(ftmp, data_type);
-	    Rast_get_raster_row(finput, ftmp, i, FCELL_TYPE);
+	    Rast_get_row(finput, ftmp, i, FCELL_TYPE);
 	    break;
 	case DCELL_TYPE:
 	    Rast_zero_raster_buf(dtmp, data_type);
-	    Rast_get_raster_row(finput, dtmp, i, DCELL_TYPE);
+	    Rast_get_row(finput, dtmp, i, DCELL_TYPE);
 	    break;
 	}
 

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

@@ -443,15 +443,15 @@ void mv_driver()
 	    switch (data_type) {
 	    case (CELL_TYPE):
 		Rast_zero_raster_buf(tmp, CELL_TYPE);
-		Rast_get_raster_row(finput, tmp, i, CELL_TYPE);
+		Rast_get_row(finput, tmp, i, CELL_TYPE);
 		break;
 	    case (FCELL_TYPE):
 		Rast_zero_raster_buf(ftmp, FCELL_TYPE);
-		Rast_get_raster_row(finput, ftmp, i, FCELL_TYPE);
+		Rast_get_row(finput, ftmp, i, FCELL_TYPE);
 		break;
 	    case (DCELL_TYPE):
 		Rast_zero_raster_buf(dtmp, DCELL_TYPE);
-		Rast_get_raster_row(finput, dtmp, i, DCELL_TYPE);
+		Rast_get_row(finput, dtmp, i, DCELL_TYPE);
 		break;
 	    }
 
@@ -525,7 +525,7 @@ void mv_driver()
 
 	if (fmask > 0) {
 	    Rast_zero_raster_buf(row_buf, CELL_TYPE);
-	    Rast_get_raster_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
+	    Rast_get_row_nomask(fmask, row_buf, y0 + i + u_l / 2,
 				    CELL_TYPE);
 
 	    /* for each cell whose value is "1"
@@ -1366,15 +1366,15 @@ void unit_driver()
 	    switch (data_type) {
 	    case (CELL_TYPE):
 		Rast_zero_raster_buf(tmp, CELL_TYPE);
-		Rast_get_raster_row(finput, tmp, i, CELL_TYPE);
+		Rast_get_row(finput, tmp, i, CELL_TYPE);
 		break;
 	    case (FCELL_TYPE):
 		Rast_zero_raster_buf(ftmp, FCELL_TYPE);
-		Rast_get_raster_row(finput, ftmp, i, FCELL_TYPE);
+		Rast_get_row(finput, ftmp, i, FCELL_TYPE);
 		break;
 	    case (DCELL_TYPE):
 		Rast_zero_raster_buf(dtmp, DCELL_TYPE);
-		Rast_get_raster_row(finput, dtmp, i, DCELL_TYPE);
+		Rast_get_row(finput, dtmp, i, DCELL_TYPE);
 		break;
 	    }
 
@@ -1685,15 +1685,15 @@ void whole_reg_driver()
 	    switch (data_type) {
 	    case (CELL_TYPE):
 		Rast_zero_raster_buf(tmp, CELL_TYPE);
-		Rast_get_raster_row(finput, tmp, i, CELL_TYPE);
+		Rast_get_row(finput, tmp, i, CELL_TYPE);
 		break;
 	    case (FCELL_TYPE):
 		Rast_zero_raster_buf(ftmp, FCELL_TYPE);
-		Rast_get_raster_row(finput, ftmp, i, FCELL_TYPE);
+		Rast_get_row(finput, ftmp, i, FCELL_TYPE);
 		break;
 	    case (DCELL_TYPE):
 		Rast_zero_raster_buf(dtmp, DCELL_TYPE);
-		Rast_get_raster_row(finput, dtmp, i, DCELL_TYPE);
+		Rast_get_row(finput, dtmp, i, DCELL_TYPE);
 		break;
 	    }
 
@@ -1754,7 +1754,7 @@ void whole_reg_driver()
 	row_buf = Rast_allocate_buf(CELL_TYPE);
 	for (i = 0; i < nrows; i++) {
 	    Rast_zero_raster_buf(row_buf, CELL_TYPE);
-	    Rast_get_raster_row(fr, row_buf, i, CELL_TYPE);
+	    Rast_get_row(fr, row_buf, i, CELL_TYPE);
 	    for (j = 0; j < ncols; j++) {
 		if (*(row_buf + j)) {
 		    if (regcnt == 0)

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

@@ -356,7 +356,7 @@ static void man_unit(int t, int b, int l, int r, char *n1, char *n2, char *n3,
 		    fr = Rast_open_cell_old(n1, G_mapset());
 		    for (j = t; j < b; j++) {
 			Rast_zero_raster_buf(row_buf, CELL_TYPE);
-			Rast_get_raster_row(fr, row_buf, j, CELL_TYPE);
+			Rast_get_row(fr, row_buf, j, CELL_TYPE);
 			for (k = l; k < r; k++) {
 			    if (*(row_buf + k))
 				count++;
@@ -413,7 +413,7 @@ static void man_unit(int t, int b, int l, int r, char *n1, char *n2, char *n3,
 			fr = Rast_open_cell_old(n1, G_mapset());
 			for (j = t; j < b; j++) {
 			    Rast_zero_raster_buf(row_buf, CELL_TYPE);
-			    Rast_get_raster_row(fr, row_buf, j, CELL_TYPE);
+			    Rast_get_row(fr, row_buf, j, CELL_TYPE);
 			    for (k = l; k < r; k++) {
 				if (*(row_buf + k))
 				    count++;
@@ -956,13 +956,13 @@ static int calc_unit_loc(double radius, int top, int bot, int left, int right,
 
 		if (fmask > 0) {
 		    row_buf = Rast_allocate_c_buf();
-		    Rast_get_map_row_nomask(fmask, row_buf, t + top1);
+		    Rast_get_c_row_nomask(fmask, row_buf, t + top1);
 		    if (!
 			(*(row_buf + l + left1) &&
 			 *(row_buf + l + left1 + u_w - 1)))
 			goto back;
 		    Rast_zero_cell_buf(row_buf);
-		    Rast_get_map_row_nomask(fmask, row_buf, t + top1 + u_l - 1);
+		    Rast_get_c_row_nomask(fmask, row_buf, t + top1 + u_l - 1);
 		    if (!
 			(*(row_buf + l + left1) &&
 			 *(row_buf + l + left1 + u_w - 1)))
@@ -1407,7 +1407,7 @@ static void graph_unit(int t, int b, int l, int r, char *n1, char *n2,
 
 		if (fmask > 0) {
 		    row_buf = Rast_allocate_c_buf();
-		    Rast_get_map_row_nomask(fmask, row_buf, at);
+		    Rast_get_c_row_nomask(fmask, row_buf, at);
 		    if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
 			fprintf(stderr,
 				"\n    The unit would be outside the mask; ");
@@ -1417,7 +1417,7 @@ static void graph_unit(int t, int b, int l, int r, char *n1, char *n2,
 			goto back1;
 		    }
 		    Rast_zero_cell_buf(row_buf);
-		    Rast_get_map_row_nomask(fmask, row_buf, ab - 1);
+		    Rast_get_c_row_nomask(fmask, row_buf, ab - 1);
 		    if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
 			fprintf(stderr,
 				"\n    The unit would be outside the mask; ");
@@ -1529,7 +1529,7 @@ static void graph_unit(int t, int b, int l, int r, char *n1, char *n2,
 
 		if (fmask > 0) {
 		    row_buf = Rast_allocate_c_buf();
-		    Rast_get_map_row_nomask(fmask, row_buf, at);
+		    Rast_get_c_row_nomask(fmask, row_buf, at);
 		    if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
 			fprintf(stderr,
 				"\n    The unit would be outside the mask; ");
@@ -1539,7 +1539,7 @@ static void graph_unit(int t, int b, int l, int r, char *n1, char *n2,
 			goto back2;
 		    }
 		    Rast_zero_cell_buf(row_buf);
-		    Rast_get_map_row_nomask(fmask, row_buf, ab - 1);
+		    Rast_get_c_row_nomask(fmask, row_buf, ab - 1);
 		    if (!(*(row_buf + al) && *(row_buf + ar - 1))) {
 			fprintf(stderr,
 				"\n    The unit would be outside the mask; ");

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

@@ -609,15 +609,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_get_raster_row(finput, tmp, i, data_type);
+	    Rast_get_row(finput, tmp, i, data_type);
 	    break;
 	case FCELL_TYPE:
 	    Rast_zero_raster_buf(ftmp, data_type);
-	    Rast_get_raster_row(finput, ftmp, i, data_type);
+	    Rast_get_row(finput, ftmp, i, data_type);
 	    break;
 	case DCELL_TYPE:
 	    Rast_zero_raster_buf(dtmp, data_type);
-	    Rast_get_raster_row(finput, dtmp, i, data_type);
+	    Rast_get_row(finput, dtmp, i, data_type);
 	    break;
 	}
 

raster/r.li/r.li.daemon/worker.c

@@ -246,7 +246,7 @@ char *mask_preprocessing(char *mask, char *raster, int rl, int cl)
 	int riga;
 
 	riga = (int)rint(i * add_row);
-	Rast_get_map_row_nomask(old_fd, old, riga);
+	Rast_get_c_row_nomask(old_fd, old, riga);
 	for (j = 0; j < cl; j++) {
 	    int colonna;
 
@@ -268,7 +268,7 @@ CELL *RLI_get_cell_raster_row(int fd, int row, area_des ad)
     if (ad->cm->contents[hash] == row)
 	return ad->cm->cache[hash];
     else {
-	Rast_get_raster_row(fd, ad->cm->cache[hash], row, CELL_TYPE);
+	Rast_get_row(fd, ad->cm->cache[hash], row, CELL_TYPE);
 	ad->cm->contents[hash] = row;
 	return ad->cm->cache[hash];
     }
@@ -283,7 +283,7 @@ DCELL *RLI_get_dcell_raster_row(int fd, int row, area_des ad)
     if (ad->dm->contents[hash] == row)
 	return ad->dm->cache[hash];
     else {
-	Rast_get_raster_row(fd, ad->dm->cache[hash], row, DCELL_TYPE);
+	Rast_get_row(fd, ad->dm->cache[hash], row, DCELL_TYPE);
 	ad->dm->contents[hash] = row;
 	return ad->dm->cache[hash];
     }
@@ -298,7 +298,7 @@ FCELL *RLI_get_fcell_raster_row(int fd, int row, area_des ad)
     if (ad->fm->contents[hash] == row)
 	return ad->fm->cache[hash];
     else {
-	Rast_get_raster_row(fd, ad->fm->cache[hash], row, FCELL_TYPE);
+	Rast_get_row(fd, ad->fm->cache[hash], row, FCELL_TYPE);
 	ad->fm->contents[hash] = row;
 	return ad->fm->cache[hash];
     }

raster/r.los/main.c

@@ -267,7 +267,7 @@ int main(int argc, char *argv[])
 	patt_fd = open(patt_name, 2);
 	segment_init(&seg_patt, patt_fd, 4);
 	for (row = 0; row < nrows; row++) {
-	    if (Rast_get_raster_row(patt, cell, row, CELL_TYPE) < 0)
+	    if (Rast_get_row(patt, cell, row, CELL_TYPE) < 0)
 		G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			      patt_layer, row);
 	    segment_put_row(&seg_patt, cell, row);
@@ -275,7 +275,7 @@ int main(int argc, char *argv[])
     }
 
     for (row = 0; row < nrows; row++) {
-	if (Rast_get_raster_row(old, fcell, row, FCELL_TYPE) < 0)
+	if (Rast_get_row(old, fcell, row, FCELL_TYPE) < 0)
 	    G_fatal_error(_("Unable to read raster map <%s> row %d"),
 			  elev_layer, row);
 	segment_put_row(&seg_in, fcell, row);

raster/r.mapcalc/map.c

@@ -145,7 +145,7 @@ static void *cache_get_raw(struct row_cache *cache, int row, int data_type)
 
     if (i >= 0 && i < cache->nrows) {
 	if (!sub->valid[i]) {
-	    Rast_get_raster_row(cache->fd, sub->buf[i], row + i, data_type);
+	    Rast_get_row(cache->fd, sub->buf[i], row + i, data_type);
 	    sub->valid[i] = 1;
 	}
 	return sub->buf[i];
@@ -154,7 +154,7 @@ static void *cache_get_raw(struct row_cache *cache, int row, int data_type)
     if (i <= -cache->nrows || i >= cache->nrows * 2 - 1) {
 	memset(sub->valid, 0, cache->nrows);
 	sub->row = i;
-	Rast_get_raster_row(cache->fd, sub->buf[0], row, data_type);
+	Rast_get_row(cache->fd, sub->buf[0], row, data_type);
 	sub->valid[0] = 1;
 	return sub->buf[0];
     }
@@ -182,7 +182,7 @@ static void *cache_get_raw(struct row_cache *cache, int row, int data_type)
     G__freea(tmp);
     G__freea(vtmp);
 
-    Rast_get_raster_row(cache->fd, sub->buf[i], row, data_type);
+    Rast_get_row(cache->fd, sub->buf[i], row, data_type);
     sub->valid[i] = 1;
 
     return sub->buf[i];
@@ -367,7 +367,7 @@ static void translate_from_cats(struct map *m, CELL * cell, DCELL * xcell,
 
 static void read_row(int fd, void *buf, int row, int res_type)
 {
-    if (Rast_get_raster_row(fd, buf, row, res_type) < 0)
+    if (Rast_get_row(fd, buf, row, res_type) < 0)
 	G_fatal_error(_("Unable to read raster map row %d"), row);
 }
 

raster/r.mfilter/getrow.c

@@ -9,7 +9,7 @@
 
 int getmaprow(int fd, void *buf, int row, int len)
 {
-    if (Rast_get_d_raster_row(fd, (DCELL *) buf, row) < 0)
+    if (Rast_get_d_row(fd, (DCELL *) buf, row) < 0)
 	G_fatal_error(_("Cannot read raster row %d"), row);
     return 1;
 }

raster/r.neighbors/readcell.c

@@ -9,7 +9,7 @@ int readcell(int fd, int row, int nrows, int ncols)
     rotate_bufs();
 
     if (row < nrows)
-	Rast_get_d_raster_row(fd, ncb.buf[ncb.nsize - 1] + ncb.dist, row);
+	Rast_get_d_row(fd, ncb.buf[ncb.nsize - 1] + ncb.dist, row);
     else
 	Rast_set_d_null_value(ncb.buf[ncb.nsize - 1] + ncb.dist, ncols);
 

raster/r.null/main.c

@@ -331,7 +331,7 @@ int doit(const char *name, const char *mapset, int change_null, RASTER_MAP_TYPE
     for (row = 0; row < cellhd.rows; row++) {
 	G_percent(row, cellhd.rows, 1);
 
-	if (Rast_get_raster_row_nomask(old, rast, row, map_type) < 0) {
+	if (Rast_get_row_nomask(old, rast, row, map_type) < 0) {
 	    G_warning(_("Unable to read raster map <%s> row %d"),
 		      name, row);
 	    break;

raster/r.out.arc/main.c

@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
 
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 2);
-	if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+	if (Rast_get_row(fd, raster, row, out_type) < 0)
 	    exit(EXIT_FAILURE);
 	/*
 	   if (Rast_get_null_value_row(fd, null_row, row) < 0)

raster/r.out.ascii/formspecific.c

@@ -38,7 +38,7 @@ int write_GRASS(int fd,
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 2);
 
-	if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+	if (Rast_get_row(fd, raster, row, out_type) < 0)
 	    return (row);
 
 	for (col = 0, ptr = raster; col < ncols; col++,
@@ -91,7 +91,7 @@ int write_MODFLOW(int fd,
     for (row = 0; row < nrows; row++) {
 	G_percent(row, nrows, 2);
 
-	if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+	if (Rast_get_row(fd, raster, row, out_type) < 0)
 	    return (row);
 
 	colcnt = 0;
@@ -177,7 +177,7 @@ int write_GSGRID(int fd,
     for (row = nrows - 1; row >= 0; row--) {
 	G_percent((row - nrows) * (-1), nrows, 2);
 
-	if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+	if (Rast_get_row(fd, raster, row, out_type) < 0)
 	    return (row);
 
 	colcnt = 0;

raster/r.out.bin/main.c

@@ -332,7 +332,7 @@ int main(int argc, char *argv[])
     G_message(_("c=%d"), region.cols);
 
     for (row = 0; row < nrows; row++) {
-	if (Rast_get_raster_row(fd, raster, row, out_type) < 0)
+	if (Rast_get_row(fd, raster, row, out_type) < 0)
 	    G_fatal_error(_("Reading map"));
 	G_percent(row, nrows, 2);