summaryrefslogtreecommitdiff
path: root/src/photos
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-04-14 18:53:12 +0200
commitdfdb61e578cccb4b7ec2e9ccfa16a66ec481fab5 (patch)
treedee893916166ac1c8b479b74e7f341429945260e /src/photos
parenta5ea701acc282ade4ccb9b08a8613a8d66ca82a5 (diff)
parent9e7cd144725a270e0460b21747619f447ca87684 (diff)
Merge tag 'upstream/0.26.1'
Upstream version 0.26.1
Diffstat (limited to 'src/photos')
-rw-r--r--src/photos/BmpSupport.c230
-rw-r--r--src/photos/GRaw.c220
-rw-r--r--src/photos/GdkSupport.c10
-rw-r--r--src/photos/JfifSupport.c198
-rw-r--r--src/photos/PhotoFileAdapter.c12
-rw-r--r--src/photos/PhotoFileFormat.c226
-rw-r--r--src/photos/PhotoFileSniffer.c4
-rw-r--r--src/photos/PhotoMetadata.c1074
-rw-r--r--src/photos/Photos.c2
-rw-r--r--src/photos/PngSupport.c230
-rw-r--r--src/photos/RawSupport.c40
-rw-r--r--src/photos/TiffSupport.c124
12 files changed, 1198 insertions, 1172 deletions
diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c
index ae80b52..2425607 100644
--- a/src/photos/BmpSupport.c
+++ b/src/photos/BmpSupport.c
@@ -1,4 +1,4 @@
-/* BmpSupport.c generated by valac 0.34.4, the Vala compiler
+/* BmpSupport.c generated by valac 0.34.7, the Vala compiler
* generated from BmpSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -888,19 +888,19 @@ static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPro
#line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
((PhotoFileFormatPropertiesClass *) klass)->finalize = photos_bmp_file_format_properties_finalize;
#line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = photos_bmp_file_format_properties_real_get_file_format;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_file_format;
#line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_flags = photos_bmp_file_format_properties_real_get_flags;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_flags;
#line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = photos_bmp_file_format_properties_real_get_user_visible_name;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_user_visible_name;
#line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = photos_bmp_file_format_properties_real_get_default_extension;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_default_extension;
#line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = photos_bmp_file_format_properties_real_get_known_extensions;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_bmp_file_format_properties_real_get_known_extensions;
#line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = photos_bmp_file_format_properties_real_get_default_mime_type;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photos_bmp_file_format_properties_real_get_default_mime_type;
#line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = photos_bmp_file_format_properties_real_get_mime_types;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_bmp_file_format_properties_real_get_mime_types;
#line 10 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp0_ = g_strdup ("bmp");
#line 10 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -986,12 +986,12 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
GFile* _tmp0_ = NULL;
GFileInputStream* _tmp1_ = NULL;
guint8* file_lead_sequence = NULL;
- guint8* _tmp2_ = NULL;
+ guint8* _tmp3_ = NULL;
gint file_lead_sequence_length1 = 0;
gint _file_lead_sequence_size_ = 0;
- GFileInputStream* _tmp3_ = NULL;
- guint8* _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
+ GFileInputStream* _tmp4_ = NULL;
+ guint8* _tmp5_ = NULL;
+ gint _tmp5__length1 = 0;
GError * _inner_error_ = NULL;
#line 59 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1003,30 +1003,34 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
instream = _tmp1_;
#line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1007 "BmpSupport.c"
+ gboolean _tmp2_ = FALSE;
#line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
g_propagate_error (error, _inner_error_);
#line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- return FALSE;
-#line 1011 "BmpSupport.c"
+ return _tmp2_;
+#line 1013 "BmpSupport.c"
}
#line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE));
+ _tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE));
#line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- file_lead_sequence = _tmp2_;
+ file_lead_sequence = _tmp3_;
#line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
file_lead_sequence_length1 = G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE);
#line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_file_lead_sequence_size_ = file_lead_sequence_length1;
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp3_ = instream;
+ _tmp4_ = instream;
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp4_ = file_lead_sequence;
+ _tmp5_ = file_lead_sequence;
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp4__length1 = file_lead_sequence_length1;
+ _tmp5__length1 = file_lead_sequence_length1;
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+ g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_);
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1033 "BmpSupport.c"
+ gboolean _tmp6_ = FALSE;
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
g_propagate_error (error, _inner_error_);
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1034,62 +1038,62 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_g_object_unref0 (instream);
#line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- return FALSE;
-#line 1039 "BmpSupport.c"
+ return _tmp6_;
+#line 1043 "BmpSupport.c"
}
{
gint i = 0;
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
i = 0;
-#line 1045 "BmpSupport.c"
+#line 1049 "BmpSupport.c"
{
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp7_ = FALSE;
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp5_ = TRUE;
+ _tmp7_ = TRUE;
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
while (TRUE) {
-#line 1052 "BmpSupport.c"
- gint _tmp7_ = 0;
- guint8* _tmp8_ = NULL;
- gint _tmp8__length1 = 0;
+#line 1056 "BmpSupport.c"
gint _tmp9_ = 0;
- guint8 _tmp10_ = 0U;
+ guint8* _tmp10_ = NULL;
+ gint _tmp10__length1 = 0;
gint _tmp11_ = 0;
guint8 _tmp12_ = 0U;
+ gint _tmp13_ = 0;
+ guint8 _tmp14_ = 0U;
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- if (!_tmp5_) {
-#line 1062 "BmpSupport.c"
- gint _tmp6_ = 0;
+ if (!_tmp7_) {
+#line 1066 "BmpSupport.c"
+ gint _tmp8_ = 0;
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp6_ = i;
+ _tmp8_ = i;
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- i = _tmp6_ + 1;
-#line 1068 "BmpSupport.c"
+ i = _tmp8_ + 1;
+#line 1072 "BmpSupport.c"
}
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp5_ = FALSE;
+ _tmp7_ = FALSE;
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp7_ = i;
+ _tmp9_ = i;
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- if (!(_tmp7_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) {
+ if (!(_tmp9_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) {
#line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
break;
-#line 1078 "BmpSupport.c"
+#line 1082 "BmpSupport.c"
}
#line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp8_ = file_lead_sequence;
+ _tmp10_ = file_lead_sequence;
#line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp8__length1 = file_lead_sequence_length1;
+ _tmp10__length1 = file_lead_sequence_length1;
#line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp9_ = i;
+ _tmp11_ = i;
#line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp10_ = _tmp8_[_tmp9_];
+ _tmp12_ = _tmp10_[_tmp11_];
#line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp11_ = i;
+ _tmp13_ = i;
#line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- _tmp12_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp11_];
+ _tmp14_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp13_];
#line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- if (_tmp10_ != _tmp12_) {
+ if (_tmp12_ != _tmp14_) {
#line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
result = FALSE;
#line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
@@ -1098,7 +1102,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
_g_object_unref0 (instream);
#line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1102 "BmpSupport.c"
+#line 1106 "BmpSupport.c"
}
}
}
@@ -1111,14 +1115,14 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) {
_g_object_unref0 (instream);
#line 71 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1115 "BmpSupport.c"
+#line 1119 "BmpSupport.c"
}
static gpointer _detected_photo_information_ref0 (gpointer self) {
#line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return self ? detected_photo_information_ref (self) : NULL;
-#line 1122 "BmpSupport.c"
+#line 1126 "BmpSupport.c"
}
@@ -1154,7 +1158,7 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
g_propagate_error (error, _inner_error_);
#line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return NULL;
-#line 1158 "BmpSupport.c"
+#line 1162 "BmpSupport.c"
}
#line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
if (!_tmp0_) {
@@ -1164,11 +1168,11 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
if (is_corrupted) {
#line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
*is_corrupted = _vala_is_corrupted;
-#line 1168 "BmpSupport.c"
+#line 1172 "BmpSupport.c"
}
#line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1172 "BmpSupport.c"
+#line 1176 "BmpSupport.c"
}
#line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_bmp_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_);
@@ -1182,7 +1186,7 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
g_propagate_error (error, _inner_error_);
#line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return NULL;
-#line 1186 "BmpSupport.c"
+#line 1190 "BmpSupport.c"
}
#line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp5_ = detected;
@@ -1196,11 +1200,11 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
if (is_corrupted) {
#line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
*is_corrupted = _vala_is_corrupted;
-#line 1200 "BmpSupport.c"
+#line 1204 "BmpSupport.c"
}
#line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1204 "BmpSupport.c"
+#line 1208 "BmpSupport.c"
}
#line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp7_ = detected;
@@ -1208,17 +1212,17 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
_tmp8_ = _tmp7_->file_format;
#line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
if (_tmp8_ == PHOTO_FILE_FORMAT_BMP) {
-#line 1212 "BmpSupport.c"
+#line 1216 "BmpSupport.c"
DetectedPhotoInformation* _tmp9_ = NULL;
#line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp9_ = detected;
#line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp6_ = _tmp9_;
-#line 1218 "BmpSupport.c"
+#line 1222 "BmpSupport.c"
} else {
#line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp6_ = NULL;
-#line 1222 "BmpSupport.c"
+#line 1226 "BmpSupport.c"
}
#line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1230,11 +1234,11 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer
if (is_corrupted) {
#line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
*is_corrupted = _vala_is_corrupted;
-#line 1234 "BmpSupport.c"
+#line 1238 "BmpSupport.c"
}
#line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1238 "BmpSupport.c"
+#line 1242 "BmpSupport.c"
}
@@ -1242,8 +1246,8 @@ static void photos_bmp_sniffer_class_init (PhotosBmpSnifferClass * klass) {
#line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
photos_bmp_sniffer_parent_class = g_type_class_peek_parent (klass);
#line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileSnifferClass *) klass)->sniff = photos_bmp_sniffer_real_sniff;
-#line 1247 "BmpSupport.c"
+ ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_bmp_sniffer_real_sniff;
+#line 1251 "BmpSupport.c"
}
@@ -1274,14 +1278,14 @@ PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* fi
self = (PhotosBmpReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP);
#line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return self;
-#line 1278 "BmpSupport.c"
+#line 1282 "BmpSupport.c"
}
PhotosBmpReader* photos_bmp_reader_new (const gchar* filepath) {
#line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return photos_bmp_reader_construct (PHOTOS_TYPE_BMP_READER, filepath);
-#line 1285 "BmpSupport.c"
+#line 1289 "BmpSupport.c"
}
@@ -1310,7 +1314,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
if (_tmp3_ > 9999) {
#line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp1_ = TRUE;
-#line 1314 "BmpSupport.c"
+#line 1318 "BmpSupport.c"
} else {
Dimensions _tmp4_ = {0};
gint _tmp5_ = 0;
@@ -1320,11 +1324,11 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
_tmp5_ = _tmp4_.height;
#line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp1_ = _tmp5_ > 9999;
-#line 1324 "BmpSupport.c"
+#line 1328 "BmpSupport.c"
}
#line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
if (_tmp1_) {
-#line 1328 "BmpSupport.c"
+#line 1332 "BmpSupport.c"
gboolean _tmp6_ = FALSE;
Dimensions _tmp7_ = {0};
gint _tmp8_ = 0;
@@ -1336,7 +1340,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
if (_tmp8_ < 100) {
#line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp6_ = TRUE;
-#line 1340 "BmpSupport.c"
+#line 1344 "BmpSupport.c"
} else {
Dimensions _tmp9_ = {0};
gint _tmp10_ = 0;
@@ -1346,19 +1350,19 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
_tmp10_ = _tmp9_.height;
#line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp6_ = _tmp10_ < 100;
-#line 1350 "BmpSupport.c"
+#line 1354 "BmpSupport.c"
}
#line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp0_ = _tmp6_;
-#line 1354 "BmpSupport.c"
+#line 1358 "BmpSupport.c"
} else {
#line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp0_ = FALSE;
-#line 1358 "BmpSupport.c"
+#line 1362 "BmpSupport.c"
}
#line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
if (_tmp0_) {
-#line 1362 "BmpSupport.c"
+#line 1366 "BmpSupport.c"
Dimensions prefetch_dimensions = {0};
Dimensions _tmp11_ = {0};
GdkPixbuf* _tmp12_ = NULL;
@@ -1409,7 +1413,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
_g_object_unref0 (_result_);
#line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return NULL;
-#line 1413 "BmpSupport.c"
+#line 1417 "BmpSupport.c"
}
#line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp21_ = _tmp12_;
@@ -1437,7 +1441,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
_result_ = _tmp27_;
#line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_g_object_unref0 (_tmp12_);
-#line 1441 "BmpSupport.c"
+#line 1445 "BmpSupport.c"
} else {
GdkPixbuf* _tmp28_ = NULL;
gchar* _tmp29_ = NULL;
@@ -1477,7 +1481,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
_g_object_unref0 (_result_);
#line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return NULL;
-#line 1481 "BmpSupport.c"
+#line 1485 "BmpSupport.c"
}
#line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_tmp37_ = _tmp28_;
@@ -1489,13 +1493,13 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim
_result_ = _tmp37_;
#line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
_g_object_unref0 (_tmp28_);
-#line 1493 "BmpSupport.c"
+#line 1497 "BmpSupport.c"
}
#line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
result = _result_;
#line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1499 "BmpSupport.c"
+#line 1503 "BmpSupport.c"
}
@@ -1503,8 +1507,8 @@ static void photos_bmp_reader_class_init (PhotosBmpReaderClass * klass) {
#line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
photos_bmp_reader_parent_class = g_type_class_peek_parent (klass);
#line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileReaderClass *) klass)->scaled_read = photos_bmp_reader_real_scaled_read;
-#line 1508 "BmpSupport.c"
+ ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) photos_bmp_reader_real_scaled_read;
+#line 1512 "BmpSupport.c"
}
@@ -1535,14 +1539,14 @@ PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* fi
self = (PhotosBmpWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP);
#line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return self;
-#line 1539 "BmpSupport.c"
+#line 1543 "BmpSupport.c"
}
PhotosBmpWriter* photos_bmp_writer_new (const gchar* filepath) {
#line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return photos_bmp_writer_construct (PHOTOS_TYPE_BMP_WRITER, filepath);
-#line 1546 "BmpSupport.c"
+#line 1550 "BmpSupport.c"
}
@@ -1572,7 +1576,7 @@ static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixb
g_propagate_error (error, _inner_error_);
#line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return;
-#line 1576 "BmpSupport.c"
+#line 1580 "BmpSupport.c"
}
}
@@ -1581,8 +1585,8 @@ static void photos_bmp_writer_class_init (PhotosBmpWriterClass * klass) {
#line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
photos_bmp_writer_parent_class = g_type_class_peek_parent (klass);
#line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileWriterClass *) klass)->write = photos_bmp_writer_real_write;
-#line 1586 "BmpSupport.c"
+ ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_bmp_writer_real_write;
+#line 1590 "BmpSupport.c"
}
@@ -1613,14 +1617,14 @@ PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type
self = (PhotosBmpMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP);
#line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return self;
-#line 1617 "BmpSupport.c"
+#line 1621 "BmpSupport.c"
}
PhotosBmpMetadataWriter* photos_bmp_metadata_writer_new (const gchar* filepath) {
#line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return photos_bmp_metadata_writer_construct (PHOTOS_TYPE_BMP_METADATA_WRITER, filepath);
-#line 1624 "BmpSupport.c"
+#line 1628 "BmpSupport.c"
}
@@ -1630,7 +1634,7 @@ static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWri
self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_METADATA_WRITER, PhotosBmpMetadataWriter);
#line 137 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
g_return_if_fail (IS_PHOTO_METADATA (metadata));
-#line 1634 "BmpSupport.c"
+#line 1638 "BmpSupport.c"
}
@@ -1638,8 +1642,8 @@ static void photos_bmp_metadata_writer_class_init (PhotosBmpMetadataWriterClass
#line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
photos_bmp_metadata_writer_parent_class = g_type_class_peek_parent (klass);
#line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileMetadataWriterClass *) klass)->write_metadata = photos_bmp_metadata_writer_real_write_metadata;
-#line 1643 "BmpSupport.c"
+ ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_bmp_metadata_writer_real_write_metadata;
+#line 1647 "BmpSupport.c"
}
@@ -1669,14 +1673,14 @@ void photos_bmp_file_format_driver_init (void) {
photos_bmp_file_format_driver_instance = _tmp0_;
#line 147 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
photos_bmp_file_format_properties_init ();
-#line 1673 "BmpSupport.c"
+#line 1677 "BmpSupport.c"
}
static gpointer _photo_file_format_driver_ref0 (gpointer self) {
#line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return self ? photo_file_format_driver_ref (self) : NULL;
-#line 1680 "BmpSupport.c"
+#line 1684 "BmpSupport.c"
}
@@ -1692,7 +1696,7 @@ PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) {
result = _tmp1_;
#line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1696 "BmpSupport.c"
+#line 1700 "BmpSupport.c"
}
@@ -1708,7 +1712,7 @@ static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_propert
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
#line 155 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1712 "BmpSupport.c"
+#line 1716 "BmpSupport.c"
}
@@ -1729,7 +1733,7 @@ static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoF
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
#line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1733 "BmpSupport.c"
+#line 1737 "BmpSupport.c"
}
@@ -1742,7 +1746,7 @@ static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFor
result = TRUE;
#line 163 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1746 "BmpSupport.c"
+#line 1750 "BmpSupport.c"
}
@@ -1755,7 +1759,7 @@ static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFile
result = FALSE;
#line 167 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1759 "BmpSupport.c"
+#line 1763 "BmpSupport.c"
}
@@ -1776,7 +1780,7 @@ static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoF
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter);
#line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1780 "BmpSupport.c"
+#line 1784 "BmpSupport.c"
}
@@ -1797,7 +1801,7 @@ static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metada
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter);
#line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1801 "BmpSupport.c"
+#line 1805 "BmpSupport.c"
}
@@ -1821,7 +1825,7 @@ static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (Phot
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
#line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1825 "BmpSupport.c"
+#line 1829 "BmpSupport.c"
}
@@ -1837,7 +1841,7 @@ static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoF
result = _tmp0_;
#line 183 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return result;
-#line 1841 "BmpSupport.c"
+#line 1845 "BmpSupport.c"
}
@@ -1847,14 +1851,14 @@ PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_construct (GType object
self = (PhotosBmpFileFormatDriver*) photo_file_format_driver_construct (object_type);
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return self;
-#line 1851 "BmpSupport.c"
+#line 1855 "BmpSupport.c"
}
PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_new (void) {
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
return photos_bmp_file_format_driver_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER);
-#line 1858 "BmpSupport.c"
+#line 1862 "BmpSupport.c"
}
@@ -1864,22 +1868,22 @@ static void photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverC
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
((PhotoFileFormatDriverClass *) klass)->finalize = photos_bmp_file_format_driver_finalize;
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->get_properties = photos_bmp_file_format_driver_real_get_properties;
+ ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_get_properties;
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_reader = photos_bmp_file_format_driver_real_create_reader;
+ ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photos_bmp_file_format_driver_real_create_reader;
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_image = photos_bmp_file_format_driver_real_can_write_image;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_can_write_image;
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = photos_bmp_file_format_driver_real_can_write_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_can_write_metadata;
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_writer = photos_bmp_file_format_driver_real_create_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_bmp_file_format_driver_real_create_writer;
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = photos_bmp_file_format_driver_real_create_metadata_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_bmp_file_format_driver_real_create_metadata_writer;
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_sniffer = photos_bmp_file_format_driver_real_create_sniffer;
+ ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photos_bmp_file_format_driver_real_create_sniffer;
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata = photos_bmp_file_format_driver_real_create_metadata;
-#line 1883 "BmpSupport.c"
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_create_metadata;
+#line 1887 "BmpSupport.c"
}
@@ -1893,7 +1897,7 @@ static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver* obj)
self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver);
#line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala"
PHOTO_FILE_FORMAT_DRIVER_CLASS (photos_bmp_file_format_driver_parent_class)->finalize (obj);
-#line 1897 "BmpSupport.c"
+#line 1901 "BmpSupport.c"
}
diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c
index 12ffba3..27a2ffb 100644
--- a/src/photos/GRaw.c
+++ b/src/photos/GRaw.c
@@ -1,4 +1,4 @@
-/* GRaw.c generated by valac 0.34.4, the Vala compiler
+/* GRaw.c generated by valac 0.34.7, the Vala compiler
* generated from GRaw.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -1095,14 +1095,12 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) {
libraw_imgother_t result = {0};
libraw_imgother_t _tmp0_ = {0};
#line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- g_return_val_if_fail (self != NULL, result);
-#line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
_tmp0_ = self->other;
#line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
result = _tmp0_;
#line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi"
return result;
-#line 1106 "GRaw.c"
+#line 1104 "GRaw.c"
}
@@ -1110,8 +1108,6 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
libraw_imgother_t result = {0};
libraw_data_t* _tmp0_ = NULL;
libraw_imgother_t _tmp1_ = {0};
-#line 171 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1120,7 +1116,7 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) {
result = _tmp1_;
#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1124 "GRaw.c"
+#line 1120 "GRaw.c"
}
@@ -1128,14 +1124,12 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) {
libraw_iparams_t result = {0};
libraw_iparams_t _tmp0_ = {0};
#line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- g_return_val_if_fail (self != NULL, result);
-#line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
_tmp0_ = self->idata;
#line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
result = _tmp0_;
#line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi"
return result;
-#line 1139 "GRaw.c"
+#line 1133 "GRaw.c"
}
@@ -1143,8 +1137,6 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
libraw_iparams_t result = {0};
libraw_data_t* _tmp0_ = NULL;
libraw_iparams_t _tmp1_ = {0};
-#line 175 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1153,7 +1145,7 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) {
result = _tmp1_;
#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1157 "GRaw.c"
+#line 1149 "GRaw.c"
}
@@ -1161,14 +1153,12 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) {
libraw_image_sizes_t result = {0};
libraw_image_sizes_t _tmp0_ = {0};
#line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- g_return_val_if_fail (self != NULL, result);
-#line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
_tmp0_ = self->sizes;
#line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
result = _tmp0_;
#line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi"
return result;
-#line 1172 "GRaw.c"
+#line 1162 "GRaw.c"
}
@@ -1176,8 +1166,6 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
libraw_image_sizes_t result = {0};
libraw_data_t* _tmp0_ = NULL;
libraw_image_sizes_t _tmp1_ = {0};
-#line 179 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1186,7 +1174,7 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) {
result = _tmp1_;
#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1190 "GRaw.c"
+#line 1178 "GRaw.c"
}
@@ -1194,14 +1182,12 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) {
libraw_thumbnail_t result = {0};
libraw_thumbnail_t _tmp0_ = {0};
#line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
- g_return_val_if_fail (self != NULL, result);
-#line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
_tmp0_ = self->thumbnail;
#line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
result = _tmp0_;
#line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi"
return result;
-#line 1205 "GRaw.c"
+#line 1191 "GRaw.c"
}
@@ -1209,8 +1195,6 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
libraw_thumbnail_t result = {0};
libraw_data_t* _tmp0_ = NULL;
libraw_thumbnail_t _tmp1_ = {0};
-#line 183 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
- g_return_val_if_fail (GRAW_IS_PROCESSOR (self), result);
#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp0_ = self->priv->proc;
#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1219,7 +1203,7 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) {
result = _tmp1_;
#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1223 "GRaw.c"
+#line 1207 "GRaw.c"
}
@@ -1246,7 +1230,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
g_propagate_error (error, _inner_error_);
#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1250 "GRaw.c"
+#line 1234 "GRaw.c"
} else {
#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1254,7 +1238,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
g_clear_error (&_inner_error_);
#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1258 "GRaw.c"
+#line 1242 "GRaw.c"
}
}
#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1267,7 +1251,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError**
_graw_processed_image_unref0 (_tmp0_);
#line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1271 "GRaw.c"
+#line 1255 "GRaw.c"
}
@@ -1294,7 +1278,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
g_propagate_error (error, _inner_error_);
#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1298 "GRaw.c"
+#line 1282 "GRaw.c"
} else {
#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1302,7 +1286,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
g_clear_error (&_inner_error_);
#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1306 "GRaw.c"
+#line 1290 "GRaw.c"
}
}
#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
@@ -1315,7 +1299,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError
_graw_processed_image_unref0 (_tmp0_);
#line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1319 "GRaw.c"
+#line 1303 "GRaw.c"
}
@@ -1345,7 +1329,7 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
g_propagate_error (error, _inner_error_);
#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1349 "GRaw.c"
+#line 1333 "GRaw.c"
} else {
#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1353,7 +1337,7 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer
g_clear_error (&_inner_error_);
#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1357 "GRaw.c"
+#line 1341 "GRaw.c"
}
}
}
@@ -1384,7 +1368,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
g_propagate_error (error, _inner_error_);
#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1388 "GRaw.c"
+#line 1372 "GRaw.c"
} else {
#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1392,7 +1376,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro
g_clear_error (&_inner_error_);
#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1396 "GRaw.c"
+#line 1380 "GRaw.c"
}
}
}
@@ -1418,7 +1402,7 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1422 "GRaw.c"
+#line 1406 "GRaw.c"
} else {
#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1426,7 +1410,7 @@ void graw_processor_process (GRawProcessor* self, GError** error) {
g_clear_error (&_inner_error_);
#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1430 "GRaw.c"
+#line 1414 "GRaw.c"
}
}
}
@@ -1457,7 +1441,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
g_propagate_error (error, _inner_error_);
#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1461 "GRaw.c"
+#line 1445 "GRaw.c"
} else {
#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1465,7 +1449,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename,
g_clear_error (&_inner_error_);
#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1469 "GRaw.c"
+#line 1453 "GRaw.c"
}
}
}
@@ -1496,7 +1480,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
g_propagate_error (error, _inner_error_);
#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1500 "GRaw.c"
+#line 1484 "GRaw.c"
} else {
#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1504,7 +1488,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE
g_clear_error (&_inner_error_);
#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1508 "GRaw.c"
+#line 1492 "GRaw.c"
}
}
}
@@ -1518,7 +1502,7 @@ void graw_processor_recycle (GRawProcessor* self) {
_tmp0_ = self->priv->proc;
#line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
libraw_recycle (_tmp0_);
-#line 1522 "GRaw.c"
+#line 1506 "GRaw.c"
}
@@ -1542,7 +1526,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1546 "GRaw.c"
+#line 1530 "GRaw.c"
} else {
#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1550,7 +1534,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) {
g_clear_error (&_inner_error_);
#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1554 "GRaw.c"
+#line 1538 "GRaw.c"
}
}
}
@@ -1576,7 +1560,7 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
g_propagate_error (error, _inner_error_);
#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1580 "GRaw.c"
+#line 1564 "GRaw.c"
} else {
#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -1584,7 +1568,7 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) {
g_clear_error (&_inner_error_);
#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 1588 "GRaw.c"
+#line 1572 "GRaw.c"
}
}
}
@@ -1613,7 +1597,7 @@ static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_param
(*_tmp3_).aber[2] = _tmp4_;
#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi"
_tmp5_ = (*_tmp3_).aber[2];
-#line 1617 "GRaw.c"
+#line 1601 "GRaw.c"
}
@@ -1640,7 +1624,7 @@ static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* param
(*_tmp3_).gamm[1] = _tmp4_;
#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi"
_tmp5_ = (*_tmp3_).gamm[1];
-#line 1644 "GRaw.c"
+#line 1628 "GRaw.c"
}
@@ -1770,7 +1754,7 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal
_tmp30_ = _tmp29_;
#line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
(*_tmp30_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE;
-#line 1774 "GRaw.c"
+#line 1758 "GRaw.c"
}
@@ -1785,14 +1769,14 @@ libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) {
result = &_tmp0_->params;
#line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return result;
-#line 1789 "GRaw.c"
+#line 1773 "GRaw.c"
}
static void graw_value_processor_init (GValue* value) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 1796 "GRaw.c"
+#line 1780 "GRaw.c"
}
@@ -1801,7 +1785,7 @@ static void graw_value_processor_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processor_unref (value->data[0].v_pointer);
-#line 1805 "GRaw.c"
+#line 1789 "GRaw.c"
}
}
@@ -1811,11 +1795,11 @@ static void graw_value_processor_copy_value (const GValue* src_value, GValue* de
if (src_value->data[0].v_pointer) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
dest_value->data[0].v_pointer = graw_processor_ref (src_value->data[0].v_pointer);
-#line 1815 "GRaw.c"
+#line 1799 "GRaw.c"
} else {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
dest_value->data[0].v_pointer = NULL;
-#line 1819 "GRaw.c"
+#line 1803 "GRaw.c"
}
}
@@ -1823,37 +1807,37 @@ static void graw_value_processor_copy_value (const GValue* src_value, GValue* de
static gpointer graw_value_processor_peek_pointer (const GValue* value) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return value->data[0].v_pointer;
-#line 1827 "GRaw.c"
+#line 1811 "GRaw.c"
}
static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (collect_values[0].v_pointer) {
-#line 1834 "GRaw.c"
+#line 1818 "GRaw.c"
GRawProcessor* object;
object = collect_values[0].v_pointer;
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (object->parent_instance.g_class == NULL) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1841 "GRaw.c"
+#line 1825 "GRaw.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 1845 "GRaw.c"
+#line 1829 "GRaw.c"
}
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = graw_processor_ref (object);
-#line 1849 "GRaw.c"
+#line 1833 "GRaw.c"
} else {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 1853 "GRaw.c"
+#line 1837 "GRaw.c"
}
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1857 "GRaw.c"
+#line 1841 "GRaw.c"
}
@@ -1864,25 +1848,25 @@ static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_col
if (!object_p) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 1868 "GRaw.c"
+#line 1852 "GRaw.c"
}
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (!value->data[0].v_pointer) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
*object_p = NULL;
-#line 1874 "GRaw.c"
+#line 1858 "GRaw.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
*object_p = value->data[0].v_pointer;
-#line 1878 "GRaw.c"
+#line 1862 "GRaw.c"
} else {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
*object_p = graw_processor_ref (value->data[0].v_pointer);
-#line 1882 "GRaw.c"
+#line 1866 "GRaw.c"
}
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return NULL;
-#line 1886 "GRaw.c"
+#line 1870 "GRaw.c"
}
@@ -1896,7 +1880,7 @@ GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, con
G_PARAM_SPEC (spec)->value_type = object_type;
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return G_PARAM_SPEC (spec);
-#line 1900 "GRaw.c"
+#line 1884 "GRaw.c"
}
@@ -1905,7 +1889,7 @@ gpointer graw_value_get_processor (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR), NULL);
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return value->data[0].v_pointer;
-#line 1909 "GRaw.c"
+#line 1893 "GRaw.c"
}
@@ -1925,17 +1909,17 @@ void graw_value_set_processor (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processor_ref (value->data[0].v_pointer);
-#line 1929 "GRaw.c"
+#line 1913 "GRaw.c"
} else {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 1933 "GRaw.c"
+#line 1917 "GRaw.c"
}
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (old) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processor_unref (old);
-#line 1939 "GRaw.c"
+#line 1923 "GRaw.c"
}
}
@@ -1954,17 +1938,17 @@ void graw_value_take_processor (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = v_object;
-#line 1958 "GRaw.c"
+#line 1942 "GRaw.c"
} else {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
value->data[0].v_pointer = NULL;
-#line 1962 "GRaw.c"
+#line 1946 "GRaw.c"
}
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (old) {
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
graw_processor_unref (old);
-#line 1968 "GRaw.c"
+#line 1952 "GRaw.c"
}
}
@@ -1976,7 +1960,7 @@ static void graw_processor_class_init (GRawProcessorClass * klass) {
((GRawProcessorClass *) klass)->finalize = graw_processor_finalize;
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_type_class_add_private (klass, sizeof (GRawProcessorPrivate));
-#line 1980 "GRaw.c"
+#line 1964 "GRaw.c"
}
@@ -1985,7 +1969,7 @@ static void graw_processor_instance_init (GRawProcessor * self) {
self->priv = GRAW_PROCESSOR_GET_PRIVATE (self);
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
self->ref_count = 1;
-#line 1989 "GRaw.c"
+#line 1973 "GRaw.c"
}
@@ -1997,7 +1981,7 @@ static void graw_processor_finalize (GRawProcessor* obj) {
g_signal_handlers_destroy (self);
#line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_libraw_close0 (self->priv->proc);
-#line 2001 "GRaw.c"
+#line 1985 "GRaw.c"
}
@@ -2022,7 +2006,7 @@ gpointer graw_processor_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return instance;
-#line 2026 "GRaw.c"
+#line 2010 "GRaw.c"
}
@@ -2035,7 +2019,7 @@ void graw_processor_unref (gpointer instance) {
GRAW_PROCESSOR_GET_CLASS (self)->finalize (self);
#line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2039 "GRaw.c"
+#line 2023 "GRaw.c"
}
}
@@ -2057,14 +2041,14 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
if (_tmp0_ == LIBRAW_SUCCESS) {
#line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2061 "GRaw.c"
+#line 2045 "GRaw.c"
} else {
enum LibRaw_errors _tmp1_ = 0;
#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_tmp1_ = _result_;
#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
if (_tmp1_ > 0) {
-#line 2068 "GRaw.c"
+#line 2052 "GRaw.c"
const gchar* _tmp2_ = NULL;
enum LibRaw_errors _tmp3_ = 0;
enum LibRaw_errors _tmp4_ = 0;
@@ -2088,7 +2072,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_propagate_error (error, _inner_error_);
#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2092 "GRaw.c"
+#line 2076 "GRaw.c"
} else {
#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
@@ -2096,7 +2080,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2100 "GRaw.c"
+#line 2084 "GRaw.c"
}
}
}
@@ -2116,7 +2100,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
switch (_tmp11_) {
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_UNSPECIFIED_ERROR:
-#line 2120 "GRaw.c"
+#line 2104 "GRaw.c"
{
const gchar* _tmp12_ = NULL;
GError* _tmp13_ = NULL;
@@ -2134,7 +2118,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2138 "GRaw.c"
+#line 2122 "GRaw.c"
} else {
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2144,12 +2128,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2148 "GRaw.c"
+#line 2132 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_FILE_UNSUPPORTED:
-#line 2153 "GRaw.c"
+#line 2137 "GRaw.c"
{
const gchar* _tmp14_ = NULL;
GError* _tmp15_ = NULL;
@@ -2167,7 +2151,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2171 "GRaw.c"
+#line 2155 "GRaw.c"
} else {
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2177,12 +2161,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2181 "GRaw.c"
+#line 2165 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE:
-#line 2186 "GRaw.c"
+#line 2170 "GRaw.c"
{
const gchar* _tmp16_ = NULL;
GError* _tmp17_ = NULL;
@@ -2200,7 +2184,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2204 "GRaw.c"
+#line 2188 "GRaw.c"
} else {
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2210,12 +2194,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2214 "GRaw.c"
+#line 2198 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_OUT_OF_ORDER_CALL:
-#line 2219 "GRaw.c"
+#line 2203 "GRaw.c"
{
const gchar* _tmp18_ = NULL;
GError* _tmp19_ = NULL;
@@ -2233,7 +2217,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2237 "GRaw.c"
+#line 2221 "GRaw.c"
} else {
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2243,12 +2227,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2247 "GRaw.c"
+#line 2231 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_NO_THUMBNAIL:
-#line 2252 "GRaw.c"
+#line 2236 "GRaw.c"
{
const gchar* _tmp20_ = NULL;
GError* _tmp21_ = NULL;
@@ -2266,7 +2250,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2270 "GRaw.c"
+#line 2254 "GRaw.c"
} else {
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2276,12 +2260,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2280 "GRaw.c"
+#line 2264 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_UNSUPPORTED_THUMBNAIL:
-#line 2285 "GRaw.c"
+#line 2269 "GRaw.c"
{
const gchar* _tmp22_ = NULL;
GError* _tmp23_ = NULL;
@@ -2299,7 +2283,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2303 "GRaw.c"
+#line 2287 "GRaw.c"
} else {
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2309,12 +2293,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2313 "GRaw.c"
+#line 2297 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_UNSUFFICIENT_MEMORY:
-#line 2318 "GRaw.c"
+#line 2302 "GRaw.c"
{
const gchar* _tmp24_ = NULL;
GError* _tmp25_ = NULL;
@@ -2332,7 +2316,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2336 "GRaw.c"
+#line 2320 "GRaw.c"
} else {
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2342,12 +2326,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2346 "GRaw.c"
+#line 2330 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_DATA_ERROR:
-#line 2351 "GRaw.c"
+#line 2335 "GRaw.c"
{
const gchar* _tmp26_ = NULL;
GError* _tmp27_ = NULL;
@@ -2365,7 +2349,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2369 "GRaw.c"
+#line 2353 "GRaw.c"
} else {
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2375,12 +2359,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2379 "GRaw.c"
+#line 2363 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_IO_ERROR:
-#line 2384 "GRaw.c"
+#line 2368 "GRaw.c"
{
const gchar* _tmp28_ = NULL;
GError* _tmp29_ = NULL;
@@ -2398,7 +2382,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2402 "GRaw.c"
+#line 2386 "GRaw.c"
} else {
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2408,12 +2392,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2412 "GRaw.c"
+#line 2396 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_CANCELLED_BY_CALLBACK:
-#line 2417 "GRaw.c"
+#line 2401 "GRaw.c"
{
const gchar* _tmp30_ = NULL;
GError* _tmp31_ = NULL;
@@ -2431,7 +2415,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2435 "GRaw.c"
+#line 2419 "GRaw.c"
} else {
#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2441,12 +2425,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2445 "GRaw.c"
+#line 2429 "GRaw.c"
}
}
#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
case LIBRAW_BAD_CROP:
-#line 2450 "GRaw.c"
+#line 2434 "GRaw.c"
{
const gchar* _tmp32_ = NULL;
GError* _tmp33_ = NULL;
@@ -2464,7 +2448,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2468 "GRaw.c"
+#line 2452 "GRaw.c"
} else {
#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
@@ -2474,7 +2458,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
g_clear_error (&_inner_error_);
#line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2478 "GRaw.c"
+#line 2462 "GRaw.c"
}
}
default:
@@ -2483,12 +2467,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr
_g_free0 (msg);
#line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
return;
-#line 2487 "GRaw.c"
+#line 2471 "GRaw.c"
}
}
#line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala"
_g_free0 (msg);
-#line 2492 "GRaw.c"
+#line 2476 "GRaw.c"
}
diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c
index b9e36c1..1fb61f7 100644
--- a/src/photos/GdkSupport.c
+++ b/src/photos/GdkSupport.c
@@ -1,4 +1,4 @@
-/* GdkSupport.c generated by valac 0.34.4, the Vala compiler
+/* GdkSupport.c generated by valac 0.34.7, the Vala compiler
* generated from GdkSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -462,11 +462,11 @@ static void gdk_reader_class_init (GdkReaderClass * klass) {
#line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
gdk_reader_parent_class = g_type_class_peek_parent (klass);
#line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
- ((PhotoFileReaderClass *) klass)->read_metadata = gdk_reader_real_read_metadata;
+ ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) gdk_reader_real_read_metadata;
#line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
- ((PhotoFileReaderClass *) klass)->unscaled_read = gdk_reader_real_unscaled_read;
+ ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) gdk_reader_real_unscaled_read;
#line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
- ((PhotoFileReaderClass *) klass)->scaled_read = gdk_reader_real_scaled_read;
+ ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read;
#line 471 "GdkSupport.c"
}
@@ -1357,7 +1357,7 @@ static void gdk_sniffer_class_init (GdkSnifferClass * klass) {
#line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
g_type_class_add_private (klass, sizeof (GdkSnifferPrivate));
#line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala"
- ((PhotoFileSnifferClass *) klass)->sniff = gdk_sniffer_real_sniff;
+ ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) gdk_sniffer_real_sniff;
#line 1362 "GdkSupport.c"
}
diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c
index 113c56c..1891b36 100644
--- a/src/photos/JfifSupport.c
+++ b/src/photos/JfifSupport.c
@@ -1,4 +1,4 @@
-/* JfifSupport.c generated by valac 0.34.4, the Vala compiler
+/* JfifSupport.c generated by valac 0.34.7, the Vala compiler
* generated from JfifSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -824,21 +824,21 @@ static void jfif_file_format_driver_class_init (JfifFileFormatDriverClass * klas
#line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
((PhotoFileFormatDriverClass *) klass)->finalize = jfif_file_format_driver_finalize;
#line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->get_properties = jfif_file_format_driver_real_get_properties;
+ ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) jfif_file_format_driver_real_get_properties;
#line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_reader = jfif_file_format_driver_real_create_reader;
+ ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) jfif_file_format_driver_real_create_reader;
#line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata = jfif_file_format_driver_real_create_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) jfif_file_format_driver_real_create_metadata;
#line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_image = jfif_file_format_driver_real_can_write_image;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) jfif_file_format_driver_real_can_write_image;
#line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = jfif_file_format_driver_real_can_write_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) jfif_file_format_driver_real_can_write_metadata;
#line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_writer = jfif_file_format_driver_real_create_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) jfif_file_format_driver_real_create_writer;
#line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = jfif_file_format_driver_real_create_metadata_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) jfif_file_format_driver_real_create_metadata_writer;
#line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_sniffer = jfif_file_format_driver_real_create_sniffer;
+ ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) jfif_file_format_driver_real_create_sniffer;
#line 843 "JfifSupport.c"
}
@@ -1136,19 +1136,19 @@ static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClas
#line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
((PhotoFileFormatPropertiesClass *) klass)->finalize = jfif_file_format_properties_finalize;
#line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = jfif_file_format_properties_real_get_file_format;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_file_format;
#line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_flags = jfif_file_format_properties_real_get_flags;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_flags;
#line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = jfif_file_format_properties_real_get_default_extension;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_default_extension;
#line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = jfif_file_format_properties_real_get_user_visible_name;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_user_visible_name;
#line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = jfif_file_format_properties_real_get_known_extensions;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) jfif_file_format_properties_real_get_known_extensions;
#line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = jfif_file_format_properties_real_get_default_mime_type;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) jfif_file_format_properties_real_get_default_mime_type;
#line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = jfif_file_format_properties_real_get_mime_types;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) jfif_file_format_properties_real_get_mime_types;
#line 53 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
_tmp0_ = g_strdup ("jpg");
#line 53 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1363,7 +1363,7 @@ static void jfif_sniffer_class_init (JfifSnifferClass * klass) {
#line 100 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
jfif_sniffer_parent_class = g_type_class_peek_parent (klass);
#line 100 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileSnifferClass *) klass)->sniff = jfif_sniffer_real_sniff;
+ ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) jfif_sniffer_real_sniff;
#line 1368 "JfifSupport.c"
}
@@ -1497,7 +1497,7 @@ static void jfif_writer_class_init (JfifWriterClass * klass) {
#line 126 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
jfif_writer_parent_class = g_type_class_peek_parent (klass);
#line 126 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileWriterClass *) klass)->write = jfif_writer_real_write;
+ ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) jfif_writer_real_write;
#line 1502 "JfifSupport.c"
}
@@ -1575,7 +1575,7 @@ static void jfif_metadata_writer_class_init (JfifMetadataWriterClass * klass) {
#line 136 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
jfif_metadata_writer_parent_class = g_type_class_peek_parent (klass);
#line 136 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- ((PhotoFileMetadataWriterClass *) klass)->write_metadata = jfif_metadata_writer_real_write_metadata;
+ ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) jfif_metadata_writer_real_write_metadata;
#line 1580 "JfifSupport.c"
}
@@ -1776,11 +1776,11 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) {
GFileInputStream* _tmp1_ = NULL;
JpegMarker marker = 0;
gint segment_length = 0;
- GFileInputStream* _tmp2_ = NULL;
- JpegMarker _tmp3_ = 0;
- gint _tmp4_ = 0;
- gboolean _tmp5_ = FALSE;
- JpegMarker _tmp6_ = 0;
+ GFileInputStream* _tmp3_ = NULL;
+ JpegMarker _tmp4_ = 0;
+ gint _tmp5_ = 0;
+ gboolean _tmp7_ = FALSE;
+ JpegMarker _tmp8_ = 0;
GError * _inner_error_ = NULL;
#line 203 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1792,53 +1792,57 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) {
fins = _tmp1_;
#line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1796 "JfifSupport.c"
+ gboolean _tmp2_ = FALSE;
#line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
g_propagate_error (error, _inner_error_);
#line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- return FALSE;
-#line 1800 "JfifSupport.c"
+ return _tmp2_;
+#line 1802 "JfifSupport.c"
}
#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp2_ = fins;
+ _tmp3_ = fins;
#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp4_ = jpeg_read_marker (_tmp2_, &_tmp3_, &_inner_error_);
+ _tmp5_ = jpeg_read_marker (_tmp3_, &_tmp4_, &_inner_error_);
#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- marker = _tmp3_;
+ marker = _tmp4_;
#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- segment_length = _tmp4_;
+ segment_length = _tmp5_;
#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1814 "JfifSupport.c"
+ gboolean _tmp6_ = FALSE;
#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
g_propagate_error (error, _inner_error_);
#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
_g_object_unref0 (fins);
#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- return FALSE;
-#line 1818 "JfifSupport.c"
+ return _tmp6_;
+#line 1822 "JfifSupport.c"
}
#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp6_ = marker;
+ _tmp8_ = marker;
#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- if (_tmp6_ == JPEG_MARKER_SOI) {
-#line 1824 "JfifSupport.c"
- gint _tmp7_ = 0;
+ if (_tmp8_ == JPEG_MARKER_SOI) {
+#line 1828 "JfifSupport.c"
+ gint _tmp9_ = 0;
#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp7_ = segment_length;
+ _tmp9_ = segment_length;
#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp5_ = _tmp7_ == 0;
-#line 1830 "JfifSupport.c"
+ _tmp7_ = _tmp9_ == 0;
+#line 1834 "JfifSupport.c"
} else {
#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp5_ = FALSE;
-#line 1834 "JfifSupport.c"
+ _tmp7_ = FALSE;
+#line 1838 "JfifSupport.c"
}
#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- result = _tmp5_;
+ result = _tmp7_;
#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
_g_object_unref0 (fins);
#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
return result;
-#line 1842 "JfifSupport.c"
+#line 1846 "JfifSupport.c"
}
@@ -1852,16 +1856,16 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
guint8 _tmp3_ = 0U;
GDataInputStream* _tmp4_ = NULL;
guint8 _tmp5_ = 0U;
- guint8 _tmp6_ = 0U;
- GDataInputStream* _tmp7_ = NULL;
- guint8 _tmp8_ = 0U;
- gboolean _tmp9_ = FALSE;
- JpegMarker _tmp10_ = 0;
+ guint8 _tmp7_ = 0U;
+ GDataInputStream* _tmp8_ = NULL;
+ guint8 _tmp9_ = 0U;
+ gboolean _tmp11_ = FALSE;
+ JpegMarker _tmp12_ = 0;
guint16 length = 0U;
- GDataInputStream* _tmp12_ = NULL;
- guint16 _tmp13_ = 0U;
- guint16 _tmp14_ = 0U;
- guint16 _tmp18_ = 0U;
+ GDataInputStream* _tmp14_ = NULL;
+ guint16 _tmp15_ = 0U;
+ guint16 _tmp17_ = 0U;
+ guint16 _tmp21_ = 0U;
GError * _inner_error_ = NULL;
#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
g_return_val_if_fail (G_IS_FILE_INPUT_STREAM (fins), 0);
@@ -1885,13 +1889,15 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
_tmp3_ = _tmp5_;
#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1893 "JfifSupport.c"
+ gint _tmp6_ = 0;
#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
g_propagate_error (error, _inner_error_);
#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
_g_object_unref0 (dins);
#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- return 0;
-#line 1895 "JfifSupport.c"
+ return _tmp6_;
+#line 1901 "JfifSupport.c"
}
#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
if (_tmp3_ != JPEG_MARKER_PREFIX) {
@@ -1903,47 +1909,49 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
if (marker) {
#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
*marker = _vala_marker;
-#line 1907 "JfifSupport.c"
+#line 1913 "JfifSupport.c"
}
#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
return result;
-#line 1911 "JfifSupport.c"
+#line 1917 "JfifSupport.c"
}
#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp7_ = dins;
+ _tmp8_ = dins;
#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp8_ = g_data_input_stream_read_byte (_tmp7_, NULL, &_inner_error_);
+ _tmp9_ = g_data_input_stream_read_byte (_tmp8_, NULL, &_inner_error_);
#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp6_ = _tmp8_;
+ _tmp7_ = _tmp9_;
#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1927 "JfifSupport.c"
+ gint _tmp10_ = 0;
#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
g_propagate_error (error, _inner_error_);
#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
_g_object_unref0 (dins);
#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- return 0;
-#line 1927 "JfifSupport.c"
+ return _tmp10_;
+#line 1935 "JfifSupport.c"
}
#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _vala_marker = (JpegMarker) _tmp6_;
+ _vala_marker = (JpegMarker) _tmp7_;
#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp10_ = _vala_marker;
+ _tmp12_ = _vala_marker;
#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- if (_tmp10_ == JPEG_MARKER_SOI) {
+ if (_tmp12_ == JPEG_MARKER_SOI) {
#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp9_ = TRUE;
-#line 1937 "JfifSupport.c"
+ _tmp11_ = TRUE;
+#line 1945 "JfifSupport.c"
} else {
- JpegMarker _tmp11_ = 0;
+ JpegMarker _tmp13_ = 0;
#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp11_ = _vala_marker;
+ _tmp13_ = _vala_marker;
#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp9_ = _tmp11_ == JPEG_MARKER_EOI;
-#line 1944 "JfifSupport.c"
+ _tmp11_ = _tmp13_ == JPEG_MARKER_EOI;
+#line 1952 "JfifSupport.c"
}
#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- if (_tmp9_) {
+ if (_tmp11_) {
#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
result = 0;
#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1952,44 +1960,46 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
if (marker) {
#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
*marker = _vala_marker;
-#line 1956 "JfifSupport.c"
+#line 1964 "JfifSupport.c"
}
#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
return result;
-#line 1960 "JfifSupport.c"
+#line 1968 "JfifSupport.c"
}
#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp12_ = dins;
+ _tmp14_ = dins;
#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp13_ = g_data_input_stream_read_uint16 (_tmp12_, NULL, &_inner_error_);
+ _tmp15_ = g_data_input_stream_read_uint16 (_tmp14_, NULL, &_inner_error_);
#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- length = _tmp13_;
+ length = _tmp15_;
#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1978 "JfifSupport.c"
+ gint _tmp16_ = 0;
#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
g_propagate_error (error, _inner_error_);
#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
_g_object_unref0 (dins);
#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- return 0;
-#line 1976 "JfifSupport.c"
+ return _tmp16_;
+#line 1986 "JfifSupport.c"
}
#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp14_ = length;
+ _tmp17_ = length;
#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- if (((gint) _tmp14_) < 2) {
-#line 1982 "JfifSupport.c"
- guint16 _tmp15_ = 0U;
- GFileInputStream* _tmp16_ = NULL;
- gint64 _tmp17_ = 0LL;
+ if (((gint) _tmp17_) < 2) {
+#line 1992 "JfifSupport.c"
+ guint16 _tmp18_ = 0U;
+ GFileInputStream* _tmp19_ = NULL;
+ gint64 _tmp20_ = 0LL;
#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp15_ = length;
+ _tmp18_ = length;
#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp16_ = fins;
+ _tmp19_ = fins;
#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp17_ = G_FILE_INPUT_STREAM_GET_CLASS (_tmp16_)->tell (_tmp16_);
+ _tmp20_ = G_FILE_INPUT_STREAM_GET_CLASS (_tmp19_)->tell (_tmp19_);
#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp15_, _tmp17_ - 2);
+ g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp18_, _tmp20_ - 2);
#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
result = -1;
#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
@@ -1998,27 +2008,27 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro
if (marker) {
#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
*marker = _vala_marker;
-#line 2002 "JfifSupport.c"
+#line 2012 "JfifSupport.c"
}
#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
return result;
-#line 2006 "JfifSupport.c"
+#line 2016 "JfifSupport.c"
}
#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- _tmp18_ = length;
+ _tmp21_ = length;
#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
- result = _tmp18_ - 2;
+ result = _tmp21_ - 2;
#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
_g_object_unref0 (dins);
#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
if (marker) {
#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
*marker = _vala_marker;
-#line 2018 "JfifSupport.c"
+#line 2028 "JfifSupport.c"
}
#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala"
return result;
-#line 2022 "JfifSupport.c"
+#line 2032 "JfifSupport.c"
}
diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c
index 89b0e25..a2fb384 100644
--- a/src/photos/PhotoFileAdapter.c
+++ b/src/photos/PhotoFileAdapter.c
@@ -1,4 +1,4 @@
-/* PhotoFileAdapter.c generated by valac 0.34.4, the Vala compiler
+/* PhotoFileAdapter.c generated by valac 0.34.7, the Vala compiler
* generated from PhotoFileAdapter.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -955,11 +955,11 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) {
#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
g_type_class_add_private (klass, sizeof (PhotoFileReaderPrivate));
#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
- ((PhotoFileReaderClass *) klass)->read_metadata = photo_file_reader_real_read_metadata;
+ ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) photo_file_reader_real_read_metadata;
#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
- ((PhotoFileReaderClass *) klass)->unscaled_read = photo_file_reader_real_unscaled_read;
+ ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) photo_file_reader_real_unscaled_read;
#line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
- ((PhotoFileReaderClass *) klass)->scaled_read = photo_file_reader_real_scaled_read;
+ ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read;
#line 964 "PhotoFileAdapter.c"
}
@@ -1064,7 +1064,7 @@ static void photo_file_writer_class_init (PhotoFileWriterClass * klass) {
#line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
photo_file_writer_parent_class = g_type_class_peek_parent (klass);
#line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
- ((PhotoFileWriterClass *) klass)->write = photo_file_writer_real_write;
+ ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write;
#line 1069 "PhotoFileAdapter.c"
}
@@ -1154,7 +1154,7 @@ static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass
#line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass);
#line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala"
- ((PhotoFileMetadataWriterClass *) klass)->write_metadata = photo_file_metadata_writer_real_write_metadata;
+ ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata;
#line 1159 "PhotoFileAdapter.c"
}
diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c
index 24f6bd3..f34e451 100644
--- a/src/photos/PhotoFileFormat.c
+++ b/src/photos/PhotoFileFormat.c
@@ -1,4 +1,4 @@
-/* PhotoFileFormat.c generated by valac 0.34.4, the Vala compiler
+/* PhotoFileFormat.c generated by valac 0.34.7, the Vala compiler
* generated from PhotoFileFormat.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -2319,11 +2319,12 @@ PhotoMetadata* photo_file_format_driver_create_metadata (PhotoFileFormatDriver*
static gboolean photo_file_format_driver_real_can_write_image (PhotoFileFormatDriver* self) {
+ gboolean _tmp0_ = FALSE;
#line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_image'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- return FALSE;
-#line 2327 "PhotoFileFormat.c"
+ return _tmp0_;
+#line 2328 "PhotoFileFormat.c"
}
@@ -2332,16 +2333,17 @@ gboolean photo_file_format_driver_can_write_image (PhotoFileFormatDriver* self)
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE);
#line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_image (self);
-#line 2336 "PhotoFileFormat.c"
+#line 2337 "PhotoFileFormat.c"
}
static gboolean photo_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* self) {
+ gboolean _tmp0_ = FALSE;
#line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- return FALSE;
-#line 2345 "PhotoFileFormat.c"
+ return _tmp0_;
+#line 2347 "PhotoFileFormat.c"
}
@@ -2350,7 +2352,7 @@ gboolean photo_file_format_driver_can_write_metadata (PhotoFileFormatDriver* sel
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE);
#line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_metadata (self);
-#line 2354 "PhotoFileFormat.c"
+#line 2356 "PhotoFileFormat.c"
}
@@ -2359,7 +2361,7 @@ static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFo
g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2363 "PhotoFileFormat.c"
+#line 2365 "PhotoFileFormat.c"
}
@@ -2368,7 +2370,7 @@ PhotoFileWriter* photo_file_format_driver_create_writer (PhotoFileFormatDriver*
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL);
#line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_writer (self, filepath);
-#line 2372 "PhotoFileFormat.c"
+#line 2374 "PhotoFileFormat.c"
}
@@ -2377,7 +2379,7 @@ static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_wr
g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_metadata_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2381 "PhotoFileFormat.c"
+#line 2383 "PhotoFileFormat.c"
}
@@ -2386,7 +2388,7 @@ PhotoFileMetadataWriter* photo_file_format_driver_create_metadata_writer (PhotoF
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL);
#line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_metadata_writer (self, filepath);
-#line 2390 "PhotoFileFormat.c"
+#line 2392 "PhotoFileFormat.c"
}
@@ -2395,7 +2397,7 @@ static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFile
g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_sniffer'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2399 "PhotoFileFormat.c"
+#line 2401 "PhotoFileFormat.c"
}
@@ -2404,7 +2406,7 @@ PhotoFileSniffer* photo_file_format_driver_create_sniffer (PhotoFileFormatDriver
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL);
#line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_sniffer (self, file, options);
-#line 2408 "PhotoFileFormat.c"
+#line 2410 "PhotoFileFormat.c"
}
@@ -2414,14 +2416,14 @@ PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type) {
self = (PhotoFileFormatDriver*) g_type_create_instance (object_type);
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return self;
-#line 2418 "PhotoFileFormat.c"
+#line 2420 "PhotoFileFormat.c"
}
static void value_photo_file_format_driver_init (GValue* value) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = NULL;
-#line 2425 "PhotoFileFormat.c"
+#line 2427 "PhotoFileFormat.c"
}
@@ -2430,7 +2432,7 @@ static void value_photo_file_format_driver_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_driver_unref (value->data[0].v_pointer);
-#line 2434 "PhotoFileFormat.c"
+#line 2436 "PhotoFileFormat.c"
}
}
@@ -2440,11 +2442,11 @@ static void value_photo_file_format_driver_copy_value (const GValue* src_value,
if (src_value->data[0].v_pointer) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
dest_value->data[0].v_pointer = photo_file_format_driver_ref (src_value->data[0].v_pointer);
-#line 2444 "PhotoFileFormat.c"
+#line 2446 "PhotoFileFormat.c"
} else {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2448 "PhotoFileFormat.c"
+#line 2450 "PhotoFileFormat.c"
}
}
@@ -2452,37 +2454,37 @@ static void value_photo_file_format_driver_copy_value (const GValue* src_value,
static gpointer value_photo_file_format_driver_peek_pointer (const GValue* value) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return value->data[0].v_pointer;
-#line 2456 "PhotoFileFormat.c"
+#line 2458 "PhotoFileFormat.c"
}
static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (collect_values[0].v_pointer) {
-#line 2463 "PhotoFileFormat.c"
+#line 2465 "PhotoFileFormat.c"
PhotoFileFormatDriver* object;
object = collect_values[0].v_pointer;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (object->parent_instance.g_class == NULL) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2470 "PhotoFileFormat.c"
+#line 2472 "PhotoFileFormat.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2474 "PhotoFileFormat.c"
+#line 2476 "PhotoFileFormat.c"
}
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = photo_file_format_driver_ref (object);
-#line 2478 "PhotoFileFormat.c"
+#line 2480 "PhotoFileFormat.c"
} else {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = NULL;
-#line 2482 "PhotoFileFormat.c"
+#line 2484 "PhotoFileFormat.c"
}
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2486 "PhotoFileFormat.c"
+#line 2488 "PhotoFileFormat.c"
}
@@ -2493,25 +2495,25 @@ static gchar* value_photo_file_format_driver_lcopy_value (const GValue* value, g
if (!object_p) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2497 "PhotoFileFormat.c"
+#line 2499 "PhotoFileFormat.c"
}
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (!value->data[0].v_pointer) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
*object_p = NULL;
-#line 2503 "PhotoFileFormat.c"
+#line 2505 "PhotoFileFormat.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
*object_p = value->data[0].v_pointer;
-#line 2507 "PhotoFileFormat.c"
+#line 2509 "PhotoFileFormat.c"
} else {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
*object_p = photo_file_format_driver_ref (value->data[0].v_pointer);
-#line 2511 "PhotoFileFormat.c"
+#line 2513 "PhotoFileFormat.c"
}
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2515 "PhotoFileFormat.c"
+#line 2517 "PhotoFileFormat.c"
}
@@ -2525,7 +2527,7 @@ GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar*
G_PARAM_SPEC (spec)->value_type = object_type;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return G_PARAM_SPEC (spec);
-#line 2529 "PhotoFileFormat.c"
+#line 2531 "PhotoFileFormat.c"
}
@@ -2534,7 +2536,7 @@ gpointer value_get_photo_file_format_driver (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER), NULL);
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return value->data[0].v_pointer;
-#line 2538 "PhotoFileFormat.c"
+#line 2540 "PhotoFileFormat.c"
}
@@ -2554,17 +2556,17 @@ void value_set_photo_file_format_driver (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_driver_ref (value->data[0].v_pointer);
-#line 2558 "PhotoFileFormat.c"
+#line 2560 "PhotoFileFormat.c"
} else {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = NULL;
-#line 2562 "PhotoFileFormat.c"
+#line 2564 "PhotoFileFormat.c"
}
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (old) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_driver_unref (old);
-#line 2568 "PhotoFileFormat.c"
+#line 2570 "PhotoFileFormat.c"
}
}
@@ -2583,17 +2585,17 @@ void value_take_photo_file_format_driver (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = v_object;
-#line 2587 "PhotoFileFormat.c"
+#line 2589 "PhotoFileFormat.c"
} else {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = NULL;
-#line 2591 "PhotoFileFormat.c"
+#line 2593 "PhotoFileFormat.c"
}
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (old) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_driver_unref (old);
-#line 2597 "PhotoFileFormat.c"
+#line 2599 "PhotoFileFormat.c"
}
}
@@ -2604,29 +2606,29 @@ static void photo_file_format_driver_class_init (PhotoFileFormatDriverClass * kl
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
((PhotoFileFormatDriverClass *) klass)->finalize = photo_file_format_driver_finalize;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatDriverClass *) klass)->get_properties = photo_file_format_driver_real_get_properties;
+ ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_get_properties;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_reader = photo_file_format_driver_real_create_reader;
+ ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_reader;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata = photo_file_format_driver_real_create_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_create_metadata;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_image = photo_file_format_driver_real_can_write_image;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_image;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = photo_file_format_driver_real_can_write_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_metadata;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_writer = photo_file_format_driver_real_create_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_writer;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = photo_file_format_driver_real_create_metadata_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_metadata_writer;
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_sniffer = photo_file_format_driver_real_create_sniffer;
-#line 2623 "PhotoFileFormat.c"
+ ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer;
+#line 2625 "PhotoFileFormat.c"
}
static void photo_file_format_driver_instance_init (PhotoFileFormatDriver * self) {
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
self->ref_count = 1;
-#line 2630 "PhotoFileFormat.c"
+#line 2632 "PhotoFileFormat.c"
}
@@ -2636,7 +2638,7 @@ static void photo_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver);
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
g_signal_handlers_destroy (self);
-#line 2640 "PhotoFileFormat.c"
+#line 2642 "PhotoFileFormat.c"
}
@@ -2661,7 +2663,7 @@ gpointer photo_file_format_driver_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return instance;
-#line 2665 "PhotoFileFormat.c"
+#line 2667 "PhotoFileFormat.c"
}
@@ -2674,7 +2676,7 @@ void photo_file_format_driver_unref (gpointer instance) {
PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->finalize (self);
#line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2678 "PhotoFileFormat.c"
+#line 2680 "PhotoFileFormat.c"
}
}
@@ -2696,7 +2698,7 @@ static PhotoFileFormat photo_file_format_properties_real_get_file_format (PhotoF
g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_file_format'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return 0;
-#line 2700 "PhotoFileFormat.c"
+#line 2702 "PhotoFileFormat.c"
}
@@ -2705,7 +2707,7 @@ PhotoFileFormat photo_file_format_properties_get_file_format (PhotoFileFormatPro
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0);
#line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_file_format (self);
-#line 2709 "PhotoFileFormat.c"
+#line 2711 "PhotoFileFormat.c"
}
@@ -2714,7 +2716,7 @@ static PhotoFileFormatFlags photo_file_format_properties_real_get_flags (PhotoFi
g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_flags'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return 0;
-#line 2718 "PhotoFileFormat.c"
+#line 2720 "PhotoFileFormat.c"
}
@@ -2723,7 +2725,7 @@ PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProp
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0);
#line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_flags (self);
-#line 2727 "PhotoFileFormat.c"
+#line 2729 "PhotoFileFormat.c"
}
@@ -2756,7 +2758,7 @@ static gboolean photo_file_format_properties_real_is_recognized_extension (Photo
result = _tmp5_;
#line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return result;
-#line 2760 "PhotoFileFormat.c"
+#line 2762 "PhotoFileFormat.c"
}
@@ -2765,7 +2767,7 @@ gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatPr
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), FALSE);
#line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->is_recognized_extension (self, ext);
-#line 2769 "PhotoFileFormat.c"
+#line 2771 "PhotoFileFormat.c"
}
@@ -2774,7 +2776,7 @@ static gchar* photo_file_format_properties_real_get_default_extension (PhotoFile
g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_extension'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2778 "PhotoFileFormat.c"
+#line 2780 "PhotoFileFormat.c"
}
@@ -2783,7 +2785,7 @@ gchar* photo_file_format_properties_get_default_extension (PhotoFileFormatProper
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
#line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_extension (self);
-#line 2787 "PhotoFileFormat.c"
+#line 2789 "PhotoFileFormat.c"
}
@@ -2792,7 +2794,7 @@ static gchar** photo_file_format_properties_real_get_known_extensions (PhotoFile
g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_known_extensions'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2796 "PhotoFileFormat.c"
+#line 2798 "PhotoFileFormat.c"
}
@@ -2801,7 +2803,7 @@ gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProper
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
#line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_known_extensions (self, result_length1);
-#line 2805 "PhotoFileFormat.c"
+#line 2807 "PhotoFileFormat.c"
}
@@ -2810,7 +2812,7 @@ static gchar* photo_file_format_properties_real_get_default_mime_type (PhotoFile
g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_mime_type'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2814 "PhotoFileFormat.c"
+#line 2816 "PhotoFileFormat.c"
}
@@ -2819,7 +2821,7 @@ gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProper
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
#line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_mime_type (self);
-#line 2823 "PhotoFileFormat.c"
+#line 2825 "PhotoFileFormat.c"
}
@@ -2828,7 +2830,7 @@ static gchar** photo_file_format_properties_real_get_mime_types (PhotoFileFormat
g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_mime_types'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2832 "PhotoFileFormat.c"
+#line 2834 "PhotoFileFormat.c"
}
@@ -2837,7 +2839,7 @@ gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties*
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
#line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_mime_types (self, result_length1);
-#line 2841 "PhotoFileFormat.c"
+#line 2843 "PhotoFileFormat.c"
}
@@ -2846,7 +2848,7 @@ static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFile
g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_user_visible_name'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
#line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 2850 "PhotoFileFormat.c"
+#line 2852 "PhotoFileFormat.c"
}
@@ -2855,14 +2857,14 @@ gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProper
g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL);
#line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_user_visible_name (self);
-#line 2859 "PhotoFileFormat.c"
+#line 2861 "PhotoFileFormat.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return self ? g_object_ref (self) : NULL;
-#line 2866 "PhotoFileFormat.c"
+#line 2868 "PhotoFileFormat.c"
}
@@ -2913,7 +2915,7 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
_tmp6_ = ext;
#line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (_tmp6_ != NULL) {
-#line 2917 "PhotoFileFormat.c"
+#line 2919 "PhotoFileFormat.c"
const gchar* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
#line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2922,15 +2924,15 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
_tmp8_ = photo_file_format_properties_is_recognized_extension (self, _tmp7_);
#line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
_tmp5_ = _tmp8_;
-#line 2926 "PhotoFileFormat.c"
+#line 2928 "PhotoFileFormat.c"
} else {
#line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
_tmp5_ = FALSE;
-#line 2930 "PhotoFileFormat.c"
+#line 2932 "PhotoFileFormat.c"
}
#line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (_tmp5_) {
-#line 2934 "PhotoFileFormat.c"
+#line 2936 "PhotoFileFormat.c"
GFile* _tmp9_ = NULL;
GFile* _tmp10_ = NULL;
#line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
@@ -2945,7 +2947,7 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
_g_free0 (name);
#line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return result;
-#line 2949 "PhotoFileFormat.c"
+#line 2951 "PhotoFileFormat.c"
}
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
_tmp11_ = file;
@@ -2981,7 +2983,7 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope
_g_free0 (name);
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return result;
-#line 2985 "PhotoFileFormat.c"
+#line 2987 "PhotoFileFormat.c"
}
@@ -2991,14 +2993,14 @@ PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_
self = (PhotoFileFormatProperties*) g_type_create_instance (object_type);
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return self;
-#line 2995 "PhotoFileFormat.c"
+#line 2997 "PhotoFileFormat.c"
}
static void value_photo_file_format_properties_init (GValue* value) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = NULL;
-#line 3002 "PhotoFileFormat.c"
+#line 3004 "PhotoFileFormat.c"
}
@@ -3007,7 +3009,7 @@ static void value_photo_file_format_properties_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_properties_unref (value->data[0].v_pointer);
-#line 3011 "PhotoFileFormat.c"
+#line 3013 "PhotoFileFormat.c"
}
}
@@ -3017,11 +3019,11 @@ static void value_photo_file_format_properties_copy_value (const GValue* src_val
if (src_value->data[0].v_pointer) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
dest_value->data[0].v_pointer = photo_file_format_properties_ref (src_value->data[0].v_pointer);
-#line 3021 "PhotoFileFormat.c"
+#line 3023 "PhotoFileFormat.c"
} else {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
dest_value->data[0].v_pointer = NULL;
-#line 3025 "PhotoFileFormat.c"
+#line 3027 "PhotoFileFormat.c"
}
}
@@ -3029,37 +3031,37 @@ static void value_photo_file_format_properties_copy_value (const GValue* src_val
static gpointer value_photo_file_format_properties_peek_pointer (const GValue* value) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return value->data[0].v_pointer;
-#line 3033 "PhotoFileFormat.c"
+#line 3035 "PhotoFileFormat.c"
}
static gchar* value_photo_file_format_properties_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (collect_values[0].v_pointer) {
-#line 3040 "PhotoFileFormat.c"
+#line 3042 "PhotoFileFormat.c"
PhotoFileFormatProperties* object;
object = collect_values[0].v_pointer;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (object->parent_instance.g_class == NULL) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3047 "PhotoFileFormat.c"
+#line 3049 "PhotoFileFormat.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3051 "PhotoFileFormat.c"
+#line 3053 "PhotoFileFormat.c"
}
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = photo_file_format_properties_ref (object);
-#line 3055 "PhotoFileFormat.c"
+#line 3057 "PhotoFileFormat.c"
} else {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = NULL;
-#line 3059 "PhotoFileFormat.c"
+#line 3061 "PhotoFileFormat.c"
}
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 3063 "PhotoFileFormat.c"
+#line 3065 "PhotoFileFormat.c"
}
@@ -3070,25 +3072,25 @@ static gchar* value_photo_file_format_properties_lcopy_value (const GValue* valu
if (!object_p) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3074 "PhotoFileFormat.c"
+#line 3076 "PhotoFileFormat.c"
}
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (!value->data[0].v_pointer) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
*object_p = NULL;
-#line 3080 "PhotoFileFormat.c"
+#line 3082 "PhotoFileFormat.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
*object_p = value->data[0].v_pointer;
-#line 3084 "PhotoFileFormat.c"
+#line 3086 "PhotoFileFormat.c"
} else {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
*object_p = photo_file_format_properties_ref (value->data[0].v_pointer);
-#line 3088 "PhotoFileFormat.c"
+#line 3090 "PhotoFileFormat.c"
}
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return NULL;
-#line 3092 "PhotoFileFormat.c"
+#line 3094 "PhotoFileFormat.c"
}
@@ -3102,7 +3104,7 @@ GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gc
G_PARAM_SPEC (spec)->value_type = object_type;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return G_PARAM_SPEC (spec);
-#line 3106 "PhotoFileFormat.c"
+#line 3108 "PhotoFileFormat.c"
}
@@ -3111,7 +3113,7 @@ gpointer value_get_photo_file_format_properties (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES), NULL);
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return value->data[0].v_pointer;
-#line 3115 "PhotoFileFormat.c"
+#line 3117 "PhotoFileFormat.c"
}
@@ -3131,17 +3133,17 @@ void value_set_photo_file_format_properties (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_properties_ref (value->data[0].v_pointer);
-#line 3135 "PhotoFileFormat.c"
+#line 3137 "PhotoFileFormat.c"
} else {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = NULL;
-#line 3139 "PhotoFileFormat.c"
+#line 3141 "PhotoFileFormat.c"
}
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (old) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_properties_unref (old);
-#line 3145 "PhotoFileFormat.c"
+#line 3147 "PhotoFileFormat.c"
}
}
@@ -3160,17 +3162,17 @@ void value_take_photo_file_format_properties (GValue* value, gpointer v_object)
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = v_object;
-#line 3164 "PhotoFileFormat.c"
+#line 3166 "PhotoFileFormat.c"
} else {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
value->data[0].v_pointer = NULL;
-#line 3168 "PhotoFileFormat.c"
+#line 3170 "PhotoFileFormat.c"
}
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
if (old) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
photo_file_format_properties_unref (old);
-#line 3174 "PhotoFileFormat.c"
+#line 3176 "PhotoFileFormat.c"
}
}
@@ -3181,29 +3183,29 @@ static void photo_file_format_properties_class_init (PhotoFileFormatPropertiesCl
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
((PhotoFileFormatPropertiesClass *) klass)->finalize = photo_file_format_properties_finalize;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = photo_file_format_properties_real_get_file_format;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_file_format;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_flags = photo_file_format_properties_real_get_flags;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_flags;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = photo_file_format_properties_real_is_recognized_extension;
+ ((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = (gboolean (*)(PhotoFileFormatProperties*, const gchar*)) photo_file_format_properties_real_is_recognized_extension;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = photo_file_format_properties_real_get_default_extension;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_extension;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = photo_file_format_properties_real_get_known_extensions;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_known_extensions;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = photo_file_format_properties_real_get_default_mime_type;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_mime_type;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = photo_file_format_properties_real_get_mime_types;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_mime_types;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = photo_file_format_properties_real_get_user_visible_name;
-#line 3200 "PhotoFileFormat.c"
+ ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_user_visible_name;
+#line 3202 "PhotoFileFormat.c"
}
static void photo_file_format_properties_instance_init (PhotoFileFormatProperties * self) {
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
self->ref_count = 1;
-#line 3207 "PhotoFileFormat.c"
+#line 3209 "PhotoFileFormat.c"
}
@@ -3213,7 +3215,7 @@ static void photo_file_format_properties_finalize (PhotoFileFormatProperties* ob
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
g_signal_handlers_destroy (self);
-#line 3217 "PhotoFileFormat.c"
+#line 3219 "PhotoFileFormat.c"
}
@@ -3238,7 +3240,7 @@ gpointer photo_file_format_properties_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
return instance;
-#line 3242 "PhotoFileFormat.c"
+#line 3244 "PhotoFileFormat.c"
}
@@ -3251,7 +3253,7 @@ void photo_file_format_properties_unref (gpointer instance) {
PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->finalize (self);
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3255 "PhotoFileFormat.c"
+#line 3257 "PhotoFileFormat.c"
}
}
diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c
index 50a71b1..86295b3 100644
--- a/src/photos/PhotoFileSniffer.c
+++ b/src/photos/PhotoFileSniffer.c
@@ -1,4 +1,4 @@
-/* PhotoFileSniffer.c generated by valac 0.34.4, the Vala compiler
+/* PhotoFileSniffer.c generated by valac 0.34.7, the Vala compiler
* generated from PhotoFileSniffer.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -787,7 +787,7 @@ static void photo_file_sniffer_class_init (PhotoFileSnifferClass * klass) {
#line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
((PhotoFileSnifferClass *) klass)->finalize = photo_file_sniffer_finalize;
#line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala"
- ((PhotoFileSnifferClass *) klass)->sniff = photo_file_sniffer_real_sniff;
+ ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photo_file_sniffer_real_sniff;
#line 792 "PhotoFileSniffer.c"
}
diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c
index 7748685..a30a3b4 100644
--- a/src/photos/PhotoMetadata.c
+++ b/src/photos/PhotoMetadata.c
@@ -1,4 +1,4 @@
-/* PhotoMetadata.c generated by valac 0.34.4, the Vala compiler
+/* PhotoMetadata.c generated by valac 0.34.7, the Vala compiler
* generated from PhotoMetadata.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -970,7 +970,7 @@ static void keyword_transformer_class_init (KeywordTransformerClass * klass) {
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((KeywordTransformerClass *) klass)->finalize = keyword_transformer_finalize;
#line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((KeywordTransformerClass *) klass)->transform = keyword_transformer_real_transform;
+ ((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) keyword_transformer_real_transform;
#line 975 "PhotoMetadata.c"
}
@@ -1042,7 +1042,7 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas
#line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_return_val_if_fail (input != NULL, NULL);
#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_result_ = _tmp0_;
#line 38 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1078,7 +1078,7 @@ static void null_keyword_transformer_class_init (NullKeywordTransformerClass * k
#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
null_keyword_transformer_parent_class = g_type_class_peek_parent (klass);
#line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((KeywordTransformerClass *) klass)->transform = null_keyword_transformer_real_transform;
+ ((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) null_keyword_transformer_real_transform;
#line 1083 "PhotoMetadata.c"
}
@@ -1144,13 +1144,13 @@ ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_ty
#line 67 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->parser.error = _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func;
#line 68 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp0_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 68 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (self->priv->result);
#line 68 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->result = _tmp0_;
#line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp1_ = gee_array_queue_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp1_ = gee_array_queue_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (self->priv->stack);
#line 69 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -1489,7 +1489,7 @@ static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClas
#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_type_class_add_private (klass, sizeof (ACDSeeKeywordTransformerPrivate));
#line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((KeywordTransformerClass *) klass)->transform = acd_see_keyword_transformer_real_transform;
+ ((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) acd_see_keyword_transformer_real_transform;
#line 1494 "PhotoMetadata.c"
}
@@ -2321,9 +2321,9 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) {
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_type_class_add_private (klass, sizeof (PhotoPreviewPrivate));
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((PhotoPreviewClass *) klass)->flatten = photo_preview_real_flatten;
+ ((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_preview_real_flatten;
#line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((PhotoPreviewClass *) klass)->get_pixbuf = photo_preview_real_get_pixbuf;
+ ((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoPreview*, GError**)) photo_preview_real_get_pixbuf;
#line 2328 "PhotoMetadata.c"
}
@@ -3042,7 +3042,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
#line 3043 "PhotoMetadata.c"
GeeHashSet* _tmp1_ = NULL;
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3068,9 +3068,13 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2__target_destroy_notify = compare_func_target_destroy_notify;
#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ compare_func = NULL;
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ compare_func_target = NULL;
+#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target_destroy_notify = NULL;
#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp3_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify);
+ _tmp3_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify);
#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet);
#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3083,7 +3087,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
compare_func_target_destroy_notify = NULL;
#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3087 "PhotoMetadata.c"
+#line 3091 "PhotoMetadata.c"
}
#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL);
@@ -3093,7 +3097,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa
compare_func_target = NULL;
#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target_destroy_notify = NULL;
-#line 3097 "PhotoMetadata.c"
+#line 3101 "PhotoMetadata.c"
}
@@ -3127,7 +3131,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
switch (_tmp0_) {
#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 3131 "PhotoMetadata.c"
+#line 3135 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
gchar** _tmp2_ = NULL;
@@ -3146,11 +3150,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tags_size_ = tags_length1;
#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3150 "PhotoMetadata.c"
+#line 3154 "PhotoMetadata.c"
}
#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 3154 "PhotoMetadata.c"
+#line 3158 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp4_ = NULL;
gchar** _tmp5_ = NULL;
@@ -3169,11 +3173,11 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tags_size_ = tags_length1;
#line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3173 "PhotoMetadata.c"
+#line 3177 "PhotoMetadata.c"
}
#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 3177 "PhotoMetadata.c"
+#line 3181 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp7_ = NULL;
gchar** _tmp8_ = NULL;
@@ -3192,12 +3196,12 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tags_size_ = tags_length1;
#line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3196 "PhotoMetadata.c"
+#line 3200 "PhotoMetadata.c"
}
default:
#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 3201 "PhotoMetadata.c"
+#line 3205 "PhotoMetadata.c"
}
#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = tags;
@@ -3207,7 +3211,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
if (_tmp11_ == NULL) {
#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = TRUE;
-#line 3211 "PhotoMetadata.c"
+#line 3215 "PhotoMetadata.c"
} else {
gchar** _tmp12_ = NULL;
gint _tmp12__length1 = 0;
@@ -3217,7 +3221,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tmp12__length1 = tags_length1;
#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = _tmp12__length1 == 0;
-#line 3221 "PhotoMetadata.c"
+#line 3225 "PhotoMetadata.c"
}
#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
@@ -3235,7 +3239,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
compare_func_target_destroy_notify = NULL;
#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3239 "PhotoMetadata.c"
+#line 3243 "PhotoMetadata.c"
}
#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = compare_func;
@@ -3244,6 +3248,10 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13__target_destroy_notify = compare_func_target_destroy_notify;
#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ compare_func = NULL;
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ compare_func_target = NULL;
+#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target_destroy_notify = NULL;
#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = photo_metadata_create_string_set (self, _tmp13_, _tmp13__target, _tmp13__target_destroy_notify);
@@ -3253,7 +3261,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
_tmp15_ = tags;
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15__length1 = tags_length1;
-#line 3257 "PhotoMetadata.c"
+#line 3265 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3265,14 +3273,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
tag_collection_length1 = _tmp15__length1;
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) {
-#line 3269 "PhotoMetadata.c"
+#line 3277 "PhotoMetadata.c"
gchar* _tmp16_ = NULL;
gchar* tag = NULL;
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = g_strdup (tag_collection[tag_it]);
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp16_;
-#line 3276 "PhotoMetadata.c"
+#line 3284 "PhotoMetadata.c"
{
GeeCollection* _tmp17_ = NULL;
const gchar* _tmp18_ = NULL;
@@ -3284,7 +3292,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
gee_collection_add (_tmp17_, _tmp18_);
#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 3288 "PhotoMetadata.c"
+#line 3296 "PhotoMetadata.c"
}
}
}
@@ -3302,7 +3310,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma
compare_func_target_destroy_notify = NULL;
#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3306 "PhotoMetadata.c"
+#line 3314 "PhotoMetadata.c"
}
@@ -3339,6 +3347,10 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__target_destroy_notify = compare_func_target_destroy_notify;
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ compare_func = NULL;
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ compare_func_target = NULL;
+#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target_destroy_notify = NULL;
#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = photo_metadata_create_string_set (self, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify);
@@ -3352,7 +3364,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp4_ = exif_tags;
#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_ != NULL) {
-#line 3356 "PhotoMetadata.c"
+#line 3368 "PhotoMetadata.c"
GeeCollection* _tmp5_ = NULL;
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -3364,15 +3376,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp7_ = _tmp6_;
#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp7_ > 0;
-#line 3368 "PhotoMetadata.c"
+#line 3380 "PhotoMetadata.c"
} else {
#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = FALSE;
-#line 3372 "PhotoMetadata.c"
+#line 3384 "PhotoMetadata.c"
}
#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
-#line 3376 "PhotoMetadata.c"
+#line 3388 "PhotoMetadata.c"
GeeCollection* _tmp8_ = NULL;
GeeCollection* _tmp9_ = NULL;
#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3381,7 +3393,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp9_ = exif_tags;
#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (_tmp8_, _tmp9_);
-#line 3385 "PhotoMetadata.c"
+#line 3397 "PhotoMetadata.c"
}
#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL);
@@ -3391,7 +3403,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp12_ = xmp_tags;
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp12_ != NULL) {
-#line 3395 "PhotoMetadata.c"
+#line 3407 "PhotoMetadata.c"
GeeCollection* _tmp13_ = NULL;
gint _tmp14_ = 0;
gint _tmp15_ = 0;
@@ -3403,15 +3415,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp15_ = _tmp14_;
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = _tmp15_ > 0;
-#line 3407 "PhotoMetadata.c"
+#line 3419 "PhotoMetadata.c"
} else {
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = FALSE;
-#line 3411 "PhotoMetadata.c"
+#line 3423 "PhotoMetadata.c"
}
#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp11_) {
-#line 3415 "PhotoMetadata.c"
+#line 3427 "PhotoMetadata.c"
GeeCollection* _tmp16_ = NULL;
GeeCollection* _tmp17_ = NULL;
#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3420,7 +3432,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp17_ = xmp_tags;
#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (_tmp16_, _tmp17_);
-#line 3424 "PhotoMetadata.c"
+#line 3436 "PhotoMetadata.c"
}
#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL);
@@ -3430,7 +3442,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp20_ = iptc_tags;
#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp20_ != NULL) {
-#line 3434 "PhotoMetadata.c"
+#line 3446 "PhotoMetadata.c"
GeeCollection* _tmp21_ = NULL;
gint _tmp22_ = 0;
gint _tmp23_ = 0;
@@ -3442,15 +3454,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp23_ = _tmp22_;
#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = _tmp23_ > 0;
-#line 3446 "PhotoMetadata.c"
+#line 3458 "PhotoMetadata.c"
} else {
#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = FALSE;
-#line 3450 "PhotoMetadata.c"
+#line 3462 "PhotoMetadata.c"
}
#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp19_) {
-#line 3454 "PhotoMetadata.c"
+#line 3466 "PhotoMetadata.c"
GeeCollection* _tmp24_ = NULL;
GeeCollection* _tmp25_ = NULL;
#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -3459,7 +3471,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp25_ = iptc_tags;
#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add_all (_tmp24_, _tmp25_);
-#line 3463 "PhotoMetadata.c"
+#line 3475 "PhotoMetadata.c"
}
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = all_tags;
@@ -3469,17 +3481,17 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
_tmp29_ = _tmp28_;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp29_ > 0) {
-#line 3473 "PhotoMetadata.c"
+#line 3485 "PhotoMetadata.c"
GeeCollection* _tmp30_ = NULL;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp30_ = all_tags;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = _tmp30_;
-#line 3479 "PhotoMetadata.c"
+#line 3491 "PhotoMetadata.c"
} else {
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = NULL;
-#line 3483 "PhotoMetadata.c"
+#line 3495 "PhotoMetadata.c"
}
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp31_ = _g_object_ref0 (_tmp26_);
@@ -3503,7 +3515,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun
compare_func_target_destroy_notify = NULL;
#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3507 "PhotoMetadata.c"
+#line 3519 "PhotoMetadata.c"
}
@@ -3526,7 +3538,7 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) {
result = _tmp2_;
#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3530 "PhotoMetadata.c"
+#line 3542 "PhotoMetadata.c"
}
@@ -3549,7 +3561,7 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag
result = _tmp2_;
#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3553 "PhotoMetadata.c"
+#line 3565 "PhotoMetadata.c"
}
@@ -3586,7 +3598,7 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare
result = _tmp6_;
#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3590 "PhotoMetadata.c"
+#line 3602 "PhotoMetadata.c"
}
@@ -3623,7 +3635,7 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar*
result = _tmp6_;
#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3627 "PhotoMetadata.c"
+#line 3639 "PhotoMetadata.c"
}
@@ -3637,7 +3649,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
_tmp0_ = tags;
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 3641 "PhotoMetadata.c"
+#line 3653 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3649,14 +3661,14 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
tag_collection_length1 = _tmp0__length1;
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3653 "PhotoMetadata.c"
+#line 3665 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 3660 "PhotoMetadata.c"
+#line 3672 "PhotoMetadata.c"
{
gchar* value = NULL;
const gchar* _tmp2_ = NULL;
@@ -3678,13 +3690,13 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
_g_free0 (tag);
#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3682 "PhotoMetadata.c"
+#line 3694 "PhotoMetadata.c"
}
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 3688 "PhotoMetadata.c"
+#line 3700 "PhotoMetadata.c"
}
}
}
@@ -3692,7 +3704,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t
result = NULL;
#line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3696 "PhotoMetadata.c"
+#line 3708 "PhotoMetadata.c"
}
@@ -3706,7 +3718,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
_tmp0_ = tags;
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 3710 "PhotoMetadata.c"
+#line 3722 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3718,14 +3730,14 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
tag_collection_length1 = _tmp0__length1;
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3722 "PhotoMetadata.c"
+#line 3734 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 3729 "PhotoMetadata.c"
+#line 3741 "PhotoMetadata.c"
{
gchar* value = NULL;
const gchar* _tmp2_ = NULL;
@@ -3747,13 +3759,13 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
_g_free0 (tag);
#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3751 "PhotoMetadata.c"
+#line 3763 "PhotoMetadata.c"
}
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 3757 "PhotoMetadata.c"
+#line 3769 "PhotoMetadata.c"
}
}
}
@@ -3761,7 +3773,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar**
result = NULL;
#line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3765 "PhotoMetadata.c"
+#line 3777 "PhotoMetadata.c"
}
@@ -3812,7 +3824,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
if (_tmp5_ == NULL) {
#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = TRUE;
-#line 3816 "PhotoMetadata.c"
+#line 3828 "PhotoMetadata.c"
} else {
gchar** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
@@ -3822,7 +3834,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp6__length1 = values_length1;
#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp6__length1 == 0;
-#line 3826 "PhotoMetadata.c"
+#line 3838 "PhotoMetadata.c"
}
#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
@@ -3832,21 +3844,21 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3836 "PhotoMetadata.c"
+#line 3848 "PhotoMetadata.c"
}
#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
list = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList);
#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
+ _tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL);
#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
collection = _tmp8_;
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = values;
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9__length1 = values_length1;
-#line 3850 "PhotoMetadata.c"
+#line 3862 "PhotoMetadata.c"
{
gchar** value_collection = NULL;
gint value_collection_length1 = 0;
@@ -3858,14 +3870,14 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
value_collection_length1 = _tmp9__length1;
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) {
-#line 3862 "PhotoMetadata.c"
+#line 3874 "PhotoMetadata.c"
gchar* _tmp10_ = NULL;
gchar* value = NULL;
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = g_strdup (value_collection[value_it]);
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
value = _tmp10_;
-#line 3869 "PhotoMetadata.c"
+#line 3881 "PhotoMetadata.c"
{
gchar* prepped = NULL;
const gchar* _tmp11_ = NULL;
@@ -3882,7 +3894,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp14_ = prepped;
#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp14_ != NULL) {
-#line 3886 "PhotoMetadata.c"
+#line 3898 "PhotoMetadata.c"
GeeHashSet* _tmp15_ = NULL;
const gchar* _tmp16_ = NULL;
gboolean _tmp17_ = FALSE;
@@ -3894,15 +3906,15 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_);
#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = !_tmp17_;
-#line 3898 "PhotoMetadata.c"
+#line 3910 "PhotoMetadata.c"
} else {
#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = FALSE;
-#line 3902 "PhotoMetadata.c"
+#line 3914 "PhotoMetadata.c"
}
#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp13_) {
-#line 3906 "PhotoMetadata.c"
+#line 3918 "PhotoMetadata.c"
GeeList* _tmp18_ = NULL;
const gchar* _tmp19_ = NULL;
GeeHashSet* _tmp20_ = NULL;
@@ -3919,13 +3931,13 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp21_ = prepped;
#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_);
-#line 3923 "PhotoMetadata.c"
+#line 3935 "PhotoMetadata.c"
}
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (prepped);
#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
-#line 3929 "PhotoMetadata.c"
+#line 3941 "PhotoMetadata.c"
}
}
}
@@ -3937,17 +3949,17 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
_tmp25_ = _tmp24_;
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp25_ > 0) {
-#line 3941 "PhotoMetadata.c"
+#line 3953 "PhotoMetadata.c"
GeeList* _tmp26_ = NULL;
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp26_ = list;
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = _tmp26_;
-#line 3947 "PhotoMetadata.c"
+#line 3959 "PhotoMetadata.c"
} else {
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = NULL;
-#line 3951 "PhotoMetadata.c"
+#line 3963 "PhotoMetadata.c"
}
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = _g_object_ref0 (_tmp22_);
@@ -3961,7 +3973,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 3965 "PhotoMetadata.c"
+#line 3977 "PhotoMetadata.c"
}
@@ -3975,7 +3987,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_tmp0_ = tags;
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 3979 "PhotoMetadata.c"
+#line 3991 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -3987,14 +3999,14 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
tag_collection_length1 = _tmp0__length1;
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 3991 "PhotoMetadata.c"
+#line 4003 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 3998 "PhotoMetadata.c"
+#line 4010 "PhotoMetadata.c"
{
GeeList* values = NULL;
const gchar* _tmp2_ = NULL;
@@ -4011,7 +4023,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_tmp5_ = values;
#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_ != NULL) {
-#line 4015 "PhotoMetadata.c"
+#line 4027 "PhotoMetadata.c"
GeeList* _tmp6_ = NULL;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
@@ -4023,11 +4035,11 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_tmp8_ = _tmp7_;
#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp8_ > 0;
-#line 4027 "PhotoMetadata.c"
+#line 4039 "PhotoMetadata.c"
} else {
#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = FALSE;
-#line 4031 "PhotoMetadata.c"
+#line 4043 "PhotoMetadata.c"
}
#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
@@ -4037,13 +4049,13 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
_g_free0 (tag);
#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4041 "PhotoMetadata.c"
+#line 4053 "PhotoMetadata.c"
}
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 4047 "PhotoMetadata.c"
+#line 4059 "PhotoMetadata.c"
}
}
}
@@ -4051,7 +4063,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar**
result = NULL;
#line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4055 "PhotoMetadata.c"
+#line 4067 "PhotoMetadata.c"
}
@@ -4083,7 +4095,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
_tmp3_ = prepped;
#line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_ == NULL) {
-#line 4087 "PhotoMetadata.c"
+#line 4099 "PhotoMetadata.c"
const gchar* _tmp4_ = NULL;
const gchar* _tmp5_ = NULL;
#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4096,7 +4108,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
_g_free0 (prepped);
#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 4100 "PhotoMetadata.c"
+#line 4112 "PhotoMetadata.c"
}
#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = self->priv->exiv2;
@@ -4108,7 +4120,7 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
_tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_);
#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp9_) {
-#line 4112 "PhotoMetadata.c"
+#line 4124 "PhotoMetadata.c"
const gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
const gchar* _tmp12_ = NULL;
@@ -4121,11 +4133,11 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch
#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:512: Unable to set tag %s to string %s from source " \
"%s", _tmp10_, _tmp11_, _tmp12_);
-#line 4124 "PhotoMetadata.c"
+#line 4136 "PhotoMetadata.c"
}
#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (prepped);
-#line 4128 "PhotoMetadata.c"
+#line 4140 "PhotoMetadata.c"
}
@@ -4144,7 +4156,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp0_ = tags;
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 4147 "PhotoMetadata.c"
+#line 4159 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -4156,14 +4168,14 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
tag_collection_length1 = _tmp0__length1;
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4159 "PhotoMetadata.c"
+#line 4171 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 4166 "PhotoMetadata.c"
+#line 4178 "PhotoMetadata.c"
{
gboolean _tmp2_ = FALSE;
PhotoMetadataSetOption _tmp3_ = 0;
@@ -4173,7 +4185,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) {
#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = TRUE;
-#line 4176 "PhotoMetadata.c"
+#line 4188 "PhotoMetadata.c"
} else {
const gchar* _tmp4_ = NULL;
MetadataDomain _tmp5_ = 0;
@@ -4186,11 +4198,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp6_ = photo_metadata_has_domain (self, _tmp5_);
#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = _tmp6_;
-#line 4189 "PhotoMetadata.c"
+#line 4201 "PhotoMetadata.c"
}
#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_) {
-#line 4193 "PhotoMetadata.c"
+#line 4205 "PhotoMetadata.c"
PhotoMetadataSetGenericValue _tmp7_ = NULL;
void* _tmp7__target = NULL;
const gchar* _tmp8_ = NULL;
@@ -4204,11 +4216,11 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp7_ (_tmp8_, _tmp7__target);
#line 522 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
written = TRUE;
-#line 4207 "PhotoMetadata.c"
+#line 4219 "PhotoMetadata.c"
}
#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 4211 "PhotoMetadata.c"
+#line 4223 "PhotoMetadata.c"
}
}
}
@@ -4216,21 +4228,21 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp11_ = option;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) {
-#line 4219 "PhotoMetadata.c"
+#line 4231 "PhotoMetadata.c"
gboolean _tmp12_ = FALSE;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = written;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = !_tmp12_;
-#line 4225 "PhotoMetadata.c"
+#line 4237 "PhotoMetadata.c"
} else {
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = FALSE;
-#line 4229 "PhotoMetadata.c"
+#line 4241 "PhotoMetadata.c"
}
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
-#line 4233 "PhotoMetadata.c"
+#line 4245 "PhotoMetadata.c"
gchar** _tmp13_ = NULL;
gint _tmp13__length1 = 0;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -4239,15 +4251,15 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp13__length1 = tags_length1;
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = _tmp13__length1 > 0;
-#line 4242 "PhotoMetadata.c"
+#line 4254 "PhotoMetadata.c"
} else {
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = FALSE;
-#line 4246 "PhotoMetadata.c"
+#line 4258 "PhotoMetadata.c"
}
#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp9_) {
-#line 4250 "PhotoMetadata.c"
+#line 4262 "PhotoMetadata.c"
MetadataDomain default_domain = 0;
gchar** _tmp14_ = NULL;
gint _tmp14__length1 = 0;
@@ -4280,19 +4292,19 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp19_ = _tmp18_[0];
#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ (_tmp19_, _tmp17__target);
-#line 4283 "PhotoMetadata.c"
+#line 4295 "PhotoMetadata.c"
{
gint ctr = 0;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = 1;
-#line 4288 "PhotoMetadata.c"
+#line 4300 "PhotoMetadata.c"
{
gboolean _tmp20_ = FALSE;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = TRUE;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 4295 "PhotoMetadata.c"
+#line 4307 "PhotoMetadata.c"
gint _tmp22_ = 0;
gchar** _tmp23_ = NULL;
gint _tmp23__length1 = 0;
@@ -4304,13 +4316,13 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
MetadataDomain _tmp28_ = 0;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp20_) {
-#line 4307 "PhotoMetadata.c"
+#line 4319 "PhotoMetadata.c"
gint _tmp21_ = 0;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = ctr;
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = _tmp21_ + 1;
-#line 4313 "PhotoMetadata.c"
+#line 4325 "PhotoMetadata.c"
}
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = FALSE;
@@ -4324,7 +4336,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
if (!(_tmp22_ < _tmp23__length1)) {
#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 4327 "PhotoMetadata.c"
+#line 4339 "PhotoMetadata.c"
}
#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp24_ = tags;
@@ -4340,7 +4352,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp28_ = default_domain;
#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp27_ == _tmp28_) {
-#line 4343 "PhotoMetadata.c"
+#line 4355 "PhotoMetadata.c"
PhotoMetadataSetGenericValue _tmp29_ = NULL;
void* _tmp29__target = NULL;
gchar** _tmp30_ = NULL;
@@ -4361,7 +4373,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i
_tmp32_ = _tmp30_[_tmp31_];
#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ (_tmp32_, _tmp29__target);
-#line 4364 "PhotoMetadata.c"
+#line 4376 "PhotoMetadata.c"
}
}
}
@@ -4375,7 +4387,7 @@ static Block1Data* block1_data_ref (Block1Data* _data1_) {
g_atomic_int_inc (&_data1_->_ref_count_);
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data1_;
-#line 4378 "PhotoMetadata.c"
+#line 4390 "PhotoMetadata.c"
}
@@ -4384,7 +4396,7 @@ static void block1_data_unref (void * _userdata_) {
_data1_ = (Block1Data*) _userdata_;
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) {
-#line 4387 "PhotoMetadata.c"
+#line 4399 "PhotoMetadata.c"
PhotoMetadata* self;
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data1_->self;
@@ -4394,7 +4406,7 @@ static void block1_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block1Data, _data1_);
-#line 4397 "PhotoMetadata.c"
+#line 4409 "PhotoMetadata.c"
}
}
@@ -4413,14 +4425,14 @@ static void __lambda5_ (Block1Data* _data1_, const gchar* tag) {
_tmp1_ = _data1_->value;
#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 4416 "PhotoMetadata.c"
+#line 4428 "PhotoMetadata.c"
}
static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda5_ (self, tag);
-#line 4423 "PhotoMetadata.c"
+#line 4435 "PhotoMetadata.c"
}
@@ -4461,7 +4473,7 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_
block1_data_unref (_data1_);
#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data1_ = NULL;
-#line 4464 "PhotoMetadata.c"
+#line 4476 "PhotoMetadata.c"
}
@@ -4472,13 +4484,13 @@ static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* va
*size = (*size) ? (2 * (*size)) : 4;
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 4475 "PhotoMetadata.c"
+#line 4487 "PhotoMetadata.c"
}
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[(*length)++] = value;
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[*length] = NULL;
-#line 4481 "PhotoMetadata.c"
+#line 4493 "PhotoMetadata.c"
}
@@ -4489,13 +4501,13 @@ static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* va
*size = (*size) ? (2 * (*size)) : 4;
#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*array = g_renew (gchar*, *array, (*size) + 1);
-#line 4492 "PhotoMetadata.c"
+#line 4504 "PhotoMetadata.c"
}
#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[(*length)++] = value;
#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
(*array)[*length] = NULL;
-#line 4498 "PhotoMetadata.c"
+#line 4510 "PhotoMetadata.c"
}
@@ -4527,7 +4539,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
values_length1 = 0;
#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_values_size_ = values_length1;
-#line 4530 "PhotoMetadata.c"
+#line 4542 "PhotoMetadata.c"
{
GeeIterator* _value_it = NULL;
GeeCollection* _tmp1_ = NULL;
@@ -4540,7 +4552,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_value_it = _tmp2_;
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 4543 "PhotoMetadata.c"
+#line 4555 "PhotoMetadata.c"
GeeIterator* _tmp3_ = NULL;
gboolean _tmp4_ = FALSE;
gchar* value = NULL;
@@ -4558,7 +4570,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
if (!_tmp4_) {
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 4561 "PhotoMetadata.c"
+#line 4573 "PhotoMetadata.c"
}
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _value_it;
@@ -4576,7 +4588,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp9_ = prepped;
#line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp9_ != NULL) {
-#line 4579 "PhotoMetadata.c"
+#line 4591 "PhotoMetadata.c"
gchar** _tmp10_ = NULL;
gint _tmp10__length1 = 0;
const gchar* _tmp11_ = NULL;
@@ -4591,7 +4603,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp12_ = g_strdup (_tmp11_);
#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_);
-#line 4594 "PhotoMetadata.c"
+#line 4606 "PhotoMetadata.c"
} else {
const gchar* _tmp13_ = NULL;
const gchar* _tmp14_ = NULL;
@@ -4601,17 +4613,17 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp14_ = tag;
#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:551: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_);
-#line 4604 "PhotoMetadata.c"
+#line 4616 "PhotoMetadata.c"
}
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (prepped);
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (value);
-#line 4610 "PhotoMetadata.c"
+#line 4622 "PhotoMetadata.c"
}
#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_value_it);
-#line 4614 "PhotoMetadata.c"
+#line 4626 "PhotoMetadata.c"
}
#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp15_ = values;
@@ -4623,7 +4635,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 4626 "PhotoMetadata.c"
+#line 4638 "PhotoMetadata.c"
}
#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = values;
@@ -4643,7 +4655,7 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
_tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_);
#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp20_) {
-#line 4646 "PhotoMetadata.c"
+#line 4658 "PhotoMetadata.c"
gchar** _tmp21_ = NULL;
gint _tmp21__length1 = 0;
const gchar* _tmp22_ = NULL;
@@ -4659,11 +4671,11 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag,
#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:564: Unable to set %d strings to tag %s from source" \
" %s", _tmp21__length1, _tmp22_, _tmp23_);
-#line 4661 "PhotoMetadata.c"
+#line 4673 "PhotoMetadata.c"
}
#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL);
-#line 4665 "PhotoMetadata.c"
+#line 4677 "PhotoMetadata.c"
}
@@ -4672,7 +4684,7 @@ static Block2Data* block2_data_ref (Block2Data* _data2_) {
g_atomic_int_inc (&_data2_->_ref_count_);
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data2_;
-#line 4674 "PhotoMetadata.c"
+#line 4686 "PhotoMetadata.c"
}
@@ -4681,7 +4693,7 @@ static void block2_data_unref (void * _userdata_) {
_data2_ = (Block2Data*) _userdata_;
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) {
-#line 4683 "PhotoMetadata.c"
+#line 4695 "PhotoMetadata.c"
PhotoMetadata* self;
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data2_->self;
@@ -4691,7 +4703,7 @@ static void block2_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block2Data, _data2_);
-#line 4693 "PhotoMetadata.c"
+#line 4705 "PhotoMetadata.c"
}
}
@@ -4710,14 +4722,14 @@ static void __lambda6_ (Block2Data* _data2_, const gchar* tag) {
_tmp1_ = _data2_->values;
#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_);
-#line 4712 "PhotoMetadata.c"
+#line 4724 "PhotoMetadata.c"
}
static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda6_ (self, tag);
-#line 4719 "PhotoMetadata.c"
+#line 4731 "PhotoMetadata.c"
}
@@ -4758,7 +4770,7 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags,
block2_data_unref (_data2_);
#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data2_ = NULL;
-#line 4760 "PhotoMetadata.c"
+#line 4772 "PhotoMetadata.c"
}
@@ -4788,11 +4800,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
if (value) {
#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 4790 "PhotoMetadata.c"
+#line 4802 "PhotoMetadata.c"
}
#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4794 "PhotoMetadata.c"
+#line 4806 "PhotoMetadata.c"
}
#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = self->priv->exiv2;
@@ -4808,11 +4820,11 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong*
if (value) {
#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 4810 "PhotoMetadata.c"
+#line 4822 "PhotoMetadata.c"
}
#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4814 "PhotoMetadata.c"
+#line 4826 "PhotoMetadata.c"
}
@@ -4827,7 +4839,7 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
_tmp0_ = tags;
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 4829 "PhotoMetadata.c"
+#line 4841 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -4839,14 +4851,14 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
tag_collection_length1 = _tmp0__length1;
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 4841 "PhotoMetadata.c"
+#line 4853 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 4848 "PhotoMetadata.c"
+#line 4860 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
glong _tmp3_ = 0L;
@@ -4867,15 +4879,15 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
if (value) {
#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 4869 "PhotoMetadata.c"
+#line 4881 "PhotoMetadata.c"
}
#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4873 "PhotoMetadata.c"
+#line 4885 "PhotoMetadata.c"
}
#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 4877 "PhotoMetadata.c"
+#line 4889 "PhotoMetadata.c"
}
}
}
@@ -4887,11 +4899,11 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t
if (value) {
#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*value = _vala_value;
-#line 4889 "PhotoMetadata.c"
+#line 4901 "PhotoMetadata.c"
}
#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 4893 "PhotoMetadata.c"
+#line 4905 "PhotoMetadata.c"
}
@@ -4914,7 +4926,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
_tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_);
#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp3_) {
-#line 4916 "PhotoMetadata.c"
+#line 4928 "PhotoMetadata.c"
const gchar* _tmp4_ = NULL;
glong _tmp5_ = 0L;
const gchar* _tmp6_ = NULL;
@@ -4927,7 +4939,7 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value
#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_warning ("PhotoMetadata.vala:596: Unable to set tag %s to long %ld from source %" \
"s", _tmp4_, _tmp5_, _tmp6_);
-#line 4928 "PhotoMetadata.c"
+#line 4940 "PhotoMetadata.c"
}
}
@@ -4937,7 +4949,7 @@ static Block3Data* block3_data_ref (Block3Data* _data3_) {
g_atomic_int_inc (&_data3_->_ref_count_);
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data3_;
-#line 4938 "PhotoMetadata.c"
+#line 4950 "PhotoMetadata.c"
}
@@ -4946,7 +4958,7 @@ static void block3_data_unref (void * _userdata_) {
_data3_ = (Block3Data*) _userdata_;
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) {
-#line 4947 "PhotoMetadata.c"
+#line 4959 "PhotoMetadata.c"
PhotoMetadata* self;
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data3_->self;
@@ -4954,7 +4966,7 @@ static void block3_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block3Data, _data3_);
-#line 4955 "PhotoMetadata.c"
+#line 4967 "PhotoMetadata.c"
}
}
@@ -4973,14 +4985,14 @@ static void __lambda7_ (Block3Data* _data3_, const gchar* tag) {
_tmp1_ = _data3_->value;
#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_long (self, _tmp0_, _tmp1_);
-#line 4974 "PhotoMetadata.c"
+#line 4986 "PhotoMetadata.c"
}
static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda7_ (self, tag);
-#line 4981 "PhotoMetadata.c"
+#line 4993 "PhotoMetadata.c"
}
@@ -5014,7 +5026,7 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le
block3_data_unref (_data3_);
#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data3_ = NULL;
-#line 5015 "PhotoMetadata.c"
+#line 5027 "PhotoMetadata.c"
}
@@ -5053,11 +5065,11 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met
if (rational) {
#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*rational = _vala_rational;
-#line 5054 "PhotoMetadata.c"
+#line 5066 "PhotoMetadata.c"
}
#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5058 "PhotoMetadata.c"
+#line 5070 "PhotoMetadata.c"
}
@@ -5072,7 +5084,7 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
_tmp0_ = tags;
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 5073 "PhotoMetadata.c"
+#line 5085 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -5084,14 +5096,14 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
tag_collection_length1 = _tmp0__length1;
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5085 "PhotoMetadata.c"
+#line 5097 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 5092 "PhotoMetadata.c"
+#line 5104 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
MetadataRational _tmp3_ = {0};
@@ -5112,15 +5124,15 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
if (rational) {
#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*rational = _vala_rational;
-#line 5113 "PhotoMetadata.c"
+#line 5125 "PhotoMetadata.c"
}
#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5117 "PhotoMetadata.c"
+#line 5129 "PhotoMetadata.c"
}
#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 5121 "PhotoMetadata.c"
+#line 5133 "PhotoMetadata.c"
}
}
}
@@ -5132,11 +5144,11 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i
if (rational) {
#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*rational = _vala_rational;
-#line 5133 "PhotoMetadata.c"
+#line 5145 "PhotoMetadata.c"
}
#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5137 "PhotoMetadata.c"
+#line 5149 "PhotoMetadata.c"
}
@@ -5170,7 +5182,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
_tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_);
#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp6_) {
-#line 5171 "PhotoMetadata.c"
+#line 5183 "PhotoMetadata.c"
const gchar* _tmp7_ = NULL;
gchar* _tmp8_ = NULL;
gchar* _tmp9_ = NULL;
@@ -5188,7 +5200,7 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat
"e %s", _tmp7_, _tmp9_, _tmp10_);
#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp9_);
-#line 5188 "PhotoMetadata.c"
+#line 5200 "PhotoMetadata.c"
}
}
@@ -5198,7 +5210,7 @@ static Block4Data* block4_data_ref (Block4Data* _data4_) {
g_atomic_int_inc (&_data4_->_ref_count_);
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data4_;
-#line 5198 "PhotoMetadata.c"
+#line 5210 "PhotoMetadata.c"
}
@@ -5207,7 +5219,7 @@ static void block4_data_unref (void * _userdata_) {
_data4_ = (Block4Data*) _userdata_;
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) {
-#line 5207 "PhotoMetadata.c"
+#line 5219 "PhotoMetadata.c"
PhotoMetadata* self;
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data4_->self;
@@ -5215,7 +5227,7 @@ static void block4_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block4Data, _data4_);
-#line 5215 "PhotoMetadata.c"
+#line 5227 "PhotoMetadata.c"
}
}
@@ -5234,14 +5246,14 @@ static void __lambda8_ (Block4Data* _data4_, const gchar* tag) {
_tmp1_ = _data4_->rational;
#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_rational (self, _tmp0_, &_tmp1_);
-#line 5234 "PhotoMetadata.c"
+#line 5246 "PhotoMetadata.c"
}
static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda8_ (self, tag);
-#line 5241 "PhotoMetadata.c"
+#line 5253 "PhotoMetadata.c"
}
@@ -5277,7 +5289,7 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag
block4_data_unref (_data4_);
#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data4_ = NULL;
-#line 5277 "PhotoMetadata.c"
+#line 5289 "PhotoMetadata.c"
}
@@ -5308,7 +5320,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5308 "PhotoMetadata.c"
+#line 5320 "PhotoMetadata.c"
}
{
const gchar* _tmp3_ = NULL;
@@ -5321,7 +5333,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
switch (_tmp4_) {
#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 5321 "PhotoMetadata.c"
+#line 5333 "PhotoMetadata.c"
{
MetadataDateTime* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
@@ -5335,7 +5347,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_tmp5_ = _tmp7_;
#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5335 "PhotoMetadata.c"
+#line 5347 "PhotoMetadata.c"
goto __catch26_g_error;
}
#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5350,11 +5362,11 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5350 "PhotoMetadata.c"
+#line 5362 "PhotoMetadata.c"
}
#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 5354 "PhotoMetadata.c"
+#line 5366 "PhotoMetadata.c"
{
#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = NULL;
@@ -5362,12 +5374,12 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5362 "PhotoMetadata.c"
+#line 5374 "PhotoMetadata.c"
}
default:
#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 5367 "PhotoMetadata.c"
+#line 5379 "PhotoMetadata.c"
{
MetadataDateTime* _tmp9_ = NULL;
const gchar* _tmp10_ = NULL;
@@ -5381,7 +5393,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_tmp9_ = _tmp11_;
#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 5381 "PhotoMetadata.c"
+#line 5393 "PhotoMetadata.c"
goto __catch26_g_error;
}
#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5396,7 +5408,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5396 "PhotoMetadata.c"
+#line 5408 "PhotoMetadata.c"
}
}
}
@@ -5430,7 +5442,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
_g_free0 (value);
#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5430 "PhotoMetadata.c"
+#line 5442 "PhotoMetadata.c"
}
__finally26:
#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5441,7 +5453,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar
g_clear_error (&_inner_error_);
#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 5441 "PhotoMetadata.c"
+#line 5453 "PhotoMetadata.c"
}
@@ -5455,7 +5467,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
_tmp0_ = tags;
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 5455 "PhotoMetadata.c"
+#line 5467 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -5467,14 +5479,14 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
tag_collection_length1 = _tmp0__length1;
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 5467 "PhotoMetadata.c"
+#line 5479 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 5474 "PhotoMetadata.c"
+#line 5486 "PhotoMetadata.c"
{
MetadataDateTime* date_time = NULL;
const gchar* _tmp2_ = NULL;
@@ -5496,13 +5508,13 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
_g_free0 (tag);
#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5496 "PhotoMetadata.c"
+#line 5508 "PhotoMetadata.c"
}
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_metadata_date_time_unref0 (date_time);
#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 5502 "PhotoMetadata.c"
+#line 5514 "PhotoMetadata.c"
}
}
}
@@ -5510,7 +5522,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar
result = NULL;
#line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5510 "PhotoMetadata.c"
+#line 5522 "PhotoMetadata.c"
}
@@ -5531,7 +5543,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
switch (_tmp1_) {
#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 5531 "PhotoMetadata.c"
+#line 5543 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
MetadataDateTime* _tmp3_ = NULL;
@@ -5551,11 +5563,11 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
_g_free0 (_tmp5_);
#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5551 "PhotoMetadata.c"
+#line 5563 "PhotoMetadata.c"
}
#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 5555 "PhotoMetadata.c"
+#line 5567 "PhotoMetadata.c"
{
const gchar* _tmp6_ = NULL;
MetadataDateTime* _tmp7_ = NULL;
@@ -5575,12 +5587,12 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
_g_free0 (_tmp9_);
#line 678 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5575 "PhotoMetadata.c"
+#line 5587 "PhotoMetadata.c"
}
default:
#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 5580 "PhotoMetadata.c"
+#line 5592 "PhotoMetadata.c"
{
const gchar* _tmp10_ = NULL;
const gchar* _tmp11_ = NULL;
@@ -5602,7 +5614,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
"supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL);
#line 685 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 5601 "PhotoMetadata.c"
+#line 5613 "PhotoMetadata.c"
}
}
}
@@ -5611,7 +5623,7 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada
static gpointer _metadata_date_time_ref0 (gpointer self) {
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? metadata_date_time_ref (self) : NULL;
-#line 5610 "PhotoMetadata.c"
+#line 5622 "PhotoMetadata.c"
}
@@ -5620,7 +5632,7 @@ static Block5Data* block5_data_ref (Block5Data* _data5_) {
g_atomic_int_inc (&_data5_->_ref_count_);
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return _data5_;
-#line 5619 "PhotoMetadata.c"
+#line 5631 "PhotoMetadata.c"
}
@@ -5629,7 +5641,7 @@ static void block5_data_unref (void * _userdata_) {
_data5_ = (Block5Data*) _userdata_;
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) {
-#line 5628 "PhotoMetadata.c"
+#line 5640 "PhotoMetadata.c"
PhotoMetadata* self;
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self = _data5_->self;
@@ -5639,7 +5651,7 @@ static void block5_data_unref (void * _userdata_) {
_media_metadata_unref0 (self);
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_slice_free (Block5Data, _data5_);
-#line 5638 "PhotoMetadata.c"
+#line 5650 "PhotoMetadata.c"
}
}
@@ -5658,14 +5670,14 @@ static void __lambda9_ (Block5Data* _data5_, const gchar* tag) {
_tmp1_ = _data5_->date_time;
#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_date_time (self, _tmp0_, _tmp1_);
-#line 5657 "PhotoMetadata.c"
+#line 5669 "PhotoMetadata.c"
}
static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) {
#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__lambda9_ (self, tag);
-#line 5664 "PhotoMetadata.c"
+#line 5676 "PhotoMetadata.c"
}
@@ -5706,7 +5718,7 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta
block5_data_unref (_data5_);
#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_data5_ = NULL;
-#line 5705 "PhotoMetadata.c"
+#line 5717 "PhotoMetadata.c"
}
@@ -5740,7 +5752,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp0_ = self->priv->exif;
#line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ == NULL) {
-#line 5739 "PhotoMetadata.c"
+#line 5751 "PhotoMetadata.c"
guint8* _tmp1_ = NULL;
gint _tmp1__length1 = 0;
#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5751,13 +5763,13 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
if (result_length1) {
#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp1__length1;
-#line 5750 "PhotoMetadata.c"
+#line 5762 "PhotoMetadata.c"
}
#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp1_;
#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5756 "PhotoMetadata.c"
+#line 5768 "PhotoMetadata.c"
}
#line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = self->priv->exif;
@@ -5775,7 +5787,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp6_ = include_preview;
#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp6_) {
-#line 5774 "PhotoMetadata.c"
+#line 5786 "PhotoMetadata.c"
ExifData* _tmp7_ = NULL;
ExifData* _tmp8_ = NULL;
#line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5786,7 +5798,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp8_ = self->priv->exif;
#line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_->size = (guint) 0;
-#line 5785 "PhotoMetadata.c"
+#line 5797 "PhotoMetadata.c"
}
#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
flattened = NULL;
@@ -5806,21 +5818,21 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
_tmp11_ = saved_size;
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp11_ > ((guint) 0)) {
-#line 5805 "PhotoMetadata.c"
+#line 5817 "PhotoMetadata.c"
guchar* _tmp12_ = NULL;
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp12_ = saved_data;
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = _tmp12_ != NULL;
-#line 5811 "PhotoMetadata.c"
+#line 5823 "PhotoMetadata.c"
} else {
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = FALSE;
-#line 5815 "PhotoMetadata.c"
+#line 5827 "PhotoMetadata.c"
}
#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
-#line 5819 "PhotoMetadata.c"
+#line 5831 "PhotoMetadata.c"
guint _tmp13_ = 0U;
guint8* _tmp14_ = NULL;
guint8* _tmp15_ = NULL;
@@ -5862,7 +5874,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
exif_mem_free (_tmp19_, _tmp20_);
#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_exif_mem_unref0 (_tmp19_);
-#line 5861 "PhotoMetadata.c"
+#line 5873 "PhotoMetadata.c"
}
#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = self->priv->exif;
@@ -5884,20 +5896,20 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ
if (result_length1) {
#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp25__length1;
-#line 5883 "PhotoMetadata.c"
+#line 5895 "PhotoMetadata.c"
}
#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp25_;
#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5889 "PhotoMetadata.c"
+#line 5901 "PhotoMetadata.c"
}
static guint8* _vala_array_dup5 (guint8* self, int length) {
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 5896 "PhotoMetadata.c"
+#line 5908 "PhotoMetadata.c"
}
@@ -5933,7 +5945,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
_buffer_size_ = buffer_length1;
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
-#line 5932 "PhotoMetadata.c"
+#line 5944 "PhotoMetadata.c"
guchar* _tmp5_ = NULL;
gint _tmp5__length1 = 0;
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -5946,7 +5958,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
_tmp0__length1 = _tmp5__length1;
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__tmp0__size_ = _tmp0__length1;
-#line 5945 "PhotoMetadata.c"
+#line 5957 "PhotoMetadata.c"
} else {
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = NULL;
@@ -5954,7 +5966,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
_tmp0__length1 = 0;
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
__tmp0__size_ = _tmp0__length1;
-#line 5953 "PhotoMetadata.c"
+#line 5965 "PhotoMetadata.c"
}
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_);
@@ -5968,7 +5980,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
if (result_length1) {
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp7__length1;
-#line 5967 "PhotoMetadata.c"
+#line 5979 "PhotoMetadata.c"
}
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp7_;
@@ -5976,7 +5988,7 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le
buffer = (g_free (buffer), NULL);
#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 5975 "PhotoMetadata.c"
+#line 5987 "PhotoMetadata.c"
}
@@ -6009,7 +6021,7 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
_tmp4__length1 = props_length1;
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_ != NULL) {
-#line 6008 "PhotoMetadata.c"
+#line 6020 "PhotoMetadata.c"
GExiv2PreviewProperties** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6018,17 +6030,17 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) {
_tmp5__length1 = props_length1;
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp5__length1;
-#line 6017 "PhotoMetadata.c"
+#line 6029 "PhotoMetadata.c"
} else {
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = 0;
-#line 6021 "PhotoMetadata.c"
+#line 6033 "PhotoMetadata.c"
}
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = (guint) _tmp3_;
#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6027 "PhotoMetadata.c"
+#line 6039 "PhotoMetadata.c"
}
@@ -6070,7 +6082,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
if (_tmp4_ == NULL) {
#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = TRUE;
-#line 6069 "PhotoMetadata.c"
+#line 6081 "PhotoMetadata.c"
} else {
GExiv2PreviewProperties** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
@@ -6083,7 +6095,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
_tmp6_ = number;
#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = ((guint) _tmp5__length1) <= _tmp6_;
-#line 6082 "PhotoMetadata.c"
+#line 6094 "PhotoMetadata.c"
}
#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
@@ -6091,7 +6103,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
result = NULL;
#line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6090 "PhotoMetadata.c"
+#line 6102 "PhotoMetadata.c"
}
#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = self->priv->source_name;
@@ -6111,7 +6123,7 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) {
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview);
#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6110 "PhotoMetadata.c"
+#line 6122 "PhotoMetadata.c"
}
@@ -6128,7 +6140,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
_tmp1_ = self->priv->exif;
#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp1_ != NULL) {
-#line 6127 "PhotoMetadata.c"
+#line 6139 "PhotoMetadata.c"
ExifMem* _tmp2_ = NULL;
ExifMem* _tmp3_ = NULL;
ExifData* _tmp4_ = NULL;
@@ -6155,7 +6167,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) {
_tmp7_ = self->priv->exif;
#line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_->size = (guint) 0;
-#line 6154 "PhotoMetadata.c"
+#line 6166 "PhotoMetadata.c"
}
}
@@ -6173,7 +6185,7 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) {
_tmp1_ = tag;
#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gexiv2_metadata_clear_tag (_tmp0_, _tmp1_);
-#line 6172 "PhotoMetadata.c"
+#line 6184 "PhotoMetadata.c"
}
@@ -6186,7 +6198,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
_tmp0_ = tags;
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = tags_length1;
-#line 6185 "PhotoMetadata.c"
+#line 6197 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -6198,14 +6210,14 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
tag_collection_length1 = _tmp0__length1;
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 6197 "PhotoMetadata.c"
+#line 6209 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 6204 "PhotoMetadata.c"
+#line 6216 "PhotoMetadata.c"
{
const gchar* _tmp2_ = NULL;
#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6214,7 +6226,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len
photo_metadata_remove_tag (self, _tmp2_);
#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 6213 "PhotoMetadata.c"
+#line 6225 "PhotoMetadata.c"
}
}
}
@@ -6231,7 +6243,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
switch (_tmp0_) {
#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_EXIF:
-#line 6230 "PhotoMetadata.c"
+#line 6242 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp1_ = NULL;
#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6240,11 +6252,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
gexiv2_metadata_clear_exif (_tmp1_);
#line 770 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6239 "PhotoMetadata.c"
+#line 6251 "PhotoMetadata.c"
}
#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_XMP:
-#line 6243 "PhotoMetadata.c"
+#line 6255 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp2_ = NULL;
#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6253,11 +6265,11 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
gexiv2_metadata_clear_xmp (_tmp2_);
#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6252 "PhotoMetadata.c"
+#line 6264 "PhotoMetadata.c"
}
#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
case METADATA_DOMAIN_IPTC:
-#line 6256 "PhotoMetadata.c"
+#line 6268 "PhotoMetadata.c"
{
GExiv2Metadata* _tmp3_ = NULL;
#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6266,12 +6278,12 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) {
gexiv2_metadata_clear_iptc (_tmp3_);
#line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6265 "PhotoMetadata.c"
+#line 6277 "PhotoMetadata.c"
}
default:
#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6270 "PhotoMetadata.c"
+#line 6282 "PhotoMetadata.c"
}
}
@@ -6284,7 +6296,7 @@ void photo_metadata_clear (PhotoMetadata* self) {
_tmp0_ = self->priv->exiv2;
#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gexiv2_metadata_clear (_tmp0_);
-#line 6283 "PhotoMetadata.c"
+#line 6295 "PhotoMetadata.c"
}
@@ -6305,7 +6317,7 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self
result = _tmp1_;
#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6304 "PhotoMetadata.c"
+#line 6316 "PhotoMetadata.c"
}
@@ -6319,7 +6331,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
_tmp0_ = date_time;
#line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 6318 "PhotoMetadata.c"
+#line 6330 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
MetadataDateTime* _tmp2_ = NULL;
@@ -6334,7 +6346,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
_tmp3_ = option;
#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6333 "PhotoMetadata.c"
+#line 6345 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -6344,7 +6356,7 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat
_tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1;
#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6343 "PhotoMetadata.c"
+#line 6355 "PhotoMetadata.c"
}
}
@@ -6366,7 +6378,7 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) {
result = _tmp1_;
#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6365 "PhotoMetadata.c"
+#line 6377 "PhotoMetadata.c"
}
@@ -6380,7 +6392,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
_tmp0_ = date_time;
#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 6379 "PhotoMetadata.c"
+#line 6391 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
MetadataDateTime* _tmp2_ = NULL;
@@ -6395,7 +6407,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
_tmp3_ = option;
#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6394 "PhotoMetadata.c"
+#line 6406 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -6405,7 +6417,7 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim
_tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1;
#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6404 "PhotoMetadata.c"
+#line 6416 "PhotoMetadata.c"
}
}
@@ -6427,7 +6439,7 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) {
result = _tmp1_;
#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6426 "PhotoMetadata.c"
+#line 6438 "PhotoMetadata.c"
}
@@ -6441,7 +6453,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
_tmp0_ = date_time;
#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 6440 "PhotoMetadata.c"
+#line 6452 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
MetadataDateTime* _tmp2_ = NULL;
@@ -6456,7 +6468,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
_tmp3_ = option;
#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_);
-#line 6455 "PhotoMetadata.c"
+#line 6467 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -6466,7 +6478,7 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi
_tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1;
#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1);
-#line 6465 "PhotoMetadata.c"
+#line 6477 "PhotoMetadata.c"
}
}
@@ -6487,7 +6499,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
_tmp1_ = creation;
#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp1_ == NULL) {
-#line 6486 "PhotoMetadata.c"
+#line 6498 "PhotoMetadata.c"
MetadataDateTime* _tmp2_ = NULL;
#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_get_digitized_date_time (self);
@@ -6495,20 +6507,20 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada
_metadata_date_time_unref0 (creation);
#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
creation = _tmp2_;
-#line 6494 "PhotoMetadata.c"
+#line 6506 "PhotoMetadata.c"
}
#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = creation;
#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6500 "PhotoMetadata.c"
+#line 6512 "PhotoMetadata.c"
}
static gpointer _dimensions_dup0 (gpointer self) {
#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? dimensions_dup (self) : NULL;
-#line 6507 "PhotoMetadata.c"
+#line 6519 "PhotoMetadata.c"
}
@@ -6530,19 +6542,19 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
_tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1;
#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length");
-#line 6529 "PhotoMetadata.c"
+#line 6541 "PhotoMetadata.c"
{
gint ctr = 0;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = 0;
-#line 6534 "PhotoMetadata.c"
+#line 6546 "PhotoMetadata.c"
{
gboolean _tmp2_ = FALSE;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = TRUE;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 6541 "PhotoMetadata.c"
+#line 6553 "PhotoMetadata.c"
gint _tmp4_ = 0;
gchar** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
@@ -6566,13 +6578,13 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
Dimensions* _tmp19_ = NULL;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp2_) {
-#line 6565 "PhotoMetadata.c"
+#line 6577 "PhotoMetadata.c"
gint _tmp3_ = 0;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = ctr;
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
ctr = _tmp3_ + 1;
-#line 6571 "PhotoMetadata.c"
+#line 6583 "PhotoMetadata.c"
}
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = FALSE;
@@ -6586,7 +6598,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
if (!(_tmp4_ < _tmp5__length1)) {
#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 6585 "PhotoMetadata.c"
+#line 6597 "PhotoMetadata.c"
}
#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = photo_metadata_WIDTH_TAGS;
@@ -6604,7 +6616,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
if (!_tmp10_) {
#line 873 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 6603 "PhotoMetadata.c"
+#line 6615 "PhotoMetadata.c"
}
#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = photo_metadata_HEIGHT_TAGS;
@@ -6622,7 +6634,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
if (!_tmp15_) {
#line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 6621 "PhotoMetadata.c"
+#line 6633 "PhotoMetadata.c"
}
#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = width;
@@ -6636,7 +6648,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
result = _tmp19_;
#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6635 "PhotoMetadata.c"
+#line 6647 "PhotoMetadata.c"
}
}
}
@@ -6644,7 +6656,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) {
result = NULL;
#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6643 "PhotoMetadata.c"
+#line 6655 "PhotoMetadata.c"
}
@@ -6656,7 +6668,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
_tmp0_ = dim;
#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp0_ != NULL) {
-#line 6655 "PhotoMetadata.c"
+#line 6667 "PhotoMetadata.c"
gchar** _tmp1_ = NULL;
gint _tmp1__length1 = 0;
Dimensions* _tmp2_ = NULL;
@@ -6691,7 +6703,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
_tmp8_ = option;
#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_);
-#line 6690 "PhotoMetadata.c"
+#line 6702 "PhotoMetadata.c"
} else {
gchar** _tmp9_ = NULL;
gint _tmp9__length1 = 0;
@@ -6709,7 +6721,7 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim,
_tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1;
#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1);
-#line 6708 "PhotoMetadata.c"
+#line 6720 "PhotoMetadata.c"
}
}
@@ -6733,7 +6745,7 @@ static gchar* string_strip (const gchar* self) {
result = _result_;
#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6732 "PhotoMetadata.c"
+#line 6744 "PhotoMetadata.c"
}
@@ -6753,7 +6765,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) {
result = _tmp1_ != NULL;
#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 6752 "PhotoMetadata.c"
+#line 6764 "PhotoMetadata.c"
}
@@ -6782,7 +6794,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp1_) {
-#line 6781 "PhotoMetadata.c"
+#line 6793 "PhotoMetadata.c"
GeeList* _tmp2_ = NULL;
#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
@@ -6790,7 +6802,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_object_unref0 (_tmp0_);
#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = _tmp2_;
-#line 6789 "PhotoMetadata.c"
+#line 6801 "PhotoMetadata.c"
} else {
gchar** _tmp3_ = NULL;
gint _tmp3__length1 = 0;
@@ -6805,7 +6817,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_object_unref0 (_tmp0_);
#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = _tmp4_;
-#line 6804 "PhotoMetadata.c"
+#line 6816 "PhotoMetadata.c"
}
#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _g_object_ref0 (_tmp0_);
@@ -6815,7 +6827,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp8_ = titles;
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp8_ != NULL) {
-#line 6814 "PhotoMetadata.c"
+#line 6826 "PhotoMetadata.c"
GeeList* _tmp9_ = NULL;
gint _tmp10_ = 0;
gint _tmp11_ = 0;
@@ -6827,15 +6839,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp11_ = _tmp10_;
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _tmp11_ > 0;
-#line 6826 "PhotoMetadata.c"
+#line 6838 "PhotoMetadata.c"
} else {
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = FALSE;
-#line 6830 "PhotoMetadata.c"
+#line 6842 "PhotoMetadata.c"
}
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp7_) {
-#line 6834 "PhotoMetadata.c"
+#line 6846 "PhotoMetadata.c"
GeeList* _tmp12_ = NULL;
gpointer _tmp13_ = NULL;
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6846,13 +6858,13 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_free0 (_tmp6_);
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = (gchar*) _tmp13_;
-#line 6845 "PhotoMetadata.c"
+#line 6857 "PhotoMetadata.c"
} else {
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp6_);
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = NULL;
-#line 6851 "PhotoMetadata.c"
+#line 6863 "PhotoMetadata.c"
}
#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp14_ = g_strdup (_tmp6_);
@@ -6862,7 +6874,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp15_ = title;
#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp15_ != NULL) {
-#line 6861 "PhotoMetadata.c"
+#line 6873 "PhotoMetadata.c"
const gchar* _tmp16_ = NULL;
gchar* _tmp17_ = NULL;
#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6873,7 +6885,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_free0 (title);
#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
title = _tmp17_;
-#line 6872 "PhotoMetadata.c"
+#line 6884 "PhotoMetadata.c"
}
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp21_ = title;
@@ -6881,7 +6893,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp22_ = is_string_empty (_tmp21_);
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp22_) {
-#line 6880 "PhotoMetadata.c"
+#line 6892 "PhotoMetadata.c"
const gchar* _tmp23_ = NULL;
gboolean _tmp24_ = FALSE;
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6890,15 +6902,15 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp24_ = string_contains (_tmp23_, "\n");
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = !_tmp24_;
-#line 6889 "PhotoMetadata.c"
+#line 6901 "PhotoMetadata.c"
} else {
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp20_ = FALSE;
-#line 6893 "PhotoMetadata.c"
+#line 6905 "PhotoMetadata.c"
}
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp20_) {
-#line 6897 "PhotoMetadata.c"
+#line 6909 "PhotoMetadata.c"
const gchar* _tmp25_ = NULL;
gboolean _tmp26_ = FALSE;
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -6907,25 +6919,25 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_tmp26_ = string_contains (_tmp25_, "\r");
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = !_tmp26_;
-#line 6906 "PhotoMetadata.c"
+#line 6918 "PhotoMetadata.c"
} else {
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp19_ = FALSE;
-#line 6910 "PhotoMetadata.c"
+#line 6922 "PhotoMetadata.c"
}
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp19_) {
-#line 6914 "PhotoMetadata.c"
+#line 6926 "PhotoMetadata.c"
const gchar* _tmp27_ = NULL;
#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = title;
#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = _tmp27_;
-#line 6920 "PhotoMetadata.c"
+#line 6932 "PhotoMetadata.c"
} else {
#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp18_ = NULL;
-#line 6924 "PhotoMetadata.c"
+#line 6936 "PhotoMetadata.c"
}
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = g_strdup (_tmp18_);
@@ -6941,7 +6953,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) {
_g_object_unref0 (_tmp0_);
#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 6940 "PhotoMetadata.c"
+#line 6952 "PhotoMetadata.c"
}
@@ -6956,19 +6968,19 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
_tmp1_ = is_string_empty (_tmp0_);
#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp1_) {
-#line 6955 "PhotoMetadata.c"
+#line 6967 "PhotoMetadata.c"
gboolean _tmp2_ = FALSE;
#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG);
#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_) {
-#line 6961 "PhotoMetadata.c"
+#line 6973 "PhotoMetadata.c"
const gchar* _tmp3_ = NULL;
#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = title;
#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 6967 "PhotoMetadata.c"
+#line 6979 "PhotoMetadata.c"
} else {
gchar** _tmp4_ = NULL;
gint _tmp4__length1 = 0;
@@ -6984,7 +6996,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
_tmp6_ = option;
#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_);
-#line 6983 "PhotoMetadata.c"
+#line 6995 "PhotoMetadata.c"
}
} else {
gchar** _tmp7_ = NULL;
@@ -6995,7 +7007,7 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet
_tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1;
#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1);
-#line 6994 "PhotoMetadata.c"
+#line 7006 "PhotoMetadata.c"
}
}
@@ -7018,7 +7030,7 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) {
result = _tmp1_;
#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7017 "PhotoMetadata.c"
+#line 7029 "PhotoMetadata.c"
}
@@ -7033,7 +7045,7 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
_tmp1_ = is_string_empty (_tmp0_);
#line 973 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp1_) {
-#line 7032 "PhotoMetadata.c"
+#line 7044 "PhotoMetadata.c"
gchar** _tmp2_ = NULL;
gint _tmp2__length1 = 0;
const gchar* _tmp3_ = NULL;
@@ -7048,7 +7060,7 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
_tmp4_ = option;
#line 974 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_all_string (self, _tmp2_, _tmp2__length1, _tmp3_, _tmp4_);
-#line 7047 "PhotoMetadata.c"
+#line 7059 "PhotoMetadata.c"
} else {
gchar** _tmp5_ = NULL;
gint _tmp5__length1 = 0;
@@ -7058,7 +7070,7 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot
_tmp5__length1 = photo_metadata_COMMENT_TAGS_length1;
#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tags (self, _tmp5_, _tmp5__length1);
-#line 7057 "PhotoMetadata.c"
+#line 7069 "PhotoMetadata.c"
}
}
@@ -7080,7 +7092,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp0_ = photo_metadata_KEYWORD_TAGS;
#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1;
-#line 7079 "PhotoMetadata.c"
+#line 7091 "PhotoMetadata.c"
{
gchar** tag_collection = NULL;
gint tag_collection_length1 = 0;
@@ -7092,14 +7104,14 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
tag_collection_length1 = _tmp0__length1;
#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) {
-#line 7091 "PhotoMetadata.c"
+#line 7103 "PhotoMetadata.c"
gchar* _tmp1_ = NULL;
gchar* tag = NULL;
#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = g_strdup (tag_collection[tag_it]);
#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
tag = _tmp1_;
-#line 7098 "PhotoMetadata.c"
+#line 7110 "PhotoMetadata.c"
{
GeeCollection* values = NULL;
const gchar* _tmp2_ = NULL;
@@ -7116,7 +7128,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp5_ = values;
#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_ != NULL) {
-#line 7115 "PhotoMetadata.c"
+#line 7127 "PhotoMetadata.c"
GeeCollection* _tmp6_ = NULL;
gint _tmp7_ = 0;
gint _tmp8_ = 0;
@@ -7128,21 +7140,21 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp8_ = _tmp7_;
#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _tmp8_ > 0;
-#line 7127 "PhotoMetadata.c"
+#line 7139 "PhotoMetadata.c"
} else {
#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = FALSE;
-#line 7131 "PhotoMetadata.c"
+#line 7143 "PhotoMetadata.c"
}
#line 1000 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
-#line 7135 "PhotoMetadata.c"
+#line 7147 "PhotoMetadata.c"
GeeSet* _tmp9_ = NULL;
#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = keywords;
#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp9_ == NULL) {
-#line 7141 "PhotoMetadata.c"
+#line 7153 "PhotoMetadata.c"
GCompareDataFunc _tmp10_ = NULL;
void* _tmp10__target = NULL;
GDestroyNotify _tmp10__target_destroy_notify = NULL;
@@ -7154,6 +7166,10 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10__target_destroy_notify = compare_func_target_destroy_notify;
#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ compare_func = NULL;
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
+ compare_func_target = NULL;
+#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
compare_func_target_destroy_notify = NULL;
#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = photo_metadata_create_string_set (self, _tmp10_, _tmp10__target, _tmp10__target_destroy_notify);
@@ -7161,7 +7177,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_g_object_unref0 (keywords);
#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
keywords = _tmp11_;
-#line 7160 "PhotoMetadata.c"
+#line 7176 "PhotoMetadata.c"
}
{
GeeIterator* _current_value_it = NULL;
@@ -7175,7 +7191,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_current_value_it = _tmp13_;
#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 7174 "PhotoMetadata.c"
+#line 7190 "PhotoMetadata.c"
GeeIterator* _tmp14_ = NULL;
gboolean _tmp15_ = FALSE;
gchar* current_value = NULL;
@@ -7193,7 +7209,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
if (!_tmp15_) {
#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 7192 "PhotoMetadata.c"
+#line 7208 "PhotoMetadata.c"
}
#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp16_ = _current_value_it;
@@ -7215,18 +7231,18 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_g_free0 (_tmp21_);
#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_value);
-#line 7214 "PhotoMetadata.c"
+#line 7230 "PhotoMetadata.c"
}
#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_value_it);
-#line 7218 "PhotoMetadata.c"
+#line 7234 "PhotoMetadata.c"
}
}
#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (tag);
-#line 7225 "PhotoMetadata.c"
+#line 7241 "PhotoMetadata.c"
}
}
}
@@ -7234,7 +7250,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp24_ = keywords;
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp24_ != NULL) {
-#line 7233 "PhotoMetadata.c"
+#line 7249 "PhotoMetadata.c"
GeeSet* _tmp25_ = NULL;
gint _tmp26_ = 0;
gint _tmp27_ = 0;
@@ -7246,25 +7262,25 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
_tmp27_ = _tmp26_;
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp23_ = _tmp27_ > 0;
-#line 7245 "PhotoMetadata.c"
+#line 7261 "PhotoMetadata.c"
} else {
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp23_ = FALSE;
-#line 7249 "PhotoMetadata.c"
+#line 7265 "PhotoMetadata.c"
}
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp23_) {
-#line 7253 "PhotoMetadata.c"
+#line 7269 "PhotoMetadata.c"
GeeSet* _tmp28_ = NULL;
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = keywords;
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = _tmp28_;
-#line 7259 "PhotoMetadata.c"
+#line 7275 "PhotoMetadata.c"
} else {
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp22_ = NULL;
-#line 7263 "PhotoMetadata.c"
+#line 7279 "PhotoMetadata.c"
}
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ = _g_object_ref0 (_tmp22_);
@@ -7282,14 +7298,14 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa
compare_func_target_destroy_notify = NULL;
#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 7281 "PhotoMetadata.c"
+#line 7297 "PhotoMetadata.c"
}
static gpointer _hierarchical_keyword_field_ref0 (gpointer self) {
#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? hierarchical_keyword_field_ref (self) : NULL;
-#line 7288 "PhotoMetadata.c"
+#line 7304 "PhotoMetadata.c"
}
@@ -7302,7 +7318,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_return_val_if_fail (old != NULL, NULL);
#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (replacement != NULL, NULL);
-#line 7301 "PhotoMetadata.c"
+#line 7317 "PhotoMetadata.c"
{
GRegex* regex = NULL;
const gchar* _tmp0_ = NULL;
@@ -7333,7 +7349,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7332 "PhotoMetadata.c"
+#line 7348 "PhotoMetadata.c"
goto __catch27_g_regex_error;
}
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7342,7 +7358,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 7341 "PhotoMetadata.c"
+#line 7357 "PhotoMetadata.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp6_ = regex;
@@ -7358,7 +7374,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 7357 "PhotoMetadata.c"
+#line 7373 "PhotoMetadata.c"
goto __catch27_g_regex_error;
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7369,7 +7385,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 7368 "PhotoMetadata.c"
+#line 7384 "PhotoMetadata.c"
}
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp9_ = _tmp5_;
@@ -7383,7 +7399,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
_g_regex_unref0 (regex);
#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 7382 "PhotoMetadata.c"
+#line 7398 "PhotoMetadata.c"
}
goto __finally27;
__catch27_g_regex_error:
@@ -7397,7 +7413,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_assert_not_reached ();
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_g_error_free0 (e);
-#line 7396 "PhotoMetadata.c"
+#line 7412 "PhotoMetadata.c"
}
__finally27:
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7408,7 +7424,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar*
g_clear_error (&_inner_error_);
#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return NULL;
-#line 7407 "PhotoMetadata.c"
+#line 7423 "PhotoMetadata.c"
}
}
@@ -7432,7 +7448,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
_tmp3_ = end;
#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
-#line 7431 "PhotoMetadata.c"
+#line 7447 "PhotoMetadata.c"
glong _tmp4_ = 0L;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
@@ -7440,7 +7456,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = _tmp4_;
#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 7439 "PhotoMetadata.c"
+#line 7455 "PhotoMetadata.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
@@ -7452,7 +7468,7 @@ static glong string_strnlen (gchar* str, glong maxlen) {
result = (glong) (_tmp5_ - _tmp6_);
#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 7451 "PhotoMetadata.c"
+#line 7467 "PhotoMetadata.c"
}
}
@@ -7476,21 +7492,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp1_ = offset;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
-#line 7475 "PhotoMetadata.c"
+#line 7491 "PhotoMetadata.c"
glong _tmp2_ = 0L;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp2_ = len;
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 7481 "PhotoMetadata.c"
+#line 7497 "PhotoMetadata.c"
} else {
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
-#line 7485 "PhotoMetadata.c"
+#line 7501 "PhotoMetadata.c"
}
#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp0_) {
-#line 7489 "PhotoMetadata.c"
+#line 7505 "PhotoMetadata.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
@@ -7502,7 +7518,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = _tmp5_;
-#line 7501 "PhotoMetadata.c"
+#line 7517 "PhotoMetadata.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
@@ -7512,13 +7528,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp7_ = _tmp6_;
#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
-#line 7511 "PhotoMetadata.c"
+#line 7527 "PhotoMetadata.c"
}
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp8_ = offset;
#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
-#line 7517 "PhotoMetadata.c"
+#line 7533 "PhotoMetadata.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
@@ -7532,7 +7548,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp11_ = offset;
#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 7531 "PhotoMetadata.c"
+#line 7547 "PhotoMetadata.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
@@ -7542,13 +7558,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp13_ = string_length;
#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 7541 "PhotoMetadata.c"
+#line 7557 "PhotoMetadata.c"
}
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp14_ = len;
#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
-#line 7547 "PhotoMetadata.c"
+#line 7563 "PhotoMetadata.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
@@ -7557,7 +7573,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
_tmp16_ = offset;
#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
-#line 7556 "PhotoMetadata.c"
+#line 7572 "PhotoMetadata.c"
}
#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
_tmp17_ = offset;
@@ -7577,7 +7593,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
result = _tmp22_;
#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
return result;
-#line 7576 "PhotoMetadata.c"
+#line 7592 "PhotoMetadata.c"
}
@@ -7595,7 +7611,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7594 "PhotoMetadata.c"
+#line 7610 "PhotoMetadata.c"
{
HierarchicalKeywordField** current_field_collection = NULL;
gint current_field_collection_length1 = 0;
@@ -7607,14 +7623,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
current_field_collection_length1 = _tmp0__length1;
#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) {
-#line 7606 "PhotoMetadata.c"
+#line 7622 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp1_ = NULL;
HierarchicalKeywordField* current_field = NULL;
#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field = _tmp1_;
-#line 7613 "PhotoMetadata.c"
+#line 7629 "PhotoMetadata.c"
{
HierarchicalKeywordField* _tmp2_ = NULL;
const gchar* _tmp3_ = NULL;
@@ -7626,7 +7642,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
photo_metadata_remove_tag (self, _tmp3_);
#line 1013 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (current_field);
-#line 7625 "PhotoMetadata.c"
+#line 7641 "PhotoMetadata.c"
}
}
}
@@ -7636,13 +7652,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
if (_tmp4_ == NULL) {
#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return;
-#line 7635 "PhotoMetadata.c"
+#line 7651 "PhotoMetadata.c"
}
#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 7641 "PhotoMetadata.c"
+#line 7657 "PhotoMetadata.c"
{
HierarchicalKeywordField** current_field_collection = NULL;
gint current_field_collection_length1 = 0;
@@ -7654,14 +7670,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
current_field_collection_length1 = _tmp5__length1;
#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) {
-#line 7653 "PhotoMetadata.c"
+#line 7669 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp6_ = NULL;
HierarchicalKeywordField* current_field = NULL;
#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]);
#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_field = _tmp6_;
-#line 7660 "PhotoMetadata.c"
+#line 7676 "PhotoMetadata.c"
{
HierarchicalKeywordField* _tmp7_ = NULL;
gboolean _tmp8_ = FALSE;
@@ -7680,13 +7696,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_hierarchical_keyword_field_unref0 (current_field);
#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 7679 "PhotoMetadata.c"
+#line 7695 "PhotoMetadata.c"
}
#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet);
-#line 7685 "PhotoMetadata.c"
+#line 7701 "PhotoMetadata.c"
{
GeeIterator* _current_path_it = NULL;
HierarchicalTagIndex* _tmp10_ = NULL;
@@ -7710,7 +7726,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_current_path_it = _tmp14_;
#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 7709 "PhotoMetadata.c"
+#line 7725 "PhotoMetadata.c"
GeeIterator* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gchar* current_path = NULL;
@@ -7733,7 +7749,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
if (!_tmp16_) {
#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 7732 "PhotoMetadata.c"
+#line 7748 "PhotoMetadata.c"
}
#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = _current_path_it;
@@ -7757,7 +7773,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_tmp24_ = _tmp23_->wants_leading_separator;
#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp24_) {
-#line 7756 "PhotoMetadata.c"
+#line 7772 "PhotoMetadata.c"
const gchar* _tmp25_ = NULL;
gchar* _tmp26_ = NULL;
#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -7768,7 +7784,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_g_free0 (writeable_path);
#line 1029 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
writeable_path = _tmp26_;
-#line 7767 "PhotoMetadata.c"
+#line 7783 "PhotoMetadata.c"
}
#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp27_ = writeable_set;
@@ -7780,11 +7796,11 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_g_free0 (writeable_path);
#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_path);
-#line 7779 "PhotoMetadata.c"
+#line 7795 "PhotoMetadata.c"
}
#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_path_it);
-#line 7783 "PhotoMetadata.c"
+#line 7799 "PhotoMetadata.c"
}
#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp29_ = current_field;
@@ -7798,7 +7814,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se
_g_object_unref0 (writeable_set);
#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (current_field);
-#line 7797 "PhotoMetadata.c"
+#line 7813 "PhotoMetadata.c"
}
}
}
@@ -7821,14 +7837,14 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
htag_index = _tmp0_;
#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
flat_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = keywords;
#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_ != NULL) {
-#line 7827 "PhotoMetadata.c"
+#line 7843 "PhotoMetadata.c"
GeeSet* _tmp24_ = NULL;
HierarchicalTagIndex* _tmp25_ = NULL;
GeeCollection* _tmp26_ = NULL;
@@ -7845,7 +7861,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_keyword_it = _tmp4_;
#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 7844 "PhotoMetadata.c"
+#line 7860 "PhotoMetadata.c"
GeeIterator* _tmp5_ = NULL;
gboolean _tmp6_ = FALSE;
gchar* keyword = NULL;
@@ -7861,7 +7877,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
if (!_tmp6_) {
#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 7860 "PhotoMetadata.c"
+#line 7876 "PhotoMetadata.c"
}
#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _keyword_it;
@@ -7875,7 +7891,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING);
#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp10_) {
-#line 7874 "PhotoMetadata.c"
+#line 7890 "PhotoMetadata.c"
GeeCollection* path_components = NULL;
const gchar* _tmp11_ = NULL;
GeeList* _tmp12_ = NULL;
@@ -7885,7 +7901,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_);
#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection);
-#line 7884 "PhotoMetadata.c"
+#line 7900 "PhotoMetadata.c"
{
GeeIterator* _component_it = NULL;
GeeCollection* _tmp13_ = NULL;
@@ -7898,7 +7914,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_component_it = _tmp14_;
#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 7897 "PhotoMetadata.c"
+#line 7913 "PhotoMetadata.c"
GeeIterator* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gchar* component = NULL;
@@ -7915,7 +7931,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
if (!_tmp16_) {
#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 7914 "PhotoMetadata.c"
+#line 7930 "PhotoMetadata.c"
}
#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = _component_it;
@@ -7933,15 +7949,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_);
#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (component);
-#line 7932 "PhotoMetadata.c"
+#line 7948 "PhotoMetadata.c"
}
#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_component_it);
-#line 7936 "PhotoMetadata.c"
+#line 7952 "PhotoMetadata.c"
}
#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (path_components);
-#line 7940 "PhotoMetadata.c"
+#line 7956 "PhotoMetadata.c"
} else {
GeeSet* _tmp22_ = NULL;
const gchar* _tmp23_ = NULL;
@@ -7951,15 +7967,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_tmp23_ = keyword;
#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 7950 "PhotoMetadata.c"
+#line 7966 "PhotoMetadata.c"
}
#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (keyword);
-#line 7954 "PhotoMetadata.c"
+#line 7970 "PhotoMetadata.c"
}
#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_keyword_it);
-#line 7958 "PhotoMetadata.c"
+#line 7974 "PhotoMetadata.c"
}
#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp24_ = flat_keywords;
@@ -7973,13 +7989,13 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_);
#line 1054 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_tmp27_);
-#line 7972 "PhotoMetadata.c"
+#line 7988 "PhotoMetadata.c"
}
#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp28_ = keywords;
#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp28_ != NULL) {
-#line 7978 "PhotoMetadata.c"
+#line 7994 "PhotoMetadata.c"
gchar** _tmp29_ = NULL;
gint _tmp29__length1 = 0;
GeeSet* _tmp30_ = NULL;
@@ -7999,7 +8015,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
_tmp32_ = htag_index;
#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_);
-#line 7998 "PhotoMetadata.c"
+#line 8014 "PhotoMetadata.c"
} else {
gchar** _tmp33_ = NULL;
gint _tmp33__length1 = 0;
@@ -8011,13 +8027,13 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords,
photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1);
#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_internal_set_hierarchical_keywords (self, NULL);
-#line 8010 "PhotoMetadata.c"
+#line 8026 "PhotoMetadata.c"
}
#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (flat_keywords);
#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_tag_index_unref0 (htag_index);
-#line 8016 "PhotoMetadata.c"
+#line 8032 "PhotoMetadata.c"
}
@@ -8031,7 +8047,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
_tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8030 "PhotoMetadata.c"
+#line 8046 "PhotoMetadata.c"
{
HierarchicalKeywordField** field_collection = NULL;
gint field_collection_length1 = 0;
@@ -8043,14 +8059,14 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
field_collection_length1 = _tmp0__length1;
#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) {
-#line 8042 "PhotoMetadata.c"
+#line 8058 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp1_ = NULL;
HierarchicalKeywordField* field = NULL;
#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field = _tmp1_;
-#line 8049 "PhotoMetadata.c"
+#line 8065 "PhotoMetadata.c"
{
GeeCollection* values = NULL;
HierarchicalKeywordField* _tmp2_ = NULL;
@@ -8070,7 +8086,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
_tmp6_ = values;
#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp6_ != NULL) {
-#line 8069 "PhotoMetadata.c"
+#line 8085 "PhotoMetadata.c"
GeeCollection* _tmp7_ = NULL;
gint _tmp8_ = 0;
gint _tmp9_ = 0;
@@ -8082,11 +8098,11 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
_tmp9_ = _tmp8_;
#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _tmp9_ > 0;
-#line 8081 "PhotoMetadata.c"
+#line 8097 "PhotoMetadata.c"
} else {
#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = FALSE;
-#line 8085 "PhotoMetadata.c"
+#line 8101 "PhotoMetadata.c"
}
#line 1070 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_) {
@@ -8098,13 +8114,13 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
_hierarchical_keyword_field_unref0 (field);
#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8097 "PhotoMetadata.c"
+#line 8113 "PhotoMetadata.c"
}
#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (values);
#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (field);
-#line 8103 "PhotoMetadata.c"
+#line 8119 "PhotoMetadata.c"
}
}
}
@@ -8112,7 +8128,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) {
result = FALSE;
#line 1074 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8111 "PhotoMetadata.c"
+#line 8127 "PhotoMetadata.c"
}
@@ -8138,7 +8154,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS;
#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1;
-#line 8137 "PhotoMetadata.c"
+#line 8153 "PhotoMetadata.c"
{
HierarchicalKeywordField** field_collection = NULL;
gint field_collection_length1 = 0;
@@ -8150,14 +8166,14 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
field_collection_length1 = _tmp2__length1;
#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) {
-#line 8149 "PhotoMetadata.c"
+#line 8165 "PhotoMetadata.c"
HierarchicalKeywordField* _tmp3_ = NULL;
HierarchicalKeywordField* field = NULL;
#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]);
#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
field = _tmp3_;
-#line 8156 "PhotoMetadata.c"
+#line 8172 "PhotoMetadata.c"
{
GeeCollection* values = NULL;
HierarchicalKeywordField* _tmp4_ = NULL;
@@ -8181,7 +8197,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
if (_tmp8_ == NULL) {
#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = TRUE;
-#line 8180 "PhotoMetadata.c"
+#line 8196 "PhotoMetadata.c"
} else {
GeeCollection* _tmp9_ = NULL;
gint _tmp10_ = 0;
@@ -8194,7 +8210,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_tmp11_ = _tmp10_;
#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = _tmp11_ < 1;
-#line 8193 "PhotoMetadata.c"
+#line 8209 "PhotoMetadata.c"
}
#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp7_) {
@@ -8204,13 +8220,13 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_hierarchical_keyword_field_unref0 (field);
#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
continue;
-#line 8203 "PhotoMetadata.c"
+#line 8219 "PhotoMetadata.c"
}
#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL);
+ _tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
transformed_values = _tmp12_;
-#line 8209 "PhotoMetadata.c"
+#line 8225 "PhotoMetadata.c"
{
GeeIterator* _current_value_it = NULL;
GeeCollection* _tmp13_ = NULL;
@@ -8223,7 +8239,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_current_value_it = _tmp14_;
#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 8222 "PhotoMetadata.c"
+#line 8238 "PhotoMetadata.c"
GeeIterator* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gchar* current_value = NULL;
@@ -8237,7 +8253,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
if (!_tmp16_) {
#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 8236 "PhotoMetadata.c"
+#line 8252 "PhotoMetadata.c"
}
#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp17_ = _current_value_it;
@@ -8245,7 +8261,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_tmp18_ = gee_iterator_get (_tmp17_);
#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
current_value = (gchar*) _tmp18_;
-#line 8244 "PhotoMetadata.c"
+#line 8260 "PhotoMetadata.c"
{
GeeList* transformed = NULL;
HierarchicalKeywordField* _tmp19_ = NULL;
@@ -8266,7 +8282,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
transformed = _tmp22_;
#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8265 "PhotoMetadata.c"
+#line 8281 "PhotoMetadata.c"
goto __catch28_g_error;
}
#line 1092 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8277,7 +8293,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
gee_array_list_add_all (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection));
#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (transformed);
-#line 8276 "PhotoMetadata.c"
+#line 8292 "PhotoMetadata.c"
}
goto __finally28;
__catch28_g_error:
@@ -8300,7 +8316,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
g_critical ("PhotoMetadata.vala:1094: Failed to transform tag value %s: %s", _tmp25_, _tmp27_);
#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_error_free0 (_error_);
-#line 8299 "PhotoMetadata.c"
+#line 8315 "PhotoMetadata.c"
}
__finally28:
#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8323,15 +8339,15 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
g_clear_error (&_inner_error_);
#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return NULL;
-#line 8322 "PhotoMetadata.c"
+#line 8338 "PhotoMetadata.c"
}
#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_value);
-#line 8326 "PhotoMetadata.c"
+#line 8342 "PhotoMetadata.c"
}
#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_value_it);
-#line 8330 "PhotoMetadata.c"
+#line 8346 "PhotoMetadata.c"
}
{
GeeArrayList* _current_value_list = NULL;
@@ -8351,7 +8367,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp30_ = _current_value_list;
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- _tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection));
+ _tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp32_ = _tmp31_;
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8360,7 +8376,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_current_value_index = -1;
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 8359 "PhotoMetadata.c"
+#line 8375 "PhotoMetadata.c"
gint _tmp33_ = 0;
gint _tmp34_ = 0;
gint _tmp35_ = 0;
@@ -8386,7 +8402,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
if (!(_tmp34_ < _tmp35_)) {
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 8385 "PhotoMetadata.c"
+#line 8401 "PhotoMetadata.c"
}
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp36_ = _current_value_list;
@@ -8410,7 +8426,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_tmp43_ = canonicalized;
#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp43_ != NULL) {
-#line 8409 "PhotoMetadata.c"
+#line 8425 "PhotoMetadata.c"
GeeSet* _tmp44_ = NULL;
const gchar* _tmp45_ = NULL;
#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8419,17 +8435,17 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_tmp45_ = canonicalized;
#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_);
-#line 8418 "PhotoMetadata.c"
+#line 8434 "PhotoMetadata.c"
}
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (canonicalized);
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (current_value);
-#line 8424 "PhotoMetadata.c"
+#line 8440 "PhotoMetadata.c"
}
#line 1100 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (_current_value_list);
-#line 8428 "PhotoMetadata.c"
+#line 8444 "PhotoMetadata.c"
}
#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_object_unref0 (transformed_values);
@@ -8437,7 +8453,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
_g_object_unref0 (values);
#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_hierarchical_keyword_field_unref0 (field);
-#line 8436 "PhotoMetadata.c"
+#line 8452 "PhotoMetadata.c"
}
}
}
@@ -8445,7 +8461,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) {
result = h_keywords;
#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8444 "PhotoMetadata.c"
+#line 8460 "PhotoMetadata.c"
}
@@ -8463,7 +8479,7 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) {
result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED;
#line 1114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8462 "PhotoMetadata.c"
+#line 8478 "PhotoMetadata.c"
}
@@ -8489,27 +8505,27 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) {
#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = TRUE;
-#line 8488 "PhotoMetadata.c"
+#line 8504 "PhotoMetadata.c"
} else {
GExiv2Orientation _tmp5_ = 0;
#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = orientation;
#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp5_ < ORIENTATION_MIN;
-#line 8495 "PhotoMetadata.c"
+#line 8511 "PhotoMetadata.c"
}
#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = TRUE;
-#line 8501 "PhotoMetadata.c"
+#line 8517 "PhotoMetadata.c"
} else {
GExiv2Orientation _tmp6_ = 0;
#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = orientation;
#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = _tmp6_ > ORIENTATION_MAX;
-#line 8508 "PhotoMetadata.c"
+#line 8524 "PhotoMetadata.c"
}
#line 1122 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_) {
@@ -8517,7 +8533,7 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
result = ORIENTATION_TOP_LEFT;
#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8516 "PhotoMetadata.c"
+#line 8532 "PhotoMetadata.c"
} else {
GExiv2Orientation _tmp7_ = 0;
#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -8526,7 +8542,7 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) {
result = (Orientation) _tmp7_;
#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8525 "PhotoMetadata.c"
+#line 8541 "PhotoMetadata.c"
}
}
@@ -8542,7 +8558,7 @@ void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientatio
_tmp1_ = orientation;
#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_);
-#line 8541 "PhotoMetadata.c"
+#line 8557 "PhotoMetadata.c"
}
@@ -8588,43 +8604,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
if (longitude) {
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*longitude = _vala_longitude;
-#line 8587 "PhotoMetadata.c"
+#line 8603 "PhotoMetadata.c"
}
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (long_ref) {
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*long_ref = _vala_long_ref;
-#line 8593 "PhotoMetadata.c"
+#line 8609 "PhotoMetadata.c"
} else {
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_long_ref);
-#line 8597 "PhotoMetadata.c"
+#line 8613 "PhotoMetadata.c"
}
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (latitude) {
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*latitude = _vala_latitude;
-#line 8603 "PhotoMetadata.c"
+#line 8619 "PhotoMetadata.c"
}
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (lat_ref) {
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*lat_ref = _vala_lat_ref;
-#line 8609 "PhotoMetadata.c"
+#line 8625 "PhotoMetadata.c"
} else {
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_lat_ref);
-#line 8613 "PhotoMetadata.c"
+#line 8629 "PhotoMetadata.c"
}
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (altitude) {
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*altitude = _vala_altitude;
-#line 8619 "PhotoMetadata.c"
+#line 8635 "PhotoMetadata.c"
}
#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8623 "PhotoMetadata.c"
+#line 8639 "PhotoMetadata.c"
}
#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8644,43 +8660,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar*
if (longitude) {
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*longitude = _vala_longitude;
-#line 8643 "PhotoMetadata.c"
+#line 8659 "PhotoMetadata.c"
}
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (long_ref) {
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*long_ref = _vala_long_ref;
-#line 8649 "PhotoMetadata.c"
+#line 8665 "PhotoMetadata.c"
} else {
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_long_ref);
-#line 8653 "PhotoMetadata.c"
+#line 8669 "PhotoMetadata.c"
}
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (latitude) {
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*latitude = _vala_latitude;
-#line 8659 "PhotoMetadata.c"
+#line 8675 "PhotoMetadata.c"
}
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (lat_ref) {
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*lat_ref = _vala_lat_ref;
-#line 8665 "PhotoMetadata.c"
+#line 8681 "PhotoMetadata.c"
} else {
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_vala_lat_ref);
-#line 8669 "PhotoMetadata.c"
+#line 8685 "PhotoMetadata.c"
}
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (altitude) {
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*altitude = _vala_altitude;
-#line 8675 "PhotoMetadata.c"
+#line 8691 "PhotoMetadata.c"
}
#line 1146 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8679 "PhotoMetadata.c"
+#line 8695 "PhotoMetadata.c"
}
@@ -8701,11 +8717,11 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp
if (exposure) {
#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*exposure = _vala_exposure;
-#line 8700 "PhotoMetadata.c"
+#line 8716 "PhotoMetadata.c"
}
#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8704 "PhotoMetadata.c"
+#line 8720 "PhotoMetadata.c"
}
@@ -8728,7 +8744,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
result = NULL;
#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8727 "PhotoMetadata.c"
+#line 8743 "PhotoMetadata.c"
}
#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = metadata_rational_is_valid (&exposure_time);
@@ -8738,7 +8754,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
result = NULL;
#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8737 "PhotoMetadata.c"
+#line 8753 "PhotoMetadata.c"
}
#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8746,7 +8762,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) {
result = _tmp3_;
#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8745 "PhotoMetadata.c"
+#line 8761 "PhotoMetadata.c"
}
@@ -8777,11 +8793,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
if (iso) {
#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*iso = _vala_iso;
-#line 8776 "PhotoMetadata.c"
+#line 8792 "PhotoMetadata.c"
}
#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8780 "PhotoMetadata.c"
+#line 8796 "PhotoMetadata.c"
}
#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = _vala_iso;
@@ -8789,14 +8805,14 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
if (_tmp4_ < ((glong) 6)) {
#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = TRUE;
-#line 8788 "PhotoMetadata.c"
+#line 8804 "PhotoMetadata.c"
} else {
glong _tmp5_ = 0L;
#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp5_ = _vala_iso;
#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp3_ = _tmp5_ > ((glong) 409600);
-#line 8795 "PhotoMetadata.c"
+#line 8811 "PhotoMetadata.c"
}
#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp3_) {
@@ -8806,11 +8822,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
if (iso) {
#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*iso = _vala_iso;
-#line 8805 "PhotoMetadata.c"
+#line 8821 "PhotoMetadata.c"
}
#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8809 "PhotoMetadata.c"
+#line 8825 "PhotoMetadata.c"
}
#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = TRUE;
@@ -8818,11 +8834,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) {
if (iso) {
#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*iso = _vala_iso;
-#line 8817 "PhotoMetadata.c"
+#line 8833 "PhotoMetadata.c"
}
#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8821 "PhotoMetadata.c"
+#line 8837 "PhotoMetadata.c"
}
@@ -8844,7 +8860,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
result = NULL;
#line 1181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8843 "PhotoMetadata.c"
+#line 8859 "PhotoMetadata.c"
}
#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -8852,7 +8868,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) {
result = _tmp2_;
#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8851 "PhotoMetadata.c"
+#line 8867 "PhotoMetadata.c"
}
@@ -8873,11 +8889,11 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape
if (aperture) {
#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*aperture = _vala_aperture;
-#line 8872 "PhotoMetadata.c"
+#line 8888 "PhotoMetadata.c"
}
#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8876 "PhotoMetadata.c"
+#line 8892 "PhotoMetadata.c"
}
@@ -8913,7 +8929,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
result = NULL;
#line 1193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8912 "PhotoMetadata.c"
+#line 8928 "PhotoMetadata.c"
}
#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp2_ = aperture;
@@ -8935,11 +8951,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
if (_tmp8_) {
#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = "<i>f</i>/";
-#line 8934 "PhotoMetadata.c"
+#line 8950 "PhotoMetadata.c"
} else {
#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp7_ = "f/";
-#line 8938 "PhotoMetadata.c"
+#line 8954 "PhotoMetadata.c"
}
#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = aperture_value;
@@ -8947,11 +8963,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
if (fmod (_tmp10_, 1) == ((gdouble) 0)) {
#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = "%.0f";
-#line 8946 "PhotoMetadata.c"
+#line 8962 "PhotoMetadata.c"
} else {
#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp9_ = "%.1f";
-#line 8950 "PhotoMetadata.c"
+#line 8966 "PhotoMetadata.c"
}
#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = aperture_value;
@@ -8969,7 +8985,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f
result = _tmp15_;
#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8968 "PhotoMetadata.c"
+#line 8984 "PhotoMetadata.c"
}
@@ -8984,7 +9000,7 @@ gchar* photo_metadata_get_camera_make (PhotoMetadata* self) {
result = _tmp0_;
#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8983 "PhotoMetadata.c"
+#line 8999 "PhotoMetadata.c"
}
@@ -8999,7 +9015,7 @@ gchar* photo_metadata_get_camera_model (PhotoMetadata* self) {
result = _tmp0_;
#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 8998 "PhotoMetadata.c"
+#line 9014 "PhotoMetadata.c"
}
@@ -9020,11 +9036,11 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) {
if (flash) {
#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*flash = _vala_flash;
-#line 9019 "PhotoMetadata.c"
+#line 9035 "PhotoMetadata.c"
}
#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9023 "PhotoMetadata.c"
+#line 9039 "PhotoMetadata.c"
}
@@ -9039,7 +9055,7 @@ gchar* photo_metadata_get_flash_string (PhotoMetadata* self) {
result = _tmp0_;
#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9038 "PhotoMetadata.c"
+#line 9054 "PhotoMetadata.c"
}
@@ -9060,11 +9076,11 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational*
if (focal_length) {
#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*focal_length = _vala_focal_length;
-#line 9059 "PhotoMetadata.c"
+#line 9075 "PhotoMetadata.c"
}
#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9063 "PhotoMetadata.c"
+#line 9079 "PhotoMetadata.c"
}
@@ -9079,7 +9095,7 @@ gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) {
result = _tmp0_;
#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9078 "PhotoMetadata.c"
+#line 9094 "PhotoMetadata.c"
}
@@ -9100,7 +9116,7 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) {
result = _tmp1_;
#line 1235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9099 "PhotoMetadata.c"
+#line 9115 "PhotoMetadata.c"
}
@@ -9115,7 +9131,7 @@ gchar* photo_metadata_get_copyright (PhotoMetadata* self) {
result = _tmp0_;
#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9114 "PhotoMetadata.c"
+#line 9130 "PhotoMetadata.c"
}
@@ -9130,7 +9146,7 @@ gchar* photo_metadata_get_software (PhotoMetadata* self) {
result = _tmp0_;
#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9129 "PhotoMetadata.c"
+#line 9145 "PhotoMetadata.c"
}
@@ -9162,7 +9178,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
_tmp4_ = photo_metadata_has_iptc (self);
#line 1250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp4_) {
-#line 9161 "PhotoMetadata.c"
+#line 9177 "PhotoMetadata.c"
const gchar* _tmp5_ = NULL;
const gchar* _tmp6_ = NULL;
#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9173,7 +9189,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co
_tmp6_ = version;
#line 1252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
-#line 9172 "PhotoMetadata.c"
+#line 9188 "PhotoMetadata.c"
}
}
@@ -9187,7 +9203,7 @@ void photo_metadata_remove_software (PhotoMetadata* self) {
photo_metadata_remove_tag (self, "Iptc.Application2.Program");
#line 1259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion");
-#line 9186 "PhotoMetadata.c"
+#line 9202 "PhotoMetadata.c"
}
@@ -9202,7 +9218,7 @@ gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) {
result = _tmp0_;
#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9201 "PhotoMetadata.c"
+#line 9217 "PhotoMetadata.c"
}
@@ -9233,7 +9249,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_tmp2_ = rating_string;
#line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp2_ != NULL) {
-#line 9232 "PhotoMetadata.c"
+#line 9248 "PhotoMetadata.c"
const gchar* _tmp3_ = NULL;
gint _tmp4_ = 0;
Rating _tmp5_ = 0;
@@ -9249,7 +9265,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_g_free0 (rating_string);
#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9248 "PhotoMetadata.c"
+#line 9264 "PhotoMetadata.c"
}
#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS);
@@ -9267,7 +9283,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_g_free0 (rating_string);
#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9266 "PhotoMetadata.c"
+#line 9282 "PhotoMetadata.c"
}
#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp8_ = rating_string;
@@ -9275,32 +9291,32 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_tmp9_ = atoi (_tmp8_);
#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
int_percent_rating = _tmp9_;
-#line 9274 "PhotoMetadata.c"
+#line 9290 "PhotoMetadata.c"
{
gint i = 0;
#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
i = 5;
-#line 9279 "PhotoMetadata.c"
+#line 9295 "PhotoMetadata.c"
{
gboolean _tmp10_ = FALSE;
#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = TRUE;
#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
while (TRUE) {
-#line 9286 "PhotoMetadata.c"
+#line 9302 "PhotoMetadata.c"
gint _tmp12_ = 0;
gint _tmp13_ = 0;
gint _tmp14_ = 0;
gint _tmp15_ = 0;
#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (!_tmp10_) {
-#line 9293 "PhotoMetadata.c"
+#line 9309 "PhotoMetadata.c"
gint _tmp11_ = 0;
#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp11_ = i;
#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
i = _tmp11_ - 1;
-#line 9299 "PhotoMetadata.c"
+#line 9315 "PhotoMetadata.c"
}
#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp10_ = FALSE;
@@ -9310,7 +9326,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
if (!(_tmp12_ >= 0)) {
#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
break;
-#line 9309 "PhotoMetadata.c"
+#line 9325 "PhotoMetadata.c"
}
#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp13_ = int_percent_rating;
@@ -9320,7 +9336,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_tmp15_ = RESOURCES_rating_thresholds[_tmp14_];
#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp13_ >= _tmp15_) {
-#line 9319 "PhotoMetadata.c"
+#line 9335 "PhotoMetadata.c"
gint _tmp16_ = 0;
Rating _tmp17_ = 0;
#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -9333,7 +9349,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_g_free0 (rating_string);
#line 1287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9332 "PhotoMetadata.c"
+#line 9348 "PhotoMetadata.c"
}
}
}
@@ -9346,7 +9362,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) {
_g_free0 (rating_string);
#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9345 "PhotoMetadata.c"
+#line 9361 "PhotoMetadata.c"
}
@@ -9393,7 +9409,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
_tmp8_ = int_rating;
#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (0 <= _tmp8_) {
-#line 9392 "PhotoMetadata.c"
+#line 9408 "PhotoMetadata.c"
gint _tmp9_ = 0;
gint _tmp10_ = 0;
gchar* _tmp11_ = NULL;
@@ -9410,7 +9426,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp12_);
-#line 9409 "PhotoMetadata.c"
+#line 9425 "PhotoMetadata.c"
} else {
gint _tmp13_ = 0;
gchar* _tmp14_ = NULL;
@@ -9425,7 +9441,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS);
#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_g_free0 (_tmp15_);
-#line 9424 "PhotoMetadata.c"
+#line 9440 "PhotoMetadata.c"
}
}
@@ -9433,7 +9449,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) {
static gpointer _media_metadata_ref0 (gpointer self) {
#line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self ? media_metadata_ref (self) : NULL;
-#line 9432 "PhotoMetadata.c"
+#line 9448 "PhotoMetadata.c"
}
@@ -9500,21 +9516,21 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_
self->number = _tmp14_;
#line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return self;
-#line 9499 "PhotoMetadata.c"
+#line 9515 "PhotoMetadata.c"
}
static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) {
#line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props);
-#line 9506 "PhotoMetadata.c"
+#line 9522 "PhotoMetadata.c"
}
static guint8* _vala_array_dup6 (guint8* self, int length) {
#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return g_memdup (self, length * sizeof (guint8));
-#line 9513 "PhotoMetadata.c"
+#line 9529 "PhotoMetadata.c"
}
@@ -9567,7 +9583,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
_tmp5__length1 = props_length1;
#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
if (_tmp5_ != NULL) {
-#line 9566 "PhotoMetadata.c"
+#line 9582 "PhotoMetadata.c"
GExiv2PreviewProperties** _tmp6_ = NULL;
gint _tmp6__length1 = 0;
guint _tmp7_ = 0U;
@@ -9579,11 +9595,11 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
_tmp7_ = self->number;
#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = ((guint) _tmp6__length1) > _tmp7_;
-#line 9578 "PhotoMetadata.c"
+#line 9594 "PhotoMetadata.c"
} else {
#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp4_ = FALSE;
-#line 9582 "PhotoMetadata.c"
+#line 9598 "PhotoMetadata.c"
}
#line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_vala_assert (_tmp4_, "props != null && props.length > number");
@@ -9623,13 +9639,13 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview*
if (result_length1) {
#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
*result_length1 = _tmp19__length1;
-#line 9622 "PhotoMetadata.c"
+#line 9638 "PhotoMetadata.c"
}
#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
result = _tmp19_;
#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
return result;
-#line 9628 "PhotoMetadata.c"
+#line 9644 "PhotoMetadata.c"
}
@@ -9639,8 +9655,8 @@ static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInter
#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize;
#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((PhotoPreviewClass *) klass)->flatten = photo_metadata_internal_photo_preview_real_flatten;
-#line 9639 "PhotoMetadata.c"
+ ((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten;
+#line 9655 "PhotoMetadata.c"
}
@@ -9656,7 +9672,7 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) {
_media_metadata_unref0 (self->owner);
#line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj);
-#line 9655 "PhotoMetadata.c"
+#line 9671 "PhotoMetadata.c"
}
@@ -9744,13 +9760,13 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
g_type_class_add_private (klass, sizeof (PhotoMetadataPrivate));
#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((MediaMetadataClass *) klass)->read_from_file = photo_metadata_real_read_from_file;
+ ((MediaMetadataClass *) klass)->read_from_file = (void (*)(MediaMetadata*, GFile*, GError**)) photo_metadata_real_read_from_file;
#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((MediaMetadataClass *) klass)->get_creation_date_time = photo_metadata_real_get_creation_date_time;
+ ((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*)(MediaMetadata*)) photo_metadata_real_get_creation_date_time;
#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((MediaMetadataClass *) klass)->get_title = photo_metadata_real_get_title;
+ ((MediaMetadataClass *) klass)->get_title = (gchar* (*)(MediaMetadata*)) photo_metadata_real_get_title;
#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
- ((MediaMetadataClass *) klass)->get_comment = photo_metadata_real_get_comment;
+ ((MediaMetadataClass *) klass)->get_comment = (gchar* (*)(MediaMetadata*)) photo_metadata_real_get_comment;
#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
_tmp0_ = g_strdup ("Exif.Image.DateTime");
#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
@@ -10009,7 +10025,7 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) {
photo_metadata_RATING_TAGS = _tmp63_;
#line 1266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
photo_metadata_RATING_TAGS_length1 = 5;
-#line 10008 "PhotoMetadata.c"
+#line 10024 "PhotoMetadata.c"
}
@@ -10028,7 +10044,7 @@ static void photo_metadata_instance_init (PhotoMetadata * self) {
_tmp1_ = g_strdup ("<uninitialized>");
#line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
self->priv->source_name = _tmp1_;
-#line 10027 "PhotoMetadata.c"
+#line 10043 "PhotoMetadata.c"
}
@@ -10044,7 +10060,7 @@ static void photo_metadata_finalize (MediaMetadata* obj) {
_g_free0 (self->priv->source_name);
#line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala"
MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj);
-#line 10043 "PhotoMetadata.c"
+#line 10059 "PhotoMetadata.c"
}
diff --git a/src/photos/Photos.c b/src/photos/Photos.c
index a5a2b83..72c2778 100644
--- a/src/photos/Photos.c
+++ b/src/photos/Photos.c
@@ -1,4 +1,4 @@
-/* Photos.c generated by valac 0.34.4, the Vala compiler
+/* Photos.c generated by valac 0.34.7, the Vala compiler
* generated from Photos.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c
index 3229f52..20e79a9 100644
--- a/src/photos/PngSupport.c
+++ b/src/photos/PngSupport.c
@@ -1,4 +1,4 @@
-/* PngSupport.c generated by valac 0.34.4, the Vala compiler
+/* PngSupport.c generated by valac 0.34.7, the Vala compiler
* generated from PngSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -888,19 +888,19 @@ static void png_file_format_properties_class_init (PngFileFormatPropertiesClass
#line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
((PhotoFileFormatPropertiesClass *) klass)->finalize = png_file_format_properties_finalize;
#line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = png_file_format_properties_real_get_file_format;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_file_format;
#line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_flags = png_file_format_properties_real_get_flags;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_flags;
#line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = png_file_format_properties_real_get_user_visible_name;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_user_visible_name;
#line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = png_file_format_properties_real_get_default_extension;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_default_extension;
#line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = png_file_format_properties_real_get_known_extensions;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) png_file_format_properties_real_get_known_extensions;
#line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = png_file_format_properties_real_get_default_mime_type;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_default_mime_type;
#line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = png_file_format_properties_real_get_mime_types;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) png_file_format_properties_real_get_mime_types;
#line 8 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp0_ = g_strdup ("png");
#line 8 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -982,12 +982,12 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
GFile* _tmp0_ = NULL;
GFileInputStream* _tmp1_ = NULL;
guint8* file_lead_sequence = NULL;
- guint8* _tmp2_ = NULL;
+ guint8* _tmp3_ = NULL;
gint file_lead_sequence_length1 = 0;
gint _file_lead_sequence_size_ = 0;
- GFileInputStream* _tmp3_ = NULL;
- guint8* _tmp4_ = NULL;
- gint _tmp4__length1 = 0;
+ GFileInputStream* _tmp4_ = NULL;
+ guint8* _tmp5_ = NULL;
+ gint _tmp5__length1 = 0;
GError * _inner_error_ = NULL;
#line 57 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -999,30 +999,34 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
instream = _tmp1_;
#line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1003 "PngSupport.c"
+ gboolean _tmp2_ = FALSE;
#line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
g_propagate_error (error, _inner_error_);
#line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- return FALSE;
-#line 1007 "PngSupport.c"
+ return _tmp2_;
+#line 1009 "PngSupport.c"
}
#line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE));
+ _tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE));
#line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- file_lead_sequence = _tmp2_;
+ file_lead_sequence = _tmp3_;
#line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
file_lead_sequence_length1 = G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE);
#line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_file_lead_sequence_size_ = file_lead_sequence_length1;
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp3_ = instream;
+ _tmp4_ = instream;
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp4_ = file_lead_sequence;
+ _tmp5_ = file_lead_sequence;
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp4__length1 = file_lead_sequence_length1;
+ _tmp5__length1 = file_lead_sequence_length1;
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_);
+ g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_);
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1029 "PngSupport.c"
+ gboolean _tmp6_ = FALSE;
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
g_propagate_error (error, _inner_error_);
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1030,62 +1034,62 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_g_object_unref0 (instream);
#line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- return FALSE;
-#line 1035 "PngSupport.c"
+ return _tmp6_;
+#line 1039 "PngSupport.c"
}
{
gint i = 0;
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
i = 0;
-#line 1041 "PngSupport.c"
+#line 1045 "PngSupport.c"
{
- gboolean _tmp5_ = FALSE;
+ gboolean _tmp7_ = FALSE;
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp5_ = TRUE;
+ _tmp7_ = TRUE;
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
while (TRUE) {
-#line 1048 "PngSupport.c"
- gint _tmp7_ = 0;
- guint8* _tmp8_ = NULL;
- gint _tmp8__length1 = 0;
+#line 1052 "PngSupport.c"
gint _tmp9_ = 0;
- guint8 _tmp10_ = 0U;
+ guint8* _tmp10_ = NULL;
+ gint _tmp10__length1 = 0;
gint _tmp11_ = 0;
guint8 _tmp12_ = 0U;
+ gint _tmp13_ = 0;
+ guint8 _tmp14_ = 0U;
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- if (!_tmp5_) {
-#line 1058 "PngSupport.c"
- gint _tmp6_ = 0;
+ if (!_tmp7_) {
+#line 1062 "PngSupport.c"
+ gint _tmp8_ = 0;
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp6_ = i;
+ _tmp8_ = i;
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- i = _tmp6_ + 1;
-#line 1064 "PngSupport.c"
+ i = _tmp8_ + 1;
+#line 1068 "PngSupport.c"
}
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp5_ = FALSE;
+ _tmp7_ = FALSE;
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp7_ = i;
+ _tmp9_ = i;
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- if (!(_tmp7_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) {
+ if (!(_tmp9_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) {
#line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
break;
-#line 1074 "PngSupport.c"
+#line 1078 "PngSupport.c"
}
#line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp8_ = file_lead_sequence;
+ _tmp10_ = file_lead_sequence;
#line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp8__length1 = file_lead_sequence_length1;
+ _tmp10__length1 = file_lead_sequence_length1;
#line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp9_ = i;
+ _tmp11_ = i;
#line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp10_ = _tmp8_[_tmp9_];
+ _tmp12_ = _tmp10_[_tmp11_];
#line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp11_ = i;
+ _tmp13_ = i;
#line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- _tmp12_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp11_];
+ _tmp14_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp13_];
#line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- if (_tmp10_ != _tmp12_) {
+ if (_tmp12_ != _tmp14_) {
#line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
result = FALSE;
#line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
@@ -1094,7 +1098,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
_g_object_unref0 (instream);
#line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1098 "PngSupport.c"
+#line 1102 "PngSupport.c"
}
}
}
@@ -1107,14 +1111,14 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) {
_g_object_unref0 (instream);
#line 69 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1111 "PngSupport.c"
+#line 1115 "PngSupport.c"
}
static gpointer _detected_photo_information_ref0 (gpointer self) {
#line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return self ? detected_photo_information_ref (self) : NULL;
-#line 1118 "PngSupport.c"
+#line 1122 "PngSupport.c"
}
@@ -1150,7 +1154,7 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
g_propagate_error (error, _inner_error_);
#line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return NULL;
-#line 1154 "PngSupport.c"
+#line 1158 "PngSupport.c"
}
#line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
if (!_tmp0_) {
@@ -1160,11 +1164,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
if (is_corrupted) {
#line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
*is_corrupted = _vala_is_corrupted;
-#line 1164 "PngSupport.c"
+#line 1168 "PngSupport.c"
}
#line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1168 "PngSupport.c"
+#line 1172 "PngSupport.c"
}
#line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp4_ = PHOTO_FILE_SNIFFER_CLASS (png_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_);
@@ -1178,7 +1182,7 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
g_propagate_error (error, _inner_error_);
#line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return NULL;
-#line 1182 "PngSupport.c"
+#line 1186 "PngSupport.c"
}
#line 80 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp5_ = detected;
@@ -1192,11 +1196,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
if (is_corrupted) {
#line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
*is_corrupted = _vala_is_corrupted;
-#line 1196 "PngSupport.c"
+#line 1200 "PngSupport.c"
}
#line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1200 "PngSupport.c"
+#line 1204 "PngSupport.c"
}
#line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp7_ = detected;
@@ -1204,17 +1208,17 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
_tmp8_ = _tmp7_->file_format;
#line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
if (_tmp8_ == PHOTO_FILE_FORMAT_PNG) {
-#line 1208 "PngSupport.c"
+#line 1212 "PngSupport.c"
DetectedPhotoInformation* _tmp9_ = NULL;
#line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp9_ = detected;
#line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp6_ = _tmp9_;
-#line 1214 "PngSupport.c"
+#line 1218 "PngSupport.c"
} else {
#line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp6_ = NULL;
-#line 1218 "PngSupport.c"
+#line 1222 "PngSupport.c"
}
#line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp10_ = _detected_photo_information_ref0 (_tmp6_);
@@ -1226,11 +1230,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base,
if (is_corrupted) {
#line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
*is_corrupted = _vala_is_corrupted;
-#line 1230 "PngSupport.c"
+#line 1234 "PngSupport.c"
}
#line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1234 "PngSupport.c"
+#line 1238 "PngSupport.c"
}
@@ -1238,8 +1242,8 @@ static void png_sniffer_class_init (PngSnifferClass * klass) {
#line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
png_sniffer_parent_class = g_type_class_peek_parent (klass);
#line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileSnifferClass *) klass)->sniff = png_sniffer_real_sniff;
-#line 1243 "PngSupport.c"
+ ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) png_sniffer_real_sniff;
+#line 1247 "PngSupport.c"
}
@@ -1270,14 +1274,14 @@ PngReader* png_reader_construct (GType object_type, const gchar* filepath) {
self = (PngReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG);
#line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return self;
-#line 1274 "PngSupport.c"
+#line 1278 "PngSupport.c"
}
PngReader* png_reader_new (const gchar* filepath) {
#line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return png_reader_construct (TYPE_PNG_READER, filepath);
-#line 1281 "PngSupport.c"
+#line 1285 "PngSupport.c"
}
@@ -1306,7 +1310,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
if (_tmp3_ > 9999) {
#line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp1_ = TRUE;
-#line 1310 "PngSupport.c"
+#line 1314 "PngSupport.c"
} else {
Dimensions _tmp4_ = {0};
gint _tmp5_ = 0;
@@ -1316,11 +1320,11 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
_tmp5_ = _tmp4_.height;
#line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp1_ = _tmp5_ > 9999;
-#line 1320 "PngSupport.c"
+#line 1324 "PngSupport.c"
}
#line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
if (_tmp1_) {
-#line 1324 "PngSupport.c"
+#line 1328 "PngSupport.c"
gboolean _tmp6_ = FALSE;
Dimensions _tmp7_ = {0};
gint _tmp8_ = 0;
@@ -1332,7 +1336,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
if (_tmp8_ < 100) {
#line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp6_ = TRUE;
-#line 1336 "PngSupport.c"
+#line 1340 "PngSupport.c"
} else {
Dimensions _tmp9_ = {0};
gint _tmp10_ = 0;
@@ -1342,19 +1346,19 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
_tmp10_ = _tmp9_.height;
#line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp6_ = _tmp10_ < 100;
-#line 1346 "PngSupport.c"
+#line 1350 "PngSupport.c"
}
#line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp0_ = _tmp6_;
-#line 1350 "PngSupport.c"
+#line 1354 "PngSupport.c"
} else {
#line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp0_ = FALSE;
-#line 1354 "PngSupport.c"
+#line 1358 "PngSupport.c"
}
#line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
if (_tmp0_) {
-#line 1358 "PngSupport.c"
+#line 1362 "PngSupport.c"
Dimensions prefetch_dimensions = {0};
Dimensions _tmp11_ = {0};
GdkPixbuf* _tmp12_ = NULL;
@@ -1405,7 +1409,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
_g_object_unref0 (_result_);
#line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return NULL;
-#line 1409 "PngSupport.c"
+#line 1413 "PngSupport.c"
}
#line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp21_ = _tmp12_;
@@ -1433,7 +1437,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
_result_ = _tmp27_;
#line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_g_object_unref0 (_tmp12_);
-#line 1437 "PngSupport.c"
+#line 1441 "PngSupport.c"
} else {
GdkPixbuf* _tmp28_ = NULL;
gchar* _tmp29_ = NULL;
@@ -1473,7 +1477,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
_g_object_unref0 (_result_);
#line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return NULL;
-#line 1477 "PngSupport.c"
+#line 1481 "PngSupport.c"
}
#line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_tmp37_ = _tmp28_;
@@ -1485,13 +1489,13 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions
_result_ = _tmp37_;
#line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
_g_object_unref0 (_tmp28_);
-#line 1489 "PngSupport.c"
+#line 1493 "PngSupport.c"
}
#line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
result = _result_;
#line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1495 "PngSupport.c"
+#line 1499 "PngSupport.c"
}
@@ -1499,8 +1503,8 @@ static void png_reader_class_init (PngReaderClass * klass) {
#line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
png_reader_parent_class = g_type_class_peek_parent (klass);
#line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileReaderClass *) klass)->scaled_read = png_reader_real_scaled_read;
-#line 1504 "PngSupport.c"
+ ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) png_reader_real_scaled_read;
+#line 1508 "PngSupport.c"
}
@@ -1531,14 +1535,14 @@ PngWriter* png_writer_construct (GType object_type, const gchar* filepath) {
self = (PngWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG);
#line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return self;
-#line 1535 "PngSupport.c"
+#line 1539 "PngSupport.c"
}
PngWriter* png_writer_new (const gchar* filepath) {
#line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return png_writer_construct (TYPE_PNG_WRITER, filepath);
-#line 1542 "PngSupport.c"
+#line 1546 "PngSupport.c"
}
@@ -1568,7 +1572,7 @@ static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, Jpe
g_propagate_error (error, _inner_error_);
#line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return;
-#line 1572 "PngSupport.c"
+#line 1576 "PngSupport.c"
}
}
@@ -1577,8 +1581,8 @@ static void png_writer_class_init (PngWriterClass * klass) {
#line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
png_writer_parent_class = g_type_class_peek_parent (klass);
#line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileWriterClass *) klass)->write = png_writer_real_write;
-#line 1582 "PngSupport.c"
+ ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) png_writer_real_write;
+#line 1586 "PngSupport.c"
}
@@ -1609,14 +1613,14 @@ PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar
self = (PngMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG);
#line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return self;
-#line 1613 "PngSupport.c"
+#line 1617 "PngSupport.c"
}
PngMetadataWriter* png_metadata_writer_new (const gchar* filepath) {
#line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return png_metadata_writer_construct (TYPE_PNG_METADATA_WRITER, filepath);
-#line 1620 "PngSupport.c"
+#line 1624 "PngSupport.c"
}
@@ -1646,7 +1650,7 @@ static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* ba
g_propagate_error (error, _inner_error_);
#line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return;
-#line 1650 "PngSupport.c"
+#line 1654 "PngSupport.c"
}
}
@@ -1655,8 +1659,8 @@ static void png_metadata_writer_class_init (PngMetadataWriterClass * klass) {
#line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
png_metadata_writer_parent_class = g_type_class_peek_parent (klass);
#line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileMetadataWriterClass *) klass)->write_metadata = png_metadata_writer_real_write_metadata;
-#line 1660 "PngSupport.c"
+ ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) png_metadata_writer_real_write_metadata;
+#line 1664 "PngSupport.c"
}
@@ -1686,14 +1690,14 @@ void png_file_format_driver_init (void) {
png_file_format_driver_instance = _tmp0_;
#line 145 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
png_file_format_properties_init ();
-#line 1690 "PngSupport.c"
+#line 1694 "PngSupport.c"
}
static gpointer _photo_file_format_driver_ref0 (gpointer self) {
#line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return self ? photo_file_format_driver_ref (self) : NULL;
-#line 1697 "PngSupport.c"
+#line 1701 "PngSupport.c"
}
@@ -1709,7 +1713,7 @@ PngFileFormatDriver* png_file_format_driver_get_instance (void) {
result = _tmp1_;
#line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1713 "PngSupport.c"
+#line 1717 "PngSupport.c"
}
@@ -1725,7 +1729,7 @@ static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (Ph
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties);
#line 153 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1729 "PngSupport.c"
+#line 1733 "PngSupport.c"
}
@@ -1746,7 +1750,7 @@ static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileForm
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader);
#line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1750 "PngSupport.c"
+#line 1754 "PngSupport.c"
}
@@ -1759,7 +1763,7 @@ static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriv
result = TRUE;
#line 161 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1763 "PngSupport.c"
+#line 1767 "PngSupport.c"
}
@@ -1772,7 +1776,7 @@ static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatD
result = TRUE;
#line 165 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1776 "PngSupport.c"
+#line 1780 "PngSupport.c"
}
@@ -1793,7 +1797,7 @@ static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileForm
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter);
#line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1797 "PngSupport.c"
+#line 1801 "PngSupport.c"
}
@@ -1814,7 +1818,7 @@ static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writ
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter);
#line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1818 "PngSupport.c"
+#line 1822 "PngSupport.c"
}
@@ -1838,7 +1842,7 @@ static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFo
result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer);
#line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1842 "PngSupport.c"
+#line 1846 "PngSupport.c"
}
@@ -1854,7 +1858,7 @@ static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileForm
result = _tmp0_;
#line 181 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return result;
-#line 1858 "PngSupport.c"
+#line 1862 "PngSupport.c"
}
@@ -1864,14 +1868,14 @@ PngFileFormatDriver* png_file_format_driver_construct (GType object_type) {
self = (PngFileFormatDriver*) photo_file_format_driver_construct (object_type);
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return self;
-#line 1868 "PngSupport.c"
+#line 1872 "PngSupport.c"
}
PngFileFormatDriver* png_file_format_driver_new (void) {
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
return png_file_format_driver_construct (TYPE_PNG_FILE_FORMAT_DRIVER);
-#line 1875 "PngSupport.c"
+#line 1879 "PngSupport.c"
}
@@ -1881,22 +1885,22 @@ static void png_file_format_driver_class_init (PngFileFormatDriverClass * klass)
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
((PhotoFileFormatDriverClass *) klass)->finalize = png_file_format_driver_finalize;
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->get_properties = png_file_format_driver_real_get_properties;
+ ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_get_properties;
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_reader = png_file_format_driver_real_create_reader;
+ ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_reader;
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_image = png_file_format_driver_real_can_write_image;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_can_write_image;
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = png_file_format_driver_real_can_write_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_can_write_metadata;
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_writer = png_file_format_driver_real_create_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_writer;
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = png_file_format_driver_real_create_metadata_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_metadata_writer;
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_sniffer = png_file_format_driver_real_create_sniffer;
+ ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) png_file_format_driver_real_create_sniffer;
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata = png_file_format_driver_real_create_metadata;
-#line 1900 "PngSupport.c"
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_create_metadata;
+#line 1904 "PngSupport.c"
}
@@ -1910,7 +1914,7 @@ static void png_file_format_driver_finalize (PhotoFileFormatDriver* obj) {
self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver);
#line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala"
PHOTO_FILE_FORMAT_DRIVER_CLASS (png_file_format_driver_parent_class)->finalize (obj);
-#line 1914 "PngSupport.c"
+#line 1918 "PngSupport.c"
}
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c
index 1b0d4b8..8e23487 100644
--- a/src/photos/RawSupport.c
+++ b/src/photos/RawSupport.c
@@ -1,4 +1,4 @@
-/* RawSupport.c generated by valac 0.34.4, the Vala compiler
+/* RawSupport.c generated by valac 0.34.7, the Vala compiler
* generated from RawSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -848,21 +848,21 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass)
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
((PhotoFileFormatDriverClass *) klass)->finalize = raw_file_format_driver_finalize;
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->get_properties = raw_file_format_driver_real_get_properties;
+ ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_get_properties;
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_reader = raw_file_format_driver_real_create_reader;
+ ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_reader;
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata = raw_file_format_driver_real_create_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_create_metadata;
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_image = raw_file_format_driver_real_can_write_image;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_image;
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = raw_file_format_driver_real_can_write_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_metadata;
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_writer = raw_file_format_driver_real_create_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_writer;
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = raw_file_format_driver_real_create_metadata_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_metadata_writer;
#line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_sniffer = raw_file_format_driver_real_create_sniffer;
+ ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer;
#line 867 "RawSupport.c"
}
@@ -1242,19 +1242,19 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
((PhotoFileFormatPropertiesClass *) klass)->finalize = raw_file_format_properties_finalize;
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = raw_file_format_properties_real_get_file_format;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_file_format;
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = raw_file_format_properties_real_get_user_visible_name;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_user_visible_name;
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_flags = raw_file_format_properties_real_get_flags;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_flags;
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = raw_file_format_properties_real_get_default_extension;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_extension;
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = raw_file_format_properties_real_get_known_extensions;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_known_extensions;
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = raw_file_format_properties_real_get_default_mime_type;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_mime_type;
#line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = raw_file_format_properties_real_get_mime_types;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_mime_types;
#line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
_tmp0_ = g_strdup ("3fr");
#line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
@@ -2206,7 +2206,7 @@ static void raw_sniffer_class_init (RawSnifferClass * klass) {
#line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
raw_sniffer_parent_class = g_type_class_peek_parent (klass);
#line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileSnifferClass *) klass)->sniff = raw_sniffer_real_sniff;
+ ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) raw_sniffer_real_sniff;
#line 2211 "RawSupport.c"
}
@@ -2696,11 +2696,11 @@ static void raw_reader_class_init (RawReaderClass * klass) {
#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
raw_reader_parent_class = g_type_class_peek_parent (klass);
#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileReaderClass *) klass)->read_metadata = raw_reader_real_read_metadata;
+ ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) raw_reader_real_read_metadata;
#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileReaderClass *) klass)->unscaled_read = raw_reader_real_unscaled_read;
+ ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) raw_reader_real_unscaled_read;
#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala"
- ((PhotoFileReaderClass *) klass)->scaled_read = raw_reader_real_scaled_read;
+ ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read;
#line 2705 "RawSupport.c"
}
diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c
index 1b70973..1fcbfa7 100644
--- a/src/photos/TiffSupport.c
+++ b/src/photos/TiffSupport.c
@@ -1,4 +1,4 @@
-/* TiffSupport.c generated by valac 0.34.4, the Vala compiler
+/* TiffSupport.c generated by valac 0.34.7, the Vala compiler
* generated from TiffSupport.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -811,21 +811,21 @@ static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDrive
#line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
((PhotoFileFormatDriverClass *) klass)->finalize = photos_tiff_file_format_driver_finalize;
#line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->get_properties = photos_tiff_file_format_driver_real_get_properties;
+ ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_get_properties;
#line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_reader = photos_tiff_file_format_driver_real_create_reader;
+ ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_reader;
#line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata = photos_tiff_file_format_driver_real_create_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_create_metadata;
#line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_image = photos_tiff_file_format_driver_real_can_write_image;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_image;
#line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = photos_tiff_file_format_driver_real_can_write_metadata;
+ ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_metadata;
#line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_writer = photos_tiff_file_format_driver_real_create_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_writer;
#line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = photos_tiff_file_format_driver_real_create_metadata_writer;
+ ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer;
#line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatDriverClass *) klass)->create_sniffer = photos_tiff_file_format_driver_real_create_sniffer;
+ ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer;
#line 830 "TiffSupport.c"
}
@@ -1121,19 +1121,19 @@ static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatP
#line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
((PhotoFileFormatPropertiesClass *) klass)->finalize = photos_tiff_file_format_properties_finalize;
#line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = photos_tiff_file_format_properties_real_get_file_format;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_file_format;
#line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_flags = photos_tiff_file_format_properties_real_get_flags;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_flags;
#line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = photos_tiff_file_format_properties_real_get_default_extension;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_extension;
#line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = photos_tiff_file_format_properties_real_get_user_visible_name;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_user_visible_name;
#line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = photos_tiff_file_format_properties_real_get_known_extensions;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_known_extensions;
#line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = photos_tiff_file_format_properties_real_get_default_mime_type;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_mime_type;
#line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = photos_tiff_file_format_properties_real_get_mime_types;
+ ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_mime_types;
#line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
_tmp0_ = g_strdup ("tif");
#line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1340,7 +1340,7 @@ static void photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) {
#line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
photos_tiff_sniffer_parent_class = g_type_class_peek_parent (klass);
#line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileSnifferClass *) klass)->sniff = photos_tiff_sniffer_real_sniff;
+ ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_tiff_sniffer_real_sniff;
#line 1345 "TiffSupport.c"
}
@@ -1463,7 +1463,7 @@ static void photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) {
#line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
photos_tiff_writer_parent_class = g_type_class_peek_parent (klass);
#line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileWriterClass *) klass)->write = photos_tiff_writer_real_write;
+ ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write;
#line 1468 "TiffSupport.c"
}
@@ -1541,7 +1541,7 @@ static void photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClas
#line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
photos_tiff_metadata_writer_parent_class = g_type_class_peek_parent (klass);
#line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- ((PhotoFileMetadataWriterClass *) klass)->write_metadata = photos_tiff_metadata_writer_real_write_metadata;
+ ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata;
#line 1546 "TiffSupport.c"
}
@@ -1568,19 +1568,19 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
GFile* _tmp1_ = NULL;
GFileInputStream* _tmp2_ = NULL;
GDataInputStream* dins = NULL;
- GDataInputStream* _tmp3_ = NULL;
+ GDataInputStream* _tmp4_ = NULL;
GDataStreamByteOrder order = 0;
- guint16 _tmp4_ = 0U;
- GDataInputStream* _tmp5_ = NULL;
- GCancellable* _tmp6_ = NULL;
- guint16 _tmp7_ = 0U;
- GDataInputStream* _tmp8_ = NULL;
- GDataStreamByteOrder _tmp9_ = 0;
- guint16 lue = 0U;
+ guint16 _tmp5_ = 0U;
+ GDataInputStream* _tmp6_ = NULL;
+ GCancellable* _tmp7_ = NULL;
+ guint16 _tmp8_ = 0U;
GDataInputStream* _tmp10_ = NULL;
- GCancellable* _tmp11_ = NULL;
- guint16 _tmp12_ = 0U;
- guint16 _tmp13_ = 0U;
+ GDataStreamByteOrder _tmp11_ = 0;
+ guint16 lue = 0U;
+ GDataInputStream* _tmp12_ = NULL;
+ GCancellable* _tmp13_ = NULL;
+ guint16 _tmp14_ = 0U;
+ guint16 _tmp16_ = 0U;
GError * _inner_error_ = NULL;
#line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
g_return_val_if_fail (G_IS_FILE (file), FALSE);
@@ -1594,26 +1594,30 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
_tmp0_ = _tmp2_;
#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1598 "TiffSupport.c"
+ gboolean _tmp3_ = FALSE;
#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
g_propagate_error (error, _inner_error_);
#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- return FALSE;
-#line 1602 "TiffSupport.c"
+ return _tmp3_;
+#line 1604 "TiffSupport.c"
}
#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
+ _tmp4_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream));
#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- dins = _tmp3_;
+ dins = _tmp4_;
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp5_ = dins;
+ _tmp6_ = dins;
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp6_ = cancellable;
+ _tmp7_ = cancellable;
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp7_ = g_data_input_stream_read_uint16 (_tmp5_, _tmp6_, &_inner_error_);
+ _tmp8_ = g_data_input_stream_read_uint16 (_tmp6_, _tmp7_, &_inner_error_);
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp4_ = _tmp7_;
+ _tmp5_ = _tmp8_;
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1620 "TiffSupport.c"
+ gboolean _tmp9_ = FALSE;
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
g_propagate_error (error, _inner_error_);
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1621,30 +1625,30 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
_g_object_unref0 (_tmp0_);
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- return FALSE;
-#line 1626 "TiffSupport.c"
+ return _tmp9_;
+#line 1630 "TiffSupport.c"
}
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- switch (_tmp4_) {
+ switch (_tmp5_) {
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
case 0x4949:
-#line 1632 "TiffSupport.c"
+#line 1636 "TiffSupport.c"
{
#line 161 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
order = G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN;
#line 162 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
break;
-#line 1638 "TiffSupport.c"
+#line 1642 "TiffSupport.c"
}
#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
case 0x4D4D:
-#line 1642 "TiffSupport.c"
+#line 1646 "TiffSupport.c"
{
#line 165 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
order = G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN;
#line 166 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
break;
-#line 1648 "TiffSupport.c"
+#line 1652 "TiffSupport.c"
}
default:
{
@@ -1656,25 +1660,27 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
_g_object_unref0 (_tmp0_);
#line 169 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
return result;
-#line 1660 "TiffSupport.c"
+#line 1664 "TiffSupport.c"
}
}
#line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp8_ = dins;
+ _tmp10_ = dins;
#line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp9_ = order;
+ _tmp11_ = order;
#line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- g_data_input_stream_set_byte_order (_tmp8_, _tmp9_);
+ g_data_input_stream_set_byte_order (_tmp10_, _tmp11_);
#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp10_ = dins;
+ _tmp12_ = dins;
#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp11_ = cancellable;
+ _tmp13_ = cancellable;
#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp12_ = g_data_input_stream_read_uint16 (_tmp10_, _tmp11_, &_inner_error_);
+ _tmp14_ = g_data_input_stream_read_uint16 (_tmp12_, _tmp13_, &_inner_error_);
#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- lue = _tmp12_;
+ lue = _tmp14_;
#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
+#line 1683 "TiffSupport.c"
+ gboolean _tmp15_ = FALSE;
#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
g_propagate_error (error, _inner_error_);
#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1682,13 +1688,13 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
_g_object_unref0 (_tmp0_);
#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- return FALSE;
-#line 1687 "TiffSupport.c"
+ return _tmp15_;
+#line 1693 "TiffSupport.c"
}
#line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- _tmp13_ = lue;
+ _tmp16_ = lue;
#line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
- if (((gint) _tmp13_) != 42) {
+ if (((gint) _tmp16_) != 42) {
#line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
result = FALSE;
#line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
@@ -1697,7 +1703,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
_g_object_unref0 (_tmp0_);
#line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
return result;
-#line 1701 "TiffSupport.c"
+#line 1707 "TiffSupport.c"
}
#line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
result = TRUE;
@@ -1707,7 +1713,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error)
_g_object_unref0 (_tmp0_);
#line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala"
return result;
-#line 1711 "TiffSupport.c"
+#line 1717 "TiffSupport.c"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 22:16:13 +0000