rasterlib: fns from samle.c renamed, see

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


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

include/raster.h

@@ -492,10 +492,10 @@ void Rast_free_reclass(struct Reclass *);
 int Rast_put_reclass(const char *, const struct Reclass *);
 
 /* sample.c */
-DCELL Rast_get_raster_sample_nearest(int, const struct Cell_head *, struct Categories *, double, double, int);
-DCELL Rast_get_raster_sample_bilinear(int, const struct Cell_head *, struct Categories *, double, double, int);
-DCELL Rast_get_raster_sample_cubic(int, const struct Cell_head *, struct Categories *, double, double, int);
-DCELL Rast_get_raster_sample(int, const struct Cell_head *, struct Categories *, double, double, int, INTERP_TYPE);
+DCELL Rast_get_sample_nearest(int, const struct Cell_head *, struct Categories *, double, double, int);
+DCELL Rast_get_sample_bilinear(int, const struct Cell_head *, struct Categories *, double, double, int);
+DCELL Rast_get_sample_cubic(int, const struct Cell_head *, struct Categories *, double, double, int);
+DCELL Rast_get_sample(int, const struct Cell_head *, struct Categories *, double, double, int, INTERP_TYPE);
 
 /* set_window.c */
 int Rast_set_window(struct Cell_head *);

lib/raster/sample.c

@@ -47,7 +47,7 @@ static void raster_row_error(const struct Cell_head *window, double north,
  *
  *  \return cell value at given position
  */
-DCELL Rast_get_raster_sample(int fd,
+DCELL Rast_get_sample(int fd,
 			  const struct Cell_head *window,
 			  struct Categories *cats,
 			  double north, double east,
@@ -57,16 +57,16 @@ DCELL Rast_get_raster_sample(int fd,
 
     switch (itype) {
     case NEAREST:
-	retval = Rast_get_raster_sample_nearest(fd, window, cats, north, east, usedesc);
+	retval = Rast_get_sample_nearest(fd, window, cats, north, east, usedesc);
 	break;
     case BILINEAR:
-	retval = Rast_get_raster_sample_bilinear(fd, window, cats, north, east, usedesc);
+	retval = Rast_get_sample_bilinear(fd, window, cats, north, east, usedesc);
 	break;
     case CUBIC:
-	retval = Rast_get_raster_sample_cubic(fd, window, cats, north, east, usedesc);
+	retval = Rast_get_sample_cubic(fd, window, cats, north, east, usedesc);
 	break;
     default:
-	G_fatal_error("Rast_get_raster_sample: %s",
+	G_fatal_error("Rast_get_sample: %s",
 		      _("Unknown interpolation type"));
     }
 
@@ -88,7 +88,7 @@ DCELL Rast_get_raster_sample(int fd,
  *
  *  \return cell value at given position
  */
-DCELL Rast_get_raster_sample_nearest(int fd,
+DCELL Rast_get_sample_nearest(int fd,
 				  const struct Cell_head *window,
 				  struct Categories *cats,
 				  double north, double east, int usedesc)
@@ -146,7 +146,7 @@ done:
  *
  *  \return cell value at given position
  */
-DCELL Rast_get_raster_sample_bilinear(int fd,
+DCELL Rast_get_sample_bilinear(int fd,
 				   const struct Cell_head *window,
 				   struct Categories *cats,
 				   double north, double east, int usedesc)
@@ -235,7 +235,7 @@ done:
  *
  *  \return cell value at given position
  */
-DCELL Rast_get_raster_sample_cubic(int fd,
+DCELL Rast_get_sample_cubic(int fd,
 				const struct Cell_head *window,
 				struct Categories *cats,
 				double north, double east, int usedesc)

vector/v.drape/main.c

@@ -53,7 +53,7 @@ int sample_raster(const int ltype, int fdrast, struct Cell_head window,
 	/* sample raster at this point, and update the z-coordinate
 	 * (note that input vector should not be 3D!)
 	 */
-	estimated_elevation = scale * Rast_get_raster_sample(
+	estimated_elevation = scale * Rast_get_sample(
 	    fdrast, &window, NULL, Points->y[0], Points->x[0], 0, method);
 	/* Elevation value has to be meaningfull */
 	if (Rast_is_d_null_value(&estimated_elevation)) {
@@ -76,7 +76,7 @@ int sample_raster(const int ltype, int fdrast, struct Cell_head window,
 	/* loop through each point in a line */
 	for (j = 0; j < Points->n_points; j++) {
 	    /* sample raster at this point, and update the z-coordinate (note that input vector should not be 3D!) */
-	    estimated_elevation = scale * Rast_get_raster_sample(
+	    estimated_elevation = scale * Rast_get_sample(
 		fdrast, &window, NULL, Points->y[j], Points->x[j], 0, method);
 
 	    if (Rast_is_d_null_value(&estimated_elevation)) {
@@ -100,7 +100,7 @@ int sample_raster(const int ltype, int fdrast, struct Cell_head window,
 	/* loop through each point in a line */
 	for (j = 0; j < Points->n_points; j++) {
 	    /* sample raster at this point, and update the z-coordinate (note that input vector should not be 3D!) */
-	    estimated_elevation = scale * Rast_get_raster_sample(
+	    estimated_elevation = scale * Rast_get_sample(
 		fdrast, &window, NULL, Points->y[j], Points->x[j], 0, method);
 
 	    if (Rast_is_d_null_value(&estimated_elevation)) {

vector/v.extrude/main.c

@@ -392,7 +392,7 @@ static int extrude(struct Map_info *In, struct Map_info *Out,
     /* do not trace -> calculate minumum dem offset */
     if (fdrast && !trace) {
 	for (k = 0; k < Points->n_points; k++) {
-	    voffset_curr = Rast_get_raster_sample(fdrast, &window, NULL,
+	    voffset_curr = Rast_get_sample(fdrast, &window, NULL,
 					       Points->y[k], Points->x[k], 0,
 					       NEAREST);
 	    if (Rast_is_d_null_value(&voffset_curr))
@@ -415,12 +415,12 @@ static int extrude(struct Map_info *In, struct Map_info *Out,
 
 	/* trace */
 	if (fdrast && trace) {
-	    voffset_curr = Rast_get_raster_sample(fdrast, &window, NULL,
+	    voffset_curr = Rast_get_sample(fdrast, &window, NULL,
 					       Points->y[k], Points->x[k], 0,
 					       NEAREST);
 
 	    if (type != GV_POINT) {
-		voffset_next = Rast_get_raster_sample(fdrast, &window, NULL,
+		voffset_next = Rast_get_sample(fdrast, &window, NULL,
 						   Points->y[k + 1],
 						   Points->x[k + 1], 0,
 						   NEAREST);

vector/v.sample/main.c

@@ -256,7 +256,7 @@ int main(int argc, char **argv)
 	G_debug(4, "actual = %e", actual);
 
 	/* find predicted value */
-	predicted = Rast_get_raster_sample(fdrast, &window, NULL, Points->y[0],
+	predicted = Rast_get_sample(fdrast, &window, NULL, Points->y[0],
 					Points->x[0], 0, method);
 	if (Rast_is_d_null_value(&predicted))
 	    continue;