darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid error on capture return no image

Browse Source
This commit is contained in:
Marcus Meissner
2017-04-05 22:40:52 +02:00
parent 7076ea6522
commit 51517d52cc
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
camlibs/pentax/library.c
View File

@@ -269,7 +269,7 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
int bufno, i;
const char *mimes[2];
int buftypes[2], jpegres[2], nrofdownloads = 1;
char *fns[2];
char *fns[2], *lastfn = NULL;
gp_log (GP_LOG_DEBUG, "pentax", "camera_capture");
@@ -292,7 +292,7 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
mimes[1] = GP_MIME_JPEG;
sprintf (path->name, "capt%04d.jpg", capcnt);
fns[1] = strdup(path->name);
camera->pl->lastfn = strdup (fns[1]);
lastfn = strdup (fns[1]);
nrofdownloads = 2;
/* FALLTHROUGH */
case PSLR_IMAGE_FORMAT_RAW:
@@ -319,11 +319,12 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
gp_log (GP_LOG_ERROR, "pentax", "unknown format image=0x%x (raw=0x%x)", status.image_format, status.raw_format);
return GP_ERROR;
}
/* get status again */
/* get status again, also waits until not busy */
pslr_get_status (p, &status);
if (status.bufmask == 0) {
gp_log (GP_LOG_ERROR, "pentax", "no buffer available for download");
free (lastfn);
return GP_ERROR;
}
for (bufno=0;bufno<16;bufno++)
@@ -371,6 +372,7 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path,
ret = gp_filesystem_set_info_noop(camera->fs, path->folder, fns[i], info, context);
free (fns[i]);
}
camera->pl->lastfn = lastfn;
pslr_delete_buffer(p, bufno );
pslr_get_status (&camera->pl->pslr, &status); /* wait until busy is gone */