summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2020-04-18 19:22:16 +0200
committerMarcus Meissner <marcus@jet.franken.de>2020-04-18 19:22:16 +0200
commit0bfcd2e95a3d114b3cb145ebc4c3aa70c1d0b68f (patch)
tree9a9fa0391114e522adb98da386bbfcc2182ef642
parent79c66ce53243fc97cf17b4fa68584270a2287d99 (diff)
downloadlibgphoto2-0bfcd2e95a3d114b3cb145ebc4c3aa70c1d0b68f.tar.gz
handle shutterspeed default >= 0xf as size 7
-rw-r--r--camlibs/ptp2/ptp-pack.c5
1 files changed, 4 insertions, 1 deletions
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++;