diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-04-06 07:27:32 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-04-06 07:27:32 +0200 |
| commit | b555d32eca0149c010e1d39d43f324880794338a (patch) | |
| tree | bf7e9904fa9b46624c496d51510209bee233e5f8 | |
| parent | 51517d52ccbdb1c69ee08a77b119a53fc31177fa (diff) | |
| download | libgphoto2-b555d32eca0149c010e1d39d43f324880794338a.tar.gz | |
move capcnt into the private struct to increase threadsafety
| -rw-r--r-- | camlibs/pentax/library.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/camlibs/pentax/library.c b/camlibs/pentax/library.c index b18e1a0b8..a0c2bcdc0 100644 --- a/camlibs/pentax/library.c +++ b/camlibs/pentax/library.c @@ -56,6 +56,7 @@ bool debug = true; struct _CameraPrivateLibrary { ipslr_handle_t pslr; char *lastfn; + int capcnt; }; int @@ -255,8 +256,6 @@ save_buffer(pslr_handle_t camhandle, int bufno, pslr_buffer_type buftype, uint32 return current; } -static int capcnt = 0; - static int camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, GPContext *context) @@ -280,7 +279,7 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, gp_log (GP_LOG_ERROR, "pentax", "image format image=0x%x, raw=0x%x", status.image_format, status.raw_format); switch (status.image_format) { case PSLR_IMAGE_FORMAT_JPEG: - sprintf (path->name, "capt%04d.jpg", capcnt++); + sprintf (path->name, "capt%04d.jpg", camera->pl->capcnt++); mimes[0] = GP_MIME_JPEG; buftypes[0] = status.jpeg_quality + 1; jpegres[0] = status.jpeg_resolution; @@ -290,7 +289,7 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, buftypes[1] = status.jpeg_quality + 1; jpegres[1] = status.jpeg_resolution; mimes[1] = GP_MIME_JPEG; - sprintf (path->name, "capt%04d.jpg", capcnt); + sprintf (path->name, "capt%04d.jpg", camera->pl->capcnt); fns[1] = strdup(path->name); lastfn = strdup (fns[1]); nrofdownloads = 2; @@ -299,13 +298,13 @@ camera_capture (Camera *camera, CameraCaptureType type, CameraFilePath *path, jpegres[0] = 0; switch (status.raw_format) { case PSLR_RAW_FORMAT_PEF: - sprintf (path->name, "capt%04d.pef", capcnt++); + sprintf (path->name, "capt%04d.pef", camera->pl->capcnt++); fns[0] = strdup (path->name); mimes[0] = GP_MIME_RAW; buftypes[0] = PSLR_BUF_PEF; break; case PSLR_RAW_FORMAT_DNG: - sprintf (path->name, "capt%04d.dng", capcnt++); + sprintf (path->name, "capt%04d.dng", camera->pl->capcnt++); fns[0] = strdup (path->name); mimes[0] = "image/x-adobe-dng"; buftypes[0] = PSLR_BUF_DNG; @@ -441,7 +440,7 @@ camera_wait_for_event (Camera *camera, int timeout, gp_log (GP_LOG_ERROR, "pentax", "wait_for_event: imageformat %d / rawformat %d", status.image_format, status.raw_format); switch (status.image_format) { case PSLR_IMAGE_FORMAT_JPEG: - sprintf (path->name, "capt%04d.jpg", capcnt++); + sprintf (path->name, "capt%04d.jpg", camera->pl->capcnt++); mimes[0] = GP_MIME_JPEG; buftypes[0] = status.jpeg_quality + 1; jpegres[0] = status.jpeg_resolution; @@ -452,7 +451,7 @@ camera_wait_for_event (Camera *camera, int timeout, buftypes[1] = status.jpeg_quality + 1; jpegres[1] = status.jpeg_resolution; nrofdownloads = 2; - sprintf (path->name, "capt%04d.jpg", capcnt); + sprintf (path->name, "capt%04d.jpg", camera->pl->capcnt); fns[1] = strdup (path->name); /* we pass back the secondary file via the private struct, and return the first */ camera->pl->lastfn = strdup (fns[1]); @@ -461,13 +460,13 @@ camera_wait_for_event (Camera *camera, int timeout, jpegres[0] = 0; switch (status.raw_format) { case PSLR_RAW_FORMAT_PEF: - sprintf (path->name, "capt%04d.pef", capcnt++); + sprintf (path->name, "capt%04d.pef", camera->pl->capcnt++); fns[0] = strdup (path->name); mimes[0] = GP_MIME_RAW; buftypes[0] = PSLR_BUF_PEF; break; case PSLR_RAW_FORMAT_DNG: - sprintf (path->name, "capt%04d.dng", capcnt++); + sprintf (path->name, "capt%04d.dng", camera->pl->capcnt++); fns[0] = strdup (path->name); mimes[0] = "image/x-adobe-dng"; buftypes[0] = PSLR_BUF_DNG; |