summaryrefslogtreecommitdiff
path: root/vapi
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-08-22 09:58:25 +0200
committerJörg Frings-Fürst <debian@jff.email>2021-08-22 09:58:25 +0200
commit55d274a13c2524d55e07f2395316aa9d2cae912b (patch)
treeed56dbd62e0ce978ab83e8ffe2d6034e612d028f /vapi
parentfa96deefd4bc785c2937e40df3eb0742e2353c13 (diff)
parent63876b56fcba61ef061c5f0edd924551bc079354 (diff)
Merge branch 'release/debian/0.30.14-1'debian/0.30.14-1
Diffstat (limited to 'vapi')
-rw-r--r--vapi/libexif.vapi2
-rw-r--r--vapi/libgphoto2.vapi26
-rw-r--r--vapi/libraw.vapi2
3 files changed, 13 insertions, 17 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 22f70ee..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(CameraStorageInformation **sifs, out int count, 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")]
@@ -74,7 +74,7 @@ namespace GPhoto {
[CCode (cname="gp_camera_folder_delete_all")]
public Result delete_all_files(string folder, Context context);
[CCode (cname="gp_camera_folder_put_file")]
- public Result put_file(string folder, CameraFile file, Context context);
+ public Result put_file(string folder, string filename, CameraFileType type, CameraFile file, Context context);
[CCode (cname="gp_camera_folder_make_dir")]
public Result make_dir(string folder, string name, Context context);
[CCode (cname="gp_camera_folder_remove_dir")]
@@ -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);
}
@@ -140,7 +141,6 @@ namespace GPhoto {
public enum CameraFileInfoFields {
NONE,
TYPE,
- NAME,
SIZE,
WIDTH,
HEIGHT,
@@ -159,10 +159,9 @@ namespace GPhoto {
public CameraFileInfoFields fields;
public CameraFileStatus status;
public ulong size;
- public string type;
+ public char type[64];
public uint width;
public uint height;
- public string name;
public CameraFilePermissions permissions;
public time_t mtime;
}
@@ -176,12 +175,9 @@ namespace GPhoto {
public CameraFileInfoFields fields;
public CameraFileStatus status;
public ulong size;
- public string type;
+ public char type[64];
public uint width;
public uint height;
- public string name;
- public CameraFilePermissions permissions;
- public time_t mtime;
}
[CCode (
@@ -266,7 +262,7 @@ namespace GPhoto {
public Result append(string name, string value);
public Result reset();
public Result sort();
- public Result find_by_name(out int? index, string name);
+ public Result find_by_name(out int index, string name);
public Result get_name(int index, out unowned string name);
public Result get_value(int index, out unowned string value);
public Result set_name(int index, string name);
@@ -314,9 +310,9 @@ namespace GPhoto {
)]
public struct CameraStorageInformation {
public CameraStorageInfoFields fields;
- public string basedir;
- public string label;
- public string description;
+ public char basedir[256];
+ public char label[256];
+ public char description[256];
public int type;
public int fstype;
public int access;
@@ -485,7 +481,7 @@ namespace GPhoto {
[CCode (
cheader_filename="gphoto2/gphoto2-version.h",
- cprefix="GP_VERSION"
+ cprefix="GP_VERSION_"
)]
public enum VersionVerbosity {
SHORT,
diff --git a/vapi/libraw.vapi b/vapi/libraw.vapi
index b1b5875..146f447 100644
--- a/vapi/libraw.vapi
+++ b/vapi/libraw.vapi
@@ -248,7 +248,7 @@ public struct Thumbnail {
public uint tlength;
public int tcolors;
[CCode (array_length_cname="tlength")]
- public uint8[] thumb;
+ public unowned uint8[] thumb;
}
[CCode (cname="enum LibRaw_thumbnail_formats", cprefix="LIBRAW_THUMBNAIL_")]