Quellcode durchsuchen

v.colors.out: check if color table is defined

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47868 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa vor 13 Jahren
Ursprung
Commit
ca2939e93e
1 geänderte Dateien mit 9 neuen und 2 gelöschten Zeilen
  1. 9 2
      vector/v.colors.out/main.c

+ 9 - 2
vector/v.colors.out/main.c

@@ -37,6 +37,7 @@ int main(int argc, char **argv)
     } flag;
     struct Colors cat_colors, *colors;
     
+    int ret;
     int min, max;
     const char *file, *name, *layer, *column;
     FILE *fp;
@@ -78,10 +79,16 @@ int main(int argc, char **argv)
     file = opt.file->answer;
     column = opt.col->answer;
     
-    if (Vect_read_colors(name, "", &cat_colors) < 0)
+    ret = Vect_read_colors(name, "", &cat_colors);
+    if (ret < 0)
 	G_fatal_error(_("Unable to read color table for vector map <%s>"),
 		      opt.map->answer);
-    
+    if (ret == 0) {
+	G_warning(_("No color table defined for vector map <%s>"),
+		  opt.map->answer);
+	exit(EXIT_SUCCESS);
+    }
+
     min = max = -1;
     if (flag.p->answer) {
 	scan_cats(name, layer, &min, &max);