Commit c6443546 authored by Jens Georg's avatar Jens Georg

Adapt to gexiv2 master

parent d1666ce8
......@@ -135,13 +135,14 @@
},
{
"name" : "gexiv2",
"buildsystem" : "meson",
"cleanup" : [
"/lib/girepository-1.0",
"/share/gir-1.0"
],
"config-opts" : [
"--without-python2-girdir",
"--without-python3-girdir"
"-Dpython2-girdir=no",
"-Dpython3-girdir=no"
],
"build-options" : {
"env" : {
......@@ -226,4 +227,4 @@
]
}
]
}
\ No newline at end of file
}
......@@ -49,7 +49,7 @@ gstreamer = dependency('gstreamer-1.0', version : '>= 1.0')
gstreamer_pbu = dependency('gstreamer-pbutils-1.0', version : '>= 1.0')
gphoto2 = dependency('libgphoto2', version : '>= 2.5.0')
gudev = dependency('gudev-1.0', version : '>= 145', required: false)
gexiv2 = dependency('gexiv2', version: '>= 0.10.4')
gexiv2 = dependency('gexiv2', version: '>= 0.11.0')
libraw = dependency('libraw', version : '>= 0.13.2')
libexif = dependency('libexif', version : '>= 0.6.16')
unity = dependency('unity', required : false)
......
......@@ -276,8 +276,8 @@ public class PhotoMetadata : MediaMetadata {
exiv2 = new GExiv2.Metadata();
exif = null;
exiv2.open_buf(buffer, length);
exif = Exif.Data.new_from_data(buffer, length);
exiv2.open_buf(buffer[0:length]);
exif = Exif.Data.new_from_data(buffer[0:length]);
source_name = "<memory buffer %d bytes>".printf(length);
}
......@@ -285,8 +285,8 @@ public class PhotoMetadata : MediaMetadata {
exiv2 = new GExiv2.Metadata();
exif = null;
exiv2.from_app1_segment(buffer.get_data(), (long) buffer.get_size());
exif = Exif.Data.new_from_data(buffer.get_data(), buffer.get_size());
exiv2.from_app1_segment(buffer.get_data());
exif = Exif.Data.new_from_data(buffer.get_data());
source_name = "<app1 segment %zu bytes>".printf(buffer.get_size());
}
......
......@@ -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)]uint8[] data);
public void dump();
public void fix();
public void foreach_content(ForeachContentFunc cb, void *user = null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment