summaryrefslogtreecommitdiff
path: root/src/camera/GPhoto.vala
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-08-18 20:39:34 +0200
committerJörg Frings-Fürst <debian@jff.email>2021-08-18 20:39:34 +0200
commit24cc60499ad147c1897b3b68e0d8e9dde36b013c (patch)
treef93c4a826d038302d79959c6507a16aa8c20e2a3 /src/camera/GPhoto.vala
parent29dcf0568d89ade47d70714865d6d917766ec257 (diff)
parent2ed34746222ea505631ae8ef8ca50552af999ad2 (diff)
Update upstream source from tag 'upstream/0.30.14'
Update to upstream version '0.30.14' with Debian dir 7d034387dcf9975c7a3797cecaabd43467a63713
Diffstat (limited to 'src/camera/GPhoto.vala')
-rw-r--r--src/camera/GPhoto.vala8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/camera/GPhoto.vala b/src/camera/GPhoto.vala
index bc2251c..9bcb151 100644
--- a/src/camera/GPhoto.vala
+++ b/src/camera/GPhoto.vala
@@ -119,15 +119,11 @@ namespace GPhoto {
// if buffer can be loaded into memory, return a Bytes class with
// CameraFile being the owner of the data. This way, the CameraFile is freed
// when the Bytes are freed
- unowned uint8 *data;
- ulong data_len;
- var res = file.get_data_and_size(out data, out data_len);
+ unowned uint8[] buffer = null;
+ var res = file.get_data(out buffer);
if (res != Result.OK)
return null;
- unowned uint8[] buffer = (uint8[]) data;
- buffer.length = (int) data_len;
-
return Bytes.new_with_owner<GPhoto.CameraFile>(buffer, file);
}