From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/photos/BmpSupport.c | 437 ++++++++++++++++++++++++------------------------ 1 file changed, 217 insertions(+), 220 deletions(-) (limited to 'src/photos/BmpSupport.c') diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c index 2425607..eeffbb9 100644 --- a/src/photos/BmpSupport.c +++ b/src/photos/BmpSupport.c @@ -1,4 +1,4 @@ -/* BmpSupport.c generated by valac 0.34.7, the Vala compiler +/* BmpSupport.c generated by valac 0.36.6, the Vala compiler * generated from BmpSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -507,7 +507,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); static gchar** _vala_array_dup11 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); -static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties* obj); +static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -610,12 +610,12 @@ static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoF PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); -static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver* obj); +static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj); static const guint8 PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[2] = {(guint8) 0x42, (guint8) 0x4D}; void photos_bmp_file_format_properties_init (void) { - PhotosBmpFileFormatProperties* _tmp0_ = NULL; + PhotosBmpFileFormatProperties* _tmp0_; #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = photos_bmp_file_format_properties_new (); #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -635,8 +635,8 @@ static gpointer _photo_file_format_properties_ref0 (gpointer self) { PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_get_instance (void) { PhotosBmpFileFormatProperties* result = NULL; - PhotosBmpFileFormatProperties* _tmp0_ = NULL; - PhotosBmpFileFormatProperties* _tmp1_ = NULL; + PhotosBmpFileFormatProperties* _tmp0_; + PhotosBmpFileFormatProperties* _tmp1_; #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = photos_bmp_file_format_properties_instance; #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -678,29 +678,26 @@ static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (Ph static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { PhotosBmpFileFormatProperties * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 31 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties); #line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = _ ("BMP"); + _tmp0_ = g_strdup (_ ("BMP")); #line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 694 "BmpSupport.c" +#line 691 "BmpSupport.c" } static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { PhotosBmpFileFormatProperties * self; gchar* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gchar** _tmp0_; + gint _tmp0__length1; + const gchar* _tmp1_; + gchar* _tmp2_; #line 35 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties); #line 36 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -715,7 +712,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_extension (Phot result = _tmp2_; #line 36 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 719 "BmpSupport.c" +#line 716 "BmpSupport.c" } @@ -726,29 +723,29 @@ static gchar** _vala_array_dup10 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" for (i = 0; i < length; i++) { -#line 730 "BmpSupport.c" - gchar* _tmp0_ = NULL; +#line 727 "BmpSupport.c" + gchar* _tmp0_; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = g_strdup (self[i]); #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result[i] = _tmp0_; -#line 736 "BmpSupport.c" +#line 733 "BmpSupport.c" } #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 740 "BmpSupport.c" +#line 737 "BmpSupport.c" } static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { PhotosBmpFileFormatProperties * self; gchar** result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; + gchar** _tmp2_; + gint _tmp2__length1; #line 39 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties); #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -767,23 +764,23 @@ static gchar** photos_bmp_file_format_properties_real_get_known_extensions (Phot if (result_length1) { #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *result_length1 = _tmp2__length1; -#line 771 "BmpSupport.c" +#line 768 "BmpSupport.c" } #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = _tmp2_; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 777 "BmpSupport.c" +#line 774 "BmpSupport.c" } static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { PhotosBmpFileFormatProperties * self; gchar* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gchar** _tmp0_; + gint _tmp0__length1; + const gchar* _tmp1_; + gchar* _tmp2_; #line 43 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties); #line 44 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -798,7 +795,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot result = _tmp2_; #line 44 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 802 "BmpSupport.c" +#line 799 "BmpSupport.c" } @@ -809,29 +806,29 @@ static gchar** _vala_array_dup11 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" for (i = 0; i < length; i++) { -#line 813 "BmpSupport.c" - gchar* _tmp0_ = NULL; +#line 810 "BmpSupport.c" + gchar* _tmp0_; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = g_strdup (self[i]); #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result[i] = _tmp0_; -#line 819 "BmpSupport.c" +#line 816 "BmpSupport.c" } #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 823 "BmpSupport.c" +#line 820 "BmpSupport.c" } static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { PhotosBmpFileFormatProperties * self; gchar** result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; + gchar** _tmp2_; + gint _tmp2__length1; #line 47 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties); #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -850,13 +847,13 @@ static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileF if (result_length1) { #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *result_length1 = _tmp2__length1; -#line 854 "BmpSupport.c" +#line 851 "BmpSupport.c" } #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = _tmp2_; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 860 "BmpSupport.c" +#line 857 "BmpSupport.c" } @@ -866,41 +863,41 @@ PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_construct (GTyp self = (PhotosBmpFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 870 "BmpSupport.c" +#line 867 "BmpSupport.c" } PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_new (void) { #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_file_format_properties_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES); -#line 877 "BmpSupport.c" +#line 874 "BmpSupport.c" } static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPropertiesClass * klass) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar** _tmp2_; + gchar* _tmp3_; + gchar** _tmp4_; #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_properties_parent_class = g_type_class_peek_parent (klass); #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 = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) 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 = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) 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 = (gchar* (*)(PhotoFileFormatProperties*)) 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 = (gchar* (*)(PhotoFileFormatProperties*)) 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 = (gchar** (*)(PhotoFileFormatProperties*, int*)) 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 = (gchar* (*)(PhotoFileFormatProperties*)) 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 = (gchar** (*)(PhotoFileFormatProperties*, int*)) 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" @@ -925,7 +922,7 @@ static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPro photos_bmp_file_format_properties_KNOWN_MIME_TYPES = _tmp4_; #line 11 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 929 "BmpSupport.c" +#line 926 "BmpSupport.c" } @@ -933,13 +930,13 @@ static void photos_bmp_file_format_properties_instance_init (PhotosBmpFileFormat } -static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties* obj) { +static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj) { PhotosBmpFileFormatProperties * self; #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties); #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_bmp_file_format_properties_parent_class)->finalize (obj); -#line 943 "BmpSupport.c" +#line 940 "BmpSupport.c" } @@ -957,8 +954,8 @@ GType photos_bmp_file_format_properties_get_type (void) { PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { PhotosBmpSniffer* self = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -969,29 +966,29 @@ PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file, self = (PhotosBmpSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 973 "BmpSupport.c" +#line 970 "BmpSupport.c" } PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_sniffer_construct (PHOTOS_TYPE_BMP_SNIFFER, file, options); -#line 980 "BmpSupport.c" +#line 977 "BmpSupport.c" } static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { gboolean result = FALSE; GFileInputStream* instream = NULL; - GFile* _tmp0_ = NULL; - GFileInputStream* _tmp1_ = NULL; + GFile* _tmp0_; + GFileInputStream* _tmp1_; guint8* file_lead_sequence = NULL; - guint8* _tmp3_ = NULL; - gint file_lead_sequence_length1 = 0; - gint _file_lead_sequence_size_ = 0; - GFileInputStream* _tmp4_ = NULL; - guint8* _tmp5_ = NULL; - gint _tmp5__length1 = 0; + guint8* _tmp3_; + gint file_lead_sequence_length1; + gint _file_lead_sequence_size_; + GFileInputStream* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; 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,13 +1000,13 @@ 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" +#line 1004 "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 _tmp2_; -#line 1013 "BmpSupport.c" +#line 1010 "BmpSupport.c" } #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE)); @@ -1029,7 +1026,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** 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" +#line 1030 "BmpSupport.c" gboolean _tmp6_ = FALSE; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); @@ -1039,36 +1036,36 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return _tmp6_; -#line 1043 "BmpSupport.c" +#line 1040 "BmpSupport.c" } { gint i = 0; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" i = 0; -#line 1049 "BmpSupport.c" +#line 1046 "BmpSupport.c" { gboolean _tmp7_ = FALSE; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp7_ = TRUE; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" while (TRUE) { -#line 1056 "BmpSupport.c" - gint _tmp9_ = 0; - guint8* _tmp10_ = NULL; - gint _tmp10__length1 = 0; - gint _tmp11_ = 0; - guint8 _tmp12_ = 0U; - gint _tmp13_ = 0; - guint8 _tmp14_ = 0U; +#line 1053 "BmpSupport.c" + gint _tmp9_; + guint8* _tmp10_; + gint _tmp10__length1; + gint _tmp11_; + guint8 _tmp12_; + gint _tmp13_; + guint8 _tmp14_; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (!_tmp7_) { -#line 1066 "BmpSupport.c" - gint _tmp8_ = 0; +#line 1063 "BmpSupport.c" + gint _tmp8_; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp8_ = i; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" i = _tmp8_ + 1; -#line 1072 "BmpSupport.c" +#line 1069 "BmpSupport.c" } #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp7_ = FALSE; @@ -1078,7 +1075,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { if (!(_tmp9_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) { #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" break; -#line 1082 "BmpSupport.c" +#line 1079 "BmpSupport.c" } #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp10_ = file_lead_sequence; @@ -1102,7 +1099,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 1106 "BmpSupport.c" +#line 1103 "BmpSupport.c" } } } @@ -1115,14 +1112,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 1119 "BmpSupport.c" +#line 1116 "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 1126 "BmpSupport.c" +#line 1123 "BmpSupport.c" } @@ -1131,16 +1128,16 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; gboolean _tmp0_ = FALSE; - GFile* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GFile* _tmp1_; + gboolean _tmp2_; DetectedPhotoInformation* detected = NULL; gboolean _tmp3_ = FALSE; - DetectedPhotoInformation* _tmp4_ = NULL; - DetectedPhotoInformation* _tmp5_ = NULL; + DetectedPhotoInformation* _tmp4_; + DetectedPhotoInformation* _tmp5_; DetectedPhotoInformation* _tmp6_ = NULL; - DetectedPhotoInformation* _tmp7_ = NULL; - PhotoFileFormat _tmp8_ = 0; - DetectedPhotoInformation* _tmp10_ = NULL; + DetectedPhotoInformation* _tmp7_; + PhotoFileFormat _tmp8_; + DetectedPhotoInformation* _tmp10_; GError * _inner_error_ = NULL; #line 74 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_SNIFFER, PhotosBmpSniffer); @@ -1158,7 +1155,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 1162 "BmpSupport.c" +#line 1159 "BmpSupport.c" } #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (!_tmp0_) { @@ -1168,11 +1165,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 1172 "BmpSupport.c" +#line 1169 "BmpSupport.c" } #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1176 "BmpSupport.c" +#line 1173 "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_); @@ -1186,7 +1183,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 1190 "BmpSupport.c" +#line 1187 "BmpSupport.c" } #line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp5_ = detected; @@ -1200,11 +1197,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 1204 "BmpSupport.c" +#line 1201 "BmpSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1208 "BmpSupport.c" +#line 1205 "BmpSupport.c" } #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp7_ = detected; @@ -1212,17 +1209,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 1216 "BmpSupport.c" - DetectedPhotoInformation* _tmp9_ = NULL; +#line 1213 "BmpSupport.c" + DetectedPhotoInformation* _tmp9_; #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 1222 "BmpSupport.c" +#line 1219 "BmpSupport.c" } else { #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp6_ = NULL; -#line 1226 "BmpSupport.c" +#line 1223 "BmpSupport.c" } #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp10_ = _detected_photo_information_ref0 (_tmp6_); @@ -1234,11 +1231,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 1238 "BmpSupport.c" +#line 1235 "BmpSupport.c" } #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1242 "BmpSupport.c" +#line 1239 "BmpSupport.c" } @@ -1246,8 +1243,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 = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_bmp_sniffer_real_sniff; -#line 1251 "BmpSupport.c" + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_bmp_sniffer_real_sniff; +#line 1248 "BmpSupport.c" } @@ -1269,7 +1266,7 @@ GType photos_bmp_sniffer_get_type (void) { PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* filepath) { PhotosBmpReader* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 91 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1278,14 +1275,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 1282 "BmpSupport.c" +#line 1279 "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 1289 "BmpSupport.c" +#line 1286 "BmpSupport.c" } @@ -1295,8 +1292,8 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim GdkPixbuf* _result_ = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - Dimensions _tmp2_ = {0}; - gint _tmp3_ = 0; + Dimensions _tmp2_; + gint _tmp3_; GError * _inner_error_ = NULL; #line 94 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_READER, PhotosBmpReader); @@ -1314,24 +1311,24 @@ 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 1318 "BmpSupport.c" +#line 1315 "BmpSupport.c" } else { - Dimensions _tmp4_ = {0}; - gint _tmp5_ = 0; + Dimensions _tmp4_; + gint _tmp5_; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp4_ = *full; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp5_ = _tmp4_.height; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1_ = _tmp5_ > 9999; -#line 1328 "BmpSupport.c" +#line 1325 "BmpSupport.c" } #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (_tmp1_) { -#line 1332 "BmpSupport.c" +#line 1329 "BmpSupport.c" gboolean _tmp6_ = FALSE; - Dimensions _tmp7_ = {0}; - gint _tmp8_ = 0; + Dimensions _tmp7_; + gint _tmp8_; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp7_ = *scaled; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1340,47 +1337,47 @@ 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 1344 "BmpSupport.c" +#line 1341 "BmpSupport.c" } else { - Dimensions _tmp9_ = {0}; - gint _tmp10_ = 0; + Dimensions _tmp9_; + gint _tmp10_; #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp9_ = *scaled; #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp10_ = _tmp9_.height; #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp6_ = _tmp10_ < 100; -#line 1354 "BmpSupport.c" +#line 1351 "BmpSupport.c" } #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = _tmp6_; -#line 1358 "BmpSupport.c" +#line 1355 "BmpSupport.c" } else { #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = FALSE; -#line 1362 "BmpSupport.c" +#line 1359 "BmpSupport.c" } #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (_tmp0_) { -#line 1366 "BmpSupport.c" +#line 1363 "BmpSupport.c" Dimensions prefetch_dimensions = {0}; Dimensions _tmp11_ = {0}; GdkPixbuf* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - Dimensions _tmp15_ = {0}; - gint _tmp16_ = 0; - Dimensions _tmp17_ = {0}; - gint _tmp18_ = 0; - GdkPixbuf* _tmp19_ = NULL; - GdkPixbuf* _tmp20_ = NULL; - GdkPixbuf* _tmp21_ = NULL; - GdkPixbuf* _tmp22_ = NULL; - Dimensions _tmp23_ = {0}; - gint _tmp24_ = 0; - Dimensions _tmp25_ = {0}; - gint _tmp26_ = 0; - GdkPixbuf* _tmp27_ = NULL; + gchar* _tmp13_; + gchar* _tmp14_; + Dimensions _tmp15_; + gint _tmp16_; + Dimensions _tmp17_; + gint _tmp18_; + GdkPixbuf* _tmp19_; + GdkPixbuf* _tmp20_; + GdkPixbuf* _tmp21_; + GdkPixbuf* _tmp22_; + Dimensions _tmp23_; + gint _tmp24_; + Dimensions _tmp25_; + gint _tmp26_; + GdkPixbuf* _tmp27_; #line 106 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" dimensions_get_scaled_by_constraint (full, 1000, SCALE_CONSTRAINT_DIMENSIONS, &_tmp11_); #line 106 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1413,7 +1410,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 1417 "BmpSupport.c" +#line 1414 "BmpSupport.c" } #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp21_ = _tmp12_; @@ -1441,18 +1438,18 @@ 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 1445 "BmpSupport.c" +#line 1442 "BmpSupport.c" } else { GdkPixbuf* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - Dimensions _tmp31_ = {0}; - gint _tmp32_ = 0; - Dimensions _tmp33_ = {0}; - gint _tmp34_ = 0; - GdkPixbuf* _tmp35_ = NULL; - GdkPixbuf* _tmp36_ = NULL; - GdkPixbuf* _tmp37_ = NULL; + gchar* _tmp29_; + gchar* _tmp30_; + Dimensions _tmp31_; + gint _tmp32_; + Dimensions _tmp33_; + gint _tmp34_; + GdkPixbuf* _tmp35_; + GdkPixbuf* _tmp36_; + GdkPixbuf* _tmp37_; #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp29_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1481,7 +1478,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 1485 "BmpSupport.c" +#line 1482 "BmpSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp37_ = _tmp28_; @@ -1493,13 +1490,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 1497 "BmpSupport.c" +#line 1494 "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 1503 "BmpSupport.c" +#line 1500 "BmpSupport.c" } @@ -1507,8 +1504,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 = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) photos_bmp_reader_real_scaled_read; -#line 1512 "BmpSupport.c" + ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photos_bmp_reader_real_scaled_read; +#line 1509 "BmpSupport.c" } @@ -1530,7 +1527,7 @@ GType photos_bmp_reader_get_type (void) { PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* filepath) { PhotosBmpWriter* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 124 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1539,22 +1536,22 @@ 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 1543 "BmpSupport.c" +#line 1540 "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 1550 "BmpSupport.c" +#line 1547 "BmpSupport.c" } static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { PhotosBmpWriter * self; - GdkPixbuf* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GdkPixbuf* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; GError * _inner_error_ = NULL; #line 127 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_WRITER, PhotosBmpWriter); @@ -1576,7 +1573,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 1580 "BmpSupport.c" +#line 1577 "BmpSupport.c" } } @@ -1585,8 +1582,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 = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_bmp_writer_real_write; -#line 1590 "BmpSupport.c" + ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_bmp_writer_real_write; +#line 1587 "BmpSupport.c" } @@ -1608,7 +1605,7 @@ GType photos_bmp_writer_get_type (void) { PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, const gchar* filepath) { PhotosBmpMetadataWriter* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 134 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1617,14 +1614,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 1621 "BmpSupport.c" +#line 1618 "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 1628 "BmpSupport.c" +#line 1625 "BmpSupport.c" } @@ -1634,7 +1631,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 1638 "BmpSupport.c" +#line 1635 "BmpSupport.c" } @@ -1642,8 +1639,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 = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_bmp_metadata_writer_real_write_metadata; -#line 1647 "BmpSupport.c" + ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_bmp_metadata_writer_real_write_metadata; +#line 1644 "BmpSupport.c" } @@ -1664,7 +1661,7 @@ GType photos_bmp_metadata_writer_get_type (void) { void photos_bmp_file_format_driver_init (void) { - PhotosBmpFileFormatDriver* _tmp0_ = NULL; + PhotosBmpFileFormatDriver* _tmp0_; #line 146 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = photos_bmp_file_format_driver_new (); #line 146 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1673,21 +1670,21 @@ 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 1677 "BmpSupport.c" +#line 1674 "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 1684 "BmpSupport.c" +#line 1681 "BmpSupport.c" } PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) { PhotosBmpFileFormatDriver* result = NULL; - PhotosBmpFileFormatDriver* _tmp0_ = NULL; - PhotosBmpFileFormatDriver* _tmp1_ = NULL; + PhotosBmpFileFormatDriver* _tmp0_; + PhotosBmpFileFormatDriver* _tmp1_; #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = photos_bmp_file_format_driver_instance; #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1696,14 +1693,14 @@ PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) { result = _tmp1_; #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1700 "BmpSupport.c" +#line 1697 "BmpSupport.c" } static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { PhotosBmpFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; - PhotosBmpFileFormatProperties* _tmp0_ = NULL; + PhotosBmpFileFormatProperties* _tmp0_; #line 154 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 155 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1712,15 +1709,15 @@ 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 1716 "BmpSupport.c" +#line 1713 "BmpSupport.c" } static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { PhotosBmpFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_ = NULL; - PhotosBmpReader* _tmp1_ = NULL; + const gchar* _tmp0_; + PhotosBmpReader* _tmp1_; #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1733,7 +1730,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 1737 "BmpSupport.c" +#line 1734 "BmpSupport.c" } @@ -1746,7 +1743,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 1750 "BmpSupport.c" +#line 1747 "BmpSupport.c" } @@ -1759,15 +1756,15 @@ 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 1763 "BmpSupport.c" +#line 1760 "BmpSupport.c" } static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { PhotosBmpFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_ = NULL; - PhotosBmpWriter* _tmp1_ = NULL; + const gchar* _tmp0_; + PhotosBmpWriter* _tmp1_; #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1780,15 +1777,15 @@ 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 1784 "BmpSupport.c" +#line 1781 "BmpSupport.c" } static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { PhotosBmpFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_ = NULL; - PhotosBmpMetadataWriter* _tmp1_ = NULL; + const gchar* _tmp0_; + PhotosBmpMetadataWriter* _tmp1_; #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1801,16 +1798,16 @@ 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 1805 "BmpSupport.c" +#line 1802 "BmpSupport.c" } static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { PhotosBmpFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; - PhotosBmpSniffer* _tmp2_ = NULL; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; + PhotosBmpSniffer* _tmp2_; #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1825,14 +1822,14 @@ 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 1829 "BmpSupport.c" +#line 1826 "BmpSupport.c" } static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { PhotosBmpFileFormatDriver * self; PhotoMetadata* result = NULL; - PhotoMetadata* _tmp0_ = NULL; + PhotoMetadata* _tmp0_; #line 182 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 183 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1841,7 +1838,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 1845 "BmpSupport.c" +#line 1842 "BmpSupport.c" } @@ -1851,14 +1848,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 1855 "BmpSupport.c" +#line 1852 "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 1862 "BmpSupport.c" +#line 1859 "BmpSupport.c" } @@ -1868,22 +1865,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 = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) 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 = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) 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 = (gboolean (*)(PhotoFileFormatDriver*)) 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 = (gboolean (*)(PhotoFileFormatDriver*)) 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 = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) 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 = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) 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 = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) 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 = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photos_bmp_file_format_driver_real_create_metadata; -#line 1887 "BmpSupport.c" + ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photos_bmp_file_format_driver_real_create_metadata; +#line 1884 "BmpSupport.c" } @@ -1891,13 +1888,13 @@ static void photos_bmp_file_format_driver_instance_init (PhotosBmpFileFormatDriv } -static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver* obj) { +static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj) { PhotosBmpFileFormatDriver * self; #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" 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 1901 "BmpSupport.c" +#line 1898 "BmpSupport.c" } -- cgit v1.2.3