New upstream version 0.26.1upstream/0.26.1

1 files changed, 104 insertions, 94 deletions

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"
 }