[GRASS-SVN] r36223 - grass/branches/releasebranch_6_4/lib/vector/vedit

[svn_grass at osgeo.org]

Author: martinl
Date: 2009-03-06 19:01:37 -0500 (Fri, 06 Mar 2009)
New Revision: 36223

Modified:
   grass/branches/releasebranch_6_4/lib/vector/vedit/select.c
   grass/branches/releasebranch_6_4/lib/vector/vedit/snap.c
Log:
veditlib: osgeo4w patch applied (by jef) - trac #519
	  (merge from devbr6, r36222)


Modified: grass/branches/releasebranch_6_4/lib/vector/vedit/select.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/vedit/select.c	2009-03-06 23:51:15 UTC (rev 36222)
+++ grass/branches/releasebranch_6_4/lib/vector/vedit/select.c	2009-03-07 00:01:37 UTC (rev 36223)
@@ -138,6 +138,12 @@
 {
     int ltype;
     double length;
+    int i, cat_curr;
+    int node1, node2, node;	/* nodes */
+    int nnode1, nnode2;	/* number of line in node */
+    double nx, ny, nz;	/* node coordinates */
+    struct ilist *exclude, *found;	/* line id of nearest lines */
+    struct line_cats *Cats_curr;
 
     if (!Vect_line_alive(Map, line))
 	return -1;
@@ -171,13 +177,6 @@
 	    return -1;
 	/* check if line is dangle */
 
-	int i, cat_curr;
-	int node1, node2, node;	/* nodes */
-	int nnode1, nnode2;	/* number of line in node */
-	double nx, ny, nz;	/* node coordinates */
-	struct ilist *exclude, *found;	/* line id of nearest lines */
-	struct line_cats *Cats_curr;
-
 	Vect_get_line_nodes(Map, line, &node1, &node2);
 
 	node = -1;

Modified: grass/branches/releasebranch_6_4/lib/vector/vedit/snap.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/vedit/snap.c	2009-03-06 23:51:15 UTC (rev 36222)
+++ grass/branches/releasebranch_6_4/lib/vector/vedit/snap.c	2009-03-07 00:01:37 UTC (rev 36223)
@@ -180,7 +180,7 @@
 		     int to_vertex)
 {
     int i, line, type;
-    int nlines_modified;
+    int nlines_modified = 0;
 
     struct line_pnts *Points;
     struct line_cats *Cats;