[GRASS-SVN] r69350 - grass/branches/releasebranch_7_0/vector/v.overlay

[svn_grass at osgeo.org]

Author: mmetz
Date: 2016-09-02 13:09:28 -0700 (Fri, 02 Sep 2016)
New Revision: 69350

Modified:
   grass/branches/releasebranch_7_0/vector/v.overlay/area_area.c
   grass/branches/releasebranch_7_0/vector/v.overlay/line_area.c
Log:
v.overlay: fix output layer handling (backport from trunk r69348)

Modified: grass/branches/releasebranch_7_0/vector/v.overlay/area_area.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.overlay/area_area.c	2016-09-02 20:08:20 UTC (rev 69349)
+++ grass/branches/releasebranch_7_0/vector/v.overlay/area_area.c	2016-09-02 20:09:28 UTC (rev 69350)
@@ -199,7 +199,7 @@
 			if (Cats->field[i] == field[input]) {
 			    ATTR *at;
 
-			    Vect_cat_set(Centr[area].cat[input], ofield[input + 1],
+			    Vect_cat_set(Centr[area].cat[input], field[input],
 					 Cats->cat[i]);
 
 			    /* Mark as used */

Modified: grass/branches/releasebranch_7_0/vector/v.overlay/line_area.c
===================================================================
--- grass/branches/releasebranch_7_0/vector/v.overlay/line_area.c	2016-09-02 20:08:20 UTC (rev 69349)
+++ grass/branches/releasebranch_7_0/vector/v.overlay/line_area.c	2016-09-02 20:09:28 UTC (rev 69350)
@@ -426,7 +426,7 @@
 
 	    if (ofield[2] > 0 && field[1] > 0 && ofield[1] != ofield[2]) {
 		for (i = 0; i < ACats->n_cats; i++) {
-		    if (Cats->field[i] == field[1])
+		    if (ACats->field[i] == field[1])
 			Vect_cat_set(OCats, ofield[2], ACats->cat[i]);
 		}
 	    }