[GRASS-SVN] r61686 - grass/branches/releasebranch_7_0/lib/ogsf

[svn_grass at osgeo.org]

Author: annakrat
Date: 2014-08-18 18:38:05 -0700 (Mon, 18 Aug 2014)
New Revision: 61686

Modified:
   grass/branches/releasebranch_7_0/lib/ogsf/Gp3.c
   grass/branches/releasebranch_7_0/lib/ogsf/Gv3.c
Log:
libogsf: uninitialized variable causes unresponsive vector style settings (merge from trunk, r61612)

Modified: grass/branches/releasebranch_7_0/lib/ogsf/Gp3.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/ogsf/Gp3.c	2014-08-18 20:53:05 UTC (rev 61685)
+++ grass/branches/releasebranch_7_0/lib/ogsf/Gp3.c	2014-08-19 01:38:05 UTC (rev 61686)
@@ -120,6 +120,8 @@
 	    else {
 		Vect_reset_cats(Cats);
 	    }
+	    /* initialize style */
+	    gpt->highlighted = 0;
 	    
 	    G_debug(5, "loading vector point %d x=%f y=%f ncats=%d",
 		    np, Points->x[0], Points->y[0], Cats->n_cats);

Modified: grass/branches/releasebranch_7_0/lib/ogsf/Gv3.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/ogsf/Gv3.c	2014-08-18 20:53:05 UTC (rev 61685)
+++ grass/branches/releasebranch_7_0/lib/ogsf/Gv3.c	2014-08-19 01:38:05 UTC (rev 61686)
@@ -97,6 +97,10 @@
 	Vect_get_area_points(&map, area, points);
 	if (points->n_points < 3)
 	    continue;
+
+	/* initialize style */
+	gln->highlighted = 0;
+
 	gln->type = OGSF_POLYGON;
 	gln->npts = np = points->n_points;
 	G_debug(3, "  np = %d", np);
@@ -174,6 +178,9 @@
 		/* Vect_append_point ( points, points->x[0], points->y[0], points->z[0] ); */
 	    }
 
+	    /* initialize style */
+	    gln->highlighted = 0;
+
 	    gln->npts = np = points->n_points;
 	    G_debug(3, "  np = %d", np);