diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2017-04-23 20:24:28 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2017-04-23 20:24:28 +0200 |
| commit | 9e00bbc684d29c1e6cbf60e2e45f56c4f9423b29 (patch) | |
| tree | 15891a0ddd07813880111e993e4419dc6a3b2437 | |
| parent | e719450c3881d0b13427f87f4d2eb91ec1151f2f (diff) | |
| parent | 786f2d9edfdcc4a214f026f565be79bf81a9c213 (diff) | |
| download | libgphoto2-9e00bbc684d29c1e6cbf60e2e45f56c4f9423b29.tar.gz | |
Merge branch 'master' of github.com:gphoto/libgphoto2
| -rw-r--r-- | camlibs/ptp2/config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c index e32138a65..437cf5d5f 100644 --- a/camlibs/ptp2/config.c +++ b/camlibs/ptp2/config.c @@ -463,7 +463,9 @@ camera_prepare_canon_eos_capture(Camera *camera, GPContext *context) { ct_val.u16 = 0x0008; C_PTP (ptp_canon_eos_setdevicepropvalue (params, PTP_DPC_CANON_EOS_EVFOutputDevice, &ct_val, PTP_DTC_UINT16)); +#ifndef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION usleep(1000*1000); /* 1 second */ +#endif C_PTP (ptp_check_eos_events (params)); } @@ -3786,7 +3788,7 @@ _put_Ricoh_ShutterSpeed(CONFIG_PUT_ARGS) { return GP_ERROR; y = 1; } - propval->u64 = ((unsigned long)x<<32) | y; + propval->u64 = ((uint64_t)x<<32) | y; return GP_OK; } |