[GRASS-SVN] r34404 - grass/branches/develbranch_6/raster/r.grow2

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Nov 20 11:35:12 EST 2008


Author: glynn
Date: 2008-11-20 11:35:12 -0500 (Thu, 20 Nov 2008)
New Revision: 34404

Modified:
   grass/branches/develbranch_6/raster/r.grow2/main.c
Log:
Fix spelling of "euclidean"


Modified: grass/branches/develbranch_6/raster/r.grow2/main.c
===================================================================
--- grass/branches/develbranch_6/raster/r.grow2/main.c	2008-11-20 16:34:01 UTC (rev 34403)
+++ grass/branches/develbranch_6/raster/r.grow2/main.c	2008-11-20 16:35:12 UTC (rev 34404)
@@ -33,7 +33,7 @@
 typedef int metric_fn(int, int);
 
 
-static int distance_euclidian_squared(int dx, int dy)
+static int distance_euclidean_squared(int dx, int dy)
 {
     return dx * dx + dy * dy;
 }
@@ -75,11 +75,11 @@
     }
 }
 
-static void setup_neighbors_euclidian(double radius)
+static void setup_neighbors_euclidean(double radius)
 {
     int r2 = (int)(radius * radius);
 
-    setup_neighbors(radius, r2, distance_euclidian_squared);
+    setup_neighbors(radius, r2, distance_euclidean_squared);
 }
 
 static void setup_neighbors_maximum(double radius)
@@ -146,8 +146,8 @@
     opt.met->type = TYPE_STRING;
     opt.met->required = NO;
     opt.met->description = _("Metric");
-    opt.met->options = "euclidian,maximum,manhattan";
-    opt.met->answer = "euclidian";
+    opt.met->options = "euclidean,maximum,manhattan";
+    opt.met->answer = "euclidean";
 
     opt.old = G_define_option();
     opt.old->key = "old";
@@ -189,8 +189,8 @@
     nrows = G_window_rows();
     ncols = G_window_cols();
 
-    if (strcmp(opt.met->answer, "euclidian") == 0)
-	setup_neighbors_euclidian(radius);
+    if (strcmp(opt.met->answer, "euclidean") == 0)
+	setup_neighbors_euclidean(radius);
     else if (strcmp(opt.met->answer, "maximum") == 0)
 	setup_neighbors_maximum(radius);
     else if (strcmp(opt.met->answer, "manhattan") == 0)



More information about the grass-commit mailing list