From 0bfcd2e95a3d114b3cb145ebc4c3aa70c1d0b68f Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 18 Apr 2020 19:22:16 +0200 Subject: handle shutterspeed default >= 0xf as size 7 --- camlibs/ptp2/ptp-pack.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index f5ee4e592..39d3863b6 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -2537,7 +2537,10 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, int datasize, curoff += 6; /* 7 , b (5ds) */ break; default: - curoff += 6; + if (olcver >= 0xf) + curoff += 7; + else + curoff += 6; break; } i++; -- cgit v1.2.1