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

more debugging output in olc code

Browse Source
This commit is contained in:
Marcus Meissner
2022-08-27 07:15:49 +02:00
parent c78f1ff67e
commit 41533c8cd3
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2565,6 +2565,12 @@ static int olcsizes[0x14][13] = {
for (k=8;k<size;k++)
ptp_debug (params, " %d: %02x", k-8, curdata[k]);
}
if (size < 14) {
ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
ce[i].u.info = strdup("OLC size too small");
ptp_debug (params, "event %d: OLC unexpected size %d", i, size);
break;
}
len = dtoh32a(curdata+8);
if ((len != size-8) && (len != size-4)) {
ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
@@ -2573,12 +2579,7 @@ static int olcsizes[0x14][13] = {
break;
}
mask = dtoh16a(curdata+8+4);
if (size < 14) {
ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;
ce[i].u.info = strdup("OLC size too small");
ptp_debug (params, "event %d: OLC unexpected size %d", i, size);
break;
}
ptp_debug (params, "event %d: OLC mask 0x%04x length %d / data length %d", mask, len, len - 8);
curoff = 8+4+4;
if (mask & CANON_EOS_OLC_BUTTON) {
ce[i].type = PTP_CANON_EOS_CHANGES_TYPE_UNKNOWN;