mhu/gds-render
1
0
Fork 0
Code Issues 4 Pull Requests Releases 8 Wiki Activity

LayerSettings: Fix layer_settings_load_from_csv()

Browse Source 
* Add stacked position to layer settings
* Check if layer_settings instance is valid
This commit is contained in:
Mario Hüttel 2019-09-25 17:54:26 +02:00
parent 94ef879a94
commit f20826ccf7
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
layer/layer-settings.c
View File

@ -314,10 +314,14 @@ int layer_settings_load_from_csv(LayerSettings *settings, const char *path)
GInputStream *in_stream; GInputStream *in_stream;
GDataInputStream *data_stream; GDataInputStream *data_stream;
int parser_ret; int parser_ret;
int stacked_pos;
struct layer_info linfo; struct layer_info linfo;
file = g_file_new_for_path(path); file = g_file_new_for_path(path);
in_stream = G_INPUT_STREAM(g_file_read(file, NULL, NULL)); in_stream = G_INPUT_STREAM(g_file_read(file, NULL, NULL));
g_return_val_if_fail(GDS_RENDER_IS_LAYER_SETTINGS(settings), -2);
if (!in_stream) { if (!in_stream) {
ret = -1; ret = -1;
goto ret_destroy_file; goto ret_destroy_file;
@ -327,11 +331,14 @@ int layer_settings_load_from_csv(LayerSettings *settings, const char *path)
data_stream = g_data_input_stream_new(in_stream); data_stream = g_data_input_stream_new(in_stream);
stacked_pos = 0;
while ((parser_ret = layer_settings_load_csv_line_from_stream(data_stream, &linfo)) >= 0) { while ((parser_ret = layer_settings_load_csv_line_from_stream(data_stream, &linfo)) >= 0) {
/* Line broken */ /* Line broken */
if (parser_ret == 1) if (parser_ret == 1)
continue; continue;
linfo.stacked_position = stacked_pos++;
layer_settings_append_layer_info(settings, &linfo); layer_settings_append_layer_info(settings, &linfo);
/* Clear name to prevent memory leak */ /* Clear name to prevent memory leak */
if (linfo.name) if (linfo.name)