[GRASS-SVN] r64879 - grass/branches/releasebranch_6_4/lib/vector/Vlib

[svn_grass at osgeo.org]

Author: mmetz
Date: 2015-03-17 01:43:21 -0700 (Tue, 17 Mar 2015)
New Revision: 64879

Modified:
   grass/branches/releasebranch_6_4/lib/vector/Vlib/build_nat.c
   grass/branches/releasebranch_6_4/lib/vector/Vlib/header.c
   grass/branches/releasebranch_6_4/lib/vector/Vlib/map.c
Log:
Vlib: sync 64, 65

Modified: grass/branches/releasebranch_6_4/lib/vector/Vlib/build_nat.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/Vlib/build_nat.c	2015-03-17 08:27:09 UTC (rev 64878)
+++ grass/branches/releasebranch_6_4/lib/vector/Vlib/build_nat.c	2015-03-17 08:43:21 UTC (rev 64879)
@@ -380,8 +380,8 @@
 
 	/* Unregister centroid */
 	orig_area = Line->left;
-	if ( orig_area > 0 ) {
-	    if ( plus->Area[orig_area] != NULL ) {
+	if (orig_area > 0) {
+	    if (plus->Area[orig_area] != NULL) {
 		plus->Area[orig_area]->centroid = 0;
 	    }
 	}
@@ -409,8 +409,7 @@
 		    dig_line_add_updated(plus, centr);
 	    }
 	}
-
-	if (sel_area != orig_area && plus->do_uplist)
+	else if (orig_area != 0 && plus->do_uplist)
 	    dig_line_add_updated(plus, centr);
     }
 

Modified: grass/branches/releasebranch_6_4/lib/vector/Vlib/header.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/Vlib/header.c	2015-03-17 08:27:09 UTC (rev 64878)
+++ grass/branches/releasebranch_6_4/lib/vector/Vlib/header.c	2015-03-17 08:43:21 UTC (rev 64879)
@@ -493,7 +493,7 @@
 
    \param Map vector map
 
-   \return poiter to projection name
+   \return pointer to projection name
  */
 
 const char *Vect_get_proj_name(struct Map_info *Map)
@@ -508,8 +508,13 @@
     case PROJECTION_SP:
 	return G__projection_name(n);
     }
+
+    /* Vect_get_proj() didn't return a useful result,
+       fallback to G_database_projection_name() */
+    /* (is this behavior desirable?) */
     if (!lookup(PROJECTION_FILE, "name", name, sizeof(name)))
 	strcpy(name, _("Unknown projection"));
+
     return G_store(name);
 }
 

Modified: grass/branches/releasebranch_6_4/lib/vector/Vlib/map.c
===================================================================
--- grass/branches/releasebranch_6_4/lib/vector/Vlib/map.c	2015-03-17 08:27:09 UTC (rev 64878)
+++ grass/branches/releasebranch_6_4/lib/vector/Vlib/map.c	2015-03-17 08:43:21 UTC (rev 64879)
@@ -62,7 +62,7 @@
 	for (i = 1; i <= nlines; i++) {
 	    if (!Vect_line_alive(In, i))
 		continue;
-			
+
 	    type = Vect_read_line(In, Points, Cats, i);
 	    if (type == -1) {
 		G_warning(_("Unable to read vector map <%s>"),