[GRASS-SVN] r69878 - grass/branches/releasebranch_7_2/raster/r.texture

[svn_grass at osgeo.org]

Author: mmetz
Date: 2016-11-23 05:20:20 -0800 (Wed, 23 Nov 2016)
New Revision: 69878

Modified:
   grass/branches/releasebranch_7_2/raster/r.texture/h_measure.c
Log:
r.texture: fix r11641, fix f4_var (backport from trunk r69877)

Modified: grass/branches/releasebranch_7_2/raster/r.texture/h_measure.c
===================================================================
--- grass/branches/releasebranch_7_2/raster/r.texture/h_measure.c	2016-11-23 13:19:33 UTC (rev 69877)
+++ grass/branches/releasebranch_7_2/raster/r.texture/h_measure.c	2016-11-23 13:20:20 UTC (rev 69878)
@@ -489,7 +489,7 @@
 
     for (i = 0; i < Ng; i++)
 	for (j = 0; j < Ng; j++)
-	    var += (tone[i] - mean) * (tone[j] - mean) * P[i][j];
+	    var += (tone[i] - mean) * (tone[i] - mean) * P[i][j];
 
     return var;
 }
@@ -670,7 +670,7 @@
     }
 
     /* fprintf(stderr,"hx=%f\thxy2=%f\n",hx,hxy2); */
-    return (sqrt(abs(1 - exp(-2.0 * (hxy2 - hxy)))));
+    return (sqrt(fabs(1 - exp(-2.0 * (hxy2 - hxy)))));
 }
 
 float *vector(int n)