Browse Source

r.li.edgedensity: update rli mask handling

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@59085 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 11 years ago
parent
commit
f924fd5b88
1 changed files with 10 additions and 10 deletions
  1. 10 10
      raster/r.li/r.li.edgedensity/edgedensity.c

+ 10 - 10
raster/r.li/r.li.edgedensity/edgedensity.c

@@ -164,8 +164,8 @@ int calculate(int fd, struct area_entry *ad, char **valore, double *result)
 	}
 	}
 
 
 	for (i = 0; i < ad->cl; i++) {
 	for (i = 0; i < ad->cl; i++) {
-	    mask_corr[i + ad->x] = 0;
-	    mask_sup[i + ad->x] = 0;
+	    mask_corr[i] = 0;
+	    mask_sup[i] = 0;
 	}
 	}
 
 
 	if (read(mask_fd, mask_inf, (ad->cl * sizeof(int))) < 0) {
 	if (read(mask_fd, mask_inf, (ad->cl * sizeof(int))) < 0) {
@@ -220,7 +220,7 @@ int calculate(int fd, struct area_entry *ad, char **valore, double *result)
 		int z = 0;
 		int z = 0;
 
 
 		for (z = 0; z < ad->cl; z++)
 		for (z = 0; z < ad->cl; z++)
-		    mask_inf[z + ad->x] = 0;
+		    mask_inf[z] = 0;
 	    }
 	    }
 	}
 	}
 
 
@@ -422,8 +422,8 @@ int calculateD(int fd, struct area_entry *ad, char **valore, double *result)
 	}
 	}
 
 
 	for (i = 0; i < ad->cl; i++) {
 	for (i = 0; i < ad->cl; i++) {
-	    mask_corr[i + ad->x] = 0;
-	    mask_sup[i + ad->x] = 0;
+	    mask_corr[i] = 0;
+	    mask_sup[i] = 0;
 	}
 	}
 
 
 	if (read(mask_fd, mask_inf, (ad->cl * sizeof(int))) <= 0) {
 	if (read(mask_fd, mask_inf, (ad->cl * sizeof(int))) <= 0) {
@@ -479,7 +479,7 @@ int calculateD(int fd, struct area_entry *ad, char **valore, double *result)
 		int z = 0;
 		int z = 0;
 
 
 		for (z = 0; z < ad->cl; z++)
 		for (z = 0; z < ad->cl; z++)
-		    mask_inf[z + ad->x] = 0;
+		    mask_inf[z] = 0;
 	    }
 	    }
 	}
 	}
 
 
@@ -513,7 +513,7 @@ int calculateD(int fd, struct area_entry *ad, char **valore, double *result)
 		else
 		else
 		    infCell = buf_inf[i + ad->x];
 		    infCell = buf_inf[i + ad->x];
 
 
-		/* calculate how many edge the cell has */
+		/* calculate how many edges the cell has */
 
 
 		if ((Rast_is_null_value(&prevCell, DCELL_TYPE)) ||
 		if ((Rast_is_null_value(&prevCell, DCELL_TYPE)) ||
 		    (corrCell != prevCell)) {
 		    (corrCell != prevCell)) {
@@ -680,8 +680,8 @@ int calculateF(int fd, struct area_entry *ad, char **valore, double *result)
 	}
 	}
 
 
 	for (i = 0; i < ad->cl; i++) {
 	for (i = 0; i < ad->cl; i++) {
-	    mask_corr[i + ad->x] = 0;
-	    mask_sup[i + ad->x] = 0;
+	    mask_corr[i] = 0;
+	    mask_sup[i] = 0;
 	}
 	}
 
 
 	if (read(mask_fd, mask_inf, (ad->cl * sizeof(int))) <= 0) {
 	if (read(mask_fd, mask_inf, (ad->cl * sizeof(int))) <= 0) {
@@ -735,7 +735,7 @@ int calculateF(int fd, struct area_entry *ad, char **valore, double *result)
 		int z = 0;
 		int z = 0;
 
 
 		for (z = 0; z < ad->cl; z++)
 		for (z = 0; z < ad->cl; z++)
-		    mask_inf[z + ad->x] = 0;
+		    mask_inf[z] = 0;
 	    }
 	    }
 	}
 	}