diff options
author | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-16 09:25:02 +0100 |
---|---|---|
committer | Matthias Vogelgesang <matthias.vogelgesang@ipe.fzk.de> | 2011-03-16 09:25:02 +0100 |
commit | 3d037dbe86665b59c6bb5d71f3d58558a5848d38 (patch) | |
tree | 648e1252c1cf6f9637ffc93c994d41dc206454c8 /src/uca.c | |
parent | 54a229b3864fe7867da69ef7427877094a256f1c (diff) | |
download | uca-3d037dbe86665b59c6bb5d71f3d58558a5848d38.tar.gz uca-3d037dbe86665b59c6bb5d71f3d58558a5848d38.tar.bz2 uca-3d037dbe86665b59c6bb5d71f3d58558a5848d38.tar.xz uca-3d037dbe86665b59c6bb5d71f3d58558a5848d38.zip |
Add soft MJSON dependency to load configuration/calibration data
Diffstat (limited to 'src/uca.c')
-rw-r--r-- | src/uca.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -6,6 +6,10 @@ #include "uca-cam.h" #include "uca-grabber.h" +#ifdef HAVE_MJSON +#include "json.h" +#endif + #ifdef HAVE_DUMMY_CAMERA #include "cameras/dummy.h" #endif @@ -86,7 +90,7 @@ static struct uca_property_t property_map[UCA_PROP_LAST+1] = { { NULL, 0, 0, 0 } }; -struct uca_t *uca_init(void) +struct uca_t *uca_init(const char *config_filename) { struct uca_t *uca = (struct uca_t *) malloc(sizeof(struct uca_t)); uca->cameras = NULL; |