Browse Source

Fix build issues

Martijn Braam 1 year ago
parent
commit
59f18d7bd2
2 changed files with 3 additions and 3 deletions
  1. 2 2
      src/dcp.c
  2. 1 1
      src/process_pipeline.c

+ 2 - 2
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;

+ 1 - 1
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 {