From 9e7cd144725a270e0460b21747619f447ca87684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Fri, 14 Apr 2017 18:51:46 +0200 Subject: New upstream version 0.26.1 --- src/photos/BmpSupport.c | 230 ++++++++++++++++++++++++------------------------ 1 file changed, 117 insertions(+), 113 deletions(-) (limited to 'src/photos/BmpSupport.c') 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" } -- cgit v1.2.3