From 94911960d6d06e3b1a2c22dcdb10e8f53744b5d0 Mon Sep 17 00:00:00 2001 From: Justin Berger Date: Thu, 5 Jul 2018 11:03:12 -0600 Subject: Fixed build on windows --- src/poser_general_optimizer.c | 4 ++-- src/survive_driverman.c | 4 ++++ src/survive_playback.c | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/poser_general_optimizer.c b/src/poser_general_optimizer.c index 6f181a3..4894ce8 100644 --- a/src/poser_general_optimizer.c +++ b/src/poser_general_optimizer.c @@ -7,7 +7,7 @@ STATIC_CONFIG_ITEM( CONFIG_MAX_ERROR, "max-error", 'f', "Maximum error permitted by poser_general_optimizer", .0001 ); STATIC_CONFIG_ITEM( CONFIG_FAIL_TO_RESET, "failures-to-reset", 'i', "Failures needed before seed poser is re-run", 1 ); -STATIC_CONFIG_ITEM( CONFIG_SUC_TO_RESET, "successes-to-reset", 'i', "[TODO: I don't know what this does]", -1 ); +STATIC_CONFIG_ITEM( CONFIG_SUC_TO_RESET, "successes-to-reset", 'i', "Reset periodically even if there were no failures", -1 ); STATIC_CONFIG_ITEM( CONFIG_SEED_POSER, "seed-poser", 's', "Poser to be used to seed optimizer", "PoserEPNP" ); void *GetDriver(const char *name); @@ -21,7 +21,7 @@ void general_optimizer_data_init(GeneralOptimizerData *d, SurviveObject *so) { survive_attach_configi( ctx, "failures-to-reset", &d->failures_to_reset ); survive_attach_configi( ctx, "successes-to-reset", &d->successes_to_reset ); - const char *subposer = survive_configs(ctx, "seed-poser", SC_GET, 0 ); + const char *subposer = survive_configs(ctx, "seed-poser", SC_GET, "PoserEPNP"); d->seed_poser = (PoserCB)GetDriver(subposer); SV_INFO("Initializing general optimizer:"); diff --git a/src/survive_driverman.c b/src/survive_driverman.c index c43e8ec..71a4c10 100644 --- a/src/survive_driverman.c +++ b/src/survive_driverman.c @@ -19,6 +19,10 @@ void RegisterDriver(const char *element, void *data) { void *GetDriver(const char *element) { int i; + + if (element == 0) + return 0; + for (i = 0; i < NrDrivers; i++) { if (strcmp(element, DriverNames[i]) == 0) return Drivers[i]; diff --git a/src/survive_playback.c b/src/survive_playback.c index c616aea..ab5a4c2 100644 --- a/src/survive_playback.c +++ b/src/survive_playback.c @@ -187,7 +187,7 @@ typedef struct SurvivePlaybackData SurvivePlaybackData; static int parse_and_run_imu(const char *line, SurvivePlaybackData *driver) { char dev[10]; int timecode = 0; - FLT accelgyro[9] = {}; + FLT accelgyro[9] = { 0 }; int mask; int id; -- cgit v1.2.3