[GRASS-SVN] r55268 - in grass/trunk/vector: v.clean v.generalize

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-02-28 10:53:09 -0800 (Thu, 28 Feb 2013)
New Revision: 55268

Modified:
   grass/trunk/vector/v.clean/prune.c
   grass/trunk/vector/v.generalize/misc.c
Log:
update vector modules for Vect_line_intersection()

Modified: grass/trunk/vector/v.clean/prune.c
===================================================================
--- grass/trunk/vector/v.clean/prune.c	2013-02-28 18:52:24 UTC (rev 55267)
+++ grass/trunk/vector/v.clean/prune.c	2013-02-28 18:53:09 UTC (rev 55268)
@@ -49,7 +49,7 @@
     TPoints = Vect_new_line_struct();
     BPoints = Vect_new_line_struct();
     Cats = Vect_new_cats_struct();
-    List = Vect_new_boxlist(0);
+    List = Vect_new_boxlist(1);
 
     nlines = Vect_get_num_lines(Out);
 
@@ -132,7 +132,8 @@
 		 * intersections should be found if any */
 
 		AXLines = BXLines = NULL;
-		Vect_line_intersection(TPoints, BPoints, &AXLines, &BXLines,
+		Vect_line_intersection(TPoints, BPoints, &box, &List->box[i],
+		                       &AXLines, &BXLines,
 				       &naxlines, &nbxlines, 0);
 
 		G_debug(4,

Modified: grass/trunk/vector/v.generalize/misc.c
===================================================================
--- grass/trunk/vector/v.generalize/misc.c	2013-02-28 18:52:24 UTC (rev 55267)
+++ grass/trunk/vector/v.generalize/misc.c	2013-02-28 18:53:09 UTC (rev 55268)
@@ -201,7 +201,7 @@
     if (!BPoints)
 	BPoints = Vect_new_line_struct();
     if (!List)
-	List = Vect_new_boxlist(0);
+	List = Vect_new_boxlist(1);
 
     /* Check intersection of the modified boundary with other boundaries */
     Vect_line_box(Points, &box);
@@ -223,7 +223,7 @@
 	 * intersections should be found if any */
 
 	AXLines = BXLines = NULL;
-	Vect_line_intersection(Points, BPoints, &AXLines, &BXLines,
+	Vect_line_intersection(Points, BPoints, &box, &List->box[i], &AXLines, &BXLines,
 			       &naxlines, &nbxlines, 0);
 
 	G_debug(4,