diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-09-04 22:28:52 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-09-04 22:28:52 +0200 |
| commit | fb3961e6593beb2ccc1e5771d7cba1754c6be8fe (patch) | |
| tree | 5451f74aa57f5aa6e6a7c8a96c96c61717f095c8 | |
| parent | 3f24a8c68b3d5aef2cab83bceab5c4c2a2714765 (diff) | |
| download | libgphoto2-fb3961e6593beb2ccc1e5771d7cba1754c6be8fe.tar.gz | |
fixed "uninteresting" case
output i64 and u64 in mtp metadata (no 128 bit yet though)
| -rw-r--r-- | camlibs/ptp2/library.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c index ec021ba58..22cdf3c5d 100644 --- a/camlibs/ptp2/library.c +++ b/camlibs/ptp2/library.c @@ -6176,8 +6176,9 @@ ptp_mtp_render_metadata ( if (uninteresting_props[i] == xpl->property) break; /* Is uninteresting. */ - if (i == sizeof(uninteresting_props)/sizeof(uninteresting_props[0])) + if (i != sizeof(uninteresting_props)/sizeof(uninteresting_props[0])) continue; + for(i=0;i<propcnt;i++) { /* Mark handled property as 0 */ if (props[i] == xpl->property) { @@ -6197,6 +6198,9 @@ ptp_mtp_render_metadata ( case PTP_DTC_STR: snprintf (text, sizeof(text), "%s", xpl->propval.str?xpl->propval.str:""); break; + case PTP_DTC_INT64: + sprintf (text, "%ld", xpl->propval.i64); + break; case PTP_DTC_INT32: sprintf (text, "%d", xpl->propval.i32); break; @@ -6206,6 +6210,9 @@ ptp_mtp_render_metadata ( case PTP_DTC_INT8: sprintf (text, "%d", xpl->propval.i8); break; + case PTP_DTC_UINT64: + sprintf (text, "%lu", xpl->propval.u64); + break; case PTP_DTC_UINT32: sprintf (text, "%u", xpl->propval.u32); break; @@ -6256,6 +6263,9 @@ ptp_mtp_render_metadata ( case PTP_DTC_STR: snprintf (text, sizeof(text), "%s", pv.str?pv.str:""); break; + case PTP_DTC_INT64: + sprintf (text, "%ld", pv.i64); + break; case PTP_DTC_INT32: sprintf (text, "%d", pv.i32); break; @@ -6265,6 +6275,9 @@ ptp_mtp_render_metadata ( case PTP_DTC_INT8: sprintf (text, "%d", pv.i8); break; + case PTP_DTC_UINT64: + sprintf (text, "%lu", pv.u64); + break; case PTP_DTC_UINT32: sprintf (text, "%u", pv.u32); break; |