colin/Megapixels
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build issues

Browse Source
This commit is contained in:
Martijn Braam
2023-07-25 14:05:28 +02:00
parent 7941becb17
commit 59f18d7bd2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dcp.c
View File

@@ -163,7 +163,7 @@ find_calibration_by_model(char *conffile, char *model, const char *sensor)
// Check user overridden /etc/megapixels/config/%model,%sensor.dcp // Check user overridden /etc/megapixels/config/%model,%sensor.dcp
sprintf(conffile, sprintf(conffile,
"%s/megapixels/config/%s,%s.dcp", "%s/megapixels/config/%s,%s.dcp",
SYSCONFDIR, "/etc",
model, model,
sensor); sensor);
if (access(conffile, F_OK) != -1) { 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 // 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) { if (access(conffile, F_OK) != -1) {
printf("Found calibration file at %s\n", conffile); printf("Found calibration file at %s\n", conffile);
return true; return true;

2
src/process_pipeline.c
View File

@@ -1009,7 +1009,7 @@ update_state(MPPipeline *pipeline, const mp_state_proc *new_state)
} }
if (camera_changed) { if (camera_changed) {
char *cf; char cf[PATH_MAX];
if (find_calibration(cf, state_proc.camera->name)) { if (find_calibration(cf, state_proc.camera->name)) {
state_proc.calibration = parse_calibration_file(cf); state_proc.calibration = parse_calibration_file(cf);
} else { } else {