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

more fixes for https://github.com/gphoto/libgphoto2/issues/1200

Browse Source
This commit is contained in:
Marcus Meissner
2026-02-02 11:48:39 +01:00
parent 0dfe77e5f8
commit bbb9760ed3
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@@ -1,4 +1,8 @@
libgphoto2 2.5.33.1 development
ptp2:
* new Canon EOS SDRAM capture method added
------------------------------------------------------------------------------
libgphoto2 2.5.33 release

8
camlibs/ptp2/library.c
View File

@@ -4495,11 +4495,17 @@ camera_canon_eos_capture (Camera *camera, CameraCaptureType type, CameraFilePath
case PTP_EOSEvent_Unknown:
GP_LOG_D ("event unknown: %s", event.u.info);
continue; /* in loop ... do not poll while draining the queue */
case PTP_EOSEvent_ObjectTransfer:
case PTP_EOSEvent_ObjectTransfer: {
char buf[20];
GP_LOG_D ("object transfer requested: handle 0x%x, name %s, size %lu",
event.u.object.Handle, event.u.object.Filename, event.u.object.ObjectSize);
if (!event.u.object.Filename) {
sprintf (buf, "capt%04d.", params->capcnt++);
event.u.object.Filename = strdup(buf);
}
move(oi, event.u.object);
break;
}
case PTP_EOSEvent_ObjectRemoved:
GP_LOG_D ("object removed: handle 0x%x", event.u.object.Handle);
ptp_remove_object_from_cache(params, event.u.object.Handle);

2
camlibs/ptp2/ptp-pack.c
View File

@@ -1934,7 +1934,7 @@ ptp_unpack_EOS_events (PTPParams *params, const unsigned char* data, unsigned in
1.434663 ptp (2): 0x000: 40 c0 32 14 08 b1 - - - - - - d4 1c a6 02
1.434664 ptp (2): 0x010: - - - - - c0 32 14 06 - - - -
*/
e[i].type = PTP_EOSEvent_ObjectAdded;
e[i].type = PTP_EOSEvent_ObjectTransfer;
e[i].u.object.Handle = dtoh32a(curdata + PTP_cee_OA64LFN_Handle);
e[i].u.object.ObjectFormat = dtoh16a(curdata + PTP_cee_OA64LFN_OFC);
e[i].u.object.StorageID = 0; /* use as marker */