瀏覽代碼

m.nviz.image: fix compiler warnings + coverity scan

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@74332 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 6 年之前
父節點
當前提交
ea51ed8299
共有 2 個文件被更改,包括 6 次插入7 次删除
  1. 5 6
      misc/m.nviz.image/surface.c
  2. 1 1
      misc/m.nviz.image/volume.c

+ 5 - 6
misc/m.nviz.image/surface.c

@@ -99,15 +99,14 @@ int load_rasters(const struct GParams *params, nv_data * data)
 
     for (i = 0; i < nsurfs; i++) {
 	id = surf_list[i];
+	mapset = G_find_raster2(params->color_map->answers[i], "");
+	if (mapset == NULL) {
+	    G_fatal_error(_("Raster map <%s> not found"),
+			  params->color_map->answers[i]);
+	}
 	/* color */
 	/* check for color map */
 	if (i < ncolor_map && strcmp(params->color_map->answers[i], "")) {
-	    mapset = G_find_raster2(params->color_map->answers[i], "");
-	    if (mapset == NULL) {
-		G_fatal_error(_("Raster map <%s> not found"),
-			      params->color_map->answers[i]);
-	    }
-
 	    Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT,
 			  G_fully_qualified_name(params->
 						 color_map->answers[i],

+ 1 - 1
misc/m.nviz.image/volume.c

@@ -32,7 +32,7 @@ int load_rasters3d(const struct GParams *params, nv_data * data)
 {
     int i, nvol, id;
     float x, y, z;
-    char *mapset;
+    const char *mapset;
 
     nvol = opt_get_num_answers(params->volume);