[GRASS-SVN] r71652 - grass-addons/grass7/raster/r.object.geometry

[svn_grass at osgeo.org]

Author: mlennert
Date: 2017-11-10 07:18:38 -0800 (Fri, 10 Nov 2017)
New Revision: 71652

Modified:
   grass-addons/grass7/raster/r.object.geometry/main.c
Log:
r.object.geometry: fixing a bug in area and perimeter calculations (should be in pixels, even if pixels are not square)

Modified: grass-addons/grass7/raster/r.object.geometry/main.c
===================================================================
--- grass-addons/grass7/raster/r.object.geometry/main.c	2017-11-09 01:08:30 UTC (rev 71651)
+++ grass-addons/grass7/raster/r.object.geometry/main.c	2017-11-10 15:18:38 UTC (rev 71652)
@@ -175,7 +175,7 @@
 		if (flag_m->answer) {
 		    obj_geos[cur - min].area += unit_area;
 		} else {
-		    obj_geos[cur - min].area += 1 * ew_factor;
+		    obj_geos[cur - min].area += 1;
 		}
 		if (obj_geos[cur - min].min_row > row)
 		    obj_geos[cur - min].min_row = row;
@@ -205,9 +205,9 @@
 		}
 		else {
 		    if (!cur_null)
-			obj_geos[cur - min].perimeter += ew_factor;
+			obj_geos[cur - min].perimeter += 1;
 		    if (!top_null)
-			obj_geos[top - min].perimeter += ew_factor;
+			obj_geos[top - min].perimeter += 1;
 		}
 	    }
 	    if (cmp_cells(cur, left, cur_null, left_null)) {
@@ -276,7 +276,7 @@
 	}
 	else {
 	    if (!top_null)
-		obj_geos[top - min].perimeter += ew_factor;
+		obj_geos[top - min].perimeter += 1;
 	}
     }
     G_percent(1, 1, 1);