diff options
| author | Florent Viard <fviard@lacie.com> | 2017-08-28 17:35:48 +0200 |
|---|---|---|
| committer | Florent Viard <fviard@lacie.com> | 2017-08-28 17:35:48 +0200 |
| commit | 318fe2957a8abb89b322f71dd6b47ba1ac8c8e2a (patch) | |
| tree | 4295944818098ed9695f3207aa1b3f00527be705 /libgphoto2 | |
| parent | 1e8283d095bec6e7819281bdddc4cd2419670aa0 (diff) | |
| download | libgphoto2-318fe2957a8abb89b322f71dd6b47ba1ac8c8e2a.tar.gz | |
More fixes for support 64bit getpartialobject for Android in read_file_func
Diffstat (limited to 'libgphoto2')
| -rw-r--r-- | libgphoto2/gphoto2-camera.c | 2 | ||||
| -rw-r--r-- | libgphoto2/gphoto2-filesys.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c index cdc0a9ae4..5a1cabdc0 100644 --- a/libgphoto2/gphoto2-camera.c +++ b/libgphoto2/gphoto2-camera.c @@ -1705,7 +1705,7 @@ gp_camera_file_get (Camera *camera, const char *folder, const char *file, * @param type the #CameraFileType * @param offset the offset into the camera file * @param data the buffer receiving the data - * @param size the size to be read and that was read + * @param size the size to be read and that was read. (Note: size should not exceed 32 bits) * @param context a #GPContext * @return a gphoto2 error code * diff --git a/libgphoto2/gphoto2-filesys.c b/libgphoto2/gphoto2-filesys.c index 4d64550e8..5d364a133 100644 --- a/libgphoto2/gphoto2-filesys.c +++ b/libgphoto2/gphoto2-filesys.c @@ -1780,8 +1780,10 @@ gp_filesystem_read_file (CameraFilesystem *fs, const char *folder, offset, buf, size, fs->data, context); if (r == GP_OK) return r; + } else { + return GP_ERROR_NOT_SUPPORTED; } - return GP_ERROR_NOT_SUPPORTED; + return r; /* fallback code */ CR (gp_file_new (&file)); CR (gp_filesystem_get_file (fs, folder, filename, type, |