[GRASS-SVN] r61449 - in grass/branches/releasebranch_7_0: . lib/vector/Vlib

[svn_grass at osgeo.org]

Author: hcho
Date: 2014-07-29 08:04:48 -0700 (Tue, 29 Jul 2014)
New Revision: 61449

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/lib/vector/Vlib/color_read.c
Log:
Vlib: backport from trunk r60225


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Deleted: svn:mergeinfo
   - /grass/trunk:59505,59646,60100-60101,60149,60203-60204,60215,60219,60278,60376,60610,60625,60807,60835,60936-60937,61159-61160,61165,61275,61288,61290,61292,61294,61301

Modified: grass/branches/releasebranch_7_0/lib/vector/Vlib/color_read.c
===================================================================
--- grass/branches/releasebranch_7_0/lib/vector/Vlib/color_read.c	2014-07-29 08:52:27 UTC (rev 61448)
+++ grass/branches/releasebranch_7_0/lib/vector/Vlib/color_read.c	2014-07-29 15:04:48 UTC (rev 61449)
@@ -58,13 +58,13 @@
 
     if (strcmp(mapset, G_mapset()) == 0) {
         /* look for the regular color table */
-	sprintf(buf, "%s/%s/%s", GV_DIRECTORY, name, GV_COLR_ELEMENT);
-        ret = Rast__read_colors(buf, "", mapset, colors);
+	sprintf(buf, "%s/%s", GV_DIRECTORY, name);
+        ret = Rast__read_colors(buf, GV_COLR_ELEMENT, mapset, colors);
     }
     else {
 	/* look for secondary color table in current mapset */
-	sprintf(buf, "%s/%s/%s", GV_COLR2_DIRECTORY, mapset, name);
-        ret = Rast__read_colors(buf, "", G_mapset(), colors);
+	sprintf(buf, "%s/%s", GV_COLR2_DIRECTORY, mapset);
+        ret = Rast__read_colors(buf, name, G_mapset(), colors);
     }
     if (ret == -2)
 	return 0;