From b82ab905cba1e897662fe5037dc3d45f7dbffec7 Mon Sep 17 00:00:00 2001 From: axxel Date: Sun, 20 Oct 2024 10:44:12 +0200 Subject: [PATCH] ptp2: Canon cameras are (potentially) mtp capable This enables to get some info from `gphoto2 --get-metadata` for Canons, e.g. LZQ_0530.JPG Unknown type 10 LZQ_0530.JPG 20241002T163923.0 20241002T163922.0 1920 1280 24 --- camlibs/ptp2/library.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index 8dfa06a10..fee18d1aa 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -3050,8 +3050,14 @@ ptp_error_func (void *data, const char *format, va_list args) static int is_mtp_capable(Camera *camera) { PTPParams *params = &camera->pl->params; - if (params->deviceinfo.VendorExtensionID == PTP_VENDOR_MICROSOFT) + switch (params->deviceinfo.VendorExtensionID) + { + case PTP_VENDOR_CANON: + case PTP_VENDOR_MICROSOFT: return 1; + default: break; + } + /* these are also lowercase. */ if (params->deviceinfo.Manufacturer && !strcmp(params->deviceinfo.Manufacturer,"motorola")) return 1;