diff options
| author | Stefan Wildemann <metalstrolch@users.noreply.github.com> | 2020-01-20 21:37:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-20 21:37:14 +0100 |
| commit | f90e58a9af386104c4340fd430c3747cfcab1571 (patch) | |
| tree | f5bfdd3aa1c178c397c48773802cada6fb7c7707 | |
| parent | 37f055a6d13ac705998dcc5fe85f0920e8756e44 (diff) | |
| parent | b24b3ed0d76d3cb4886fc821b0c5fb8dad553f15 (diff) | |
| download | navit-f90e58a9af386104c4340fd430c3747cfcab1571.tar.gz | |
Merge branch 'trunk' into aerostitch/flags
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | navit/plugin/pedestrian/pedestrian.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index d3a279229..2b7263a34 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 defaults: &defaults docker: - - image: ubuntu:18.04 + - image: debian:latest jobs: sanity_check: docker: diff --git a/navit/plugin/pedestrian/pedestrian.c b/navit/plugin/pedestrian/pedestrian.c index 73827077e..08ff1076a 100644 --- a/navit/plugin/pedestrian/pedestrian.c +++ b/navit/plugin/pedestrian/pedestrian.c @@ -1338,7 +1338,7 @@ static void pedestrian_navit_init(struct navit *nav) { #endif transform_set_scale(trans, 16); navit_get_attr(nav, attr_layout, &initial_layout, NULL); - iter = navit_attr_iter_new(); + iter = navit_attr_iter_new(NULL); while (navit_get_attr(nav, attr_layout, &attr, iter)) { if (!strcmp(attr.u.layout->name, "Route")) { dbg(lvl_debug, "found %s", attr_to_name(attr.type)); @@ -1397,7 +1397,7 @@ void plugin_init(void) { callback.type = attr_callback; callback.u.callback = callback_new_attr_0(callback_cast(pedestrian_navit), attr_navit); config_add_attr(config, &callback); - iter = config_attr_iter_new(); + iter = config_attr_iter_new(NULL); while (config_get_attr(config, attr_navit, &navit, iter)) { pedestrian_navit_init(navit.u.navit); } |