diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2021-08-18 20:39:48 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2021-08-18 20:39:48 +0200 |
commit | 9ee94b6fd44e93a3eacdcdef9aa96e245a2c961e (patch) | |
tree | f93c4a826d038302d79959c6507a16aa8c20e2a3 /vapi | |
parent | 29dcf0568d89ade47d70714865d6d917766ec257 (diff) | |
parent | 24cc60499ad147c1897b3b68e0d8e9dde36b013c (diff) |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'vapi')
-rw-r--r-- | vapi/libexif.vapi | 2 | ||||
-rw-r--r-- | vapi/libgphoto2.vapi | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/vapi/libexif.vapi b/vapi/libexif.vapi index 61ab36e..b95dfb0 100644 --- a/vapi/libexif.vapi +++ b/vapi/libexif.vapi @@ -79,7 +79,7 @@ namespace Exif { [CCode (cname="exif_data_new")] public Data(); public static Data? new_from_file(string path); - public static Data? new_from_data(uint8 *data, size_t count); + public static Data? new_from_data([CCode (array_length_pos=1.1)]uint8[] data); public void dump(); public void fix(); public void foreach_content(ForeachContentFunc cb, void *user = null); diff --git a/vapi/libgphoto2.vapi b/vapi/libgphoto2.vapi index e1c2246..34fc1c4 100644 --- a/vapi/libgphoto2.vapi +++ b/vapi/libgphoto2.vapi @@ -64,7 +64,7 @@ namespace GPhoto { public Result set_port_info(PortInfo info); public Result get_abilities(out CameraAbilities abilities); public Result set_abilities(CameraAbilities abilities); - public Result get_storageinfo([CCode (array_length_pos=1)]out CameraStorageInformation[] sifs, Context context); + public Result get_storageinfo([CCode (array_length_pos=1.1)]out CameraStorageInformation[] sifs, Context context); // Folders [CCode (cname="gp_camera_folder_list_folders")] @@ -106,7 +106,8 @@ namespace GPhoto { public static Result create(out CameraFile file); [CCode (cname="gp_file_new_from_fd")] public static Result create_from_fd(out CameraFile file, int fd); - public Result get_data_and_size(out uint8 *data, out ulong data_len); + [CCode (cname="gp_file_get_data_and_size")] + public Result get_data([CCode (array_length_pos=1.1, array_length_type="gulong")]out unowned uint8[] data); public Result save(string filename); public Result slurp(uint8[] data, out size_t readlen); } |