Explorar o código

d.vect: fix colorized lines/areas (color table)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47682 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa %!s(int64=13) %!d(string=hai) anos
pai
achega
5a9172b3a9
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      display/d.vect/area.c
  2. 1 1
      display/d.vect/lines.c

+ 1 - 1
display/d.vect/area.c

@@ -190,7 +190,7 @@ int display_area(struct Map_info *Map, struct cat_list *Clist, const struct Cell
 	}
 	}
 	
 	
 	if (fcolor || zcolors) {
 	if (fcolor || zcolors) {
-	    if (!cvarr_rgb && !cats_color_flag && !zcolors) {
+	    if (!cvarr_rgb && !cats_color_flag && !zcolors && !colors) {
 		D_RGB_color(fcolor->r, fcolor->g, fcolor->b);
 		D_RGB_color(fcolor->r, fcolor->g, fcolor->b);
 		D_polygon_abs(Points->x, Points->y, Points->n_points);
 		D_polygon_abs(Points->x, Points->y, Points->n_points);
 	    }
 	    }

+ 1 - 1
display/d.vect/lines.c

@@ -281,7 +281,7 @@ int display_lines(struct Map_info *Map, int type, struct cat_list *Clist,
 	    rotation = 0.0;
 	    rotation = 0.0;
 	}
 	}
 	else if (color || custom_rgb || zcolors) {
 	else if (color || custom_rgb || zcolors) {
-	    if (!cvarr_rgb && !cats_color_flag && !zcolors)
+	    if (!cvarr_rgb && !cats_color_flag && !zcolors && !colors)
 		D_RGB_color(color->r, color->g, color->b);
 		D_RGB_color(color->r, color->g, color->b);
 	    else {
 	    else {
 		if (custom_rgb)
 		if (custom_rgb)