From 070372cd70c51dc5e25797791c76604e54dcff45 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Sun, 9 Feb 2025 18:24:49 -0500 Subject: [PATCH 1/9] Fix Resource Leak issue --- misc/m.nviz.image/volume.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/misc/m.nviz.image/volume.c b/misc/m.nviz.image/volume.c index cff9b5b53ab..fa501aae99b 100644 --- a/misc/m.nviz.image/volume.c +++ b/misc/m.nviz.image/volume.c @@ -243,6 +243,7 @@ int add_isosurfs(const struct GParams *params, nv_data *data UNUSED) GVL_isosurf_set_drawmode(id, draw_mode); } + G_free(vol_list); return 1; } @@ -331,6 +332,7 @@ int add_slices(const struct GParams *params, nv_data *data UNUSED) GVL_slice_set_drawmode(id, draw_mode); } + G_free(vol_list); return 1; } From 1274a8a849824d868ed1697368bd4d9d6ad984c5 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Mon, 10 Feb 2025 16:42:52 -0500 Subject: [PATCH 2/9] fix all issues in m.nviz.image --- misc/m.nviz.image/surface.c | 4 +++- misc/m.nviz.image/vector.c | 25 +++++++++++++++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/misc/m.nviz.image/surface.c b/misc/m.nviz.image/surface.c index a4b7c836c8f..46ac361d5d8 100644 --- a/misc/m.nviz.image/surface.c +++ b/misc/m.nviz.image/surface.c @@ -27,7 +27,7 @@ */ int load_rasters(const struct GParams *params, nv_data *data) { - const char *mapset; + const char *mapset = NULL; int i; int nelevs, nelev_map, nelev_const, ncolor_map, ncolor_const, nmask_map; int ntransp_map, ntransp_const, nshine_map, nshine_const; @@ -191,6 +191,7 @@ int load_rasters(const struct GParams *params, nv_data *data) set_default_wirecolors(data, i); */ } + G_free(surf_list); return nsurfs; } @@ -273,6 +274,7 @@ void surface_set_draw_mode(const struct GParams *params) /* wire color */ GS_set_wire_color(id, Nviz_color_from_str(wire_color)); } + G_free(surf_list); return; } diff --git a/misc/m.nviz.image/vector.c b/misc/m.nviz.image/vector.c index 655f39fa225..7fc27f68545 100644 --- a/misc/m.nviz.image/vector.c +++ b/misc/m.nviz.image/vector.c @@ -72,6 +72,7 @@ int load_vectors(const struct Option *elev_map, const struct Option *elev_const, surf_list = GS_get_surf_list(&nsurf); GS_set_att_const(surf_list[0], ATT_TRANSP, 255); + G_free(surf_list); } nvects = 0; @@ -111,7 +112,7 @@ int load_vectors(const struct Option *elev_map, const struct Option *elev_const, */ int vlines_set_attrb(const struct GParams *params) { - int i, layer, color, width, flat, height; + int i, layer = 0, color, width, flat, height; int *vect_list, nvects; int have_colors; @@ -138,8 +139,10 @@ int vlines_set_attrb(const struct GParams *params) flat = 0; /* style (mode -- use memory by default) */ - if (GV_set_style(vect_list[i], TRUE, color, width, flat) < 0) + if (GV_set_style(vect_list[i], TRUE, color, width, flat) < 0) { + G_free(vect_list); return 0; + } /* check for vector color table */ have_colors = Vect_read_colors(params->vlines->answers[i], "", &colors); @@ -147,14 +150,17 @@ int vlines_set_attrb(const struct GParams *params) if (have_colors || color_column || width_column) if (GV_set_style_thematic(vect_list[i], layer, color_column, width_column, - have_colors ? &colors : NULL) < 0) + have_colors ? &colors : NULL) < 0) { + G_free(vect_list); return 0; + } /* height */ height = atoi(params->vline_height->answers[i]); if (height > 0) GV_set_trans(vect_list[i], 0.0, 0.0, height); } + G_free(vect_list); return 1; } @@ -169,7 +175,7 @@ int vlines_set_attrb(const struct GParams *params) */ int vpoints_set_attrb(const struct GParams *params) { - int i, layer, have_colors, with_z; + int i, layer = 0, have_colors, with_z = 0; int *site_list, nsites; int marker, color, width; float size; @@ -208,8 +214,10 @@ int vpoints_set_attrb(const struct GParams *params) GP_set_zmode(site_list[i], TRUE); } - if (GP_set_style(site_list[i], color, width, size, marker) < 0) + if (GP_set_style(site_list[i], color, width, size, marker) < 0) { + G_free(site_list); return 0; + } /* check for vector color table */ have_colors = @@ -219,10 +227,13 @@ int vpoints_set_attrb(const struct GParams *params) marker_column) { if (GP_set_style_thematic(site_list[i], layer, color_column, width_column, size_column, marker_column, - have_colors ? &colors : NULL) < 0) + have_colors ? &colors : NULL) < 0) { + G_free(site_list); return 0; + } } } + G_free(site_list); return 1; } @@ -347,6 +358,8 @@ int check_map(const struct GParams *params, int index, int vlines, int *field, } Vect_close(&Map); + db_free_column(column); + Vect_destroy_field_info(Fi); return 0; } From 6d5ef62b136a1086def369a17fe05b3fa9af74e9 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Mon, 10 Feb 2025 17:28:28 -0500 Subject: [PATCH 3/9] G_fully_qualified_name --- misc/m.nviz.image/surface.c | 45 +++++++++++++++++++------------------ misc/m.nviz.image/vector.c | 6 ++--- misc/m.nviz.image/volume.c | 8 +++---- 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/misc/m.nviz.image/surface.c b/misc/m.nviz.image/surface.c index 46ac361d5d8..fbf167a60f6 100644 --- a/misc/m.nviz.image/surface.c +++ b/misc/m.nviz.image/surface.c @@ -50,11 +50,9 @@ int load_rasters(const struct GParams *params, nv_data *data) G_fatal_error(_("Raster map <%s> not found"), params->elev_map->answers[i]); } - - id = Nviz_new_map_obj( - MAP_OBJ_SURF, - G_fully_qualified_name(params->elev_map->answers[i], mapset), - 0.0, data); + char *mname = G_fully_qualified_name(params->elev_map->answers[i], mapset); + id = Nviz_new_map_obj(MAP_OBJ_SURF, mname, 0.0, data); + G_free(mname); } else { if (i - nelev_map < nelev_const && @@ -107,10 +105,9 @@ int load_rasters(const struct GParams *params, nv_data *data) 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], mapset), - -1.0, data); + char *mname = G_fully_qualified_name(params->color_map->answers[i], mapset); + Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT, mname, -1.0, data); + G_free(mname); } /* check for color value */ else if (i - ncolor_map < ncolor_const && @@ -122,14 +119,14 @@ int load_rasters(const struct GParams *params, nv_data *data) } else { /* use by default elevation map for coloring */ if (nelev_map > 0) { + char *mname = G_fully_qualified_name( + params->elev_map->answers[i], mapset); Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT, - G_fully_qualified_name( - params->elev_map->answers[i], mapset), - -1.0, data); + mname, -1.0, data); G_verbose_message( _("Color attribute not defined, using default <%s>"), - G_fully_qualified_name(params->elev_map->answers[i], - mapset)); + mname); + G_free(mname); } else { G_fatal_error(_("Missing color attribute for surface %d"), @@ -138,18 +135,20 @@ int load_rasters(const struct GParams *params, nv_data *data) } /* mask */ if (i < nmask_map && strcmp(params->mask_map->answers[i], "")) { + char *mname = G_fully_qualified_name(params->mask_map->answers[i], mapset); Nviz_set_attr( - id, MAP_OBJ_SURF, ATT_MASK, MAP_ATT, - G_fully_qualified_name(params->mask_map->answers[i], mapset), + id, MAP_OBJ_SURF, ATT_MASK, MAP_ATT, mname, -1.0, data); + G_free(mname); } /* transparency */ if (i < ntransp_map && strcmp(params->transp_map->answers[i], "")) { + char *mname = G_fully_qualified_name(params->transp_map->answers[i], mapset); Nviz_set_attr( - id, MAP_OBJ_SURF, ATT_TRANSP, MAP_ATT, - G_fully_qualified_name(params->transp_map->answers[i], mapset), + id, MAP_OBJ_SURF, ATT_TRANSP, MAP_ATT, mname, -1.0, data); + G_free(mname); } else if (i - ntransp_map < ntransp_const && strcmp(params->transp_const->answers[i - ntransp_map], "")) { @@ -160,10 +159,11 @@ int load_rasters(const struct GParams *params, nv_data *data) /* shininess */ if (i < nshine_map && strcmp(params->shine_map->answers[i], "")) { + char *mname = G_fully_qualified_name(params->shine_map->answers[i], mapset); Nviz_set_attr( - id, MAP_OBJ_SURF, ATT_SHINE, MAP_ATT, - G_fully_qualified_name(params->shine_map->answers[i], mapset), + id, MAP_OBJ_SURF, ATT_SHINE, MAP_ATT, mname, -1.0, data); + G_free(mname); } else if (i - nshine_map < nshine_const && strcmp(params->shine_const->answers[i - nshine_map], "")) { @@ -174,10 +174,11 @@ int load_rasters(const struct GParams *params, nv_data *data) /* emission */ if (i < nemit_map && strcmp(params->emit_map->answers[i], "")) { + char *mname = G_fully_qualified_name(params->emit_map->answers[i], mapset); Nviz_set_attr( - id, MAP_OBJ_SURF, ATT_EMIT, MAP_ATT, - G_fully_qualified_name(params->emit_map->answers[i], mapset), + id, MAP_OBJ_SURF, ATT_EMIT, MAP_ATT, mname, -1.0, data); + G_free(mname); } else if (i - nemit_map < nemit_const && strcmp(params->emit_const->answers[i - nemit_map], "")) { diff --git a/misc/m.nviz.image/vector.c b/misc/m.nviz.image/vector.c index 7fc27f68545..a8af5eb4f89 100644 --- a/misc/m.nviz.image/vector.c +++ b/misc/m.nviz.image/vector.c @@ -82,9 +82,9 @@ int load_vectors(const struct Option *elev_map, const struct Option *elev_const, if (mapset == NULL) { G_fatal_error(_("Vector map <%s> not found"), vect->answers[i]); } - id = Nviz_new_map_obj(map_obj_type, - G_fully_qualified_name(vect->answers[i], mapset), - 0.0, data); + char *mname = G_fully_qualified_name(vect->answers[i], mapset); + id = Nviz_new_map_obj(map_obj_type, mname, 0.0, data); + G_free(mname); /* set position */ x = atof(position->answers[i * 3 + 0]); diff --git a/misc/m.nviz.image/volume.c b/misc/m.nviz.image/volume.c index fa501aae99b..b34e511d60a 100644 --- a/misc/m.nviz.image/volume.c +++ b/misc/m.nviz.image/volume.c @@ -42,11 +42,9 @@ int load_rasters3d(const struct GParams *params, nv_data *data) G_fatal_error(_("3d raster map <%s> not found"), params->volume->answers[i]); } - - id = Nviz_new_map_obj( - MAP_OBJ_VOL, - G_fully_qualified_name(params->volume->answers[i], mapset), 0.0, - data); + char *mname = G_fully_qualified_name(params->volume->answers[i], mapset); + id = Nviz_new_map_obj(MAP_OBJ_VOL, mname, 0.0, data); + G_free(mname); /* set position */ if (opt_get_num_answers(params->volume_pos) != 3 * nvol) { From 97a822558c6ac326c69f9543fc0f3c232cf52f1d Mon Sep 17 00:00:00 2001 From: ShubhamDesai <42180509+ShubhamDesai@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:57:23 -0500 Subject: [PATCH 4/9] Update misc/m.nviz.image/surface.c Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- misc/m.nviz.image/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/m.nviz.image/surface.c b/misc/m.nviz.image/surface.c index fbf167a60f6..08c258bf030 100644 --- a/misc/m.nviz.image/surface.c +++ b/misc/m.nviz.image/surface.c @@ -50,7 +50,8 @@ int load_rasters(const struct GParams *params, nv_data *data) G_fatal_error(_("Raster map <%s> not found"), params->elev_map->answers[i]); } - char *mname = G_fully_qualified_name(params->elev_map->answers[i], mapset); + char *mname = + G_fully_qualified_name(params->elev_map->answers[i], mapset); id = Nviz_new_map_obj(MAP_OBJ_SURF, mname, 0.0, data); G_free(mname); } From 0d79b9ee656ead2ffe07123fd90a311ee2ec2f09 Mon Sep 17 00:00:00 2001 From: ShubhamDesai <42180509+ShubhamDesai@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:57:30 -0500 Subject: [PATCH 5/9] Update misc/m.nviz.image/surface.c Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- misc/m.nviz.image/surface.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/misc/m.nviz.image/surface.c b/misc/m.nviz.image/surface.c index 08c258bf030..1f58f41da94 100644 --- a/misc/m.nviz.image/surface.c +++ b/misc/m.nviz.image/surface.c @@ -106,8 +106,10 @@ int load_rasters(const struct GParams *params, nv_data *data) G_fatal_error(_("Raster map <%s> not found"), params->color_map->answers[i]); } - char *mname = G_fully_qualified_name(params->color_map->answers[i], mapset); - Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT, mname, -1.0, data); + char *mname = + G_fully_qualified_name(params->color_map->answers[i], mapset); + Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT, mname, -1.0, + data); G_free(mname); } /* check for color value */ From b6330cab758ef60ff397e4ca4c6240c2f0882e3d Mon Sep 17 00:00:00 2001 From: ShubhamDesai <42180509+ShubhamDesai@users.noreply.github.com> Date: Mon, 10 Feb 2025 17:58:02 -0500 Subject: [PATCH 6/9] Update misc/m.nviz.image/volume.c Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- misc/m.nviz.image/volume.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/m.nviz.image/volume.c b/misc/m.nviz.image/volume.c index b34e511d60a..262f7cee7d5 100644 --- a/misc/m.nviz.image/volume.c +++ b/misc/m.nviz.image/volume.c @@ -42,7 +42,8 @@ int load_rasters3d(const struct GParams *params, nv_data *data) G_fatal_error(_("3d raster map <%s> not found"), params->volume->answers[i]); } - char *mname = G_fully_qualified_name(params->volume->answers[i], mapset); + char *mname = + G_fully_qualified_name(params->volume->answers[i], mapset); id = Nviz_new_map_obj(MAP_OBJ_VOL, mname, 0.0, data); G_free(mname); From 2e77085f3322aa2415483f8a0f3995eba0ce97c4 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Thu, 13 Feb 2025 16:17:50 -0500 Subject: [PATCH 7/9] Fix requested suggestions --- misc/m.nviz.image/surface.c | 50 ++++++++++++++++++++----------------- misc/m.nviz.image/vector.c | 12 +++++++-- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/misc/m.nviz.image/surface.c b/misc/m.nviz.image/surface.c index fbf167a60f6..8fa8b889830 100644 --- a/misc/m.nviz.image/surface.c +++ b/misc/m.nviz.image/surface.c @@ -28,6 +28,7 @@ int load_rasters(const struct GParams *params, nv_data *data) { const char *mapset = NULL; + char *mname = NULL; int i; int nelevs, nelev_map, nelev_const, ncolor_map, ncolor_const, nmask_map; int ntransp_map, ntransp_const, nshine_map, nshine_const; @@ -50,7 +51,8 @@ int load_rasters(const struct GParams *params, nv_data *data) G_fatal_error(_("Raster map <%s> not found"), params->elev_map->answers[i]); } - char *mname = G_fully_qualified_name(params->elev_map->answers[i], mapset); + mname = + G_fully_qualified_name(params->elev_map->answers[i], mapset); id = Nviz_new_map_obj(MAP_OBJ_SURF, mname, 0.0, data); G_free(mname); } @@ -105,8 +107,10 @@ int load_rasters(const struct GParams *params, nv_data *data) G_fatal_error(_("Raster map <%s> not found"), params->color_map->answers[i]); } - char *mname = G_fully_qualified_name(params->color_map->answers[i], mapset); - Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT, mname, -1.0, data); + mname = + G_fully_qualified_name(params->color_map->answers[i], mapset); + Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT, mname, -1.0, + data); G_free(mname); } /* check for color value */ @@ -119,10 +123,10 @@ int load_rasters(const struct GParams *params, nv_data *data) } else { /* use by default elevation map for coloring */ if (nelev_map > 0) { - char *mname = G_fully_qualified_name( - params->elev_map->answers[i], mapset); - Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT, - mname, -1.0, data); + mname = G_fully_qualified_name( + params->elev_map->answers[i], mapset); + Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT, mname, -1.0, + data); G_verbose_message( _("Color attribute not defined, using default <%s>"), mname); @@ -135,19 +139,19 @@ int load_rasters(const struct GParams *params, nv_data *data) } /* mask */ if (i < nmask_map && strcmp(params->mask_map->answers[i], "")) { - char *mname = G_fully_qualified_name(params->mask_map->answers[i], mapset); - Nviz_set_attr( - id, MAP_OBJ_SURF, ATT_MASK, MAP_ATT, mname, - -1.0, data); + mname = + G_fully_qualified_name(params->mask_map->answers[i], mapset); + Nviz_set_attr(id, MAP_OBJ_SURF, ATT_MASK, MAP_ATT, mname, -1.0, + data); G_free(mname); } /* transparency */ if (i < ntransp_map && strcmp(params->transp_map->answers[i], "")) { - char *mname = G_fully_qualified_name(params->transp_map->answers[i], mapset); - Nviz_set_attr( - id, MAP_OBJ_SURF, ATT_TRANSP, MAP_ATT, mname, - -1.0, data); + mname = + G_fully_qualified_name(params->transp_map->answers[i], mapset); + Nviz_set_attr(id, MAP_OBJ_SURF, ATT_TRANSP, MAP_ATT, mname, -1.0, + data); G_free(mname); } else if (i - ntransp_map < ntransp_const && @@ -159,10 +163,10 @@ int load_rasters(const struct GParams *params, nv_data *data) /* shininess */ if (i < nshine_map && strcmp(params->shine_map->answers[i], "")) { - char *mname = G_fully_qualified_name(params->shine_map->answers[i], mapset); - Nviz_set_attr( - id, MAP_OBJ_SURF, ATT_SHINE, MAP_ATT, mname, - -1.0, data); + mname = + G_fully_qualified_name(params->shine_map->answers[i], mapset); + Nviz_set_attr(id, MAP_OBJ_SURF, ATT_SHINE, MAP_ATT, mname, -1.0, + data); G_free(mname); } else if (i - nshine_map < nshine_const && @@ -174,10 +178,10 @@ int load_rasters(const struct GParams *params, nv_data *data) /* emission */ if (i < nemit_map && strcmp(params->emit_map->answers[i], "")) { - char *mname = G_fully_qualified_name(params->emit_map->answers[i], mapset); - Nviz_set_attr( - id, MAP_OBJ_SURF, ATT_EMIT, MAP_ATT, mname, - -1.0, data); + mname = + G_fully_qualified_name(params->emit_map->answers[i], mapset); + Nviz_set_attr(id, MAP_OBJ_SURF, ATT_EMIT, MAP_ATT, mname, -1.0, + data); G_free(mname); } else if (i - nemit_map < nemit_const && diff --git a/misc/m.nviz.image/vector.c b/misc/m.nviz.image/vector.c index a8af5eb4f89..46e7d263103 100644 --- a/misc/m.nviz.image/vector.c +++ b/misc/m.nviz.image/vector.c @@ -262,6 +262,7 @@ int check_map(const struct GParams *params, int index, int vlines, int *field, Fi = NULL; driver = NULL; + column = NULL; if (vlines) { map = params->vlines->answers[index]; @@ -321,6 +322,8 @@ int check_map(const struct GParams *params, int index, int vlines, int *field, if (db_column_Ctype(driver, Fi->table, color) != DB_C_TYPE_STRING) G_fatal_error(_("Data type of color column must be character")); + db_free_column(column); + column = NULL; } if (size) { db_get_column(driver, Fi->table, size, &column); @@ -331,6 +334,8 @@ int check_map(const struct GParams *params, int index, int vlines, int *field, type = db_column_Ctype(driver, Fi->table, size); if (type != DB_C_TYPE_INT && type != DB_C_TYPE_DOUBLE) G_fatal_error(_("Data type of size column must be numeric")); + db_free_column(column); + column = NULL; } if (width) { db_get_column(driver, Fi->table, width, &column); @@ -341,6 +346,8 @@ int check_map(const struct GParams *params, int index, int vlines, int *field, type = db_column_Ctype(driver, Fi->table, width); if (type != DB_C_TYPE_INT && type != DB_C_TYPE_DOUBLE) G_fatal_error(_("Data type of width column must be numeric")); + db_free_column(column); + column = NULL; } if (marker) { db_get_column(driver, Fi->table, marker, &column); @@ -352,14 +359,15 @@ int check_map(const struct GParams *params, int index, int vlines, int *field, if (db_column_Ctype(driver, Fi->table, marker) != DB_C_TYPE_STRING) G_fatal_error( _("Data type of marker column must be character")); + db_free_column(column); + column = NULL; } db_close_database_shutdown_driver(driver); + Vect_destroy_field_info(Fi); } Vect_close(&Map); - db_free_column(column); - Vect_destroy_field_info(Fi); return 0; } From 5fa7c164288c18018feab8c1efce215d2dec6e1e Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Thu, 13 Feb 2025 16:32:33 -0500 Subject: [PATCH 8/9] initialization inside loop --- misc/m.nviz.image/vector.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/m.nviz.image/vector.c b/misc/m.nviz.image/vector.c index 46e7d263103..80e2c32165f 100644 --- a/misc/m.nviz.image/vector.c +++ b/misc/m.nviz.image/vector.c @@ -175,7 +175,7 @@ int vlines_set_attrb(const struct GParams *params) */ int vpoints_set_attrb(const struct GParams *params) { - int i, layer = 0, have_colors, with_z = 0; + int i, have_colors; int *site_list, nsites; int marker, color, width; float size; @@ -187,6 +187,7 @@ int vpoints_set_attrb(const struct GParams *params) site_list = GP_get_site_list(&nsites); for (i = 0; i < nsites; i++) { + int layer = -1, with_z = 0; check_map(params, i, FALSE, &layer, &with_z); color = Nviz_color_from_str(params->vpoint_color->answers[i]); From e7db060a9312394c3059e2121084b0706d7b6e33 Mon Sep 17 00:00:00 2001 From: Shubham Vasudeo Desai Date: Thu, 13 Feb 2025 17:25:51 -0500 Subject: [PATCH 9/9] formatting --- misc/m.nviz.image/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/m.nviz.image/surface.c b/misc/m.nviz.image/surface.c index 8fa8b889830..6d396ca5804 100644 --- a/misc/m.nviz.image/surface.c +++ b/misc/m.nviz.image/surface.c @@ -123,8 +123,8 @@ int load_rasters(const struct GParams *params, nv_data *data) } else { /* use by default elevation map for coloring */ if (nelev_map > 0) { - mname = G_fully_qualified_name( - params->elev_map->answers[i], mapset); + mname = G_fully_qualified_name(params->elev_map->answers[i], + mapset); Nviz_set_attr(id, MAP_OBJ_SURF, ATT_COLOR, MAP_ATT, mname, -1.0, data); G_verbose_message(