[GRASS-SVN] r55267 - grass/trunk/lib/vector/vedit

[svn_grass at osgeo.org]

Author: mmetz
Date: 2013-02-28 10:52:24 -0800 (Thu, 28 Feb 2013)
New Revision: 55267

Modified:
   grass/trunk/lib/vector/vedit/zbulk.c
Log:
vedit lib update

Modified: grass/trunk/lib/vector/vedit/zbulk.c
===================================================================
--- grass/trunk/lib/vector/vedit/zbulk.c	2013-02-28 18:51:53 UTC (rev 55266)
+++ grass/trunk/lib/vector/vedit/zbulk.c	2013-02-28 18:52:24 UTC (rev 55267)
@@ -40,6 +40,7 @@
 
     struct line_cats *Cats;
     struct line_pnts *Points, *Points_se;	/* start - end */
+    struct bound_box box, box_se;
 
     /* for intersection */
     struct line_pnts **Points_a, **Points_b;
@@ -68,6 +69,8 @@
     if (temp_line < 0) {
 	return -1;
     }
+    
+    Vect_line_box(Points_se, &box_se);
 
     /* determine order of lines */
     cv_i = 0;
@@ -82,8 +85,9 @@
 	if (!(type & GV_LINE))
 	    continue;
 
+	Vect_line_box(Points, &box);
 	if (Vect_line_check_intersection(Points_se, Points, WITH_Z)) {
-	    Vect_line_intersection(Points_se, Points,
+	    Vect_line_intersection(Points_se, Points, &box_se, &box,
 				   &Points_a, &Points_b, &nlines_a, &nlines_b,
 				   WITHOUT_Z);
 
@@ -108,7 +112,7 @@
     /* z bulk-labeling */
     for (cv_i = 0; cv_i < cv.n_values; cv_i++) {
 	line = cv.value[cv_i].cat;
-	Vect_read_line(Map, Points, Cats, line);
+	type = Vect_read_line(Map, Points, Cats, line);
 
 	for (p_i = 0; p_i < Points->n_points; p_i++) {
 	    Points->z[p_i] = value;