From 5bf98e7f09e82d0e27f41a8df4ccb10e5feb6944 Mon Sep 17 00:00:00 2001 From: Arkell Rasiah Date: Thu, 18 Mar 2021 12:51:20 -0700 Subject: [PATCH] camlibs/ptp2/ptp-pack.c: Qualify previous change only for olcver=0x13 cameras. --- camlibs/ptp2/ptp-pack.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/camlibs/ptp2/ptp-pack.c b/camlibs/ptp2/ptp-pack.c index 3af5b6bbb..26465efa3 100644 --- a/camlibs/ptp2/ptp-pack.c +++ b/camlibs/ptp2/ptp-pack.c @@ -2599,10 +2599,15 @@ ptp_unpack_CANON_changes (PTPParams *params, unsigned char* data, unsigned int d */ proptype = PTP_DPC_CANON_EOS_Aperture; dpd = _lookup_or_allocate_canon_prop(params, proptype); - if (olcver >= 0x12) - dpd->CurrentValue.u16 = curdata[curoff+7]; /* CHECK */ - else + if (olcver >= 0x12) { + if (olcver == 0x13) { + dpd->CurrentValue.u16 = curdata[curoff+7]; /* R5 */ + } else { + dpd->CurrentValue.u16 = curdata[curoff+5]; /* CHECK */ + } + } else { dpd->CurrentValue.u16 = curdata[curoff+4]; /* just use last byte */ + } ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_PROPERTY; ce[i].u.propid = proptype;