X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/b696432ba7da8628d74ab0bd1a51c6017a50e6c6..b127ccd23c8c9afe3dae1aebb68a951093f92403:/src/file.c diff --git a/src/file.c b/src/file.c index f93f5efc..443bdca6 100644 --- a/src/file.c +++ b/src/file.c @@ -152,7 +152,7 @@ static void write_layer_params_and_data ( VikLayer *l, FILE *f ) guint16 i, params_count = vik_layer_get_interface(l->type)->params_count; for ( i = 0; i < params_count; i++ ) { - data = get_param(l,i); + data = get_param(l, i, TRUE); file_write_layer_param(f, params[i].name, params[i].type, data); } } @@ -259,7 +259,7 @@ static void string_list_set_param (gint i, GList *list, gpointer *layer_and_vp) { VikLayerParamData x; x.sl = list; - vik_layer_set_param ( VIK_LAYER(layer_and_vp[0]), i, x, layer_and_vp[1] ); + vik_layer_set_param ( VIK_LAYER(layer_and_vp[0]), i, x, layer_and_vp[1], TRUE ); } static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) @@ -477,7 +477,7 @@ static void file_read ( VikAggregateLayer *top, FILE *f, VikViewport *vp ) /* STRING or STRING_LIST -- if STRING_LIST, just set param to add a STRING */ default: x.s = line; } - vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp ); + vik_layer_set_param ( VIK_LAYER(stack->data), i, x, vp, TRUE ); } found_match = TRUE; break; @@ -553,7 +553,7 @@ static void xfclose ( FILE *f ) /* 0 on failure, 1 on success (vik file) 2 on success (other file) */ gshort a_file_load ( VikAggregateLayer *top, VikViewport *vp, const gchar *filename_or_uri ) { - char *filename = filename_or_uri; + char *filename = (char *)filename_or_uri; if (strncmp(filename, "file://", 7) == 0) filename = filename + 7;