浏览代码

remove statement with no effect and array indices out of bounds

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47160 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 14 年之前
父节点
当前提交
11833e2c65
共有 2 个文件被更改,包括 9 次插入2 次删除
  1. 0 1
      raster/r.texture/h_measure.c
  2. 9 1
      raster/r.texture/r.texture.html

+ 0 - 1
raster/r.texture/h_measure.c

@@ -868,7 +868,6 @@ void reduction(float **a, int n)
 		SWAP(a[i][j], a[m][j])
 		SWAP(a[i][j], a[m][j])
 		    for (j = 1; j <= n; j++)
 		    for (j = 1; j <= n; j++)
 		    SWAP(a[j][i], a[j][m])
 		    SWAP(a[j][i], a[j][m])
-			a[j][i] = a[j][i];
 	}
 	}
 	if (x) {
 	if (x) {
 	    for (i = m + 1; i <= n; i++) {
 	    for (i = m + 1; i <= n; i++) {

+ 9 - 1
raster/r.texture/r.texture.html

@@ -5,6 +5,9 @@ user-specified raster map layer. The module calculates textural features
 based on spatial dependence matrices at 0, 45, 90, and 135 
 based on spatial dependence matrices at 0, 45, 90, and 135 
 degrees for a <em>distance</em> (default = 1).
 degrees for a <em>distance</em> (default = 1).
 <p>
 <p>
+<em>r.texture</em> assumes grey levels ranging from 0 to 255 as input. 
+The input is rescaled to 0 to 255 if needed.
+<p>
 In general, several variables constitute texture: differences in grey level values,
 In general, several variables constitute texture: differences in grey level values,
 coarseness as scale of grey level differences, presence or lack of directionality
 coarseness as scale of grey level differences, presence or lack of directionality
 and regular patterns.
 and regular patterns.
@@ -94,7 +97,12 @@ Calculation of Angular Second Moment of B/W orthophoto (North Carolina data set)
 
 
 <div class="code"><pre>
 <div class="code"><pre>
 g.region rast=ortho_2001_t792_1m -p
 g.region rast=ortho_2001_t792_1m -p
-r.texture -a ortho_2001_t792_1m prefix=ortho_texture
+# set grey level color table 0% black 100% white
+r.colors ortho_2001_t792_1m color=grey
+# extract grey levels
+r.mapcalc "ortho_2001_t792_1m.greylevel = #ortho_2001_t792_1m"
+# texture analysis
+r.texture ortho_2001_t792_1m.greylevel prefix=ortho_texture -a 
 # display
 # display
 g.region n=221461 s=221094 w=638279 e=638694
 g.region n=221461 s=221094 w=638279 e=638694
 d.shadedmap drape=ortho_texture_ASM_0 rel=ortho_2001_t792_1m
 d.shadedmap drape=ortho_texture_ASM_0 rel=ortho_2001_t792_1m