mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-29 19:16:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

aux/config_json: Only check version for camera tracking config

Browse source 
Only the camera tracking config writes and uses the version field.

Unfortunately the tracking override config is written into the same json
object while not making use of the version field.
This commit is contained in:
Christoph Haag 2022-03-18 22:56:54 +01:00 committed by Jakob Bornecrantz
parent d43c7ffa71
commit 6fdd8ab93a
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/xrt/auxiliary/util/u_config_json.c
View file

@ -279,15 +279,6 @@ open_tracking_settings(struct u_config_json *json)
return NULL;
}
int ver = -1;
bool bad = false;
bad |= !get_obj_int(t, "version", &ver);
if (bad || ver >= 1) {
U_LOG_E("Missing or unknown version tag '%i' in tracking config", ver);
return NULL;
}
return t;
}
@ -363,6 +354,15 @@ u_config_json_get_tracking_settings(struct u_config_json *json, struct xrt_setti
bool bad = false;
int ver = -1;
bad |= !get_obj_int(t, "version", &ver);
if (bad || ver >= 1) {
U_LOG_E("Missing or unknown version tag '%i' in tracking config", ver);
return NULL;
}
bad |= !get_obj_str(t, "camera_name", s->camera_name, sizeof(s->camera_name));
bad |= !get_obj_int(t, "camera_mode", &s->camera_mode);
bad |= !get_obj_str(t, "camera_type", tmp, sizeof(tmp));