[GRASS-SVN] r57279 - in grass/trunk/raster: r.proj r.resamp.bspline r.resamp.interp r.shaded.relief r.viewshed

svn_grass at osgeo.org svn_grass at osgeo.org
Fri Jul 26 04:40:36 PDT 2013 

Author: neteler
Date: 2013-07-26 04:40:35 -0700 (Fri, 26 Jul 2013)
New Revision: 57279

Modified:
   grass/trunk/raster/r.proj/r.proj.html
   grass/trunk/raster/r.resamp.bspline/main.c
   grass/trunk/raster/r.resamp.bspline/r.resamp.bspline.html
   grass/trunk/raster/r.resamp.interp/r.resamp.interp.html
   grass/trunk/raster/r.shaded.relief/r.shaded.relief.html
   grass/trunk/raster/r.viewshed/r.viewshed.html
Log:
bilinear -> linear; bicubic -> cubic

Modified: grass/trunk/raster/r.proj/r.proj.html
===================================================================
--- grass/trunk/raster/r.proj/r.proj.html	2013-07-26 08:03:15 UTC (rev 57278)
+++ grass/trunk/raster/r.proj/r.proj.html	2013-07-26 11:40:35 UTC (rev 57279)
@@ -87,13 +87,13 @@
 <p><em>r.proj</em> converts a map to a new geographic projection. It
 reads a map from a different location, projects it and write it out to
 the current location. The projected data is resampled with one of four
-different methods: nearest neighbor, bilinear, cubic convolution or
+different methods: nearest neighbor, linear, cubic convolution or
 lanczos.
 <p>The <b>method=nearest</b> method, which performs a nearest neighbor
 assignment, is the fastest of the three resampling methods. It is
 primarily used for categorical data such as a land use classification,
 since it will not change the values of the data
-cells. The <b>method=bilinear</b> method determines the new value of
+cells. The <b>method=linear</b> method determines the new value of
 the cell based on a weighted distance average of the 4 surrounding
 cells in the input map. The <b>method=cubic</b> method determines the
 new value of the cell based on a weighted distance average of the 16
@@ -103,19 +103,19 @@
 cubic, lanczos puts a higher weight on cells close to the center and a
 lower weight on cells away from the center, resulting in slightly
 better contrast.
-<p>The bilinear, cubic and lanczos interpolation methods are most
+<p>The linear, cubic and lanczos interpolation methods are most
 appropriate for continuous data and cause some smoothing. The amount
-of smoothing decreases from bilinear to cubic to lanczos. These
+of smoothing decreases from linear to cubic to lanczos. These
 options should not be used with categorical data, since the cell
 values will be altered.
-<p>In the bilinear, cubic and lanczos methods, if any of the surrounding
+<p>In the linear, cubic and lanczos methods, if any of the surrounding
 cells used to interpolate the new cell value are null, the resulting
 cell will be null, even if the nearest cell is not null. This will
 cause some thinning along null borders, such as the coasts of land
-areas in a DEM. The bilinear_f, cubic_f and lanczos_f interpolation
+areas in a DEM. The linear_f, cubic_f and lanczos_f interpolation
 methods can be used if thinning along null edges is not desired.
 These methods "fall back" to simpler interpolation methods
-along null borders.  That is, from lanczos to cubic to bilinear to
+along null borders.  That is, from lanczos to cubic to linear to
 nearest.
 <p>If nearest neighbor assignment is used, the output map has the same
 raster format as the input map. If any of the interpolations is used,

Modified: grass/trunk/raster/r.resamp.bspline/main.c
===================================================================
--- grass/trunk/raster/r.resamp.bspline/main.c	2013-07-26 08:03:15 UTC (rev 57278)
+++ grass/trunk/raster/r.resamp.bspline/main.c	2013-07-26 11:40:35 UTC (rev 57279)
@@ -82,7 +82,7 @@
     G_add_keyword(_("resample"));
     G_add_keyword(_("interpolation"));
     module->description =
