From 59f18d7bd28facef862c66815bd83c85aec20629 Mon Sep 17 00:00:00 2001 From: Martijn Braam Date: Tue, 25 Jul 2023 14:05:28 +0200 Subject: [PATCH] Fix build issues --- src/dcp.c | 4 ++-- src/process_pipeline.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dcp.c b/src/dcp.c index 2acaa3b..e4a35e5 100644 --- a/src/dcp.c +++ b/src/dcp.c @@ -163,7 +163,7 @@ find_calibration_by_model(char *conffile, char *model, const char *sensor) // Check user overridden /etc/megapixels/config/%model,%sensor.dcp sprintf(conffile, "%s/megapixels/config/%s,%s.dcp", - SYSCONFDIR, + "/etc", model, sensor); if (access(conffile, F_OK) != -1) { @@ -172,7 +172,7 @@ find_calibration_by_model(char *conffile, char *model, const char *sensor) } // Check packaged /usr/share/megapixels/config/%model,%sensor.ini - sprintf(conffile, "%s/megapixels/config/%s,%s.dcp", DATADIR, model, sensor); + sprintf(conffile, "%s/megapixels/config/%s,%s.dcp", "/usr/share", model, sensor); if (access(conffile, F_OK) != -1) { printf("Found calibration file at %s\n", conffile); return true; diff --git a/src/process_pipeline.c b/src/process_pipeline.c index 455e538..3c6035d 100644 --- a/src/process_pipeline.c +++ b/src/process_pipeline.c @@ -1009,7 +1009,7 @@ update_state(MPPipeline *pipeline, const mp_state_proc *new_state) } if (camera_changed) { - char *cf; + char cf[PATH_MAX]; if (find_calibration(cf, state_proc.camera->name)) { state_proc.calibration = parse_calibration_file(cf); } else {