-	_("Performs bicubic or bilinear spline interpolation with Tykhonov regularization.");
+	_("Performs cubic or linear spline interpolation with Tykhonov regularization.");
 
     in_opt = G_define_standard_option(G_OPT_R_INPUT);
 

Modified: grass/trunk/raster/r.resamp.bspline/r.resamp.bspline.html
===================================================================
--- grass/trunk/raster/r.resamp.bspline/r.resamp.bspline.html	2013-07-26 08:03:15 UTC (rev 57278)
+++ grass/trunk/raster/r.resamp.bspline/r.resamp.bspline.html	2013-07-26 11:40:35 UTC (rev 57279)
@@ -1,5 +1,5 @@
 <h2>DESCRIPTION</h2>
-<em>r.resamp.bspline</em> performs a bilinear/bicubic spline interpolation with
+<em>r.resamp.bspline</em> performs a linear/cubic spline interpolation with
 Tykhonov regularization. The input is a raster surface map, e.g. elevation,
 temperature, precipitation etc. Output is a raster map. Optionally, only
 input NULL cells are interpolated, useful to fill NULL cells, an alternative

Modified: grass/trunk/raster/r.resamp.interp/r.resamp.interp.html
===================================================================
--- grass/trunk/raster/r.resamp.interp/r.resamp.interp.html	2013-07-26 08:03:15 UTC (rev 57278)
+++ grass/trunk/raster/r.resamp.interp/r.resamp.interp.html	2013-07-26 11:40:35 UTC (rev 57279)
@@ -9,8 +9,8 @@
 cell in the output map as follows:
 <ul>
 <li>nearest neighbour (1 cell)</li>
-<li>bilinear (4 cells)</li>
-<li>bicubic (16 cells)</li>
+<li>linear (4 cells, also called bilinear)</li>
+<li>cubic (16 cells, also called bicubic)</li>
 <li>lanczos (25 cells)</li>
 </ul>
 
@@ -26,7 +26,7 @@
 r.resamp.rst</em>) resample the map to match the current region settings.
 
  
-<p>Note that for bilinear, bicubic and lanczos interpolation,
+<p>Note that for linear, cubic and lanczos interpolation,
 cells of the output raster that cannot be bounded by the appropriate number
 of input cell centers are set to NULL (NULL propagation). This could occur
 due to the input cells being outside the current region, being NULL or MASKed.

Modified: grass/trunk/raster/r.shaded.relief/r.shaded.relief.html
===================================================================
--- grass/trunk/raster/r.shaded.relief/r.shaded.relief.html	2013-07-26 08:03:15 UTC (rev 57278)
+++ grass/trunk/raster/r.shaded.relief/r.shaded.relief.html	2013-07-26 11:40:35 UTC (rev 57279)
@@ -43,7 +43,7 @@
 <h2>NOTES</h2>
 
 To visually improve the result of shade maps from low resolution elevation
-models, use <em>r.resamp.interp</em> with bilinear or bicubic method to
+models, use <em>r.resamp.interp</em> with linear or cubic method to
 resample the DEM at higher resolution. <em>r.shaded.relief</em> is then
 run on the resampled DEM.
 

Modified: grass/trunk/raster/r.viewshed/r.viewshed.html
===================================================================
--- grass/trunk/raster/r.viewshed/r.viewshed.html	2013-07-26 08:03:15 UTC (rev 57278)
+++ grass/trunk/raster/r.viewshed/r.viewshed.html	2013-07-26 11:40:35 UTC (rev 57279)
@@ -118,7 +118,7 @@
 Two points are visible to each other if their line-of-sight does not
 intersect the terrain. The height for an arbitrary point x in the terrain 
 is interpolated from the 4 surrounding neighbours. This means that this 
-model does a bilinear interpolation of heights.
+model does a linear (bilinear) interpolation of heights.
 
 This model is suitable for both low and high resolution rasters as well 
 as terrain with flat and steep slopes.

More information about the grass-commit mailing list