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 +++---- src/photos/GRaw.c | 406 +++--- src/photos/GdkSupport.c | 284 ++-- src/photos/JfifSupport.c | 437 +++---- src/photos/PhotoFileAdapter.c | 128 +- src/photos/PhotoFileFormat.c | 534 ++++---- src/photos/PhotoFileSniffer.c | 108 +- src/photos/PhotoMetadata.c | 2898 +++++++++++++++++++++-------------------- src/photos/Photos.c | 8 +- src/photos/PngSupport.c | 441 ++++--- src/photos/RawSupport.c | 1110 ++++++++-------- src/photos/RawSupport.vala | 4 +- src/photos/TiffSupport.c | 309 +++-- 13 files changed, 3559 insertions(+), 3545 deletions(-) (limited to 'src/photos') 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" } diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c index 27a2ffb..6ea3ba4 100644 --- a/src/photos/GRaw.c +++ b/src/photos/GRaw.c @@ -1,4 +1,4 @@ -/* GRaw.c generated by valac 0.34.7, the Vala compiler +/* GRaw.c generated by valac 0.36.6, the Vala compiler * generated from GRaw.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -200,7 +200,7 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self); gushort graw_processed_image_get_bits (GRawProcessedImage* self); guint8* graw_processed_image_get_data (GRawProcessedImage* self); guint graw_processed_image_get_data_size (GRawProcessedImage* self); -static void graw_processed_image_finalize (GRawProcessedImage* obj); +static void graw_processed_image_finalize (GRawProcessedImage * obj); gpointer graw_processor_ref (gpointer instance); void graw_processor_unref (gpointer instance); GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -231,7 +231,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error); void graw_processor_unpack_thumb (GRawProcessor* self, GError** error); void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size); libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self); -static void graw_processor_finalize (GRawProcessor* obj); +static void graw_processor_finalize (GRawProcessor * obj); GType graw_colorspace_get_type (void) { @@ -314,24 +314,24 @@ GType graw_use_camera_matrix_get_type (void) { GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error) { GRawProcessedImage* self = NULL; enum LibRaw_errors _result_ = 0; - libraw_data_t* _tmp0_ = NULL; - libraw_processed_image_t* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; - libraw_processed_image_t* _tmp3_ = NULL; - libraw_processed_image_t* _tmp4_ = NULL; - guint8* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - libraw_processed_image_t* _tmp6_ = NULL; - gushort _tmp7_ = 0U; - libraw_processed_image_t* _tmp8_ = NULL; - gushort _tmp9_ = 0U; - libraw_processed_image_t* _tmp10_ = NULL; - gushort _tmp11_ = 0U; - libraw_processed_image_t* _tmp12_ = NULL; - gushort _tmp13_ = 0U; - libraw_processed_image_t* _tmp14_ = NULL; - gushort _tmp15_ = 0U; - GdkPixbuf* _tmp16_ = NULL; + libraw_data_t* _tmp0_; + libraw_processed_image_t* _tmp1_; + enum LibRaw_errors _tmp2_; + libraw_processed_image_t* _tmp3_; + libraw_processed_image_t* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + libraw_processed_image_t* _tmp6_; + gushort _tmp7_; + libraw_processed_image_t* _tmp8_; + gushort _tmp9_; + libraw_processed_image_t* _tmp10_; + gushort _tmp11_; + libraw_processed_image_t* _tmp12_; + gushort _tmp13_; + libraw_processed_image_t* _tmp14_; + gushort _tmp15_; + GdkPixbuf* _tmp16_; GError * _inner_error_ = NULL; #line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (proc != NULL, NULL); @@ -424,26 +424,26 @@ GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** erro GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type, libraw_data_t* proc, GError** error) { GRawProcessedImage* self = NULL; enum LibRaw_errors _result_ = 0; - libraw_data_t* _tmp0_ = NULL; - libraw_processed_image_t* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; - libraw_processed_image_t* _tmp3_ = NULL; - libraw_processed_image_t* _tmp17_ = NULL; - GdkPixbuf* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; - libraw_processed_image_t* _tmp21_ = NULL; - GdkPixbuf* _tmp22_ = NULL; - gint _tmp23_ = 0; - gint _tmp24_ = 0; - libraw_processed_image_t* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - gint _tmp27_ = 0; - gint _tmp28_ = 0; - libraw_processed_image_t* _tmp29_ = NULL; - GdkPixbuf* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; + libraw_data_t* _tmp0_; + libraw_processed_image_t* _tmp1_; + enum LibRaw_errors _tmp2_; + libraw_processed_image_t* _tmp3_; + libraw_processed_image_t* _tmp17_; + GdkPixbuf* _tmp18_; + gint _tmp19_; + gint _tmp20_; + libraw_processed_image_t* _tmp21_; + GdkPixbuf* _tmp22_; + gint _tmp23_; + gint _tmp24_; + libraw_processed_image_t* _tmp25_; + GdkPixbuf* _tmp26_; + gint _tmp27_; + gint _tmp28_; + libraw_processed_image_t* _tmp29_; + GdkPixbuf* _tmp30_; + gint _tmp31_; + gint _tmp32_; GError * _inner_error_ = NULL; #line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (proc != NULL, NULL); @@ -491,17 +491,17 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 492 "GRaw.c" { GBytes* bytes = NULL; - libraw_processed_image_t* _tmp4_ = NULL; - guint8* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - GBytes* _tmp6_ = NULL; + libraw_processed_image_t* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + GBytes* _tmp6_; GdkPixbuf* _tmp7_ = NULL; - GBytes* _tmp8_ = NULL; - GMemoryInputStream* _tmp9_ = NULL; - GMemoryInputStream* _tmp10_ = NULL; - GdkPixbuf* _tmp11_ = NULL; - GdkPixbuf* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; + GBytes* _tmp8_; + GMemoryInputStream* _tmp9_; + GMemoryInputStream* _tmp10_; + GdkPixbuf* _tmp11_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp4_ = self->priv->image; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -551,9 +551,9 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type __catch29_g_error: { GError* err = NULL; - GError* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GError* _tmp16_ = NULL; + GError* _tmp14_; + const gchar* _tmp15_; + GError* _tmp16_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" err = _inner_error_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -648,8 +648,8 @@ GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GE GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) { GdkPixbuf* result = NULL; - GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; + GdkPixbuf* _tmp0_; + GdkPixbuf* _tmp1_; #line 149 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL); #line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -666,8 +666,8 @@ GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) { gushort graw_processed_image_get_width (GRawProcessedImage* self) { gushort result; - libraw_processed_image_t* _tmp0_ = NULL; - gushort _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + gushort _tmp1_; #line 77 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -684,8 +684,8 @@ gushort graw_processed_image_get_width (GRawProcessedImage* self) { gushort graw_processed_image_get_height (GRawProcessedImage* self) { gushort result; - libraw_processed_image_t* _tmp0_ = NULL; - gushort _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + gushort _tmp1_; #line 83 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -702,8 +702,8 @@ gushort graw_processed_image_get_height (GRawProcessedImage* self) { gushort graw_processed_image_get_colors (GRawProcessedImage* self) { gushort result; - libraw_processed_image_t* _tmp0_ = NULL; - gushort _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + gushort _tmp1_; #line 89 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -720,8 +720,8 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self) { gushort graw_processed_image_get_bits (GRawProcessedImage* self) { gushort result; - libraw_processed_image_t* _tmp0_ = NULL; - gushort _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + gushort _tmp1_; #line 95 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -738,9 +738,9 @@ gushort graw_processed_image_get_bits (GRawProcessedImage* self) { guint8* graw_processed_image_get_data (GRawProcessedImage* self) { guint8* result; - libraw_processed_image_t* _tmp0_ = NULL; - guint8* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + libraw_processed_image_t* _tmp0_; + guint8* _tmp1_; + gint _tmp1__length1; #line 101 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL); #line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -759,8 +759,8 @@ guint8* graw_processed_image_get_data (GRawProcessedImage* self) { guint graw_processed_image_get_data_size (GRawProcessedImage* self) { guint result; - libraw_processed_image_t* _tmp0_ = NULL; - guint _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + guint _tmp1_; #line 107 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -817,7 +817,7 @@ static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_c #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (collect_values[0].v_pointer) { #line 820 "GRaw.c" - GRawProcessedImage* object; + GRawProcessedImage * object; object = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (object->parent_instance.g_class == NULL) { @@ -844,7 +844,7 @@ static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_c static gchar* graw_value_processed_image_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GRawProcessedImage** object_p; + GRawProcessedImage ** object_p; object_p = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!object_p) { @@ -896,7 +896,7 @@ gpointer graw_value_get_processed_image (const GValue* value) { void graw_value_set_processed_image (GValue* value, gpointer v_object) { - GRawProcessedImage* old; + GRawProcessedImage * old; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE)); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -927,7 +927,7 @@ void graw_value_set_processed_image (GValue* value, gpointer v_object) { void graw_value_take_processed_image (GValue* value, gpointer v_object) { - GRawProcessedImage* old; + GRawProcessedImage * old; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE)); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -977,7 +977,7 @@ static void graw_processed_image_instance_init (GRawProcessedImage * self) { } -static void graw_processed_image_finalize (GRawProcessedImage* obj) { +static void graw_processed_image_finalize (GRawProcessedImage * obj) { GRawProcessedImage * self; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage); @@ -1006,7 +1006,7 @@ GType graw_processed_image_get_type (void) { gpointer graw_processed_image_ref (gpointer instance) { - GRawProcessedImage* self; + GRawProcessedImage * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_atomic_int_inc (&self->ref_count); @@ -1017,7 +1017,7 @@ gpointer graw_processed_image_ref (gpointer instance) { void graw_processed_image_unref (gpointer instance) { - GRawProcessedImage* self; + GRawProcessedImage * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1032,8 +1032,8 @@ void graw_processed_image_unref (gpointer instance) { GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options) { GRawProcessor* self = NULL; - enum LibRaw_constructor_flags _tmp0_ = 0; - libraw_data_t* _tmp1_ = NULL; + enum LibRaw_constructor_flags _tmp0_; + libraw_data_t* _tmp1_; #line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = (GRawProcessor*) g_type_create_instance (object_type); #line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1058,8 +1058,8 @@ GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options) { void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) { - libraw_data_t* _tmp0_ = NULL; - enum LibRaw_errors _tmp1_ = 0; + libraw_data_t* _tmp0_; + enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 167 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1093,7 +1093,7 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) { libraw_imgother_t result = {0}; - libraw_imgother_t _tmp0_ = {0}; + libraw_imgother_t _tmp0_; #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = self->other; #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1106,8 +1106,8 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) { libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) { libraw_imgother_t result = {0}; - libraw_data_t* _tmp0_ = NULL; - libraw_imgother_t _tmp1_ = {0}; + libraw_data_t* _tmp0_; + libraw_imgother_t _tmp1_; #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1122,7 +1122,7 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) { static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) { libraw_iparams_t result = {0}; - libraw_iparams_t _tmp0_ = {0}; + libraw_iparams_t _tmp0_; #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = self->idata; #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1135,8 +1135,8 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) { libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) { libraw_iparams_t result = {0}; - libraw_data_t* _tmp0_ = NULL; - libraw_iparams_t _tmp1_ = {0}; + libraw_data_t* _tmp0_; + libraw_iparams_t _tmp1_; #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1151,7 +1151,7 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) { static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) { libraw_image_sizes_t result = {0}; - libraw_image_sizes_t _tmp0_ = {0}; + libraw_image_sizes_t _tmp0_; #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = self->sizes; #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1164,8 +1164,8 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) { libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) { libraw_image_sizes_t result = {0}; - libraw_data_t* _tmp0_ = NULL; - libraw_image_sizes_t _tmp1_ = {0}; + libraw_data_t* _tmp0_; + libraw_image_sizes_t _tmp1_; #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1180,7 +1180,7 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) { static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) { libraw_thumbnail_t result = {0}; - libraw_thumbnail_t _tmp0_ = {0}; + libraw_thumbnail_t _tmp0_; #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = self->thumbnail; #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1193,8 +1193,8 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) { libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) { libraw_thumbnail_t result = {0}; - libraw_data_t* _tmp0_ = NULL; - libraw_thumbnail_t _tmp1_ = {0}; + libraw_data_t* _tmp0_; + libraw_thumbnail_t _tmp1_; #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1210,9 +1210,9 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) { GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error) { GRawProcessedImage* result = NULL; GRawProcessedImage* _tmp0_ = NULL; - libraw_data_t* _tmp1_ = NULL; - GRawProcessedImage* _tmp2_ = NULL; - GRawProcessedImage* _tmp3_ = NULL; + libraw_data_t* _tmp1_; + GRawProcessedImage* _tmp2_; + GRawProcessedImage* _tmp3_; GError * _inner_error_ = NULL; #line 187 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL); @@ -1258,9 +1258,9 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error) { GRawProcessedImage* result = NULL; GRawProcessedImage* _tmp0_ = NULL; - libraw_data_t* _tmp1_ = NULL; - GRawProcessedImage* _tmp2_ = NULL; - GRawProcessedImage* _tmp3_ = NULL; + libraw_data_t* _tmp1_; + GRawProcessedImage* _tmp2_; + GRawProcessedImage* _tmp3_; GError * _inner_error_ = NULL; #line 191 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL); @@ -1304,10 +1304,10 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer_length1, GError** error) { - libraw_data_t* _tmp0_ = NULL; - guint8* _tmp1_ = NULL; - gint _tmp1__length1 = 0; - enum LibRaw_errors _tmp2_ = 0; + libraw_data_t* _tmp0_; + guint8* _tmp1_; + gint _tmp1__length1; + enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 195 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1344,9 +1344,9 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error) { - libraw_data_t* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; + libraw_data_t* _tmp0_; + const gchar* _tmp1_; + enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1383,8 +1383,8 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro void graw_processor_process (GRawProcessor* self, GError** error) { - libraw_data_t* _tmp0_ = NULL; - enum LibRaw_errors _tmp1_ = 0; + libraw_data_t* _tmp0_; + enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 203 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1417,9 +1417,9 @@ void graw_processor_process (GRawProcessor* self, GError** error) { void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error) { - libraw_data_t* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; + libraw_data_t* _tmp0_; + const gchar* _tmp1_; + enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1456,9 +1456,9 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error) { - libraw_data_t* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; + libraw_data_t* _tmp0_; + const gchar* _tmp1_; + enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1495,7 +1495,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE void graw_processor_recycle (GRawProcessor* self) { - libraw_data_t* _tmp0_ = NULL; + libraw_data_t* _tmp0_; #line 215 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1507,8 +1507,8 @@ void graw_processor_recycle (GRawProcessor* self) { void graw_processor_unpack (GRawProcessor* self, GError** error) { - libraw_data_t* _tmp0_ = NULL; - enum LibRaw_errors _tmp1_ = 0; + libraw_data_t* _tmp0_; + enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 219 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1541,8 +1541,8 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) { void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { - libraw_data_t* _tmp0_ = NULL; - enum LibRaw_errors _tmp1_ = 0; + libraw_data_t* _tmp0_; + enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1575,12 +1575,12 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, gdouble red_multiplier, gdouble green_multiplier) { - libraw_output_params_t* _tmp0_ = NULL; - gdouble _tmp1_ = 0.0; - gdouble _tmp2_ = 0.0; - libraw_output_params_t* _tmp3_ = NULL; - gdouble _tmp4_ = 0.0; - gdouble _tmp5_ = 0.0; + libraw_output_params_t* _tmp0_; + gdouble _tmp1_; + gdouble _tmp2_; + libraw_output_params_t* _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = params; #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1602,12 +1602,12 @@ static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_param static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, gdouble power, gdouble slope) { - libraw_output_params_t* _tmp0_ = NULL; - gdouble _tmp1_ = 0.0; - gdouble _tmp2_ = 0.0; - libraw_output_params_t* _tmp3_ = NULL; - gdouble _tmp4_ = 0.0; - gdouble _tmp5_ = 0.0; + libraw_output_params_t* _tmp0_; + gdouble _tmp1_; + gdouble _tmp2_; + libraw_output_params_t* _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = params; #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1629,37 +1629,37 @@ static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* param void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size) { - libraw_output_params_t* _tmp0_ = NULL; - libraw_output_params_t* _tmp1_ = NULL; - libraw_output_params_t* _tmp2_ = NULL; - libraw_output_params_t* _tmp3_ = NULL; - libraw_output_params_t* _tmp4_ = NULL; - libraw_output_params_t* _tmp5_ = NULL; - libraw_output_params_t* _tmp6_ = NULL; - libraw_output_params_t* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - libraw_output_params_t* _tmp9_ = NULL; - libraw_output_params_t* _tmp10_ = NULL; - libraw_output_params_t* _tmp11_ = NULL; - libraw_output_params_t* _tmp12_ = NULL; - libraw_output_params_t* _tmp13_ = NULL; - libraw_output_params_t* _tmp14_ = NULL; - libraw_output_params_t* _tmp15_ = NULL; - libraw_output_params_t* _tmp16_ = NULL; - libraw_output_params_t* _tmp17_ = NULL; - libraw_output_params_t* _tmp18_ = NULL; - libraw_output_params_t* _tmp19_ = NULL; - libraw_output_params_t* _tmp20_ = NULL; - libraw_output_params_t* _tmp21_ = NULL; - libraw_output_params_t* _tmp22_ = NULL; - libraw_output_params_t* _tmp23_ = NULL; - libraw_output_params_t* _tmp24_ = NULL; - libraw_output_params_t* _tmp25_ = NULL; - libraw_output_params_t* _tmp26_ = NULL; - libraw_output_params_t* _tmp27_ = NULL; - libraw_output_params_t* _tmp28_ = NULL; - libraw_output_params_t* _tmp29_ = NULL; - libraw_output_params_t* _tmp30_ = NULL; + libraw_output_params_t* _tmp0_; + libraw_output_params_t* _tmp1_; + libraw_output_params_t* _tmp2_; + libraw_output_params_t* _tmp3_; + libraw_output_params_t* _tmp4_; + libraw_output_params_t* _tmp5_; + libraw_output_params_t* _tmp6_; + libraw_output_params_t* _tmp7_; + gboolean _tmp8_; + libraw_output_params_t* _tmp9_; + libraw_output_params_t* _tmp10_; + libraw_output_params_t* _tmp11_; + libraw_output_params_t* _tmp12_; + libraw_output_params_t* _tmp13_; + libraw_output_params_t* _tmp14_; + libraw_output_params_t* _tmp15_; + libraw_output_params_t* _tmp16_; + libraw_output_params_t* _tmp17_; + libraw_output_params_t* _tmp18_; + libraw_output_params_t* _tmp19_; + libraw_output_params_t* _tmp20_; + libraw_output_params_t* _tmp21_; + libraw_output_params_t* _tmp22_; + libraw_output_params_t* _tmp23_; + libraw_output_params_t* _tmp24_; + libraw_output_params_t* _tmp25_; + libraw_output_params_t* _tmp26_; + libraw_output_params_t* _tmp27_; + libraw_output_params_t* _tmp28_; + libraw_output_params_t* _tmp29_; + libraw_output_params_t* _tmp30_; #line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1760,7 +1760,7 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) { libraw_output_params_t* result; - libraw_data_t* _tmp0_ = NULL; + libraw_data_t* _tmp0_; #line 156 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL); #line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1815,7 +1815,7 @@ static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (collect_values[0].v_pointer) { #line 1818 "GRaw.c" - GRawProcessor* object; + GRawProcessor * object; object = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (object->parent_instance.g_class == NULL) { @@ -1842,7 +1842,7 @@ static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GRawProcessor** object_p; + GRawProcessor ** object_p; object_p = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!object_p) { @@ -1894,7 +1894,7 @@ gpointer graw_value_get_processor (const GValue* value) { void graw_value_set_processor (GValue* value, gpointer v_object) { - GRawProcessor* old; + GRawProcessor * old; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR)); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1925,7 +1925,7 @@ void graw_value_set_processor (GValue* value, gpointer v_object) { void graw_value_take_processor (GValue* value, gpointer v_object) { - GRawProcessor* old; + GRawProcessor * old; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR)); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1973,7 +1973,7 @@ static void graw_processor_instance_init (GRawProcessor * self) { } -static void graw_processor_finalize (GRawProcessor* obj) { +static void graw_processor_finalize (GRawProcessor * obj) { GRawProcessor * self; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSOR, GRawProcessor); @@ -2000,7 +2000,7 @@ GType graw_processor_get_type (void) { gpointer graw_processor_ref (gpointer instance) { - GRawProcessor* self; + GRawProcessor * self; self = instance; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_atomic_int_inc (&self->ref_count); @@ -2011,7 +2011,7 @@ gpointer graw_processor_ref (gpointer instance) { void graw_processor_unref (gpointer instance) { - GRawProcessor* self; + GRawProcessor * self; self = instance; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2025,13 +2025,13 @@ void graw_processor_unref (gpointer instance) { void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GError** error) { - enum LibRaw_errors _tmp0_ = 0; + enum LibRaw_errors _tmp0_; gchar* msg = NULL; - const gchar* _tmp7_ = NULL; - enum LibRaw_errors _tmp8_ = 0; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - enum LibRaw_errors _tmp11_ = 0; + const gchar* _tmp7_; + enum LibRaw_errors _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + enum LibRaw_errors _tmp11_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (caller != NULL); @@ -2043,17 +2043,17 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr return; #line 2045 "GRaw.c" } else { - enum LibRaw_errors _tmp1_ = 0; + enum LibRaw_errors _tmp1_; #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp1_ = _result_; #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_tmp1_ > 0) { #line 2052 "GRaw.c" - const gchar* _tmp2_ = NULL; - enum LibRaw_errors _tmp3_ = 0; - enum LibRaw_errors _tmp4_ = 0; - const gchar* _tmp5_ = NULL; - GError* _tmp6_ = NULL; + const gchar* _tmp2_; + enum LibRaw_errors _tmp3_; + enum LibRaw_errors _tmp4_; + const gchar* _tmp5_; + GError* _tmp6_; #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp2_ = caller; #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2102,8 +2102,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_UNSPECIFIED_ERROR: #line 2104 "GRaw.c" { - const gchar* _tmp12_ = NULL; - GError* _tmp13_ = NULL; + const gchar* _tmp12_; + GError* _tmp13_; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp12_ = msg; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2135,8 +2135,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_FILE_UNSUPPORTED: #line 2137 "GRaw.c" { - const gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + const gchar* _tmp14_; + GError* _tmp15_; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp14_ = msg; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2168,8 +2168,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE: #line 2170 "GRaw.c" { - const gchar* _tmp16_ = NULL; - GError* _tmp17_ = NULL; + const gchar* _tmp16_; + GError* _tmp17_; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp16_ = msg; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2201,8 +2201,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_OUT_OF_ORDER_CALL: #line 2203 "GRaw.c" { - const gchar* _tmp18_ = NULL; - GError* _tmp19_ = NULL; + const gchar* _tmp18_; + GError* _tmp19_; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp18_ = msg; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2234,8 +2234,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_NO_THUMBNAIL: #line 2236 "GRaw.c" { - const gchar* _tmp20_ = NULL; - GError* _tmp21_ = NULL; + const gchar* _tmp20_; + GError* _tmp21_; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp20_ = msg; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2267,8 +2267,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_UNSUPPORTED_THUMBNAIL: #line 2269 "GRaw.c" { - const gchar* _tmp22_ = NULL; - GError* _tmp23_ = NULL; + const gchar* _tmp22_; + GError* _tmp23_; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp22_ = msg; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2300,8 +2300,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_UNSUFFICIENT_MEMORY: #line 2302 "GRaw.c" { - const gchar* _tmp24_ = NULL; - GError* _tmp25_ = NULL; + const gchar* _tmp24_; + GError* _tmp25_; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp24_ = msg; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2333,8 +2333,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_DATA_ERROR: #line 2335 "GRaw.c" { - const gchar* _tmp26_ = NULL; - GError* _tmp27_ = NULL; + const gchar* _tmp26_; + GError* _tmp27_; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp26_ = msg; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2366,8 +2366,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_IO_ERROR: #line 2368 "GRaw.c" { - const gchar* _tmp28_ = NULL; - GError* _tmp29_ = NULL; + const gchar* _tmp28_; + GError* _tmp29_; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp28_ = msg; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2399,8 +2399,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_CANCELLED_BY_CALLBACK: #line 2401 "GRaw.c" { - const gchar* _tmp30_ = NULL; - GError* _tmp31_ = NULL; + const gchar* _tmp30_; + GError* _tmp31_; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp30_ = msg; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2432,8 +2432,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_BAD_CROP: #line 2434 "GRaw.c" { - const gchar* _tmp32_ = NULL; - GError* _tmp33_ = NULL; + const gchar* _tmp32_; + GError* _tmp33_; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp32_ = msg; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c index 1fb61f7..4b94f76 100644 --- a/src/photos/GdkSupport.c +++ b/src/photos/GdkSupport.c @@ -1,4 +1,4 @@ -/* GdkSupport.c generated by valac 0.34.7, the Vala compiler +/* GdkSupport.c generated by valac 0.36.6, the Vala compiler * generated from GdkSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -289,13 +289,13 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le static guint8* _vala_array_dup7 (guint8* self, int length); void dimensions_init (Dimensions *self, gint width, gint height); PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name); -static void gdk_sniffer_finalize (PhotoFileSniffer* obj); +static void gdk_sniffer_finalize (PhotoFileSniffer * obj); GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { GdkReader* self = NULL; - const gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; + const gchar* _tmp0_; + PhotoFileFormat _tmp1_; #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -314,9 +314,9 @@ static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GErr GdkReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + PhotoMetadata* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; GError * _inner_error_ = NULL; #line 12 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_READER, GdkReader); @@ -354,11 +354,11 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; + gchar* _tmp1_; + gchar* _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; GError * _inner_error_ = NULL; #line 19 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_READER, GdkReader); @@ -400,15 +400,15 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - Dimensions _tmp3_ = {0}; - gint _tmp4_ = 0; - Dimensions _tmp5_ = {0}; - gint _tmp6_ = 0; - GdkPixbuf* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; + gchar* _tmp1_; + gchar* _tmp2_; + Dimensions _tmp3_; + gint _tmp4_; + Dimensions _tmp5_; + gint _tmp6_; + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; GError * _inner_error_ = NULL; #line 23 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_READER, GdkReader); @@ -462,11 +462,11 @@ static void gdk_reader_class_init (GdkReaderClass * klass) { #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_reader_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) gdk_reader_real_read_metadata; + ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) gdk_reader_real_read_metadata; #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) gdk_reader_real_unscaled_read; + ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) gdk_reader_real_unscaled_read; #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read; + ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read; #line 471 "GdkSupport.c" } @@ -489,8 +489,8 @@ GType gdk_reader_get_type (void) { GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { GdkSniffer* self = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -537,36 +537,36 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, GdkSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; - DetectedPhotoInformation* _tmp0_ = NULL; + DetectedPhotoInformation* _tmp0_; GdkPixbufLoader* pixbuf_loader = NULL; - GdkPixbufLoader* _tmp1_ = NULL; - GdkPixbufLoader* _tmp2_ = NULL; - GdkPixbufLoader* _tmp3_ = NULL; + GdkPixbufLoader* _tmp1_; + GdkPixbufLoader* _tmp2_; + GdkPixbufLoader* _tmp3_; GChecksum* md5_checksum = NULL; - gboolean _tmp4_ = FALSE; - DetectedPhotoInformation* _tmp6_ = NULL; - PhotoMetadata* _tmp7_ = NULL; + gboolean _tmp4_; + DetectedPhotoInformation* _tmp6_; + PhotoMetadata* _tmp7_; gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; + gboolean _tmp13_; guint8* _tmp38_ = NULL; gint _tmp38__length1 = 0; gint __tmp38__size_ = 0; - gboolean _tmp39_ = FALSE; + gboolean _tmp39_; guint8* buffer = NULL; - guint8* _tmp42_ = NULL; - gint _tmp42__length1 = 0; - gint buffer_length1 = 0; - gint _buffer_size_ = 0; + guint8* _tmp42_; + gint _tmp42__length1; + gint buffer_length1; + gint _buffer_size_; gsize count = 0UL; GFileInputStream* fins = NULL; - GFile* _tmp43_ = NULL; - GFileInputStream* _tmp44_ = NULL; - GFileInputStream* _tmp68_ = NULL; - gboolean _tmp70_ = FALSE; + GFile* _tmp43_; + GFileInputStream* _tmp44_; + GFileInputStream* _tmp68_; + gboolean _tmp70_; gboolean _tmp75_ = FALSE; - gboolean _tmp76_ = FALSE; - DetectedPhotoInformation* _tmp78_ = NULL; - DetectedPhotoInformation* _tmp79_ = NULL; + gboolean _tmp76_; + DetectedPhotoInformation* _tmp78_; + DetectedPhotoInformation* _tmp79_; GError * _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_SNIFFER, GdkSniffer); @@ -595,7 +595,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 46 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp4_) { #line 598 "GdkSupport.c" - GChecksum* _tmp5_ = NULL; + GChecksum* _tmp5_; #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = g_checksum_new (G_CHECKSUM_MD5); #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -614,9 +614,9 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp6_->metadata = _tmp7_; #line 616 "GdkSupport.c" { - DetectedPhotoInformation* _tmp8_ = NULL; - PhotoMetadata* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; + DetectedPhotoInformation* _tmp8_; + PhotoMetadata* _tmp9_; + GFile* _tmp10_; #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp8_ = self->priv->detected; #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -635,7 +635,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, __catch30_g_error: { GError* err = NULL; - DetectedPhotoInformation* _tmp11_ = NULL; + DetectedPhotoInformation* _tmp11_; #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" err = _inner_error_; #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -668,8 +668,8 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp13_) { #line 671 "GdkSupport.c" - DetectedPhotoInformation* _tmp14_ = NULL; - PhotoMetadata* _tmp15_ = NULL; + DetectedPhotoInformation* _tmp14_; + PhotoMetadata* _tmp15_; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp14_ = self->priv->detected; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -686,25 +686,25 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, if (_tmp12_) { #line 688 "GdkSupport.c" guint8* flattened_sans_thumbnail = NULL; - DetectedPhotoInformation* _tmp16_ = NULL; - PhotoMetadata* _tmp17_ = NULL; - gint _tmp18_ = 0; - guint8* _tmp19_ = NULL; - gint flattened_sans_thumbnail_length1 = 0; - gint _flattened_sans_thumbnail_size_ = 0; + DetectedPhotoInformation* _tmp16_; + PhotoMetadata* _tmp17_; + gint _tmp18_; + guint8* _tmp19_; + gint flattened_sans_thumbnail_length1; + gint _flattened_sans_thumbnail_size_; gboolean _tmp20_ = FALSE; - guint8* _tmp21_ = NULL; - gint _tmp21__length1 = 0; + guint8* _tmp21_; + gint _tmp21__length1; guint8* flattened_thumbnail = NULL; - DetectedPhotoInformation* _tmp27_ = NULL; - PhotoMetadata* _tmp28_ = NULL; - gint _tmp29_ = 0; - guint8* _tmp30_ = NULL; - gint flattened_thumbnail_length1 = 0; - gint _flattened_thumbnail_size_ = 0; + DetectedPhotoInformation* _tmp27_; + PhotoMetadata* _tmp28_; + gint _tmp29_; + guint8* _tmp30_; + gint flattened_thumbnail_length1; + gint _flattened_thumbnail_size_; gboolean _tmp31_ = FALSE; - guint8* _tmp32_ = NULL; - gint _tmp32__length1 = 0; + guint8* _tmp32_; + gint _tmp32__length1; #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp16_ = self->priv->detected; #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -724,8 +724,8 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp21_ != NULL) { #line 727 "GdkSupport.c" - guint8* _tmp22_ = NULL; - gint _tmp22__length1 = 0; + guint8* _tmp22_; + gint _tmp22__length1; #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp22_ = flattened_sans_thumbnail; #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -741,12 +741,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp20_) { #line 744 "GdkSupport.c" - DetectedPhotoInformation* _tmp23_ = NULL; - guint8* _tmp24_ = NULL; - gint _tmp24__length1 = 0; - guint8* _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gchar* _tmp26_ = NULL; + DetectedPhotoInformation* _tmp23_; + guint8* _tmp24_; + gint _tmp24__length1; + guint8* _tmp25_; + gint _tmp25__length1; + gchar* _tmp26_; #line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp23_ = self->priv->detected; #line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -784,8 +784,8 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp32_ != NULL) { #line 787 "GdkSupport.c" - guint8* _tmp33_ = NULL; - gint _tmp33__length1 = 0; + guint8* _tmp33_; + gint _tmp33__length1; #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp33_ = flattened_thumbnail; #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -801,12 +801,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp31_) { #line 804 "GdkSupport.c" - DetectedPhotoInformation* _tmp34_ = NULL; - guint8* _tmp35_ = NULL; - gint _tmp35__length1 = 0; - guint8* _tmp36_ = NULL; - gint _tmp36__length1 = 0; - gchar* _tmp37_ = NULL; + DetectedPhotoInformation* _tmp34_; + guint8* _tmp35_; + gint _tmp35__length1; + guint8* _tmp36_; + gint _tmp36__length1; + gchar* _tmp37_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp34_ = self->priv->detected; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -836,7 +836,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp39_) { #line 839 "GdkSupport.c" - guint8* _tmp40_ = NULL; + guint8* _tmp40_; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp40_ = g_new0 (guint8, 64 * 1024); #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -849,7 +849,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, __tmp38__size_ = _tmp38__length1; #line 851 "GdkSupport.c" } else { - guint8* _tmp41_ = NULL; + guint8* _tmp41_; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp41_ = g_new0 (guint8, 8 * 1024); #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -904,19 +904,19 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, while (TRUE) { #line 906 "GdkSupport.c" gsize bytes_read = 0UL; - GFileInputStream* _tmp46_ = NULL; - guint8* _tmp47_ = NULL; - gint _tmp47__length1 = 0; - gssize _tmp48_ = 0L; - gsize _tmp49_ = 0UL; - gsize _tmp50_ = 0UL; - gsize _tmp51_ = 0UL; - gboolean _tmp52_ = FALSE; + GFileInputStream* _tmp46_; + guint8* _tmp47_; + gint _tmp47__length1; + gssize _tmp48_; + gsize _tmp49_; + gsize _tmp50_; + gsize _tmp51_; + gboolean _tmp52_; gboolean _tmp56_ = FALSE; - gboolean _tmp57_ = FALSE; + gboolean _tmp57_; gboolean _tmp62_ = FALSE; gboolean _tmp63_ = FALSE; - gboolean _tmp64_ = FALSE; + gboolean _tmp64_; #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (!_tmp45_) { #line 923 "GdkSupport.c" @@ -970,10 +970,10 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp52_) { #line 973 "GdkSupport.c" - GChecksum* _tmp53_ = NULL; - guint8* _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gsize _tmp55_ = 0UL; + GChecksum* _tmp53_; + guint8* _tmp54_; + gint _tmp54__length1; + gsize _tmp55_; #line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp53_ = md5_checksum; #line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -994,7 +994,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp56_ = TRUE; #line 996 "GdkSupport.c" } else { - gboolean _tmp58_ = FALSE; + gboolean _tmp58_; #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp58_ = self->priv->area_prepared; #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1004,10 +1004,10 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp56_) { #line 1007 "GdkSupport.c" - GdkPixbufLoader* _tmp59_ = NULL; - guint8* _tmp60_ = NULL; - gint _tmp60__length1 = 0; - gsize _tmp61_ = 0UL; + GdkPixbufLoader* _tmp59_; + guint8* _tmp60_; + gint _tmp60__length1; + gsize _tmp61_; #line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp59_ = pixbuf_loader; #line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1042,7 +1042,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (!_tmp64_) { #line 1045 "GdkSupport.c" - gboolean _tmp65_ = FALSE; + gboolean _tmp65_; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp65_ = self->priv->size_ready; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1056,7 +1056,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp63_) { #line 1059 "GdkSupport.c" - gboolean _tmp66_ = FALSE; + gboolean _tmp66_; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp66_ = self->priv->area_prepared; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1076,7 +1076,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, } } { - GdkPixbufLoader* _tmp67_ = NULL; + GdkPixbufLoader* _tmp67_; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp67_ = pixbuf_loader; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1123,7 +1123,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 99 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp68_ != NULL) { #line 1126 "GdkSupport.c" - GFileInputStream* _tmp69_ = NULL; + GFileInputStream* _tmp69_; #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp69_ = fins; #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1152,10 +1152,10 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 102 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp70_) { #line 1155 "GdkSupport.c" - DetectedPhotoInformation* _tmp71_ = NULL; - GChecksum* _tmp72_ = NULL; - const gchar* _tmp73_ = NULL; - gchar* _tmp74_ = NULL; + DetectedPhotoInformation* _tmp71_; + GChecksum* _tmp72_; + const gchar* _tmp73_; + gchar* _tmp74_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp71_ = self->priv->detected; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1178,7 +1178,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp75_ = TRUE; #line 1180 "GdkSupport.c" } else { - gboolean _tmp77_ = FALSE; + gboolean _tmp77_; #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp77_ = self->priv->area_prepared; #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1216,9 +1216,9 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loader, gint width, gint height) { - DetectedPhotoInformation* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + DetectedPhotoInformation* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (IS_GDK_SNIFFER (self)); #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1246,29 +1246,29 @@ static gpointer _g_object_ref0 (gpointer self) { static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader) { GdkPixbuf* pixbuf = NULL; - GdkPixbufLoader* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; - GdkPixbuf* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; - DetectedPhotoInformation* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - GdkColorspace _tmp6_ = 0; - DetectedPhotoInformation* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; - gint _tmp9_ = 0; - DetectedPhotoInformation* _tmp10_ = NULL; - GdkPixbuf* _tmp11_ = NULL; - gint _tmp12_ = 0; + GdkPixbufLoader* _tmp0_; + GdkPixbuf* _tmp1_; + GdkPixbuf* _tmp2_; + GdkPixbuf* _tmp3_; + DetectedPhotoInformation* _tmp4_; + GdkPixbuf* _tmp5_; + GdkColorspace _tmp6_; + DetectedPhotoInformation* _tmp7_; + GdkPixbuf* _tmp8_; + gint _tmp9_; + DetectedPhotoInformation* _tmp10_; + GdkPixbuf* _tmp11_; + gint _tmp12_; GdkPixbufFormat* format = NULL; - GdkPixbufLoader* _tmp13_ = NULL; - GdkPixbufFormat* _tmp14_ = NULL; - DetectedPhotoInformation* _tmp15_ = NULL; - GdkPixbufFormat* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - DetectedPhotoInformation* _tmp18_ = NULL; - DetectedPhotoInformation* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - PhotoFileFormat _tmp21_ = 0; + GdkPixbufLoader* _tmp13_; + GdkPixbufFormat* _tmp14_; + DetectedPhotoInformation* _tmp15_; + GdkPixbufFormat* _tmp16_; + gchar* _tmp17_; + DetectedPhotoInformation* _tmp18_; + DetectedPhotoInformation* _tmp19_; + const gchar* _tmp20_; + PhotoFileFormat _tmp21_; #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (IS_GDK_SNIFFER (self)); #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1357,7 +1357,7 @@ static void gdk_sniffer_class_init (GdkSnifferClass * klass) { #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_type_class_add_private (klass, sizeof (GdkSnifferPrivate)); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) gdk_sniffer_real_sniff; + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) gdk_sniffer_real_sniff; #line 1362 "GdkSupport.c" } @@ -1375,7 +1375,7 @@ static void gdk_sniffer_instance_init (GdkSniffer * self) { } -static void gdk_sniffer_finalize (PhotoFileSniffer* obj) { +static void gdk_sniffer_finalize (PhotoFileSniffer * obj) { GdkSniffer * self; #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GDK_SNIFFER, GdkSniffer); diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c index 1891b36..baaaf55 100644 --- a/src/photos/JfifSupport.c +++ b/src/photos/JfifSupport.c @@ -1,4 +1,4 @@ -/* JfifSupport.c generated by valac 0.34.7, the Vala compiler +/* JfifSupport.c generated by valac 0.36.6, the Vala compiler * generated from JfifSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -555,7 +555,7 @@ JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSn GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType jfif_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); -static void jfif_file_format_driver_finalize (PhotoFileFormatDriver* obj); +static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; enum { @@ -573,7 +573,7 @@ static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileF static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); static gchar** _vala_array_dup9 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); -static void jfif_file_format_properties_finalize (PhotoFileFormatProperties* obj); +static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -620,7 +620,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro void jfif_file_format_driver_init (void) { - JfifFileFormatDriver* _tmp0_ = NULL; + JfifFileFormatDriver* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = jfif_file_format_driver_new (); #line 11 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -642,8 +642,8 @@ static gpointer _photo_file_format_driver_ref0 (gpointer self) { JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) { JfifFileFormatDriver* result = NULL; - JfifFileFormatDriver* _tmp0_ = NULL; - JfifFileFormatDriver* _tmp1_ = NULL; + JfifFileFormatDriver* _tmp0_; + JfifFileFormatDriver* _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = jfif_file_format_driver_instance; #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -659,7 +659,7 @@ JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) { static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { JfifFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; - JfifFileFormatProperties* _tmp0_ = NULL; + JfifFileFormatProperties* _tmp0_; #line 19 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 20 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -675,8 +675,8 @@ static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (P static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { JfifFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_ = NULL; - JfifReader* _tmp1_ = NULL; + const gchar* _tmp0_; + JfifReader* _tmp1_; #line 23 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 23 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -696,7 +696,7 @@ static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFor static PhotoMetadata* jfif_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { JfifFileFormatDriver * self; PhotoMetadata* result = NULL; - PhotoMetadata* _tmp0_ = NULL; + PhotoMetadata* _tmp0_; #line 27 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 28 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -738,8 +738,8 @@ static gboolean jfif_file_format_driver_real_can_write_metadata (PhotoFileFormat static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { JfifFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_ = NULL; - JfifWriter* _tmp1_ = NULL; + const gchar* _tmp0_; + JfifWriter* _tmp1_; #line 39 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 39 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -759,8 +759,8 @@ static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFor static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { JfifFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_ = NULL; - JfifMetadataWriter* _tmp1_ = NULL; + const gchar* _tmp0_; + JfifMetadataWriter* _tmp1_; #line 43 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 43 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -780,9 +780,9 @@ static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_wri static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { JfifFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; - JfifSniffer* _tmp2_ = NULL; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; + JfifSniffer* _tmp2_; #line 47 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 47 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -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 = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) 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 = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) 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 = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) 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 = (gboolean (*)(PhotoFileFormatDriver*)) 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 = (gboolean (*)(PhotoFileFormatDriver*)) 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 = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) 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 = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) 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 = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) 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" } @@ -847,7 +847,7 @@ static void jfif_file_format_driver_instance_init (JfifFileFormatDriver * self) } -static void jfif_file_format_driver_finalize (PhotoFileFormatDriver* obj) { +static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj) { JfifFileFormatDriver * self; #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); @@ -870,7 +870,7 @@ GType jfif_file_format_driver_get_type (void) { void jfif_file_format_properties_init (void) { - JfifFileFormatProperties* _tmp0_ = NULL; + JfifFileFormatProperties* _tmp0_; #line 64 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = jfif_file_format_properties_new (); #line 64 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -890,8 +890,8 @@ static gpointer _photo_file_format_properties_ref0 (gpointer self) { JfifFileFormatProperties* jfif_file_format_properties_get_instance (void) { JfifFileFormatProperties* result = NULL; - JfifFileFormatProperties* _tmp0_ = NULL; - JfifFileFormatProperties* _tmp1_ = NULL; + JfifFileFormatProperties* _tmp0_; + JfifFileFormatProperties* _tmp1_; #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = jfif_file_format_properties_instance; #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -933,7 +933,7 @@ static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFil static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { JfifFileFormatProperties * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 79 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties); #line 80 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -949,19 +949,16 @@ static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileF static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { JfifFileFormatProperties * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 83 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties); #line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = _ ("JPEG"); + _tmp0_ = g_strdup (_ ("JPEG")); #line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 965 "JfifSupport.c" +#line 962 "JfifSupport.c" } @@ -972,29 +969,29 @@ static gchar** _vala_array_dup8 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" for (i = 0; i < length; i++) { -#line 976 "JfifSupport.c" - gchar* _tmp0_ = NULL; +#line 973 "JfifSupport.c" + gchar* _tmp0_; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = g_strdup (self[i]); #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result[i] = _tmp0_; -#line 982 "JfifSupport.c" +#line 979 "JfifSupport.c" } #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 986 "JfifSupport.c" +#line 983 "JfifSupport.c" } static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { JfifFileFormatProperties * 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 87 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties); #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1013,23 +1010,23 @@ static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileF if (result_length1) { #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *result_length1 = _tmp2__length1; -#line 1017 "JfifSupport.c" +#line 1014 "JfifSupport.c" } #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp2_; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1023 "JfifSupport.c" +#line 1020 "JfifSupport.c" } static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { JfifFileFormatProperties * 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 91 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties); #line 92 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1044,7 +1041,7 @@ static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileF result = _tmp2_; #line 92 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1048 "JfifSupport.c" +#line 1045 "JfifSupport.c" } @@ -1055,29 +1052,29 @@ static gchar** _vala_array_dup9 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" for (i = 0; i < length; i++) { -#line 1059 "JfifSupport.c" - gchar* _tmp0_ = NULL; +#line 1056 "JfifSupport.c" + gchar* _tmp0_; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = g_strdup (self[i]); #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result[i] = _tmp0_; -#line 1065 "JfifSupport.c" +#line 1062 "JfifSupport.c" } #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1069 "JfifSupport.c" +#line 1066 "JfifSupport.c" } static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { JfifFileFormatProperties * 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 95 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties); #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1096,13 +1093,13 @@ static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatP if (result_length1) { #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *result_length1 = _tmp2__length1; -#line 1100 "JfifSupport.c" +#line 1097 "JfifSupport.c" } #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1106 "JfifSupport.c" +#line 1103 "JfifSupport.c" } @@ -1112,43 +1109,43 @@ JfifFileFormatProperties* jfif_file_format_properties_construct (GType object_ty self = (JfifFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1116 "JfifSupport.c" +#line 1113 "JfifSupport.c" } JfifFileFormatProperties* jfif_file_format_properties_new (void) { #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_file_format_properties_construct (TYPE_JFIF_FILE_FORMAT_PROPERTIES); -#line 1123 "JfifSupport.c" +#line 1120 "JfifSupport.c" } static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClass * klass) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar** _tmp6_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar** _tmp4_; + gchar* _tmp5_; + gchar** _tmp6_; #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_properties_parent_class = g_type_class_peek_parent (klass); #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 = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) 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 = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) 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 = (gchar* (*)(PhotoFileFormatProperties*)) 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 = (gchar* (*)(PhotoFileFormatProperties*)) 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 = (gchar** (*)(PhotoFileFormatProperties*, int*)) 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 = (gchar* (*)(PhotoFileFormatProperties*)) 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 = (gchar** (*)(PhotoFileFormatProperties*, int*)) 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" @@ -1181,7 +1178,7 @@ static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClas jfif_file_format_properties_KNOWN_MIME_TYPES = _tmp6_; #line 57 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 1185 "JfifSupport.c" +#line 1182 "JfifSupport.c" } @@ -1189,13 +1186,13 @@ static void jfif_file_format_properties_instance_init (JfifFileFormatProperties } -static void jfif_file_format_properties_finalize (PhotoFileFormatProperties* obj) { +static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj) { JfifFileFormatProperties * self; #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties); #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (jfif_file_format_properties_parent_class)->finalize (obj); -#line 1199 "JfifSupport.c" +#line 1196 "JfifSupport.c" } @@ -1213,8 +1210,8 @@ GType jfif_file_format_properties_get_type (void) { JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { JfifSniffer* self = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 102 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1225,21 +1222,21 @@ JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSn self = (JfifSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1229 "JfifSupport.c" +#line 1226 "JfifSupport.c" } JfifSniffer* jfif_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_sniffer_construct (TYPE_JFIF_SNIFFER, file, options); -#line 1236 "JfifSupport.c" +#line 1233 "JfifSupport.c" } static gpointer _detected_photo_information_ref0 (gpointer self) { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1243 "JfifSupport.c" +#line 1240 "JfifSupport.c" } @@ -1248,16 +1245,16 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base 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 105 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_SNIFFER, JfifSniffer); @@ -1275,7 +1272,7 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base g_propagate_error (error, _inner_error_); #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return NULL; -#line 1279 "JfifSupport.c" +#line 1276 "JfifSupport.c" } #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (!_tmp0_) { @@ -1285,11 +1282,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base if (is_corrupted) { #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1289 "JfifSupport.c" +#line 1286 "JfifSupport.c" } #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1293 "JfifSupport.c" +#line 1290 "JfifSupport.c" } #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (jfif_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_); @@ -1303,7 +1300,7 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base g_propagate_error (error, _inner_error_); #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return NULL; -#line 1307 "JfifSupport.c" +#line 1304 "JfifSupport.c" } #line 113 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp5_ = detected; @@ -1317,11 +1314,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base if (is_corrupted) { #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1321 "JfifSupport.c" +#line 1318 "JfifSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1325 "JfifSupport.c" +#line 1322 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp7_ = detected; @@ -1329,17 +1326,17 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base _tmp8_ = _tmp7_->file_format; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (_tmp8_ == PHOTO_FILE_FORMAT_JFIF) { -#line 1333 "JfifSupport.c" - DetectedPhotoInformation* _tmp9_ = NULL; +#line 1330 "JfifSupport.c" + DetectedPhotoInformation* _tmp9_; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp9_ = detected; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp6_ = _tmp9_; -#line 1339 "JfifSupport.c" +#line 1336 "JfifSupport.c" } else { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp6_ = NULL; -#line 1343 "JfifSupport.c" +#line 1340 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp10_ = _detected_photo_information_ref0 (_tmp6_); @@ -1351,11 +1348,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base if (is_corrupted) { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1355 "JfifSupport.c" +#line 1352 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1359 "JfifSupport.c" +#line 1356 "JfifSupport.c" } @@ -1363,8 +1360,8 @@ 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 = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) jfif_sniffer_real_sniff; -#line 1368 "JfifSupport.c" + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) jfif_sniffer_real_sniff; +#line 1365 "JfifSupport.c" } @@ -1386,7 +1383,7 @@ GType jfif_sniffer_get_type (void) { JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath) { JfifReader* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1395,21 +1392,21 @@ JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath) { self = (JfifReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1399 "JfifSupport.c" +#line 1396 "JfifSupport.c" } JfifReader* jfif_reader_new (const gchar* filepath) { #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_reader_construct (TYPE_JFIF_READER, filepath); -#line 1406 "JfifSupport.c" +#line 1403 "JfifSupport.c" } static void jfif_reader_class_init (JfifReaderClass * klass) { #line 120 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_reader_parent_class = g_type_class_peek_parent (klass); -#line 1413 "JfifSupport.c" +#line 1410 "JfifSupport.c" } @@ -1431,7 +1428,7 @@ GType jfif_reader_get_type (void) { JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath) { JfifWriter* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 128 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1440,25 +1437,25 @@ JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath) { self = (JfifWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1444 "JfifSupport.c" +#line 1441 "JfifSupport.c" } JfifWriter* jfif_writer_new (const gchar* filepath) { #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_writer_construct (TYPE_JFIF_WRITER, filepath); -#line 1451 "JfifSupport.c" +#line 1448 "JfifSupport.c" } static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { JfifWriter * self; - GdkPixbuf* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - JpegQuality _tmp3_ = 0; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + GdkPixbuf* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + JpegQuality _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; GError * _inner_error_ = NULL; #line 131 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_WRITER, JfifWriter); @@ -1488,7 +1485,7 @@ static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, Jp g_propagate_error (error, _inner_error_); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return; -#line 1492 "JfifSupport.c" +#line 1489 "JfifSupport.c" } } @@ -1497,8 +1494,8 @@ 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 = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) jfif_writer_real_write; -#line 1502 "JfifSupport.c" + ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) jfif_writer_real_write; +#line 1499 "JfifSupport.c" } @@ -1520,7 +1517,7 @@ GType jfif_writer_get_type (void) { JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gchar* filepath) { JfifMetadataWriter* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 138 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1529,22 +1526,22 @@ JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gch self = (JfifMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1533 "JfifSupport.c" +#line 1530 "JfifSupport.c" } JfifMetadataWriter* jfif_metadata_writer_new (const gchar* filepath) { #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_metadata_writer_construct (TYPE_JFIF_METADATA_WRITER, filepath); -#line 1540 "JfifSupport.c" +#line 1537 "JfifSupport.c" } static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { JfifMetadataWriter * self; - PhotoMetadata* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + PhotoMetadata* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; GError * _inner_error_ = NULL; #line 141 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_METADATA_WRITER, JfifMetadataWriter); @@ -1566,7 +1563,7 @@ static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* b g_propagate_error (error, _inner_error_); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return; -#line 1570 "JfifSupport.c" +#line 1567 "JfifSupport.c" } } @@ -1575,8 +1572,8 @@ 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 = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) jfif_metadata_writer_real_write_metadata; -#line 1580 "JfifSupport.c" + ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) jfif_metadata_writer_real_write_metadata; +#line 1577 "JfifSupport.c" } @@ -1602,7 +1599,7 @@ guint8 jpeg_marker_get_byte (JpegMarker self) { result = (guint8) self; #line 160 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1606 "JfifSupport.c" +#line 1603 "JfifSupport.c" } @@ -1624,28 +1621,28 @@ gint jpeg_quality_get_pct (JpegQuality self) { result = (gint) self; #line 171 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1628 "JfifSupport.c" +#line 1625 "JfifSupport.c" } gchar* jpeg_quality_get_pct_text (JpegQuality self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = g_strdup_printf ("%d", (gint) self); #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp0_; #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1641 "JfifSupport.c" +#line 1638 "JfifSupport.c" } JpegQuality* jpeg_quality_get_all (int* result_length1) { JpegQuality* result = NULL; - JpegQuality* _tmp0_ = NULL; - JpegQuality* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + JpegQuality* _tmp0_; + JpegQuality* _tmp1_; + gint _tmp1__length1; #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = g_new0 (JpegQuality, 4); #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1664,13 +1661,13 @@ JpegQuality* jpeg_quality_get_all (int* result_length1) { if (result_length1) { #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *result_length1 = _tmp1__length1; -#line 1668 "JfifSupport.c" +#line 1665 "JfifSupport.c" } #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp1_; #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1674 "JfifSupport.c" +#line 1671 "JfifSupport.c" } @@ -1680,72 +1677,60 @@ gchar* jpeg_quality_to_string (JpegQuality self) { switch (self) { #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_LOW: -#line 1684 "JfifSupport.c" +#line 1681 "JfifSupport.c" { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = _ ("Low (%d%%)"); + _tmp0_ = g_strdup_printf (_ ("Low (%d%%)"), (gint) self); #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = g_strdup_printf (_tmp0_, (gint) self); -#line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1696 "JfifSupport.c" +#line 1690 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_MEDIUM: -#line 1700 "JfifSupport.c" +#line 1694 "JfifSupport.c" { - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = _ ("Medium (%d%%)"); + gchar* _tmp1_; #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp3_ = g_strdup_printf (_tmp2_, (gint) self); + _tmp1_ = g_strdup_printf (_ ("Medium (%d%%)"), (gint) self); #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp3_; + result = _tmp1_; #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1712 "JfifSupport.c" +#line 1703 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_HIGH: -#line 1716 "JfifSupport.c" +#line 1707 "JfifSupport.c" { - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; -#line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = _ ("High (%d%%)"); + gchar* _tmp2_; #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp5_ = g_strdup_printf (_tmp4_, (gint) self); + _tmp2_ = g_strdup_printf (_ ("High (%d%%)"), (gint) self); #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp5_; + result = _tmp2_; #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1728 "JfifSupport.c" +#line 1716 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_MAXIMUM: -#line 1732 "JfifSupport.c" +#line 1720 "JfifSupport.c" { - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; -#line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp6_ = _ ("Maximum (%d%%)"); + gchar* _tmp3_; #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp7_ = g_strdup_printf (_tmp6_, (gint) self); + _tmp3_ = g_strdup_printf (_ ("Maximum (%d%%)"), (gint) self); #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp7_; + result = _tmp3_; #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1744 "JfifSupport.c" +#line 1729 "JfifSupport.c" } default: #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" break; -#line 1749 "JfifSupport.c" +#line 1734 "JfifSupport.c" } #line 197 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_warn_if_reached (); @@ -1753,7 +1738,7 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = NULL; #line 199 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1757 "JfifSupport.c" +#line 1742 "JfifSupport.c" } @@ -1772,15 +1757,15 @@ GType jpeg_quality_get_type (void) { gboolean jpeg_is_jpeg (GFile* file, GError** error) { gboolean result = FALSE; GFileInputStream* fins = NULL; - GFile* _tmp0_ = NULL; - GFileInputStream* _tmp1_ = NULL; + GFile* _tmp0_; + GFileInputStream* _tmp1_; JpegMarker marker = 0; gint segment_length = 0; - GFileInputStream* _tmp3_ = NULL; + GFileInputStream* _tmp3_; JpegMarker _tmp4_ = 0; - gint _tmp5_ = 0; + gint _tmp5_; gboolean _tmp7_ = FALSE; - JpegMarker _tmp8_ = 0; + JpegMarker _tmp8_; 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,13 +1777,13 @@ 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" +#line 1781 "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 _tmp2_; -#line 1802 "JfifSupport.c" +#line 1787 "JfifSupport.c" } #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp3_ = fins; @@ -1810,7 +1795,7 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) { segment_length = _tmp5_; #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1814 "JfifSupport.c" +#line 1799 "JfifSupport.c" gboolean _tmp6_ = FALSE; #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); @@ -1818,23 +1803,23 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) { _g_object_unref0 (fins); #line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return _tmp6_; -#line 1822 "JfifSupport.c" +#line 1807 "JfifSupport.c" } #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp8_ = marker; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (_tmp8_ == JPEG_MARKER_SOI) { -#line 1828 "JfifSupport.c" - gint _tmp9_ = 0; +#line 1813 "JfifSupport.c" + gint _tmp9_; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp9_ = segment_length; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp7_ = _tmp9_ == 0; -#line 1834 "JfifSupport.c" +#line 1819 "JfifSupport.c" } else { #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp7_ = FALSE; -#line 1838 "JfifSupport.c" +#line 1823 "JfifSupport.c" } #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp7_; @@ -1842,7 +1827,7 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) { _g_object_unref0 (fins); #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1846 "JfifSupport.c" +#line 1831 "JfifSupport.c" } @@ -1850,22 +1835,22 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro JpegMarker _vala_marker = 0; gint result = 0; GDataInputStream* dins = NULL; - GFileInputStream* _tmp0_ = NULL; - GDataInputStream* _tmp1_ = NULL; - GDataInputStream* _tmp2_ = NULL; + GFileInputStream* _tmp0_; + GDataInputStream* _tmp1_; + GDataInputStream* _tmp2_; guint8 _tmp3_ = 0U; - GDataInputStream* _tmp4_ = NULL; - guint8 _tmp5_ = 0U; + GDataInputStream* _tmp4_; + guint8 _tmp5_; guint8 _tmp7_ = 0U; - GDataInputStream* _tmp8_ = NULL; - guint8 _tmp9_ = 0U; + GDataInputStream* _tmp8_; + guint8 _tmp9_; gboolean _tmp11_ = FALSE; - JpegMarker _tmp12_ = 0; + JpegMarker _tmp12_; guint16 length = 0U; - GDataInputStream* _tmp14_ = NULL; - guint16 _tmp15_ = 0U; - guint16 _tmp17_ = 0U; - guint16 _tmp21_ = 0U; + GDataInputStream* _tmp14_; + guint16 _tmp15_; + guint16 _tmp17_; + guint16 _tmp21_; 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); @@ -1889,7 +1874,7 @@ 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" +#line 1878 "JfifSupport.c" gint _tmp6_ = 0; #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); @@ -1897,7 +1882,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro _g_object_unref0 (dins); #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return _tmp6_; -#line 1901 "JfifSupport.c" +#line 1886 "JfifSupport.c" } #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (_tmp3_ != JPEG_MARKER_PREFIX) { @@ -1909,11 +1894,11 @@ 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 1913 "JfifSupport.c" +#line 1898 "JfifSupport.c" } #line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1917 "JfifSupport.c" +#line 1902 "JfifSupport.c" } #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp8_ = dins; @@ -1923,7 +1908,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro _tmp7_ = _tmp9_; #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1927 "JfifSupport.c" +#line 1912 "JfifSupport.c" gint _tmp10_ = 0; #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); @@ -1931,7 +1916,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro _g_object_unref0 (dins); #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return _tmp10_; -#line 1935 "JfifSupport.c" +#line 1920 "JfifSupport.c" } #line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _vala_marker = (JpegMarker) _tmp7_; @@ -1941,14 +1926,14 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro if (_tmp12_ == JPEG_MARKER_SOI) { #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp11_ = TRUE; -#line 1945 "JfifSupport.c" +#line 1930 "JfifSupport.c" } else { - JpegMarker _tmp13_ = 0; + JpegMarker _tmp13_; #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp13_ = _vala_marker; #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp11_ = _tmp13_ == JPEG_MARKER_EOI; -#line 1952 "JfifSupport.c" +#line 1937 "JfifSupport.c" } #line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (_tmp11_) { @@ -1960,11 +1945,11 @@ 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 1964 "JfifSupport.c" +#line 1949 "JfifSupport.c" } #line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1968 "JfifSupport.c" +#line 1953 "JfifSupport.c" } #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp14_ = dins; @@ -1974,7 +1959,7 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro length = _tmp15_; #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1978 "JfifSupport.c" +#line 1963 "JfifSupport.c" gint _tmp16_ = 0; #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); @@ -1982,16 +1967,16 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro _g_object_unref0 (dins); #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return _tmp16_; -#line 1986 "JfifSupport.c" +#line 1971 "JfifSupport.c" } #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp17_ = length; #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (((gint) _tmp17_) < 2) { -#line 1992 "JfifSupport.c" - guint16 _tmp18_ = 0U; - GFileInputStream* _tmp19_ = NULL; - gint64 _tmp20_ = 0LL; +#line 1977 "JfifSupport.c" + guint16 _tmp18_; + GFileInputStream* _tmp19_; + gint64 _tmp20_; #line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp18_ = length; #line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -2008,11 +1993,11 @@ 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 2012 "JfifSupport.c" +#line 1997 "JfifSupport.c" } #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2016 "JfifSupport.c" +#line 2001 "JfifSupport.c" } #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp21_ = length; @@ -2024,11 +2009,11 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro if (marker) { #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 2028 "JfifSupport.c" +#line 2013 "JfifSupport.c" } #line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2032 "JfifSupport.c" +#line 2017 "JfifSupport.c" } diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c index a2fb384..6ec6ea2 100644 --- a/src/photos/PhotoFileAdapter.c +++ b/src/photos/PhotoFileAdapter.c @@ -1,4 +1,4 @@ -/* PhotoFileAdapter.c generated by valac 0.34.7, the Vala compiler +/* PhotoFileAdapter.c generated by valac 0.36.6, the Vala compiler * generated from PhotoFileAdapter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -217,7 +217,7 @@ gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self); -static void photo_file_adapter_finalize (PhotoFileAdapter* obj); +static void photo_file_adapter_finalize (PhotoFileAdapter * obj); GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); @@ -252,7 +252,7 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role); PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self); -static void photo_file_reader_finalize (PhotoFileAdapter* obj); +static void photo_file_reader_finalize (PhotoFileAdapter * obj); GType jpeg_quality_get_type (void) G_GNUC_CONST; enum { PHOTO_FILE_WRITER_DUMMY_PROPERTY @@ -273,9 +273,9 @@ static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWri PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { PhotoFileAdapter* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - PhotoFileFormat _tmp2_ = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + PhotoFileFormat _tmp2_; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -300,8 +300,8 @@ PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + const gchar* _tmp0_; + gboolean _tmp1_; #line 30 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), FALSE); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -318,8 +318,8 @@ gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) { gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -349,23 +349,23 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL); #line 351 "PhotoFileAdapter.c" { - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = self->priv->file; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_rec_mutex_lock (&self->priv->__lock_file); #line 358 "PhotoFileAdapter.c" { - GFile* _tmp1_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + GFile* _tmp1_; + GFile* _tmp4_; + GFile* _tmp5_; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp1_ = self->priv->file; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (_tmp1_ == NULL) { #line 367 "PhotoFileAdapter.c" - const gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + const gchar* _tmp2_; + GFile* _tmp3_; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp2_ = self->priv->filepath; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -388,7 +388,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { } __finally24: { - GFile* _tmp6_ = NULL; + GFile* _tmp6_; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp6_ = self->priv->file; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -418,7 +418,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) { PhotoFileFormat result = 0; - PhotoFileFormat _tmp0_ = 0; + PhotoFileFormat _tmp0_; #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), 0); #line 51 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -473,7 +473,7 @@ static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_col #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (collect_values[0].v_pointer) { #line 476 "PhotoFileAdapter.c" - PhotoFileAdapter* object; + PhotoFileAdapter * object; object = collect_values[0].v_pointer; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (object->parent_instance.g_class == NULL) { @@ -500,7 +500,7 @@ static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_col static gchar* value_photo_file_adapter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PhotoFileAdapter** object_p; + PhotoFileAdapter ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (!object_p) { @@ -552,7 +552,7 @@ gpointer value_get_photo_file_adapter (const GValue* value) { void value_set_photo_file_adapter (GValue* value, gpointer v_object) { - PhotoFileAdapter* old; + PhotoFileAdapter * old; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER)); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -583,7 +583,7 @@ void value_set_photo_file_adapter (GValue* value, gpointer v_object) { void value_take_photo_file_adapter (GValue* value, gpointer v_object) { - PhotoFileAdapter* old; + PhotoFileAdapter * old; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER)); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -635,7 +635,7 @@ static void photo_file_adapter_instance_init (PhotoFileAdapter * self) { } -static void photo_file_adapter_finalize (PhotoFileAdapter* obj) { +static void photo_file_adapter_finalize (PhotoFileAdapter * obj) { PhotoFileAdapter * self; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter); @@ -666,7 +666,7 @@ GType photo_file_adapter_get_type (void) { gpointer photo_file_adapter_ref (gpointer instance) { - PhotoFileAdapter* self; + PhotoFileAdapter * self; self = instance; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_atomic_int_inc (&self->ref_count); @@ -677,7 +677,7 @@ gpointer photo_file_adapter_ref (gpointer instance) { void photo_file_adapter_unref (gpointer instance) { - PhotoFileAdapter* self; + PhotoFileAdapter * self; self = instance; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -704,8 +704,8 @@ GType photo_file_reader_role_get_type (void) { PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { PhotoFileReader* self = NULL; - const gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; + const gchar* _tmp0_; + PhotoFileFormat _tmp1_; #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -723,12 +723,12 @@ PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* fi PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError** error) { PhotoFileWriter* result = NULL; PhotoFileWriter* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PhotoFileWriter* _tmp4_ = NULL; - PhotoFileWriter* _tmp5_ = NULL; - PhotoFileWriter* _tmp6_ = NULL; + PhotoFileFormat _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PhotoFileWriter* _tmp4_; + PhotoFileWriter* _tmp5_; + PhotoFileWriter* _tmp6_; GError * _inner_error_ = NULL; #line 71 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); @@ -782,12 +782,12 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError* PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error) { PhotoFileMetadataWriter* result = NULL; PhotoFileMetadataWriter* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PhotoFileMetadataWriter* _tmp4_ = NULL; - PhotoFileMetadataWriter* _tmp5_ = NULL; - PhotoFileMetadataWriter* _tmp6_ = NULL; + PhotoFileFormat _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PhotoFileMetadataWriter* _tmp4_; + PhotoFileMetadataWriter* _tmp5_; + PhotoFileMetadataWriter* _tmp6_; GError * _inner_error_ = NULL; #line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); @@ -877,9 +877,9 @@ GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** erro static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) { GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; - Dimensions _tmp2_ = {0}; - GdkPixbuf* _tmp3_ = NULL; + GdkPixbuf* _tmp1_; + Dimensions _tmp2_; + GdkPixbuf* _tmp3_; GError * _inner_error_ = NULL; #line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (full != NULL, NULL); @@ -921,7 +921,7 @@ GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* ful void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role) { - PhotoFileReaderRole _tmp0_ = 0; + PhotoFileReaderRole _tmp0_; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (IS_PHOTO_FILE_READER (self)); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -934,7 +934,7 @@ void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) { PhotoFileReaderRole result = 0; - PhotoFileReaderRole _tmp0_ = 0; + PhotoFileReaderRole _tmp0_; #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), 0); #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -955,11 +955,11 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) { #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_type_class_add_private (klass, sizeof (PhotoFileReaderPrivate)); #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) photo_file_reader_real_read_metadata; + ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) photo_file_reader_real_read_metadata; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) photo_file_reader_real_unscaled_read; + ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) photo_file_reader_real_unscaled_read; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read; + ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read; #line 964 "PhotoFileAdapter.c" } @@ -973,7 +973,7 @@ static void photo_file_reader_instance_init (PhotoFileReader * self) { } -static void photo_file_reader_finalize (PhotoFileAdapter* obj) { +static void photo_file_reader_finalize (PhotoFileAdapter * obj) { PhotoFileReader * self; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_READER, PhotoFileReader); @@ -997,8 +997,8 @@ GType photo_file_reader_get_type (void) { PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { PhotoFileWriter* self = NULL; - const gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; + const gchar* _tmp0_; + PhotoFileFormat _tmp1_; #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -1015,11 +1015,11 @@ PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* fi PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self) { PhotoFileReader* result = NULL; - PhotoFileFormat _tmp0_ = 0; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PhotoFileReader* _tmp3_ = NULL; - PhotoFileReader* _tmp4_ = NULL; + PhotoFileFormat _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PhotoFileReader* _tmp3_; + PhotoFileReader* _tmp4_; #line 105 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_WRITER (self), NULL); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -1064,7 +1064,7 @@ static void photo_file_writer_class_init (PhotoFileWriterClass * klass) { #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_writer_parent_class = g_type_class_peek_parent (klass); #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write; + ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write; #line 1069 "PhotoFileAdapter.c" } @@ -1087,8 +1087,8 @@ GType photo_file_writer_get_type (void) { PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { PhotoFileMetadataWriter* self = NULL; - const gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; + const gchar* _tmp0_; + PhotoFileFormat _tmp1_; #line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -1105,11 +1105,11 @@ PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self) { PhotoFileReader* result = NULL; - PhotoFileFormat _tmp0_ = 0; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PhotoFileReader* _tmp3_ = NULL; - PhotoFileReader* _tmp4_ = NULL; + PhotoFileFormat _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PhotoFileReader* _tmp3_; + PhotoFileReader* _tmp4_; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self), NULL); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -1154,7 +1154,7 @@ static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata; + ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata; #line 1159 "PhotoFileAdapter.c" } diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c index 578b1b3..a6cb235 100644 --- a/src/photos/PhotoFileFormat.c +++ b/src/photos/PhotoFileFormat.c @@ -1,4 +1,4 @@ -/* PhotoFileFormat.c generated by valac 0.34.7, the Vala compiler +/* PhotoFileFormat.c generated by valac 0.36.6, the Vala compiler * generated from PhotoFileFormat.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -263,27 +263,27 @@ GQuark photo_format_error_quark (void); GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1); PhotoFileFormat* photo_file_format_get_supported (int* result_length1); -static void _vala_array_add43 (PhotoFileFormat** array, int* length, int* size, PhotoFileFormat value); +static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value); PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1); static gboolean ___lambda4_ (PhotoFileFormat format); gboolean photo_file_format_can_write (PhotoFileFormat self); static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length); PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1); -static gboolean ___lambda23_ (PhotoFileFormat format); +static gboolean ___lambda24_ (PhotoFileFormat format); gboolean photo_file_format_can_write_image (PhotoFileFormat self); -static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); +static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length); PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1); -static gboolean ___lambda24_ (PhotoFileFormat format); +static gboolean ___lambda25_ (PhotoFileFormat format); gboolean photo_file_format_can_write_metadata (PhotoFileFormat self); -static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); +static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length); PhotoFileFormat* photo_file_format_get_writeable (int* result_length1); PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1); PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1); PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename); -void disassemble_filename (const gchar* basename, gchar** name, gchar** ext); +void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); gboolean is_string_empty (const gchar* s); gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); @@ -373,7 +373,7 @@ gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProper gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1); gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, int* result_length1); gchar** photo_file_format_get_editable_mime_types (int* result_length1); -static void _vala_array_add44 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value); enum { PHOTO_FILE_FORMAT_DRIVER_DUMMY_PROPERTY }; @@ -386,7 +386,7 @@ static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFo static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath); static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options); PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); -static void photo_file_format_driver_finalize (PhotoFileFormatDriver* obj); +static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_flags_get_type (void) G_GNUC_CONST; enum { PHOTO_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY @@ -406,7 +406,7 @@ gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProper static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* self); GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, GFile* file); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); -static void photo_file_format_properties_finalize (PhotoFileFormatProperties* obj); +static void photo_file_format_properties_finalize (PhotoFileFormatProperties * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -416,7 +416,7 @@ GQuark photo_format_error_quark (void) { } -static void _vala_array_add43 (PhotoFileFormat** array, int* length, int* size, PhotoFileFormat value) { +static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value) { #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if ((*length) == (*size)) { #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -434,13 +434,13 @@ static void _vala_array_add43 (PhotoFileFormat** array, int* length, int* size, PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1) { PhotoFileFormat* result = NULL; PhotoFileFormat* applicable = NULL; - PhotoFileFormat* _tmp0_ = NULL; - gint applicable_length1 = 0; - gint _applicable_size_ = 0; - gint _tmp1_ = 0; - PhotoFileFormat* _tmp2_ = NULL; - PhotoFileFormat* _tmp8_ = NULL; - gint _tmp8__length1 = 0; + PhotoFileFormat* _tmp0_; + gint applicable_length1; + gint _applicable_size_; + gint _tmp1_; + PhotoFileFormat* _tmp2_; + PhotoFileFormat* _tmp8_; + gint _tmp8__length1; #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = g_new0 (PhotoFileFormat, 0); #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -469,10 +469,10 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl format = format_collection[format_it]; #line 471 "PhotoFileFormat.c" { - PhotoFileFormatDataApplicableTest _tmp3_ = NULL; - void* _tmp3__target = NULL; - PhotoFileFormat _tmp4_ = 0; - gboolean _tmp5_ = FALSE; + PhotoFileFormatDataApplicableTest _tmp3_; + void* _tmp3__target; + PhotoFileFormat _tmp4_; + gboolean _tmp5_; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3_ = test; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -484,9 +484,9 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp5_) { #line 487 "PhotoFileFormat.c" - PhotoFileFormat* _tmp6_ = NULL; - gint _tmp6__length1 = 0; - PhotoFileFormat _tmp7_ = 0; + PhotoFileFormat* _tmp6_; + gint _tmp6__length1; + PhotoFileFormat _tmp7_; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp6_ = applicable; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -523,8 +523,8 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl static gboolean ___lambda4_ (PhotoFileFormat format) { gboolean result = FALSE; - PhotoFileFormat _tmp0_ = 0; - gboolean _tmp1_ = FALSE; + PhotoFileFormat _tmp0_; + gboolean _tmp1_; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = format; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -555,14 +555,14 @@ static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length) { PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { PhotoFileFormat* result = NULL; - PhotoFileFormat* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PhotoFileFormat* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - PhotoFileFormat* _tmp4_ = NULL; - gint _tmp4__length1 = 0; - PhotoFileFormat* _tmp5_ = NULL; - gint _tmp5__length1 = 0; + PhotoFileFormat* _tmp0_; + gint _tmp0__length1; + PhotoFileFormat* _tmp3_; + gint _tmp3__length1; + PhotoFileFormat* _tmp4_; + gint _tmp4__length1; + PhotoFileFormat* _tmp5_; + gint _tmp5__length1; #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_data_writeable; #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -570,8 +570,8 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp0_ == NULL) { #line 573 "PhotoFileFormat.c" - gint _tmp1_ = 0; - PhotoFileFormat* _tmp2_ = NULL; + gint _tmp1_; + PhotoFileFormat* _tmp2_; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_data_find_applicable (____lambda4__photo_file_format_data_applicable_test, NULL, &_tmp1_); #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -610,10 +610,10 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { } -static gboolean ___lambda23_ (PhotoFileFormat format) { +static gboolean ___lambda24_ (PhotoFileFormat format) { gboolean result = FALSE; - PhotoFileFormat _tmp0_ = 0; - gboolean _tmp1_ = FALSE; + PhotoFileFormat _tmp0_; + gboolean _tmp1_; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = format; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -626,9 +626,9 @@ static gboolean ___lambda23_ (PhotoFileFormat format) { } -static gboolean ____lambda23__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { gboolean result; - result = ___lambda23_ (format); + result = ___lambda24_ (format); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; #line 635 "PhotoFileFormat.c" @@ -644,14 +644,14 @@ static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length) { PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1) { PhotoFileFormat* result = NULL; - PhotoFileFormat* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PhotoFileFormat* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - PhotoFileFormat* _tmp4_ = NULL; - gint _tmp4__length1 = 0; - PhotoFileFormat* _tmp5_ = NULL; - gint _tmp5__length1 = 0; + PhotoFileFormat* _tmp0_; + gint _tmp0__length1; + PhotoFileFormat* _tmp3_; + gint _tmp3__length1; + PhotoFileFormat* _tmp4_; + gint _tmp4__length1; + PhotoFileFormat* _tmp5_; + gint _tmp5__length1; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_data_image_writeable; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -659,10 +659,10 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp0_ == NULL) { #line 662 "PhotoFileFormat.c" - gint _tmp1_ = 0; - PhotoFileFormat* _tmp2_ = NULL; + gint _tmp1_; + PhotoFileFormat* _tmp2_; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_data_find_applicable (____lambda23__photo_file_format_data_applicable_test, NULL, &_tmp1_); + _tmp2_ = photo_file_format_data_find_applicable (____lambda24__photo_file_format_data_applicable_test, NULL, &_tmp1_); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_data_image_writeable = (g_free (photo_file_format_data_image_writeable), NULL); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -699,10 +699,10 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 } -static gboolean ___lambda24_ (PhotoFileFormat format) { +static gboolean ___lambda25_ (PhotoFileFormat format) { gboolean result = FALSE; - PhotoFileFormat _tmp0_ = 0; - gboolean _tmp1_ = FALSE; + PhotoFileFormat _tmp0_; + gboolean _tmp1_; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = format; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -715,9 +715,9 @@ static gboolean ___lambda24_ (PhotoFileFormat format) { } -static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { gboolean result; - result = ___lambda24_ (format); + result = ___lambda25_ (format); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; #line 724 "PhotoFileFormat.c" @@ -733,14 +733,14 @@ static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length) { PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1) { PhotoFileFormat* result = NULL; - PhotoFileFormat* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - PhotoFileFormat* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - PhotoFileFormat* _tmp4_ = NULL; - gint _tmp4__length1 = 0; - PhotoFileFormat* _tmp5_ = NULL; - gint _tmp5__length1 = 0; + PhotoFileFormat* _tmp0_; + gint _tmp0__length1; + PhotoFileFormat* _tmp3_; + gint _tmp3__length1; + PhotoFileFormat* _tmp4_; + gint _tmp4__length1; + PhotoFileFormat* _tmp5_; + gint _tmp5__length1; #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_data_metadata_writeable; #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -748,10 +748,10 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp0_ == NULL) { #line 751 "PhotoFileFormat.c" - gint _tmp1_ = 0; - PhotoFileFormat* _tmp2_ = NULL; + gint _tmp1_; + PhotoFileFormat* _tmp2_; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_data_find_applicable (____lambda24__photo_file_format_data_applicable_test, NULL, &_tmp1_); + _tmp2_ = photo_file_format_data_find_applicable (____lambda25__photo_file_format_data_applicable_test, NULL, &_tmp1_); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_data_metadata_writeable = (g_free (photo_file_format_data_metadata_writeable), NULL); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -790,9 +790,9 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng PhotoFileFormat* photo_file_format_get_supported (int* result_length1) { PhotoFileFormat* result = NULL; - PhotoFileFormat* _tmp0_ = NULL; - PhotoFileFormat* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + PhotoFileFormat* _tmp0_; + PhotoFileFormat* _tmp1_; + gint _tmp1__length1; #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = g_new0 (PhotoFileFormat, 5); #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -825,10 +825,10 @@ PhotoFileFormat* photo_file_format_get_supported (int* result_length1) { PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) { PhotoFileFormat* result = NULL; - gint _tmp0_ = 0; - PhotoFileFormat* _tmp1_ = NULL; - PhotoFileFormat* _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gint _tmp0_; + PhotoFileFormat* _tmp1_; + PhotoFileFormat* _tmp2_; + gint _tmp2__length1; #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = photo_file_format_data_get_writeable (&_tmp0_); #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -851,10 +851,10 @@ PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) { PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) { PhotoFileFormat* result = NULL; - gint _tmp0_ = 0; - PhotoFileFormat* _tmp1_ = NULL; - PhotoFileFormat* _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gint _tmp0_; + PhotoFileFormat* _tmp1_; + PhotoFileFormat* _tmp2_; + gint _tmp2__length1; #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = photo_file_format_data_get_image_writeable (&_tmp0_); #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -877,10 +877,10 @@ PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) { PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1) { PhotoFileFormat* result = NULL; - gint _tmp0_ = 0; - PhotoFileFormat* _tmp1_ = NULL; - PhotoFileFormat* _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gint _tmp0_; + PhotoFileFormat* _tmp1_; + PhotoFileFormat* _tmp2_; + gint _tmp2__length1; #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = photo_file_format_data_get_metadata_writeable (&_tmp0_); #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -905,13 +905,13 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena PhotoFileFormat result = 0; gchar* name = NULL; gchar* ext = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gint _tmp5_ = 0; - PhotoFileFormat* _tmp6_ = NULL; + const gchar* _tmp3_; + gboolean _tmp4_; + gint _tmp5_; + PhotoFileFormat* _tmp6_; #line 80 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (basename != NULL, 0); #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -962,14 +962,14 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena file_format = file_format_collection[file_format_it]; #line 964 "PhotoFileFormat.c" { - PhotoFileFormat _tmp7_ = 0; - PhotoFileFormatDriver* _tmp8_ = NULL; - PhotoFileFormatDriver* _tmp9_ = NULL; - PhotoFileFormatProperties* _tmp10_ = NULL; - PhotoFileFormatProperties* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_ = FALSE; + PhotoFileFormat _tmp7_; + PhotoFileFormatDriver* _tmp8_; + PhotoFileFormatDriver* _tmp9_; + PhotoFileFormatProperties* _tmp10_; + PhotoFileFormatProperties* _tmp11_; + const gchar* _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp7_ = file_format; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1024,11 +1024,11 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena gboolean photo_file_format_is_file_supported (GFile* file) { gboolean result = FALSE; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - gboolean _tmp4_ = FALSE; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gboolean _tmp3_; + gboolean _tmp4_; #line 95 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1055,13 +1055,13 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) { gboolean result = FALSE; gchar* name = NULL; gchar* ext = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; gchar* _tmp1_ = NULL; gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gint _tmp5_ = 0; - PhotoFileFormat* _tmp6_ = NULL; + const gchar* _tmp3_; + gboolean _tmp4_; + gint _tmp5_; + PhotoFileFormat* _tmp6_; #line 99 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (basename != NULL, FALSE); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1112,14 +1112,14 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) { format = format_collection[format_it]; #line 1114 "PhotoFileFormat.c" { - PhotoFileFormat _tmp7_ = 0; - PhotoFileFormatDriver* _tmp8_ = NULL; - PhotoFileFormatDriver* _tmp9_ = NULL; - PhotoFileFormatProperties* _tmp10_ = NULL; - PhotoFileFormatProperties* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - gboolean _tmp14_ = FALSE; + PhotoFileFormat _tmp7_; + PhotoFileFormatDriver* _tmp8_; + PhotoFileFormatDriver* _tmp9_; + PhotoFileFormatProperties* _tmp10_; + PhotoFileFormatProperties* _tmp11_; + const gchar* _tmp12_; + gboolean _tmp13_; + gboolean _tmp14_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp7_ = format; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1184,11 +1184,11 @@ PhotoFileFormat photo_file_format_get_system_default_format (void) { PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file) { PhotoFileFormat result = 0; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PhotoFileFormat _tmp3_ = 0; - PhotoFileFormat _tmp4_ = 0; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PhotoFileFormat _tmp3_; + PhotoFileFormat _tmp4_; #line 119 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), 0); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1282,7 +1282,7 @@ gint photo_file_format_serialize (PhotoFileFormat self) { PhotoFileFormat photo_file_format_unserialize (gint value) { PhotoFileFormat result = 0; - gint _tmp0_ = 0; + gint _tmp0_; #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = value; #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1351,8 +1351,8 @@ PhotoFileFormat photo_file_format_unserialize (gint value) { PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type) { PhotoFileFormat result = 0; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; GQuark _tmp3_ = 0U; #line 170 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (type != NULL, 0); @@ -1447,8 +1447,8 @@ PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type) { PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name) { PhotoFileFormat result = 0; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; GQuark _tmp3_ = 0U; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" static GQuark _tmp2_label0 = 0; @@ -1610,7 +1610,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self case PHOTO_FILE_FORMAT_JFIF: #line 1612 "PhotoFileFormat.c" { - JfifFileFormatDriver* _tmp0_ = NULL; + JfifFileFormatDriver* _tmp0_; #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = jfif_file_format_driver_get_instance (); #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1623,7 +1623,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self case PHOTO_FILE_FORMAT_RAW: #line 1625 "PhotoFileFormat.c" { - RawFileFormatDriver* _tmp1_ = NULL; + RawFileFormatDriver* _tmp1_; #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = raw_file_format_driver_get_instance (); #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1636,7 +1636,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self case PHOTO_FILE_FORMAT_PNG: #line 1638 "PhotoFileFormat.c" { - PngFileFormatDriver* _tmp2_ = NULL; + PngFileFormatDriver* _tmp2_; #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = png_file_format_driver_get_instance (); #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1649,7 +1649,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self case PHOTO_FILE_FORMAT_TIFF: #line 1651 "PhotoFileFormat.c" { - PhotosTiffFileFormatDriver* _tmp3_ = NULL; + PhotosTiffFileFormatDriver* _tmp3_; #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3_ = photos_tiff_file_format_driver_get_instance (); #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1662,7 +1662,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self case PHOTO_FILE_FORMAT_BMP: #line 1664 "PhotoFileFormat.c" { - PhotosBmpFileFormatDriver* _tmp4_ = NULL; + PhotosBmpFileFormatDriver* _tmp4_; #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp4_ = photos_bmp_file_format_driver_get_instance (); #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1686,10 +1686,10 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self) { PhotoFileFormatProperties* result = NULL; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - PhotoFileFormatProperties* _tmp2_ = NULL; - PhotoFileFormatProperties* _tmp3_ = NULL; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + PhotoFileFormatProperties* _tmp2_; + PhotoFileFormatProperties* _tmp3_; #line 264 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 264 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1710,13 +1710,13 @@ PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat sel gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar* name) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - PhotoFileFormatProperties* _tmp1_ = NULL; - PhotoFileFormatProperties* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + const gchar* _tmp0_; + PhotoFileFormatProperties* _tmp1_; + PhotoFileFormatProperties* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 268 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (name != NULL, NULL); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1747,11 +1747,11 @@ gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath) { PhotoFileReader* result = NULL; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PhotoFileReader* _tmp3_ = NULL; - PhotoFileReader* _tmp4_ = NULL; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + const gchar* _tmp2_; + PhotoFileReader* _tmp3_; + PhotoFileReader* _tmp4_; #line 272 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1777,13 +1777,13 @@ PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gc gboolean photo_file_format_can_write (PhotoFileFormat self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = photo_file_format_can_write_image (self); #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp1_) { #line 1786 "PhotoFileFormat.c" - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_can_write_metadata (self); #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1804,10 +1804,10 @@ gboolean photo_file_format_can_write (PhotoFileFormat self) { gboolean photo_file_format_can_write_image (PhotoFileFormat self) { gboolean result = FALSE; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1828,10 +1828,10 @@ gboolean photo_file_format_can_write_image (PhotoFileFormat self) { gboolean photo_file_format_can_write_metadata (PhotoFileFormat self) { gboolean result = FALSE; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + gboolean _tmp2_; + gboolean _tmp3_; #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1853,12 +1853,12 @@ gboolean photo_file_format_can_write_metadata (PhotoFileFormat self) { PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error) { PhotoFileWriter* result = NULL; PhotoFileWriter* writer = NULL; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PhotoFileWriter* _tmp3_ = NULL; - PhotoFileWriter* _tmp4_ = NULL; - PhotoFileWriter* _tmp5_ = NULL; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + const gchar* _tmp2_; + PhotoFileWriter* _tmp3_; + PhotoFileWriter* _tmp4_; + PhotoFileWriter* _tmp5_; GError * _inner_error_ = NULL; #line 289 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (filepath != NULL, NULL); @@ -1882,7 +1882,7 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc if (_tmp5_ == NULL) { #line 1884 "PhotoFileFormat.c" GEnumValue* _tmp6_; - GError* _tmp7_ = NULL; + GError* _tmp7_; #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1921,12 +1921,12 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error) { PhotoFileMetadataWriter* result = NULL; PhotoFileMetadataWriter* writer = NULL; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - PhotoFileMetadataWriter* _tmp3_ = NULL; - PhotoFileMetadataWriter* _tmp4_ = NULL; - PhotoFileMetadataWriter* _tmp5_ = NULL; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + const gchar* _tmp2_; + PhotoFileMetadataWriter* _tmp3_; + PhotoFileMetadataWriter* _tmp4_; + PhotoFileMetadataWriter* _tmp5_; GError * _inner_error_ = NULL; #line 297 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (filepath != NULL, NULL); @@ -1950,7 +1950,7 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm if (_tmp5_ == NULL) { #line 1952 "PhotoFileFormat.c" GEnumValue* _tmp6_; - GError* _tmp7_ = NULL; + GError* _tmp7_; #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1988,12 +1988,12 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options) { PhotoFileSniffer* result = NULL; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - PhotoFileSnifferOptions _tmp3_ = 0; - PhotoFileSniffer* _tmp4_ = NULL; - PhotoFileSniffer* _tmp5_ = NULL; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + GFile* _tmp2_; + PhotoFileSnifferOptions _tmp3_; + PhotoFileSniffer* _tmp4_; + PhotoFileSniffer* _tmp5_; #line 305 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2020,10 +2020,10 @@ PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) { PhotoMetadata* result = NULL; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - PhotoMetadata* _tmp2_ = NULL; - PhotoMetadata* _tmp3_ = NULL; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + PhotoMetadata* _tmp2_; + PhotoMetadata* _tmp3_; #line 310 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 310 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2044,12 +2044,12 @@ PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) { gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) { gchar* result = NULL; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - PhotoFileFormatProperties* _tmp2_ = NULL; - PhotoFileFormatProperties* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + PhotoFileFormatProperties* _tmp2_; + PhotoFileFormatProperties* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 314 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 314 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2076,16 +2076,16 @@ gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) { gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1) { gchar** result = NULL; - PhotoFileFormatDriver* _tmp0_ = NULL; - PhotoFileFormatDriver* _tmp1_ = NULL; - PhotoFileFormatProperties* _tmp2_ = NULL; - PhotoFileFormatProperties* _tmp3_ = NULL; - gint _tmp4_ = 0; - gchar** _tmp5_ = NULL; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; + PhotoFileFormatDriver* _tmp0_; + PhotoFileFormatDriver* _tmp1_; + PhotoFileFormatProperties* _tmp2_; + PhotoFileFormatProperties* _tmp3_; + gint _tmp4_; + gchar** _tmp5_; + gchar** _tmp6_; + gint _tmp6__length1; + gchar** _tmp7_; + gint _tmp7__length1; #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2122,7 +2122,7 @@ gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_leng } -static void _vala_array_add44 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value) { #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if ((*length) == (*size)) { #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2142,13 +2142,13 @@ static void _vala_array_add44 (gchar*** array, int* length, int* size, gchar* va gchar** photo_file_format_get_editable_mime_types (int* result_length1) { gchar** result = NULL; gchar** mime_types = NULL; - gchar** _tmp0_ = NULL; - gint mime_types_length1 = 0; - gint _mime_types_size_ = 0; - gint _tmp1_ = 0; - PhotoFileFormat* _tmp2_ = NULL; - gchar** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + gchar** _tmp0_; + gint mime_types_length1; + gint _mime_types_size_; + gint _tmp1_; + PhotoFileFormat* _tmp2_; + gchar** _tmp10_; + gint _tmp10__length1; #line 322 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = g_new0 (gchar*, 0 + 1); #line 322 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2177,9 +2177,9 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { file_format = file_format_collection[file_format_it]; #line 2179 "PhotoFileFormat.c" { - PhotoFileFormat _tmp3_ = 0; - gint _tmp4_ = 0; - gchar** _tmp5_ = NULL; + PhotoFileFormat _tmp3_; + gint _tmp4_; + gchar** _tmp5_; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3_ = file_format; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2197,7 +2197,7 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" for (mime_type_it = 0; mime_type_it < _tmp4_; mime_type_it = mime_type_it + 1) { #line 2200 "PhotoFileFormat.c" - gchar* _tmp6_ = NULL; + gchar* _tmp6_; gchar* mime_type = NULL; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp6_ = g_strdup (mime_type_collection[mime_type_it]); @@ -2205,10 +2205,10 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { mime_type = _tmp6_; #line 2207 "PhotoFileFormat.c" { - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; - const gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + gchar** _tmp7_; + gint _tmp7__length1; + const gchar* _tmp8_; + gchar* _tmp9_; #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp7_ = mime_types; #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2462,7 +2462,7 @@ static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (collect_values[0].v_pointer) { #line 2465 "PhotoFileFormat.c" - PhotoFileFormatDriver* object; + PhotoFileFormatDriver * object; object = collect_values[0].v_pointer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (object->parent_instance.g_class == NULL) { @@ -2489,7 +2489,7 @@ static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint static gchar* value_photo_file_format_driver_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PhotoFileFormatDriver** object_p; + PhotoFileFormatDriver ** object_p; object_p = collect_values[0].v_pointer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!object_p) { @@ -2541,7 +2541,7 @@ gpointer value_get_photo_file_format_driver (const GValue* value) { void value_set_photo_file_format_driver (GValue* value, gpointer v_object) { - PhotoFileFormatDriver* old; + PhotoFileFormatDriver * old; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER)); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2572,7 +2572,7 @@ void value_set_photo_file_format_driver (GValue* value, gpointer v_object) { void value_take_photo_file_format_driver (GValue* value, gpointer v_object) { - PhotoFileFormatDriver* old; + PhotoFileFormatDriver * old; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER)); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2606,21 +2606,21 @@ static void photo_file_format_driver_class_init (PhotoFileFormatDriverClass * kl #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" ((PhotoFileFormatDriverClass *) klass)->finalize = photo_file_format_driver_finalize; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_get_properties; + ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_get_properties; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_reader; + ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_reader; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_create_metadata; + ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_create_metadata; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_image; + ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_can_write_image; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photo_file_format_driver_real_can_write_metadata; + ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) photo_file_format_driver_real_can_write_metadata; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_writer; + ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_writer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photo_file_format_driver_real_create_metadata_writer; + ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_metadata_writer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer; + ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer; #line 2625 "PhotoFileFormat.c" } @@ -2632,7 +2632,7 @@ static void photo_file_format_driver_instance_init (PhotoFileFormatDriver * self } -static void photo_file_format_driver_finalize (PhotoFileFormatDriver* obj) { +static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj) { PhotoFileFormatDriver * self; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); @@ -2657,7 +2657,7 @@ GType photo_file_format_driver_get_type (void) { gpointer photo_file_format_driver_ref (gpointer instance) { - PhotoFileFormatDriver* self; + PhotoFileFormatDriver * self; self = instance; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_atomic_int_inc (&self->ref_count); @@ -2668,7 +2668,7 @@ gpointer photo_file_format_driver_ref (gpointer instance) { void photo_file_format_driver_unref (gpointer instance) { - PhotoFileFormatDriver* self; + PhotoFileFormatDriver * self; self = instance; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2731,13 +2731,13 @@ PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProp static gboolean photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gint _tmp1_ = 0; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + const gchar* _tmp0_; + gint _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; + gboolean _tmp4_; + gboolean _tmp5_; #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (ext != NULL, FALSE); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2872,23 +2872,23 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope GFile* result = NULL; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GFile* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; gchar* _tmp3_ = NULL; gchar* _tmp4_ = NULL; gboolean _tmp5_ = FALSE; - const gchar* _tmp6_ = NULL; - GFile* _tmp11_ = NULL; - GFile* _tmp12_ = NULL; - GFile* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - GFile* _tmp19_ = NULL; - GFile* _tmp20_ = NULL; + const gchar* _tmp6_; + GFile* _tmp11_; + GFile* _tmp12_; + GFile* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + GFile* _tmp19_; + GFile* _tmp20_; #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2916,8 +2916,8 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp6_ != NULL) { #line 2919 "PhotoFileFormat.c" - const gchar* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + const gchar* _tmp7_; + gboolean _tmp8_; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp7_ = ext; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2933,8 +2933,8 @@ GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatPrope #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp5_) { #line 2936 "PhotoFileFormat.c" - GFile* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; + GFile* _tmp9_; + GFile* _tmp10_; #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp9_ = file; #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -3039,7 +3039,7 @@ static gchar* value_photo_file_format_properties_collect_value (GValue* value, g #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (collect_values[0].v_pointer) { #line 3042 "PhotoFileFormat.c" - PhotoFileFormatProperties* object; + PhotoFileFormatProperties * object; object = collect_values[0].v_pointer; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (object->parent_instance.g_class == NULL) { @@ -3066,7 +3066,7 @@ static gchar* value_photo_file_format_properties_collect_value (GValue* value, g static gchar* value_photo_file_format_properties_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PhotoFileFormatProperties** object_p; + PhotoFileFormatProperties ** object_p; object_p = collect_values[0].v_pointer; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!object_p) { @@ -3118,7 +3118,7 @@ gpointer value_get_photo_file_format_properties (const GValue* value) { void value_set_photo_file_format_properties (GValue* value, gpointer v_object) { - PhotoFileFormatProperties* old; + PhotoFileFormatProperties * old; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES)); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -3149,7 +3149,7 @@ void value_set_photo_file_format_properties (GValue* value, gpointer v_object) { void value_take_photo_file_format_properties (GValue* value, gpointer v_object) { - PhotoFileFormatProperties* old; + PhotoFileFormatProperties * old; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES)); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -3183,21 +3183,21 @@ static void photo_file_format_properties_class_init (PhotoFileFormatPropertiesCl #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" ((PhotoFileFormatPropertiesClass *) klass)->finalize = photo_file_format_properties_finalize; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_file_format; + ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_file_format; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_flags; + ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_flags; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = (gboolean (*)(PhotoFileFormatProperties*, const gchar*)) photo_file_format_properties_real_is_recognized_extension; + ((PhotoFileFormatPropertiesClass *) klass)->is_recognized_extension = (gboolean (*) (PhotoFileFormatProperties *, const gchar*)) photo_file_format_properties_real_is_recognized_extension; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_extension; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_default_extension; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_known_extensions; + ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) photo_file_format_properties_real_get_known_extensions; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_default_mime_type; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_default_mime_type; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photo_file_format_properties_real_get_mime_types; + ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) photo_file_format_properties_real_get_mime_types; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photo_file_format_properties_real_get_user_visible_name; + ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_user_visible_name; #line 3202 "PhotoFileFormat.c" } @@ -3209,7 +3209,7 @@ static void photo_file_format_properties_instance_init (PhotoFileFormatPropertie } -static void photo_file_format_properties_finalize (PhotoFileFormatProperties* obj) { +static void photo_file_format_properties_finalize (PhotoFileFormatProperties * obj) { PhotoFileFormatProperties * self; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); @@ -3234,7 +3234,7 @@ GType photo_file_format_properties_get_type (void) { gpointer photo_file_format_properties_ref (gpointer instance) { - PhotoFileFormatProperties* self; + PhotoFileFormatProperties * self; self = instance; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_atomic_int_inc (&self->ref_count); @@ -3245,7 +3245,7 @@ gpointer photo_file_format_properties_ref (gpointer instance) { void photo_file_format_properties_unref (gpointer instance) { - PhotoFileFormatProperties* self; + PhotoFileFormatProperties * self; self = instance; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c index 86295b3..e632525 100644 --- a/src/photos/PhotoFileSniffer.c +++ b/src/photos/PhotoFileSniffer.c @@ -1,4 +1,4 @@ -/* PhotoFileSniffer.c generated by valac 0.34.7, the Vala compiler +/* PhotoFileSniffer.c generated by valac 0.36.6, the Vala compiler * generated from PhotoFileSniffer.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -203,7 +203,7 @@ enum { void dimensions_init (Dimensions *self, gint width, gint height); DetectedPhotoInformation* detected_photo_information_new (void); DetectedPhotoInformation* detected_photo_information_construct (GType object_type); -static void detected_photo_information_finalize (DetectedPhotoInformation* obj); +static void detected_photo_information_finalize (DetectedPhotoInformation * 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); @@ -218,7 +218,7 @@ enum { PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); static DetectedPhotoInformation* photo_file_sniffer_real_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); -static void photo_file_sniffer_finalize (PhotoFileSniffer* obj); +static void photo_file_sniffer_finalize (PhotoFileSniffer * obj); gpointer photo_file_interrogator_ref (gpointer instance); void photo_file_interrogator_unref (gpointer instance); GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -237,7 +237,7 @@ gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error); PhotoFileFormat* photo_file_format_get_supported (int* result_length1); PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options); -static void photo_file_interrogator_finalize (PhotoFileInterrogator* obj); +static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj); DetectedPhotoInformation* detected_photo_information_construct (GType object_type) { @@ -299,7 +299,7 @@ static gchar* value_detected_photo_information_collect_value (GValue* value, gui #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (collect_values[0].v_pointer) { #line 302 "PhotoFileSniffer.c" - DetectedPhotoInformation* object; + DetectedPhotoInformation * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (object->parent_instance.g_class == NULL) { @@ -326,7 +326,7 @@ static gchar* value_detected_photo_information_collect_value (GValue* value, gui static gchar* value_detected_photo_information_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - DetectedPhotoInformation** object_p; + DetectedPhotoInformation ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!object_p) { @@ -378,7 +378,7 @@ gpointer value_get_detected_photo_information (const GValue* value) { void value_set_detected_photo_information (GValue* value, gpointer v_object) { - DetectedPhotoInformation* old; + DetectedPhotoInformation * old; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION)); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -409,7 +409,7 @@ void value_set_detected_photo_information (GValue* value, gpointer v_object) { void value_take_detected_photo_information (GValue* value, gpointer v_object) { - DetectedPhotoInformation* old; + DetectedPhotoInformation * old; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION)); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -473,7 +473,7 @@ static void detected_photo_information_instance_init (DetectedPhotoInformation * } -static void detected_photo_information_finalize (DetectedPhotoInformation* obj) { +static void detected_photo_information_finalize (DetectedPhotoInformation * obj) { DetectedPhotoInformation * self; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DETECTED_PHOTO_INFORMATION, DetectedPhotoInformation); @@ -508,7 +508,7 @@ GType detected_photo_information_get_type (void) { gpointer detected_photo_information_ref (gpointer instance) { - DetectedPhotoInformation* self; + DetectedPhotoInformation * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_atomic_int_inc (&self->ref_count); @@ -519,7 +519,7 @@ gpointer detected_photo_information_ref (gpointer instance) { void detected_photo_information_unref (gpointer instance) { - DetectedPhotoInformation* self; + DetectedPhotoInformation * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -553,10 +553,10 @@ static gpointer _g_object_ref0 (gpointer self) { PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { PhotoFileSniffer* self = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - PhotoFileSnifferOptions _tmp2_ = 0; - PhotoFileSnifferOptions _tmp3_ = 0; + GFile* _tmp0_; + GFile* _tmp1_; + PhotoFileSnifferOptions _tmp2_; + PhotoFileSnifferOptions _tmp3_; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -643,7 +643,7 @@ static gchar* value_photo_file_sniffer_collect_value (GValue* value, guint n_col #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (collect_values[0].v_pointer) { #line 646 "PhotoFileSniffer.c" - PhotoFileSniffer* object; + PhotoFileSniffer * object; object = collect_values[0].v_pointer; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (object->parent_instance.g_class == NULL) { @@ -670,7 +670,7 @@ static gchar* value_photo_file_sniffer_collect_value (GValue* value, guint n_col static gchar* value_photo_file_sniffer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PhotoFileSniffer** object_p; + PhotoFileSniffer ** object_p; object_p = collect_values[0].v_pointer; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!object_p) { @@ -722,7 +722,7 @@ gpointer value_get_photo_file_sniffer (const GValue* value) { void value_set_photo_file_sniffer (GValue* value, gpointer v_object) { - PhotoFileSniffer* old; + PhotoFileSniffer * old; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER)); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -753,7 +753,7 @@ void value_set_photo_file_sniffer (GValue* value, gpointer v_object) { void value_take_photo_file_sniffer (GValue* value, gpointer v_object) { - PhotoFileSniffer* old; + PhotoFileSniffer * old; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER)); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -787,7 +787,7 @@ static void photo_file_sniffer_class_init (PhotoFileSnifferClass * klass) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" ((PhotoFileSnifferClass *) klass)->finalize = photo_file_sniffer_finalize; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photo_file_sniffer_real_sniff; + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photo_file_sniffer_real_sniff; #line 792 "PhotoFileSniffer.c" } @@ -799,7 +799,7 @@ static void photo_file_sniffer_instance_init (PhotoFileSniffer * self) { } -static void photo_file_sniffer_finalize (PhotoFileSniffer* obj) { +static void photo_file_sniffer_finalize (PhotoFileSniffer * obj) { PhotoFileSniffer * self; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); @@ -826,7 +826,7 @@ GType photo_file_sniffer_get_type (void) { gpointer photo_file_sniffer_ref (gpointer instance) { - PhotoFileSniffer* self; + PhotoFileSniffer * self; self = instance; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_atomic_int_inc (&self->ref_count); @@ -837,7 +837,7 @@ gpointer photo_file_sniffer_ref (gpointer instance) { void photo_file_sniffer_unref (gpointer instance) { - PhotoFileSniffer* self; + PhotoFileSniffer * self; self = instance; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -852,9 +852,9 @@ void photo_file_sniffer_unref (gpointer instance) { PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { PhotoFileInterrogator* self = NULL; - GFile* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - PhotoFileSnifferOptions _tmp2_ = 0; + GFile* _tmp0_; + GFile* _tmp1_; + PhotoFileSnifferOptions _tmp2_; #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -893,8 +893,8 @@ static gpointer _detected_photo_information_ref0 (gpointer self) { DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self) { DetectedPhotoInformation* result = NULL; - DetectedPhotoInformation* _tmp0_ = NULL; - DetectedPhotoInformation* _tmp1_ = NULL; + DetectedPhotoInformation* _tmp0_; + DetectedPhotoInformation* _tmp1_; #line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (IS_PHOTO_FILE_INTERROGATOR (self), NULL); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -911,7 +911,7 @@ DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 80 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (IS_PHOTO_FILE_INTERROGATOR (self), FALSE); #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -925,8 +925,8 @@ gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error) { - gint _tmp0_ = 0; - PhotoFileFormat* _tmp1_ = NULL; + gint _tmp0_; + PhotoFileFormat* _tmp1_; GError * _inner_error_ = NULL; #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (IS_PHOTO_FILE_INTERROGATOR (self)); @@ -951,18 +951,18 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** #line 952 "PhotoFileSniffer.c" { PhotoFileSniffer* sniffer = NULL; - PhotoFileFormat _tmp2_ = 0; - GFile* _tmp3_ = NULL; - PhotoFileSnifferOptions _tmp4_ = 0; - PhotoFileSniffer* _tmp5_ = NULL; + PhotoFileFormat _tmp2_; + GFile* _tmp3_; + PhotoFileSnifferOptions _tmp4_; + PhotoFileSniffer* _tmp5_; gboolean is_corrupted = FALSE; DetectedPhotoInformation* _tmp6_ = NULL; - PhotoFileSniffer* _tmp7_ = NULL; + PhotoFileSniffer* _tmp7_; gboolean _tmp8_ = FALSE; - DetectedPhotoInformation* _tmp9_ = NULL; - DetectedPhotoInformation* _tmp10_ = NULL; + DetectedPhotoInformation* _tmp9_; + DetectedPhotoInformation* _tmp10_; gboolean _tmp11_ = FALSE; - DetectedPhotoInformation* _tmp12_ = NULL; + DetectedPhotoInformation* _tmp12_; #line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp2_ = file_format; #line 86 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1006,7 +1006,7 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (_tmp12_ != NULL) { #line 1009 "PhotoFileSniffer.c" - gboolean _tmp13_ = FALSE; + gboolean _tmp13_; #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp13_ = is_corrupted; #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1020,9 +1020,9 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (_tmp11_) { #line 1023 "PhotoFileSniffer.c" - DetectedPhotoInformation* _tmp14_ = NULL; - PhotoFileFormat _tmp15_ = 0; - PhotoFileFormat _tmp16_ = 0; + DetectedPhotoInformation* _tmp14_; + PhotoFileFormat _tmp15_; + PhotoFileFormat _tmp16_; #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp14_ = self->priv->detected; #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1039,15 +1039,15 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** break; #line 1041 "PhotoFileSniffer.c" } else { - gboolean _tmp17_ = FALSE; + gboolean _tmp17_; #line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp17_ = is_corrupted; #line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (_tmp17_) { #line 1048 "PhotoFileSniffer.c" - GFile* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; + GFile* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; #line 95 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp18_ = self->priv->file; #line 95 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1130,7 +1130,7 @@ static gchar* value_photo_file_interrogator_collect_value (GValue* value, guint #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (collect_values[0].v_pointer) { #line 1132 "PhotoFileSniffer.c" - PhotoFileInterrogator* object; + PhotoFileInterrogator * object; object = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (object->parent_instance.g_class == NULL) { @@ -1157,7 +1157,7 @@ static gchar* value_photo_file_interrogator_collect_value (GValue* value, guint static gchar* value_photo_file_interrogator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PhotoFileInterrogator** object_p; + PhotoFileInterrogator ** object_p; object_p = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!object_p) { @@ -1209,7 +1209,7 @@ gpointer value_get_photo_file_interrogator (const GValue* value) { void value_set_photo_file_interrogator (GValue* value, gpointer v_object) { - PhotoFileInterrogator* old; + PhotoFileInterrogator * old; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR)); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1240,7 +1240,7 @@ void value_set_photo_file_interrogator (GValue* value, gpointer v_object) { void value_take_photo_file_interrogator (GValue* value, gpointer v_object) { - PhotoFileInterrogator* old; + PhotoFileInterrogator * old; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR)); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1292,7 +1292,7 @@ static void photo_file_interrogator_instance_init (PhotoFileInterrogator * self) } -static void photo_file_interrogator_finalize (PhotoFileInterrogator* obj) { +static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj) { PhotoFileInterrogator * self; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_INTERROGATOR, PhotoFileInterrogator); @@ -1321,7 +1321,7 @@ GType photo_file_interrogator_get_type (void) { gpointer photo_file_interrogator_ref (gpointer instance) { - PhotoFileInterrogator* self; + PhotoFileInterrogator * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_atomic_int_inc (&self->ref_count); @@ -1332,7 +1332,7 @@ gpointer photo_file_interrogator_ref (gpointer instance) { void photo_file_interrogator_unref (gpointer instance) { - PhotoFileInterrogator* self; + PhotoFileInterrogator * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c index 6f7c8c7..9950bc1 100644 --- a/src/photos/PhotoMetadata.c +++ b/src/photos/PhotoMetadata.c @@ -1,4 +1,4 @@ -/* PhotoMetadata.c generated by valac 0.34.7, the Vala compiler +/* PhotoMetadata.c generated by valac 0.36.6, the Vala compiler * generated from PhotoMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -491,7 +491,7 @@ enum { GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* input, GError** error); static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, const gchar* input, GError** error); KeywordTransformer* keyword_transformer_construct (GType object_type); -static void keyword_transformer_finalize (KeywordTransformer* obj); +static void keyword_transformer_finalize (KeywordTransformer * obj); GType null_keyword_transformer_get_type (void) G_GNUC_CONST; enum { NULL_KEYWORD_TRANSFORMER_DUMMY_PROPERTY @@ -515,7 +515,7 @@ static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMark static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_); static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self); static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error); -static void acd_see_keyword_transformer_finalize (KeywordTransformer* obj); +static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj); gpointer hierarchical_keyword_field_ref (gpointer instance); void hierarchical_keyword_field_unref (gpointer instance); GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -528,7 +528,7 @@ enum { }; HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer); HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer); -static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj); +static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj); gpointer photo_preview_ref (gpointer instance); void photo_preview_unref (gpointer instance); GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -554,7 +554,7 @@ static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_lengt GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error); static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error); static guint8* _vala_array_dup4 (guint8* self, int length); -static void photo_preview_finalize (PhotoPreview* obj); +static void photo_preview_finalize (PhotoPreview * obj); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -616,8 +616,8 @@ static void block1_data_unref (void * _userdata_); static void __lambda5_ (Block1Data* _data1_, const gchar* tag); static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self); void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, GeeCollection* collection); -static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* value); -static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* value); +static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add46 (gchar** * array, int* length, int* size, gchar* value); void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1, GeeCollection* values, PhotoMetadataSetOption option); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); @@ -717,7 +717,7 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self); GType orientation_get_type (void) G_GNUC_CONST; Orientation photo_metadata_get_orientation (PhotoMetadata* self); void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation); -gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar** long_ref, gdouble* latitude, gchar** lat_ref, gdouble* altitude); +gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude); gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exposure); gchar* photo_metadata_get_exposure_string (PhotoMetadata* self); gboolean metadata_rational_is_valid (MetadataRational *self); @@ -747,8 +747,8 @@ enum { }; static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, int* result_length1, GError** error); static guint8* _vala_array_dup6 (guint8* self, int length); -static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj); -static void photo_metadata_finalize (MediaMetadata* obj); +static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj); +static void photo_metadata_finalize (MediaMetadata * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); @@ -837,7 +837,7 @@ static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_co #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { #line 840 "PhotoMetadata.c" - KeywordTransformer* object; + KeywordTransformer * object; object = collect_values[0].v_pointer; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { @@ -864,7 +864,7 @@ static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_co static gchar* value_keyword_transformer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - KeywordTransformer** object_p; + KeywordTransformer ** object_p; object_p = collect_values[0].v_pointer; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!object_p) { @@ -916,7 +916,7 @@ gpointer value_get_keyword_transformer (const GValue* value) { void value_set_keyword_transformer (GValue* value, gpointer v_object) { - KeywordTransformer* old; + KeywordTransformer * old; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER)); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -947,7 +947,7 @@ void value_set_keyword_transformer (GValue* value, gpointer v_object) { void value_take_keyword_transformer (GValue* value, gpointer v_object) { - KeywordTransformer* old; + KeywordTransformer * old; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER)); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -981,7 +981,7 @@ static void keyword_transformer_class_init (KeywordTransformerClass * klass) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->finalize = keyword_transformer_finalize; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) keyword_transformer_real_transform; + ((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) keyword_transformer_real_transform; #line 986 "PhotoMetadata.c" } @@ -993,7 +993,7 @@ static void keyword_transformer_instance_init (KeywordTransformer * self) { } -static void keyword_transformer_finalize (KeywordTransformer* obj) { +static void keyword_transformer_finalize (KeywordTransformer * obj) { KeywordTransformer * self; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer); @@ -1018,7 +1018,7 @@ GType keyword_transformer_get_type (void) { gpointer keyword_transformer_ref (gpointer instance) { - KeywordTransformer* self; + KeywordTransformer * self; self = instance; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&self->ref_count); @@ -1029,7 +1029,7 @@ gpointer keyword_transformer_ref (gpointer instance) { void keyword_transformer_unref (gpointer instance) { - KeywordTransformer* self; + KeywordTransformer * self; self = instance; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1046,8 +1046,8 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas NullKeywordTransformer * self; GeeList* result = NULL; GeeArrayList* _result_ = NULL; - GeeArrayList* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + GeeArrayList* _tmp0_; + const gchar* _tmp1_; #line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_KEYWORD_TRANSFORMER, NullKeywordTransformer); #line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1089,7 +1089,7 @@ static void null_keyword_transformer_class_init (NullKeywordTransformerClass * k #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" null_keyword_transformer_parent_class = g_type_class_peek_parent (klass); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) null_keyword_transformer_real_transform; + ((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) null_keyword_transformer_real_transform; #line 1094 "PhotoMetadata.c" } @@ -1140,8 +1140,8 @@ static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMa ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_type) { ACDSeeKeywordTransformer* self = NULL; - GeeArrayList* _tmp0_ = NULL; - GeeArrayQueue* _tmp1_ = NULL; + GeeArrayList* _tmp0_; + GeeArrayQueue* _tmp1_; #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (ACDSeeKeywordTransformer*) keyword_transformer_construct (object_type); #line 63 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1190,14 +1190,14 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* ACDSeeKeywordTransformer * self; GeeList* result = NULL; GMarkupParseContext* ctx = NULL; - GMarkupParser _tmp0_ = {0}; - GMarkupParseContext* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - GeeArrayList* _tmp6_ = NULL; - GeeList* _tmp7_ = NULL; + GMarkupParser _tmp0_; + GMarkupParseContext* _tmp1_; + const gchar* _tmp2_; + const gchar* _tmp3_; + gint _tmp4_; + gint _tmp5_; + GeeArrayList* _tmp6_; + GeeList* _tmp7_; GError * _inner_error_ = NULL; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer); @@ -1244,13 +1244,13 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, gchar** attribute_names, gchar** attribute_values, GError** error) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; + const gchar* _tmp0_; + const gchar* _tmp1_; + const gchar* _tmp2_; + gchar** _tmp3_; + gint _tmp3__length1; + gchar** _tmp4_; + gint _tmp4__length1; GError * _inner_error_ = NULL; #line 80 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); @@ -1311,7 +1311,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, GError** error) { - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1323,9 +1323,9 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, #line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_strcmp0 (_tmp0_, "Category") == 0) { #line 1326 "PhotoMetadata.c" - GeeArrayQueue* _tmp1_ = NULL; - gpointer _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + GeeArrayQueue* _tmp1_; + gpointer _tmp2_; + gchar* _tmp3_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->stack; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1340,10 +1340,10 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* text, GError** error) { - const gchar* _tmp0_ = NULL; - GeeArrayQueue* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + const gchar* _tmp0_; + GeeArrayQueue* _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1370,12 +1370,12 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, if (_tmp3_) { #line 1372 "PhotoMetadata.c" GString* builder = NULL; - GString* _tmp4_ = NULL; - GString* _tmp13_ = NULL; - gssize _tmp14_ = 0L; - GeeArrayList* _tmp18_ = NULL; - GString* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; + GString* _tmp4_; + GString* _tmp13_; + gssize _tmp14_; + GeeArrayList* _tmp18_; + GString* _tmp19_; + const gchar* _tmp20_; #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = g_string_new (""); #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1383,8 +1383,8 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, #line 1384 "PhotoMetadata.c" { GeeIterator* _f_it = NULL; - GeeArrayQueue* _tmp5_ = NULL; - GeeIterator* _tmp6_ = NULL; + GeeArrayQueue* _tmp5_; + GeeIterator* _tmp6_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = self->priv->stack; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1394,13 +1394,13 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { #line 1397 "PhotoMetadata.c" - GeeIterator* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + GeeIterator* _tmp7_; + gboolean _tmp8_; gchar* f = NULL; - GeeIterator* _tmp9_ = NULL; - gpointer _tmp10_ = NULL; - GString* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + GeeIterator* _tmp9_; + gpointer _tmp10_; + GString* _tmp11_; + const gchar* _tmp12_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _f_it; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1438,9 +1438,9 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp14_ > ((gssize) 0)) { #line 1441 "PhotoMetadata.c" - GString* _tmp15_ = NULL; - GString* _tmp16_ = NULL; - gssize _tmp17_ = 0L; + GString* _tmp15_; + GString* _tmp16_; + gssize _tmp17_; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = builder; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1474,8 +1474,8 @@ static gpointer _g_error_copy0 (gpointer self) { static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_) { - GError* _tmp0_ = NULL; - GError* _tmp1_ = NULL; + GError* _tmp0_; + GError* _tmp1_; #line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); #line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1500,7 +1500,7 @@ static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClas #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_class_add_private (klass, sizeof (ACDSeeKeywordTransformerPrivate)); #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((KeywordTransformerClass *) klass)->transform = (GeeList* (*)(KeywordTransformer*, const gchar*, GError**)) acd_see_keyword_transformer_real_transform; + ((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) acd_see_keyword_transformer_real_transform; #line 1505 "PhotoMetadata.c" } @@ -1512,7 +1512,7 @@ static void acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer } -static void acd_see_keyword_transformer_finalize (KeywordTransformer* obj) { +static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj) { ACDSeeKeywordTransformer * self; #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer); @@ -1549,14 +1549,14 @@ static gpointer _keyword_transformer_ref0 (gpointer self) { HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) { HierarchicalKeywordField* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; - KeywordTransformer* _tmp6_ = NULL; - KeywordTransformer* _tmp7_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp3_; + gboolean _tmp4_; + gboolean _tmp5_; + KeywordTransformer* _tmp6_; + KeywordTransformer* _tmp7_; #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (field_name != NULL, NULL); #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1652,7 +1652,7 @@ static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, gui #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { #line 1655 "PhotoMetadata.c" - HierarchicalKeywordField* object; + HierarchicalKeywordField * object; object = collect_values[0].v_pointer; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { @@ -1679,7 +1679,7 @@ static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, gui static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - HierarchicalKeywordField** object_p; + HierarchicalKeywordField ** object_p; object_p = collect_values[0].v_pointer; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!object_p) { @@ -1731,7 +1731,7 @@ gpointer value_get_hierarchical_keyword_field (const GValue* value) { void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) { - HierarchicalKeywordField* old; + HierarchicalKeywordField * old; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD)); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1762,7 +1762,7 @@ void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) { void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) { - HierarchicalKeywordField* old; + HierarchicalKeywordField * old; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD)); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1806,7 +1806,7 @@ static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * } -static void hierarchical_keyword_field_finalize (HierarchicalKeywordField* obj) { +static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj) { HierarchicalKeywordField * self; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_KEYWORD_FIELD, HierarchicalKeywordField); @@ -1837,7 +1837,7 @@ GType hierarchical_keyword_field_get_type (void) { gpointer hierarchical_keyword_field_ref (gpointer instance) { - HierarchicalKeywordField* self; + HierarchicalKeywordField * self; self = instance; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&self->ref_count); @@ -1848,7 +1848,7 @@ gpointer hierarchical_keyword_field_ref (gpointer instance) { void hierarchical_keyword_field_unref (gpointer instance) { - HierarchicalKeywordField* self; + HierarchicalKeywordField * self; self = instance; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1863,14 +1863,14 @@ void hierarchical_keyword_field_unref (gpointer instance) { PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dimensions* dimensions, guint32 size, const gchar* mime_type, const gchar* extension) { PhotoPreview* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - Dimensions _tmp2_ = {0}; - guint32 _tmp3_ = 0U; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + Dimensions _tmp2_; + guint32 _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; + const gchar* _tmp6_; + gchar* _tmp7_; #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (name != NULL, NULL); #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1921,8 +1921,8 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim gchar* photo_preview_get_name (PhotoPreview* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL); #line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1938,7 +1938,7 @@ gchar* photo_preview_get_name (PhotoPreview* self) { void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) { - Dimensions _tmp0_ = {0}; + Dimensions _tmp0_; #line 177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_PREVIEW (self)); #line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1953,7 +1953,7 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) guint32 photo_preview_get_size (PhotoPreview* self) { guint32 result = 0U; - guint32 _tmp0_ = 0U; + guint32 _tmp0_; #line 181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_PREVIEW (self), 0U); #line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1968,8 +1968,8 @@ guint32 photo_preview_get_size (PhotoPreview* self) { gchar* photo_preview_get_mime_type (PhotoPreview* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL); #line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1986,8 +1986,8 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) { gchar* photo_preview_get_extension (PhotoPreview* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 189 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL); #line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2030,10 +2030,10 @@ static guint8* _vala_array_dup4 (guint8* self, int length) { static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error) { GdkPixbuf* result = NULL; guint8* flattened = NULL; - gint _tmp0_ = 0; - guint8* _tmp1_ = NULL; - gint flattened_length1 = 0; - gint _flattened_size_ = 0; + gint _tmp0_; + guint8* _tmp1_; + gint flattened_length1; + gint _flattened_size_; GError * _inner_error_ = NULL; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_preview_flatten (self, &_tmp0_, &_inner_error_); @@ -2053,13 +2053,13 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er } { GdkPixbuf* _tmp2_ = NULL; - guint8* _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GMemoryInputStream* _tmp4_ = NULL; - GMemoryInputStream* _tmp5_ = NULL; - GdkPixbuf* _tmp6_ = NULL; - GdkPixbuf* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; + guint8* _tmp3_; + gint _tmp3__length1; + GMemoryInputStream* _tmp4_; + GMemoryInputStream* _tmp5_; + GdkPixbuf* _tmp6_; + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = (flattened != NULL) ? _vala_array_dup4 (flattened, flattened_length1) : ((gpointer) flattened); #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2099,9 +2099,9 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er __catch25_g_error: { GError* err = NULL; - const gchar* _tmp9_ = NULL; - GError* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; + const gchar* _tmp9_; + GError* _tmp10_; + const gchar* _tmp11_; #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" err = _inner_error_; #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2186,7 +2186,7 @@ static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { #line 2189 "PhotoMetadata.c" - PhotoPreview* object; + PhotoPreview * object; object = collect_values[0].v_pointer; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { @@ -2213,7 +2213,7 @@ static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_ static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PhotoPreview** object_p; + PhotoPreview ** object_p; object_p = collect_values[0].v_pointer; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!object_p) { @@ -2265,7 +2265,7 @@ gpointer value_get_photo_preview (const GValue* value) { void value_set_photo_preview (GValue* value, gpointer v_object) { - PhotoPreview* old; + PhotoPreview * old; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW)); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2296,7 +2296,7 @@ void value_set_photo_preview (GValue* value, gpointer v_object) { void value_take_photo_preview (GValue* value, gpointer v_object) { - PhotoPreview* old; + PhotoPreview * old; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW)); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2332,9 +2332,9 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_class_add_private (klass, sizeof (PhotoPreviewPrivate)); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_preview_real_flatten; + ((PhotoPreviewClass *) klass)->flatten = (guint8* (*) (PhotoPreview *, int*, GError**)) photo_preview_real_flatten; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*)(PhotoPreview*, GError**)) photo_preview_real_get_pixbuf; + ((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoPreview *, GError**)) photo_preview_real_get_pixbuf; #line 2339 "PhotoMetadata.c" } @@ -2348,7 +2348,7 @@ static void photo_preview_instance_init (PhotoPreview * self) { } -static void photo_preview_finalize (PhotoPreview* obj) { +static void photo_preview_finalize (PhotoPreview * obj) { PhotoPreview * self; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_PREVIEW, PhotoPreview); @@ -2379,7 +2379,7 @@ GType photo_preview_get_type (void) { gpointer photo_preview_ref (gpointer instance) { - PhotoPreview* self; + PhotoPreview * self; self = instance; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&self->ref_count); @@ -2390,7 +2390,7 @@ gpointer photo_preview_ref (gpointer instance) { void photo_preview_unref (gpointer instance) { - PhotoPreview* self; + PhotoPreview * self; self = instance; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2434,17 +2434,17 @@ PhotoMetadata* photo_metadata_new (void) { static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error) { PhotoMetadata * self; - GExiv2Metadata* _tmp0_ = NULL; - GExiv2Metadata* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - ExifData* _tmp8_ = NULL; - GFile* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + GExiv2Metadata* _tmp0_; + GExiv2Metadata* _tmp1_; + GFile* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + GFile* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + ExifData* _tmp8_; + GFile* _tmp9_; + gchar* _tmp10_; GError * _inner_error_ = NULL; #line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); @@ -2507,10 +2507,10 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error) { - GExiv2Metadata* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; + GExiv2Metadata* _tmp0_; + GFile* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; GError * _inner_error_ = NULL; #line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); @@ -2540,21 +2540,21 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error) { - gint _tmp0_ = 0; - guint8* _tmp2_ = NULL; - gint _tmp2__length1 = 0; - gint _tmp3_ = 0; - GExiv2Metadata* _tmp4_ = NULL; - GExiv2Metadata* _tmp5_ = NULL; - guint8* _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gint _tmp7_ = 0; - guint8* _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - ExifData* _tmp10_ = NULL; - gint _tmp11_ = 0; - gchar* _tmp12_ = NULL; + gint _tmp0_; + guint8* _tmp2_; + gint _tmp2__length1; + gint _tmp3_; + GExiv2Metadata* _tmp4_; + GExiv2Metadata* _tmp5_; + guint8* _tmp6_; + gint _tmp6__length1; + gint _tmp7_; + guint8* _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + ExifData* _tmp10_; + gint _tmp11_; + gchar* _tmp12_; GError * _inner_error_ = NULL; #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); @@ -2563,8 +2563,8 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b #line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ <= 0) { #line 2566 "PhotoMetadata.c" - guint8* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + guint8* _tmp1_; + gint _tmp1__length1; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = buffer; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2634,21 +2634,21 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error) { - gint _tmp0_ = 0; - guint8* _tmp2_ = NULL; - gint _tmp2__length1 = 0; - gint _tmp3_ = 0; - GExiv2Metadata* _tmp4_ = NULL; - GExiv2Metadata* _tmp5_ = NULL; - guint8* _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gint _tmp7_ = 0; - guint8* _tmp8_ = NULL; - gint _tmp8__length1 = 0; - gint _tmp9_ = 0; - ExifData* _tmp10_ = NULL; - gint _tmp11_ = 0; - gchar* _tmp12_ = NULL; + gint _tmp0_; + guint8* _tmp2_; + gint _tmp2__length1; + gint _tmp3_; + GExiv2Metadata* _tmp4_; + GExiv2Metadata* _tmp5_; + guint8* _tmp6_; + gint _tmp6__length1; + gint _tmp7_; + guint8* _tmp8_; + gint _tmp8__length1; + gint _tmp9_; + ExifData* _tmp10_; + gint _tmp11_; + gchar* _tmp12_; GError * _inner_error_ = NULL; #line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); @@ -2657,8 +2657,8 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, #line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ <= 0) { #line 2660 "PhotoMetadata.c" - guint8* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + guint8* _tmp1_; + gint _tmp1__length1; #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = buffer; #line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2729,12 +2729,12 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) { MetadataDomain result = 0; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; - const gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; + const gchar* _tmp0_; + gboolean _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; + const gchar* _tmp4_; + gboolean _tmp5_; #line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, 0); #line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2783,7 +2783,7 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) { gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) { gboolean result = FALSE; - MetadataDomain _tmp0_ = 0; + MetadataDomain _tmp0_; #line 308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2794,8 +2794,8 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) case METADATA_DOMAIN_EXIF: #line 2796 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GExiv2Metadata* _tmp1_; + gboolean _tmp2_; #line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; #line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2810,8 +2810,8 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) case METADATA_DOMAIN_XMP: #line 2812 "PhotoMetadata.c" { - GExiv2Metadata* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GExiv2Metadata* _tmp3_; + gboolean _tmp4_; #line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = self->priv->exiv2; #line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2826,8 +2826,8 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) case METADATA_DOMAIN_IPTC: #line 2828 "PhotoMetadata.c" { - GExiv2Metadata* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + GExiv2Metadata* _tmp5_; + gboolean _tmp6_; #line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = self->priv->exiv2; #line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2855,7 +2855,7 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) gboolean photo_metadata_has_exif (PhotoMetadata* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2870,7 +2870,7 @@ gboolean photo_metadata_has_exif (PhotoMetadata* self) { gboolean photo_metadata_has_xmp (PhotoMetadata* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2885,7 +2885,7 @@ gboolean photo_metadata_has_xmp (PhotoMetadata* self) { gboolean photo_metadata_has_iptc (PhotoMetadata* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 333 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2900,7 +2900,7 @@ gboolean photo_metadata_has_iptc (PhotoMetadata* self) { gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain domain) { gboolean result = FALSE; - MetadataDomain _tmp0_ = 0; + MetadataDomain _tmp0_; #line 337 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2911,8 +2911,8 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain case METADATA_DOMAIN_EXIF: #line 2913 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GExiv2Metadata* _tmp1_; + gboolean _tmp2_; #line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; #line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2927,8 +2927,8 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain case METADATA_DOMAIN_XMP: #line 2929 "PhotoMetadata.c" { - GExiv2Metadata* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GExiv2Metadata* _tmp3_; + gboolean _tmp4_; #line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = self->priv->exiv2; #line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2943,8 +2943,8 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain case METADATA_DOMAIN_IPTC: #line 2945 "PhotoMetadata.c" { - GExiv2Metadata* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; + GExiv2Metadata* _tmp5_; + gboolean _tmp6_; #line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = self->priv->exiv2; #line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2972,7 +2972,7 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain gboolean photo_metadata_can_write_exif (PhotoMetadata* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 354 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2987,7 +2987,7 @@ gboolean photo_metadata_can_write_exif (PhotoMetadata* self) { gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 358 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3002,7 +3002,7 @@ gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) { gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3017,9 +3017,9 @@ gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) { gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) { gboolean result = FALSE; - GExiv2Metadata* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gboolean _tmp2_ = FALSE; + GExiv2Metadata* _tmp0_; + const gchar* _tmp1_; + gboolean _tmp2_; #line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3040,8 +3040,8 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) { static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { GeeSet* result = NULL; - GCompareDataFunc _tmp0_ = NULL; - void* _tmp0__target = NULL; + GCompareDataFunc _tmp0_; + void* _tmp0__target; #line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3051,7 +3051,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa #line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ == NULL) { #line 3054 "PhotoMetadata.c" - GeeHashSet* _tmp1_ = NULL; + GeeHashSet* _tmp1_; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3068,10 +3068,10 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa return result; #line 3070 "PhotoMetadata.c" } else { - GCompareDataFunc _tmp2_ = NULL; - void* _tmp2__target = NULL; - GDestroyNotify _tmp2__target_destroy_notify = NULL; - GeeTreeSet* _tmp3_ = NULL; + GCompareDataFunc _tmp2_; + void* _tmp2__target; + GDestroyNotify _tmp2__target_destroy_notify; + GeeTreeSet* _tmp3_; #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = compare_func; #line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3115,19 +3115,19 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain domain, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { GeeCollection* result = NULL; gchar** tags = NULL; - gint tags_length1 = 0; - gint _tags_size_ = 0; - MetadataDomain _tmp0_ = 0; + gint tags_length1; + gint _tags_size_; + MetadataDomain _tmp0_; gboolean _tmp10_ = FALSE; - gchar** _tmp11_ = NULL; - gint _tmp11__length1 = 0; + gchar** _tmp11_; + gint _tmp11__length1; GeeCollection* collection = NULL; - GCompareDataFunc _tmp13_ = NULL; - void* _tmp13__target = NULL; - GDestroyNotify _tmp13__target_destroy_notify = NULL; - GeeSet* _tmp14_ = NULL; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; + GCompareDataFunc _tmp13_; + void* _tmp13__target; + GDestroyNotify _tmp13__target_destroy_notify; + GeeSet* _tmp14_; + gchar** _tmp15_; + gint _tmp15__length1; #line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3144,9 +3144,9 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma case METADATA_DOMAIN_EXIF: #line 3146 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; + GExiv2Metadata* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; #line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; #line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3167,9 +3167,9 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma case METADATA_DOMAIN_XMP: #line 3169 "PhotoMetadata.c" { - GExiv2Metadata* _tmp4_ = NULL; - gchar** _tmp5_ = NULL; - gchar** _tmp6_ = NULL; + GExiv2Metadata* _tmp4_; + gchar** _tmp5_; + gchar** _tmp6_; #line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = self->priv->exiv2; #line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3190,9 +3190,9 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma case METADATA_DOMAIN_IPTC: #line 3192 "PhotoMetadata.c" { - GExiv2Metadata* _tmp7_ = NULL; - gchar** _tmp8_ = NULL; - gchar** _tmp9_ = NULL; + GExiv2Metadata* _tmp7_; + gchar** _tmp8_; + gchar** _tmp9_; #line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = self->priv->exiv2; #line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3224,8 +3224,8 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma _tmp10_ = TRUE; #line 3226 "PhotoMetadata.c" } else { - gchar** _tmp12_ = NULL; - gint _tmp12__length1 = 0; + gchar** _tmp12_; + gint _tmp12__length1; #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = tags; #line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3285,7 +3285,7 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) { #line 3288 "PhotoMetadata.c" - gchar* _tmp16_ = NULL; + gchar* _tmp16_; gchar* tag = NULL; #line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = g_strdup (tag_collection[tag_it]); @@ -3293,8 +3293,8 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma tag = _tmp16_; #line 3295 "PhotoMetadata.c" { - GeeCollection* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; + GeeCollection* _tmp17_; + const gchar* _tmp18_; #line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = collection; #line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3328,27 +3328,27 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { GeeCollection* result = NULL; GeeCollection* all_tags = NULL; - GCompareDataFunc _tmp0_ = NULL; - void* _tmp0__target = NULL; - GDestroyNotify _tmp0__target_destroy_notify = NULL; - GeeSet* _tmp1_ = NULL; + GCompareDataFunc _tmp0_; + void* _tmp0__target; + GDestroyNotify _tmp0__target_destroy_notify; + GeeSet* _tmp1_; GeeCollection* exif_tags = NULL; - GeeCollection* _tmp2_ = NULL; + GeeCollection* _tmp2_; gboolean _tmp3_ = FALSE; - GeeCollection* _tmp4_ = NULL; + GeeCollection* _tmp4_; GeeCollection* xmp_tags = NULL; - GeeCollection* _tmp10_ = NULL; + GeeCollection* _tmp10_; gboolean _tmp11_ = FALSE; - GeeCollection* _tmp12_ = NULL; + GeeCollection* _tmp12_; GeeCollection* iptc_tags = NULL; - GeeCollection* _tmp18_ = NULL; + GeeCollection* _tmp18_; gboolean _tmp19_ = FALSE; - GeeCollection* _tmp20_ = NULL; + GeeCollection* _tmp20_; GeeCollection* _tmp26_ = NULL; - GeeCollection* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; - GeeCollection* _tmp31_ = NULL; + GeeCollection* _tmp27_; + gint _tmp28_; + gint _tmp29_; + GeeCollection* _tmp31_; #line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3376,9 +3376,9 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { #line 3379 "PhotoMetadata.c" - GeeCollection* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + GeeCollection* _tmp5_; + gint _tmp6_; + gint _tmp7_; #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = exif_tags; #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3396,8 +3396,8 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun #line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { #line 3399 "PhotoMetadata.c" - GeeCollection* _tmp8_ = NULL; - GeeCollection* _tmp9_ = NULL; + GeeCollection* _tmp8_; + GeeCollection* _tmp9_; #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = all_tags; #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3415,9 +3415,9 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp12_ != NULL) { #line 3418 "PhotoMetadata.c" - GeeCollection* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; + GeeCollection* _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = xmp_tags; #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3435,8 +3435,8 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun #line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_) { #line 3438 "PhotoMetadata.c" - GeeCollection* _tmp16_ = NULL; - GeeCollection* _tmp17_ = NULL; + GeeCollection* _tmp16_; + GeeCollection* _tmp17_; #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = all_tags; #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3454,9 +3454,9 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp20_ != NULL) { #line 3457 "PhotoMetadata.c" - GeeCollection* _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; + GeeCollection* _tmp21_; + gint _tmp22_; + gint _tmp23_; #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = iptc_tags; #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3474,8 +3474,8 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun #line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp19_) { #line 3477 "PhotoMetadata.c" - GeeCollection* _tmp24_ = NULL; - GeeCollection* _tmp25_ = NULL; + GeeCollection* _tmp24_; + GeeCollection* _tmp25_; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = all_tags; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3493,7 +3493,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp29_ > 0) { #line 3496 "PhotoMetadata.c" - GeeCollection* _tmp30_ = NULL; + GeeCollection* _tmp30_; #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = all_tags; #line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3532,9 +3532,9 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3555,9 +3555,9 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) { gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; #line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3578,13 +3578,13 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options) { gchar* result = NULL; - GExiv2Metadata* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PrepareInputTextOptions _tmp4_ = 0; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + GExiv2Metadata* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PrepareInputTextOptions _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3615,13 +3615,13 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options) { gchar* result = NULL; - GExiv2Metadata* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PrepareInputTextOptions _tmp4_ = 0; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + GExiv2Metadata* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PrepareInputTextOptions _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3652,8 +3652,8 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int tags_length1) { gchar* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; #line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3673,7 +3673,7 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { #line 3676 "PhotoMetadata.c" - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* tag = NULL; #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); @@ -3682,9 +3682,9 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t #line 3683 "PhotoMetadata.c" { gchar* value = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + const gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3721,8 +3721,8 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** tags, int tags_length1) { gchar* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; #line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3742,7 +3742,7 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { #line 3745 "PhotoMetadata.c" - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* tag = NULL; #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); @@ -3751,9 +3751,9 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** #line 3752 "PhotoMetadata.c" { gchar* value = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; + const gchar* _tmp2_; + gchar* _tmp3_; + const gchar* _tmp4_; #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3791,26 +3791,26 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* tag) { GeeList* result = NULL; gchar** values = NULL; - GExiv2Metadata* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gchar** _tmp3_ = NULL; - gint values_length1 = 0; - gint _values_size_ = 0; + GExiv2Metadata* _tmp0_; + const gchar* _tmp1_; + gchar** _tmp2_; + gchar** _tmp3_; + gint values_length1; + gint _values_size_; gboolean _tmp4_ = FALSE; - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; + gchar** _tmp5_; + gint _tmp5__length1; GeeList* list = NULL; - GeeArrayList* _tmp7_ = NULL; + GeeArrayList* _tmp7_; GeeHashSet* collection = NULL; - GeeHashSet* _tmp8_ = NULL; - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; + GeeHashSet* _tmp8_; + gchar** _tmp9_; + gint _tmp9__length1; GeeList* _tmp22_ = NULL; - GeeList* _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - GeeList* _tmp27_ = NULL; + GeeList* _tmp23_; + gint _tmp24_; + gint _tmp25_; + GeeList* _tmp27_; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3837,8 +3837,8 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t _tmp4_ = TRUE; #line 3839 "PhotoMetadata.c" } else { - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + gchar** _tmp6_; + gint _tmp6__length1; #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = values; #line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3882,7 +3882,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) { #line 3885 "PhotoMetadata.c" - gchar* _tmp10_ = NULL; + gchar* _tmp10_; gchar* value = NULL; #line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = g_strdup (value_collection[value_it]); @@ -3891,10 +3891,10 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t #line 3892 "PhotoMetadata.c" { gchar* prepped = NULL; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + const gchar* _tmp11_; + gchar* _tmp12_; gboolean _tmp13_ = FALSE; - const gchar* _tmp14_ = NULL; + const gchar* _tmp14_; #line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = value; #line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3906,9 +3906,9 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp14_ != NULL) { #line 3909 "PhotoMetadata.c" - GeeHashSet* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; + GeeHashSet* _tmp15_; + const gchar* _tmp16_; + gboolean _tmp17_; #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = collection; #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3926,10 +3926,10 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp13_) { #line 3929 "PhotoMetadata.c" - GeeList* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - GeeHashSet* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; + GeeList* _tmp18_; + const gchar* _tmp19_; + GeeHashSet* _tmp20_; + const gchar* _tmp21_; #line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = list; #line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3961,7 +3961,7 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp25_ > 0) { #line 3964 "PhotoMetadata.c" - GeeList* _tmp26_ = NULL; + GeeList* _tmp26_; #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = list; #line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3990,8 +3990,8 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1) { GeeList* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; #line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4011,7 +4011,7 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { #line 4014 "PhotoMetadata.c" - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* tag = NULL; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); @@ -4020,10 +4020,10 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** #line 4021 "PhotoMetadata.c" { GeeList* values = NULL; - const gchar* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; + const gchar* _tmp2_; + GeeList* _tmp3_; gboolean _tmp4_ = FALSE; - GeeList* _tmp5_ = NULL; + GeeList* _tmp5_; #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4035,9 +4035,9 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { #line 4038 "PhotoMetadata.c" - GeeList* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeList* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = values; #line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4080,14 +4080,14 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gchar* value, PrepareInputTextOptions options) { gchar* prepped = NULL; - const gchar* _tmp0_ = NULL; - PrepareInputTextOptions _tmp1_ = 0; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GExiv2Metadata* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; + const gchar* _tmp0_; + PrepareInputTextOptions _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; + GExiv2Metadata* _tmp6_; + const gchar* _tmp7_; + const gchar* _tmp8_; + gboolean _tmp9_; #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4107,8 +4107,8 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch #line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_ == NULL) { #line 4110 "PhotoMetadata.c" - const gchar* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; + const gchar* _tmp4_; + const gchar* _tmp5_; #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = tag; #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4132,9 +4132,9 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch #line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp9_) { #line 4135 "PhotoMetadata.c" - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; + const gchar* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; #line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = tag; #line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4154,11 +4154,11 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, int tags_length1, PhotoMetadataSetOption option, PhotoMetadataSetGenericValue setter, void* setter_target) { gboolean written = FALSE; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; - PhotoMetadataSetOption _tmp11_ = 0; + PhotoMetadataSetOption _tmp11_; #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4180,7 +4180,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { #line 4182 "PhotoMetadata.c" - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* tag = NULL; #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); @@ -4189,7 +4189,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i #line 4189 "PhotoMetadata.c" { gboolean _tmp2_ = FALSE; - PhotoMetadataSetOption _tmp3_ = 0; + PhotoMetadataSetOption _tmp3_; #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = option; #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4198,9 +4198,9 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i _tmp2_ = TRUE; #line 4199 "PhotoMetadata.c" } else { - const gchar* _tmp4_ = NULL; - MetadataDomain _tmp5_ = 0; - gboolean _tmp6_ = FALSE; + const gchar* _tmp4_; + MetadataDomain _tmp5_; + gboolean _tmp6_; #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = tag; #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4214,9 +4214,9 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_) { #line 4216 "PhotoMetadata.c" - PhotoMetadataSetGenericValue _tmp7_ = NULL; - void* _tmp7__target = NULL; - const gchar* _tmp8_ = NULL; + PhotoMetadataSetGenericValue _tmp7_; + void* _tmp7__target; + const gchar* _tmp8_; #line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = setter; #line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4240,7 +4240,7 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) { #line 4242 "PhotoMetadata.c" - gboolean _tmp12_ = FALSE; + gboolean _tmp12_; #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = written; #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4254,8 +4254,8 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { #line 4256 "PhotoMetadata.c" - gchar** _tmp13_ = NULL; - gint _tmp13__length1 = 0; + gchar** _tmp13_; + gint _tmp13__length1; #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = tags; #line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4272,15 +4272,15 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i if (_tmp9_) { #line 4273 "PhotoMetadata.c" MetadataDomain default_domain = 0; - gchar** _tmp14_ = NULL; - gint _tmp14__length1 = 0; - const gchar* _tmp15_ = NULL; - MetadataDomain _tmp16_ = 0; - PhotoMetadataSetGenericValue _tmp17_ = NULL; - void* _tmp17__target = NULL; - gchar** _tmp18_ = NULL; - gint _tmp18__length1 = 0; - const gchar* _tmp19_ = NULL; + gchar** _tmp14_; + gint _tmp14__length1; + const gchar* _tmp15_; + MetadataDomain _tmp16_; + PhotoMetadataSetGenericValue _tmp17_; + void* _tmp17__target; + gchar** _tmp18_; + gint _tmp18__length1; + const gchar* _tmp19_; #line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = tags; #line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4316,19 +4316,19 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { #line 4318 "PhotoMetadata.c" - gint _tmp22_ = 0; - gchar** _tmp23_ = NULL; - gint _tmp23__length1 = 0; - gchar** _tmp24_ = NULL; - gint _tmp24__length1 = 0; - gint _tmp25_ = 0; - const gchar* _tmp26_ = NULL; - MetadataDomain _tmp27_ = 0; - MetadataDomain _tmp28_ = 0; + gint _tmp22_; + gchar** _tmp23_; + gint _tmp23__length1; + gchar** _tmp24_; + gint _tmp24__length1; + gint _tmp25_; + const gchar* _tmp26_; + MetadataDomain _tmp27_; + MetadataDomain _tmp28_; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp20_) { #line 4330 "PhotoMetadata.c" - gint _tmp21_ = 0; + gint _tmp21_; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = ctr; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4364,12 +4364,12 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i #line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp27_ == _tmp28_) { #line 4366 "PhotoMetadata.c" - PhotoMetadataSetGenericValue _tmp29_ = NULL; - void* _tmp29__target = NULL; - gchar** _tmp30_ = NULL; - gint _tmp30__length1 = 0; - gint _tmp31_ = 0; - const gchar* _tmp32_ = NULL; + PhotoMetadataSetGenericValue _tmp29_; + void* _tmp29__target; + gchar** _tmp30_; + gint _tmp30__length1; + gint _tmp31_; + const gchar* _tmp32_; #line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = setter; #line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4424,8 +4424,8 @@ static void block1_data_unref (void * _userdata_) { static void __lambda5_ (Block1Data* _data1_, const gchar* tag) { PhotoMetadata* self; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; #line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data1_->self; #line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4449,11 +4449,11 @@ static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpoi void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_length1, const gchar* value, PhotoMetadataSetOption option) { Block1Data* _data1_; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - PhotoMetadataSetOption _tmp3_ = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + PhotoMetadataSetOption _tmp3_; #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4488,7 +4488,7 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_ } -static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value) { #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if ((*length) == (*size)) { #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4505,7 +4505,7 @@ static void _vala_array_add45 (gchar*** array, int* length, int* size, gchar* va } -static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* value) { +static void _vala_array_add46 (gchar** * array, int* length, int* size, gchar* value) { #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if ((*length) == (*size)) { #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4524,18 +4524,18 @@ static void _vala_array_add46 (gchar*** array, int* length, int* size, gchar* va void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, GeeCollection* collection) { gchar** values = NULL; - gchar** _tmp0_ = NULL; - gint values_length1 = 0; - gint _values_size_ = 0; - gchar** _tmp15_ = NULL; - gint _tmp15__length1 = 0; - gchar** _tmp16_ = NULL; - gint _tmp16__length1 = 0; - GExiv2Metadata* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - gchar** _tmp19_ = NULL; - gint _tmp19__length1 = 0; - gboolean _tmp20_ = FALSE; + gchar** _tmp0_; + gint values_length1; + gint _values_size_; + gchar** _tmp15_; + gint _tmp15__length1; + gchar** _tmp16_; + gint _tmp16__length1; + GExiv2Metadata* _tmp17_; + const gchar* _tmp18_; + gchar** _tmp19_; + gint _tmp19__length1; + gboolean _tmp20_; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4553,8 +4553,8 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, #line 4553 "PhotoMetadata.c" { GeeIterator* _value_it = NULL; - GeeCollection* _tmp1_ = NULL; - GeeIterator* _tmp2_ = NULL; + GeeCollection* _tmp1_; + GeeIterator* _tmp2_; #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = collection; #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4564,15 +4564,15 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { #line 4566 "PhotoMetadata.c" - GeeIterator* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + GeeIterator* _tmp3_; + gboolean _tmp4_; gchar* value = NULL; - GeeIterator* _tmp5_ = NULL; - gpointer _tmp6_ = NULL; + GeeIterator* _tmp5_; + gpointer _tmp6_; gchar* prepped = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; + const gchar* _tmp7_; + gchar* _tmp8_; + const gchar* _tmp9_; #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _value_it; #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4600,10 +4600,10 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, #line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_ != NULL) { #line 4602 "PhotoMetadata.c" - gchar** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - const gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; + gchar** _tmp10_; + gint _tmp10__length1; + const gchar* _tmp11_; + gchar* _tmp12_; #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = values; #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4616,8 +4616,8 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, _vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_); #line 4617 "PhotoMetadata.c" } else { - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; + const gchar* _tmp13_; + const gchar* _tmp14_; #line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = value; #line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4667,10 +4667,10 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, #line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp20_) { #line 4669 "PhotoMetadata.c" - gchar** _tmp21_ = NULL; - gint _tmp21__length1 = 0; - const gchar* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; + gchar** _tmp21_; + gint _tmp21__length1; + const gchar* _tmp22_; + const gchar* _tmp23_; #line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = values; #line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4721,8 +4721,8 @@ static void block2_data_unref (void * _userdata_) { static void __lambda6_ (Block2Data* _data2_, const gchar* tag) { PhotoMetadata* self; - const gchar* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; + const gchar* _tmp0_; + GeeCollection* _tmp1_; #line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data2_->self; #line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4746,11 +4746,11 @@ static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpoi void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1, GeeCollection* values, PhotoMetadataSetOption option) { Block2Data* _data2_; - GeeCollection* _tmp0_ = NULL; - GeeCollection* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - PhotoMetadataSetOption _tmp3_ = 0; + GeeCollection* _tmp0_; + GeeCollection* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + PhotoMetadataSetOption _tmp3_; #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4788,11 +4788,11 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* value) { glong _vala_value = 0L; gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - GExiv2Metadata* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - glong _tmp4_ = 0L; + const gchar* _tmp0_; + gboolean _tmp1_; + GExiv2Metadata* _tmp2_; + const gchar* _tmp3_; + glong _tmp4_; #line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4842,8 +4842,8 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong* value) { glong _vala_value = 0L; gboolean result = FALSE; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4863,7 +4863,7 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { #line 4864 "PhotoMetadata.c" - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* tag = NULL; #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); @@ -4871,9 +4871,9 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t tag = _tmp1_; #line 4871 "PhotoMetadata.c" { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; glong _tmp3_ = 0L; - gboolean _tmp4_ = FALSE; + gboolean _tmp4_; #line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; #line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4919,10 +4919,10 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value) { - GExiv2Metadata* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - glong _tmp2_ = 0L; - gboolean _tmp3_ = FALSE; + GExiv2Metadata* _tmp0_; + const gchar* _tmp1_; + glong _tmp2_; + gboolean _tmp3_; #line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4938,9 +4938,9 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value #line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp3_) { #line 4939 "PhotoMetadata.c" - const gchar* _tmp4_ = NULL; - glong _tmp5_ = 0L; - const gchar* _tmp6_ = NULL; + const gchar* _tmp4_; + glong _tmp5_; + const gchar* _tmp6_; #line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = tag; #line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4984,8 +4984,8 @@ static void block3_data_unref (void * _userdata_) { static void __lambda7_ (Block3Data* _data3_, const gchar* tag) { PhotoMetadata* self; - const gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; + const gchar* _tmp0_; + glong _tmp1_; #line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data3_->self; #line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5009,10 +5009,10 @@ static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpoi void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong value, PhotoMetadataSetOption option) { Block3Data* _data3_; - glong _tmp0_ = 0L; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PhotoMetadataSetOption _tmp2_ = 0; + glong _tmp0_; + gchar** _tmp1_; + gint _tmp1__length1; + PhotoMetadataSetOption _tmp2_; #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5047,11 +5047,11 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met gint numerator = 0; gint denominator = 0; gboolean _result_ = FALSE; - GExiv2Metadata* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + GExiv2Metadata* _tmp0_; + const gchar* _tmp1_; gint _tmp2_ = 0; gint _tmp3_ = 0; - gboolean _tmp4_ = FALSE; + gboolean _tmp4_; #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5087,8 +5087,8 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational) { MetadataRational _vala_rational = {0}; gboolean result = FALSE; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5108,7 +5108,7 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { #line 5108 "PhotoMetadata.c" - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* tag = NULL; #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); @@ -5116,9 +5116,9 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i tag = _tmp1_; #line 5115 "PhotoMetadata.c" { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; MetadataRational _tmp3_ = {0}; - gboolean _tmp4_ = FALSE; + gboolean _tmp4_; #line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; #line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5164,13 +5164,13 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational) { - GExiv2Metadata* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - MetadataRational _tmp2_ = {0}; - gint _tmp3_ = 0; - MetadataRational _tmp4_ = {0}; - gint _tmp5_ = 0; - gboolean _tmp6_ = FALSE; + GExiv2Metadata* _tmp0_; + const gchar* _tmp1_; + MetadataRational _tmp2_; + gint _tmp3_; + MetadataRational _tmp4_; + gint _tmp5_; + gboolean _tmp6_; #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5194,10 +5194,10 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat #line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp6_) { #line 5194 "PhotoMetadata.c" - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; + const gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + const gchar* _tmp10_; #line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = tag; #line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5245,8 +5245,8 @@ static void block4_data_unref (void * _userdata_) { static void __lambda8_ (Block4Data* _data4_, const gchar* tag) { PhotoMetadata* self; - const gchar* _tmp0_ = NULL; - MetadataRational _tmp1_ = {0}; + const gchar* _tmp0_; + MetadataRational _tmp1_; #line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data4_->self; #line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5270,10 +5270,10 @@ static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpoi void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational, PhotoMetadataSetOption option) { Block4Data* _data4_; - MetadataRational _tmp0_ = {0}; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - PhotoMetadataSetOption _tmp2_ = 0; + MetadataRational _tmp0_; + gchar** _tmp1_; + gint _tmp1__length1; + PhotoMetadataSetOption _tmp2_; #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5307,9 +5307,9 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar* tag) { MetadataDateTime* result = NULL; gchar* value = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; GError * _inner_error_ = NULL; #line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); @@ -5334,8 +5334,8 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar #line 5331 "PhotoMetadata.c" } { - const gchar* _tmp3_ = NULL; - MetadataDomain _tmp4_ = 0; + const gchar* _tmp3_; + MetadataDomain _tmp4_; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = tag; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5347,9 +5347,9 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar #line 5344 "PhotoMetadata.c" { MetadataDateTime* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; - MetadataDateTime* _tmp7_ = NULL; - MetadataDateTime* _tmp8_ = NULL; + const gchar* _tmp6_; + MetadataDateTime* _tmp7_; + MetadataDateTime* _tmp8_; #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = value; #line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5393,9 +5393,9 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar #line 5390 "PhotoMetadata.c" { MetadataDateTime* _tmp9_ = NULL; - const gchar* _tmp10_ = NULL; - MetadataDateTime* _tmp11_ = NULL; - MetadataDateTime* _tmp12_ = NULL; + const gchar* _tmp10_; + MetadataDateTime* _tmp11_; + MetadataDateTime* _tmp12_; #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = value; #line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5427,10 +5427,10 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar __catch26_g_error: { GError* err = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; - const gchar* _tmp16_ = NULL; + const gchar* _tmp13_; + const gchar* _tmp14_; + GError* _tmp15_; + const gchar* _tmp16_; #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" err = _inner_error_; #line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5470,8 +5470,8 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar** tags, int tags_length1) { MetadataDateTime* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; #line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5491,7 +5491,7 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { #line 5490 "PhotoMetadata.c" - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* tag = NULL; #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); @@ -5500,9 +5500,9 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar #line 5497 "PhotoMetadata.c" { MetadataDateTime* date_time = NULL; - const gchar* _tmp2_ = NULL; - MetadataDateTime* _tmp3_ = NULL; - MetadataDateTime* _tmp4_ = NULL; + const gchar* _tmp2_; + MetadataDateTime* _tmp3_; + MetadataDateTime* _tmp4_; #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5538,8 +5538,8 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, MetadataDateTime* date_time) { - const gchar* _tmp0_ = NULL; - MetadataDomain _tmp1_ = 0; + const gchar* _tmp0_; + MetadataDomain _tmp1_; #line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5556,10 +5556,10 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada case METADATA_DOMAIN_EXIF: #line 5554 "PhotoMetadata.c" { - const gchar* _tmp2_ = NULL; - MetadataDateTime* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp2_; + MetadataDateTime* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; #line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; #line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5580,10 +5580,10 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada case METADATA_DOMAIN_XMP: #line 5578 "PhotoMetadata.c" { - const gchar* _tmp6_ = NULL; - MetadataDateTime* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; + const gchar* _tmp6_; + MetadataDateTime* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; #line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = tag; #line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5605,10 +5605,10 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada case METADATA_DOMAIN_IPTC: #line 5603 "PhotoMetadata.c" { - const gchar* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - const gchar* _tmp12_ = NULL; - MetadataDomain _tmp13_ = 0; + const gchar* _tmp10_; + const gchar* _tmp11_; + const gchar* _tmp12_; + MetadataDomain _tmp13_; GEnumValue* _tmp14_; #line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = tag; @@ -5669,8 +5669,8 @@ static void block5_data_unref (void * _userdata_) { static void __lambda9_ (Block5Data* _data5_, const gchar* tag) { PhotoMetadata* self; - const gchar* _tmp0_ = NULL; - MetadataDateTime* _tmp1_ = NULL; + const gchar* _tmp0_; + MetadataDateTime* _tmp1_; #line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data5_->self; #line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5694,11 +5694,11 @@ static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpoi void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataDateTime* date_time, PhotoMetadataSetOption option) { Block5Data* _data5_; - MetadataDateTime* _tmp0_ = NULL; - MetadataDateTime* _tmp1_ = NULL; - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; - PhotoMetadataSetOption _tmp3_ = 0; + MetadataDateTime* _tmp0_; + MetadataDateTime* _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; + PhotoMetadataSetOption _tmp3_; #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5735,28 +5735,28 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1) { guint8* result = NULL; - ExifData* _tmp0_ = NULL; + ExifData* _tmp0_; guchar* thumbnail = NULL; - ExifData* _tmp2_ = NULL; - guchar* _tmp3_ = NULL; + ExifData* _tmp2_; + guchar* _tmp3_; guint thumbnail_size = 0U; - ExifData* _tmp4_ = NULL; - guint _tmp5_ = 0U; - gboolean _tmp6_ = FALSE; + ExifData* _tmp4_; + guint _tmp5_; + gboolean _tmp6_; guint8* flattened = NULL; - gint flattened_length1 = 0; - gint _flattened_size_ = 0; + gint flattened_length1; + gint _flattened_size_; guchar* saved_data = NULL; guint saved_size = 0U; - ExifData* _tmp9_ = NULL; + ExifData* _tmp9_; gboolean _tmp10_ = FALSE; - guint _tmp11_ = 0U; - ExifData* _tmp21_ = NULL; - guchar* _tmp22_ = NULL; - ExifData* _tmp23_ = NULL; - guint _tmp24_ = 0U; - guint8* _tmp25_ = NULL; - gint _tmp25__length1 = 0; + guint _tmp11_; + ExifData* _tmp21_; + guchar* _tmp22_; + ExifData* _tmp23_; + guint _tmp24_; + guint8* _tmp25_; + gint _tmp25__length1; #line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5764,8 +5764,8 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ #line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ == NULL) { #line 5762 "PhotoMetadata.c" - guint8* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + guint8* _tmp1_; + gint _tmp1__length1; #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = NULL; #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5799,8 +5799,8 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ #line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp6_) { #line 5797 "PhotoMetadata.c" - ExifData* _tmp7_ = NULL; - ExifData* _tmp8_ = NULL; + ExifData* _tmp7_; + ExifData* _tmp8_; #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = self->priv->exif; #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5830,7 +5830,7 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_ > ((guint) 0)) { #line 5828 "PhotoMetadata.c" - guchar* _tmp12_ = NULL; + guchar* _tmp12_; #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = saved_data; #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5844,15 +5844,15 @@ guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_previ #line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { #line 5842 "PhotoMetadata.c" - guint _tmp13_ = 0U; - guint8* _tmp14_ = NULL; - guint8* _tmp15_ = NULL; - gint _tmp15__length1 = 0; - guchar* _tmp16_ = NULL; - guint _tmp17_ = 0U; - ExifMem* _tmp18_ = NULL; - ExifMem* _tmp19_ = NULL; - guchar* _tmp20_ = NULL; + guint _tmp13_; + guint8* _tmp14_; + guint8* _tmp15_; + gint _tmp15__length1; + guchar* _tmp16_; + guint _tmp17_; + ExifMem* _tmp18_; + ExifMem* _tmp19_; + guchar* _tmp20_; #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = saved_size; #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5932,14 +5932,14 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le guchar* _tmp0_ = NULL; gint _tmp0__length1 = 0; gint __tmp0__size_ = 0; - GExiv2Metadata* _tmp1_ = NULL; + GExiv2Metadata* _tmp1_; guint8* _tmp2_ = NULL; - gint _tmp3_ = 0; - gboolean _tmp4_ = FALSE; - guint8* _tmp6_ = NULL; - gint _tmp6__length1 = 0; - guint8* _tmp7_ = NULL; - gint _tmp7__length1 = 0; + gint _tmp3_; + gboolean _tmp4_; + guint8* _tmp6_; + gint _tmp6__length1; + guint8* _tmp7_; + gint _tmp7__length1; #line 728 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5957,8 +5957,8 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { #line 5955 "PhotoMetadata.c" - guchar* _tmp5_ = NULL; - gint _tmp5__length1 = 0; + guchar* _tmp5_; + gint _tmp5__length1; #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = buffer; #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6006,14 +6006,14 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le guint photo_metadata_get_preview_count (PhotoMetadata* self) { guint result = 0U; GExiv2PreviewProperties** props = NULL; - GExiv2Metadata* _tmp0_ = NULL; - GExiv2PreviewProperties** _tmp1_ = NULL; - GExiv2PreviewProperties** _tmp2_ = NULL; - gint props_length1 = 0; - gint _props_size_ = 0; + GExiv2Metadata* _tmp0_; + GExiv2PreviewProperties** _tmp1_; + GExiv2PreviewProperties** _tmp2_; + gint props_length1; + gint _props_size_; gint _tmp3_ = 0; - GExiv2PreviewProperties** _tmp4_ = NULL; - gint _tmp4__length1 = 0; + GExiv2PreviewProperties** _tmp4_; + gint _tmp4__length1; #line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0U); #line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6033,8 +6033,8 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) { #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { #line 6031 "PhotoMetadata.c" - GExiv2PreviewProperties** _tmp5_ = NULL; - gint _tmp5__length1 = 0; + GExiv2PreviewProperties** _tmp5_; + gint _tmp5__length1; #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = props; #line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6058,21 +6058,21 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) { PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { PhotoPreview* result = NULL; GExiv2PreviewProperties** props = NULL; - GExiv2Metadata* _tmp0_ = NULL; - GExiv2PreviewProperties** _tmp1_ = NULL; - GExiv2PreviewProperties** _tmp2_ = NULL; - gint props_length1 = 0; - gint _props_size_ = 0; + GExiv2Metadata* _tmp0_; + GExiv2PreviewProperties** _tmp1_; + GExiv2PreviewProperties** _tmp2_; + gint props_length1; + gint _props_size_; gboolean _tmp3_ = FALSE; - GExiv2PreviewProperties** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp7_ = NULL; - guint _tmp8_ = 0U; - GExiv2PreviewProperties** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - guint _tmp10_ = 0U; - GExiv2PreviewProperties* _tmp11_ = NULL; - PhotoMetadataInternalPhotoPreview* _tmp12_ = NULL; + GExiv2PreviewProperties** _tmp4_; + gint _tmp4__length1; + const gchar* _tmp7_; + guint _tmp8_; + GExiv2PreviewProperties** _tmp9_; + gint _tmp9__length1; + guint _tmp10_; + GExiv2PreviewProperties* _tmp11_; + PhotoMetadataInternalPhotoPreview* _tmp12_; #line 740 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6095,9 +6095,9 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { _tmp3_ = TRUE; #line 6092 "PhotoMetadata.c" } else { - GExiv2PreviewProperties** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - guint _tmp6_ = 0U; + GExiv2PreviewProperties** _tmp5_; + gint _tmp5__length1; + guint _tmp6_; #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = props; #line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6139,8 +6139,8 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { - GExiv2Metadata* _tmp0_ = NULL; - ExifData* _tmp1_ = NULL; + GExiv2Metadata* _tmp0_; + ExifData* _tmp1_; #line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 749 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6152,12 +6152,12 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ != NULL) { #line 6150 "PhotoMetadata.c" - ExifMem* _tmp2_ = NULL; - ExifMem* _tmp3_ = NULL; - ExifData* _tmp4_ = NULL; - guchar* _tmp5_ = NULL; - ExifData* _tmp6_ = NULL; - ExifData* _tmp7_ = NULL; + ExifMem* _tmp2_; + ExifMem* _tmp3_; + ExifData* _tmp4_; + guchar* _tmp5_; + ExifData* _tmp6_; + ExifData* _tmp7_; #line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = exif_mem_new_default (); #line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6184,8 +6184,8 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) { - GExiv2Metadata* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + GExiv2Metadata* _tmp0_; + const gchar* _tmp1_; #line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6201,8 +6201,8 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) { void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_length1) { - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; #line 761 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6222,7 +6222,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { #line 6220 "PhotoMetadata.c" - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* tag = NULL; #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); @@ -6230,7 +6230,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len tag = _tmp1_; #line 6227 "PhotoMetadata.c" { - const gchar* _tmp2_ = NULL; + const gchar* _tmp2_; #line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; #line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6245,7 +6245,7 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { - MetadataDomain _tmp0_ = 0; + MetadataDomain _tmp0_; #line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6256,7 +6256,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { case METADATA_DOMAIN_EXIF: #line 6253 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_ = NULL; + GExiv2Metadata* _tmp1_; #line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; #line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6269,7 +6269,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { case METADATA_DOMAIN_XMP: #line 6266 "PhotoMetadata.c" { - GExiv2Metadata* _tmp2_ = NULL; + GExiv2Metadata* _tmp2_; #line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = self->priv->exiv2; #line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6282,7 +6282,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { case METADATA_DOMAIN_IPTC: #line 6279 "PhotoMetadata.c" { - GExiv2Metadata* _tmp3_ = NULL; + GExiv2Metadata* _tmp3_; #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = self->priv->exiv2; #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6300,7 +6300,7 @@ void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { void photo_metadata_clear (PhotoMetadata* self) { - GExiv2Metadata* _tmp0_ = NULL; + GExiv2Metadata* _tmp0_; #line 782 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6313,9 +6313,9 @@ void photo_metadata_clear (PhotoMetadata* self) { MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self) { MetadataDateTime* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - MetadataDateTime* _tmp1_ = NULL; + gchar** _tmp0_; + gint _tmp0__length1; + MetadataDateTime* _tmp1_; #line 793 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6333,7 +6333,7 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { - MetadataDateTime* _tmp0_ = NULL; + MetadataDateTime* _tmp0_; #line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6343,10 +6343,10 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat #line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { #line 6341 "PhotoMetadata.c" - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - MetadataDateTime* _tmp2_ = NULL; - PhotoMetadataSetOption _tmp3_ = 0; + gchar** _tmp1_; + gint _tmp1__length1; + MetadataDateTime* _tmp2_; + PhotoMetadataSetOption _tmp3_; #line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_DATE_TIME_TAGS; #line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6359,8 +6359,8 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); #line 6356 "PhotoMetadata.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; + gchar** _tmp4_; + gint _tmp4__length1; #line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_DATE_TIME_TAGS; #line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6374,9 +6374,9 @@ void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDat MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) { MetadataDateTime* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - MetadataDateTime* _tmp1_ = NULL; + gchar** _tmp0_; + gint _tmp0__length1; + MetadataDateTime* _tmp1_; #line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6394,7 +6394,7 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) { void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { - MetadataDateTime* _tmp0_ = NULL; + MetadataDateTime* _tmp0_; #line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6404,10 +6404,10 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim #line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { #line 6402 "PhotoMetadata.c" - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - MetadataDateTime* _tmp2_ = NULL; - PhotoMetadataSetOption _tmp3_ = 0; + gchar** _tmp1_; + gint _tmp1__length1; + MetadataDateTime* _tmp2_; + PhotoMetadataSetOption _tmp3_; #line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; #line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6420,8 +6420,8 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); #line 6417 "PhotoMetadata.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; + gchar** _tmp4_; + gint _tmp4__length1; #line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; #line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6435,9 +6435,9 @@ void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTim MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) { MetadataDateTime* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - MetadataDateTime* _tmp1_ = NULL; + gchar** _tmp0_; + gint _tmp0__length1; + MetadataDateTime* _tmp1_; #line 831 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6455,7 +6455,7 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) { void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { - MetadataDateTime* _tmp0_ = NULL; + MetadataDateTime* _tmp0_; #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6465,10 +6465,10 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { #line 6463 "PhotoMetadata.c" - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - MetadataDateTime* _tmp2_ = NULL; - PhotoMetadataSetOption _tmp3_ = 0; + gchar** _tmp1_; + gint _tmp1__length1; + MetadataDateTime* _tmp2_; + PhotoMetadataSetOption _tmp3_; #line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; #line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6481,8 +6481,8 @@ void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTi photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); #line 6478 "PhotoMetadata.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; + gchar** _tmp4_; + gint _tmp4__length1; #line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; #line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6498,8 +6498,8 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada PhotoMetadata * self; MetadataDateTime* result = NULL; MetadataDateTime* creation = NULL; - MetadataDateTime* _tmp0_ = NULL; - MetadataDateTime* _tmp1_ = NULL; + MetadataDateTime* _tmp0_; + MetadataDateTime* _tmp1_; #line 843 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); #line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6511,7 +6511,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada #line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ == NULL) { #line 6509 "PhotoMetadata.c" - MetadataDateTime* _tmp2_ = NULL; + MetadataDateTime* _tmp2_; #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_digitized_date_time (self); #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6537,10 +6537,10 @@ static gpointer _dimensions_dup0 (gpointer self) { Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { Dimensions* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6566,31 +6566,31 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { #line 6564 "PhotoMetadata.c" - gint _tmp4_ = 0; - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; + gint _tmp4_; + gchar** _tmp5_; + gint _tmp5__length1; glong width = 0L; - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - gint _tmp7_ = 0; - const gchar* _tmp8_ = NULL; + gchar** _tmp6_; + gint _tmp6__length1; + gint _tmp7_; + const gchar* _tmp8_; glong _tmp9_ = 0L; - gboolean _tmp10_ = FALSE; + gboolean _tmp10_; glong height = 0L; - gchar** _tmp11_ = NULL; - gint _tmp11__length1 = 0; - gint _tmp12_ = 0; - const gchar* _tmp13_ = NULL; + gchar** _tmp11_; + gint _tmp11__length1; + gint _tmp12_; + const gchar* _tmp13_; glong _tmp14_ = 0L; - gboolean _tmp15_ = FALSE; - glong _tmp16_ = 0L; - glong _tmp17_ = 0L; + gboolean _tmp15_; + glong _tmp16_; + glong _tmp17_; Dimensions _tmp18_ = {0}; - Dimensions* _tmp19_ = NULL; + Dimensions* _tmp19_; #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp2_) { #line 6588 "PhotoMetadata.c" - gint _tmp3_ = 0; + gint _tmp3_; #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = ctr; #line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6672,7 +6672,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option) { - Dimensions* _tmp0_ = NULL; + Dimensions* _tmp0_; #line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6680,16 +6680,16 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, #line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { #line 6678 "PhotoMetadata.c" - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - Dimensions* _tmp2_ = NULL; - gint _tmp3_ = 0; - PhotoMetadataSetOption _tmp4_ = 0; - gchar** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - Dimensions* _tmp6_ = NULL; - gint _tmp7_ = 0; - PhotoMetadataSetOption _tmp8_ = 0; + gchar** _tmp1_; + gint _tmp1__length1; + Dimensions* _tmp2_; + gint _tmp3_; + PhotoMetadataSetOption _tmp4_; + gchar** _tmp5_; + gint _tmp5__length1; + Dimensions* _tmp6_; + gint _tmp7_; + PhotoMetadataSetOption _tmp8_; #line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_WIDTH_TAGS; #line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6716,10 +6716,10 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_); #line 6713 "PhotoMetadata.c" } else { - gchar** _tmp9_ = NULL; - gint _tmp9__length1 = 0; - gchar** _tmp10_ = NULL; - gint _tmp10__length1 = 0; + gchar** _tmp9_; + gint _tmp9__length1; + gchar** _tmp10_; + gint _tmp10__length1; #line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = photo_metadata_WIDTH_TAGS; #line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6740,21 +6740,21 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, static gchar* string_strip (const gchar* self) { gchar* result = NULL; gchar* _result_ = NULL; - gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; -#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + const gchar* _tmp1_; +#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _result_; -#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 6755 "PhotoMetadata.c" } @@ -6762,19 +6762,19 @@ static gchar* string_strip (const gchar* self) { static gboolean string_contains (const gchar* self, const gchar* needle) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp0_; + gchar* _tmp1_; +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1376 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = needle; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp1_ != NULL; -#line 1377 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; #line 6775 "PhotoMetadata.c" } @@ -6784,21 +6784,21 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { PhotoMetadata * self; gchar* result = NULL; GeeList* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; GeeList* titles = NULL; - GeeList* _tmp5_ = NULL; + GeeList* _tmp5_; gchar* _tmp6_ = NULL; gboolean _tmp7_ = FALSE; - GeeList* _tmp8_ = NULL; + GeeList* _tmp8_; gchar* title = NULL; - gchar* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; + gchar* _tmp14_; + const gchar* _tmp15_; const gchar* _tmp18_ = NULL; gboolean _tmp19_ = FALSE; gboolean _tmp20_ = FALSE; - const gchar* _tmp21_ = NULL; - gboolean _tmp22_ = FALSE; - gchar* _tmp28_ = NULL; + const gchar* _tmp21_; + gboolean _tmp22_; + gchar* _tmp28_; #line 925 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6806,7 +6806,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { #line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_) { #line 6804 "PhotoMetadata.c" - GeeList* _tmp2_ = NULL; + GeeList* _tmp2_; #line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); #line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6815,9 +6815,9 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { _tmp0_ = _tmp2_; #line 6812 "PhotoMetadata.c" } else { - gchar** _tmp3_ = NULL; - gint _tmp3__length1 = 0; - GeeList* _tmp4_ = NULL; + gchar** _tmp3_; + gint _tmp3__length1; + GeeList* _tmp4_; #line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_STANDARD_TITLE_TAGS; #line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6839,9 +6839,9 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp8_ != NULL) { #line 6837 "PhotoMetadata.c" - GeeList* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + GeeList* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = titles; #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6859,8 +6859,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp7_) { #line 6857 "PhotoMetadata.c" - GeeList* _tmp12_ = NULL; - gpointer _tmp13_ = NULL; + GeeList* _tmp12_; + gpointer _tmp13_; #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = titles; #line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6886,8 +6886,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { #line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp15_ != NULL) { #line 6884 "PhotoMetadata.c" - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; + const gchar* _tmp16_; + gchar* _tmp17_; #line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = title; #line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6905,8 +6905,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp22_) { #line 6903 "PhotoMetadata.c" - const gchar* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; + const gchar* _tmp23_; + gboolean _tmp24_; #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = title; #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6922,8 +6922,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp20_) { #line 6920 "PhotoMetadata.c" - const gchar* _tmp25_ = NULL; - gboolean _tmp26_ = FALSE; + const gchar* _tmp25_; + gboolean _tmp26_; #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = title; #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6939,7 +6939,7 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp19_) { #line 6937 "PhotoMetadata.c" - const gchar* _tmp27_ = NULL; + const gchar* _tmp27_; #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = title; #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6969,8 +6969,8 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option) { - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + const gchar* _tmp0_; + gboolean _tmp1_; #line 951 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6980,23 +6980,23 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet #line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { #line 6978 "PhotoMetadata.c" - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; #line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); #line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_) { #line 6984 "PhotoMetadata.c" - const gchar* _tmp3_ = NULL; + const gchar* _tmp3_; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = title; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 6990 "PhotoMetadata.c" } else { - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - const gchar* _tmp5_ = NULL; - PhotoMetadataSetOption _tmp6_ = 0; + gchar** _tmp4_; + gint _tmp4__length1; + const gchar* _tmp5_; + PhotoMetadataSetOption _tmp6_; #line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_STANDARD_TITLE_TAGS; #line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7010,8 +7010,8 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet #line 7006 "PhotoMetadata.c" } } else { - gchar** _tmp7_ = NULL; - gint _tmp7__length1 = 0; + gchar** _tmp7_; + gint _tmp7__length1; #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = photo_metadata_STANDARD_TITLE_TAGS; #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7026,9 +7026,9 @@ void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMet static gchar* photo_metadata_real_get_comment (MediaMetadata* base) { PhotoMetadata * self; gchar* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar* _tmp1_ = NULL; + gchar** _tmp0_; + gint _tmp0__length1; + gchar* _tmp1_; #line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); #line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7076,8 +7076,8 @@ static void block6_data_unref (void * _userdata_) { static void ___lambda10_ (Block6Data* _data6_, const gchar* tag) { PhotoMetadata* self; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data6_->self; #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7101,10 +7101,10 @@ static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gp void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option) { Block6Data* _data6_; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gboolean _tmp3_ = FALSE; + const gchar* _tmp0_; + gchar* _tmp1_; + const gchar* _tmp2_; + gboolean _tmp3_; #line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7128,9 +7128,9 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot #line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp3_) { #line 7126 "PhotoMetadata.c" - gchar** _tmp4_ = NULL; - gint _tmp4__length1 = 0; - PhotoMetadataSetOption _tmp5_ = 0; + gchar** _tmp4_; + gint _tmp4__length1; + PhotoMetadataSetOption _tmp5_; #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_COMMENT_TAGS; #line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7141,8 +7141,8 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot photo_metadata_set_all_generic (self, _tmp4_, _tmp4__length1, _tmp5_, ____lambda10__photo_metadata_set_generic_value, _data6_); #line 7138 "PhotoMetadata.c" } else { - gchar** _tmp6_ = NULL; - gint _tmp6__length1 = 0; + gchar** _tmp6_; + gint _tmp6__length1; #line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_COMMENT_TAGS; #line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7162,12 +7162,12 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { GeeSet* result = NULL; GeeSet* keywords = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; GeeSet* _tmp22_ = NULL; gboolean _tmp23_ = FALSE; - GeeSet* _tmp24_ = NULL; - GeeSet* _tmp29_ = NULL; + GeeSet* _tmp24_; + GeeSet* _tmp29_; #line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7189,7 +7189,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { #line 7187 "PhotoMetadata.c" - gchar* _tmp1_ = NULL; + gchar* _tmp1_; gchar* tag = NULL; #line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); @@ -7198,10 +7198,10 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa #line 7194 "PhotoMetadata.c" { GeeCollection* values = NULL; - const gchar* _tmp2_ = NULL; - GeeList* _tmp3_ = NULL; + const gchar* _tmp2_; + GeeList* _tmp3_; gboolean _tmp4_ = FALSE; - GeeCollection* _tmp5_ = NULL; + GeeCollection* _tmp5_; #line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; #line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7213,9 +7213,9 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa #line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { #line 7211 "PhotoMetadata.c" - GeeCollection* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + GeeCollection* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = values; #line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7233,16 +7233,16 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa #line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { #line 7231 "PhotoMetadata.c" - GeeSet* _tmp9_ = NULL; + GeeSet* _tmp9_; #line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = keywords; #line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_ == NULL) { #line 7237 "PhotoMetadata.c" - GCompareDataFunc _tmp10_ = NULL; - void* _tmp10__target = NULL; - GDestroyNotify _tmp10__target_destroy_notify = NULL; - GeeSet* _tmp11_ = NULL; + GCompareDataFunc _tmp10_; + void* _tmp10__target; + GDestroyNotify _tmp10__target_destroy_notify; + GeeSet* _tmp11_; #line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = compare_func; #line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7265,8 +7265,8 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa } { GeeIterator* _current_value_it = NULL; - GeeCollection* _tmp12_ = NULL; - GeeIterator* _tmp13_ = NULL; + GeeCollection* _tmp12_; + GeeIterator* _tmp13_; #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = values; #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7276,15 +7276,15 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { #line 7274 "PhotoMetadata.c" - GeeIterator* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + GeeIterator* _tmp14_; + gboolean _tmp15_; gchar* current_value = NULL; - GeeIterator* _tmp16_ = NULL; - gpointer _tmp17_ = NULL; - GeeSet* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + GeeIterator* _tmp16_; + gpointer _tmp17_; + GeeSet* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = _current_value_it; #line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7335,9 +7335,9 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp24_ != NULL) { #line 7333 "PhotoMetadata.c" - GeeSet* _tmp25_ = NULL; - gint _tmp26_ = 0; - gint _tmp27_ = 0; + GeeSet* _tmp25_; + gint _tmp26_; + gint _tmp27_; #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = keywords; #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7355,7 +7355,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp23_) { #line 7353 "PhotoMetadata.c" - GeeSet* _tmp28_ = NULL; + GeeSet* _tmp28_; #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = keywords; #line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7395,120 +7395,162 @@ static gpointer _hierarchical_keyword_field_ref0 (gpointer self) { static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { gchar* result = NULL; + gboolean _tmp0_ = FALSE; + gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1380 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 7401 "PhotoMetadata.c" +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if ((*((gchar*) self)) == '\0') { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = TRUE; +#line 7407 "PhotoMetadata.c" + } else { + const gchar* _tmp2_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp2_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; +#line 7414 "PhotoMetadata.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp1_) { +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = TRUE; +#line 7420 "PhotoMetadata.c" + } else { + const gchar* _tmp3_; + const gchar* _tmp4_; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp3_ = old; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp4_ = replacement; +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; +#line 7430 "PhotoMetadata.c" + } +#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + if (_tmp0_) { +#line 7434 "PhotoMetadata.c" + gchar* _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp5_ = g_strdup (self); +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp5_; +#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + return result; +#line 7442 "PhotoMetadata.c" + } { GRegex* regex = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GRegex* _tmp3_ = NULL; - GRegex* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - GRegex* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp0_ = old; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp1_ = g_regex_escape_string (_tmp0_, -1); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp2_ = _tmp1_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp3_ = g_regex_new (_tmp2_, 0, 0, &_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp4_ = _tmp3_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp2_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - regex = _tmp4_; -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + const gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRegex* _tmp9_; + GRegex* _tmp10_; + gchar* _tmp11_ = NULL; + GRegex* _tmp12_; + const gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp6_ = old; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp7_ = g_regex_escape_string (_tmp6_, -1); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp8_ = _tmp7_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp10_ = _tmp9_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp8_); +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + regex = _tmp10_; +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7432 "PhotoMetadata.c" +#line 7474 "PhotoMetadata.c" goto __catch27_g_regex_error; } -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1382 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 7441 "PhotoMetadata.c" +#line 7483 "PhotoMetadata.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp6_ = regex; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp7_ = replacement; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp8_ = g_regex_replace_literal (_tmp6_, self, (gssize) -1, 0, _tmp7_, 0, &_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = _tmp8_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp12_ = regex; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp13_ = replacement; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = _tmp14_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7457 "PhotoMetadata.c" +#line 7499 "PhotoMetadata.c" goto __catch27_g_regex_error; } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 7468 "PhotoMetadata.c" +#line 7510 "PhotoMetadata.c" } -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp9_ = _tmp5_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _tmp5_ = NULL; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - result = _tmp9_; -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" - _g_free0 (_tmp5_); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp15_ = _tmp11_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _tmp11_ = NULL; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + result = _tmp15_; +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + _g_free0 (_tmp11_); +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1383 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7482 "PhotoMetadata.c" +#line 7524 "PhotoMetadata.c" } goto __finally27; __catch27_g_regex_error: { GError* e = NULL; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1385 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 7496 "PhotoMetadata.c" +#line 7538 "PhotoMetadata.c" } __finally27: -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1381 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 7507 "PhotoMetadata.c" +#line 7549 "PhotoMetadata.c" } } @@ -7516,43 +7558,43 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* static glong string_strnlen (gchar* str, glong maxlen) { glong result = 0L; gchar* end = NULL; - gchar* _tmp0_ = NULL; - glong _tmp1_ = 0L; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp0_; + glong _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = str; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = maxlen; -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" end = _tmp2_; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = end; -#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 7531 "PhotoMetadata.c" - glong _tmp4_ = 0L; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 7573 "PhotoMetadata.c" + glong _tmp4_; +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp4_; -#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7539 "PhotoMetadata.c" +#line 7581 "PhotoMetadata.c" } else { - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gchar* _tmp5_; + gchar* _tmp6_; +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = end; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = str; -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = (glong) (_tmp5_ - _tmp6_); -#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7551 "PhotoMetadata.c" +#line 7593 "PhotoMetadata.c" } } @@ -7561,132 +7603,132 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_ = 0L; - glong _tmp8_ = 0L; - glong _tmp14_ = 0L; - glong _tmp17_ = 0L; - glong _tmp18_ = 0L; - glong _tmp19_ = 0L; - glong _tmp20_ = 0L; - glong _tmp21_ = 0L; - gchar* _tmp22_ = NULL; -#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp1_; + glong _tmp8_; + glong _tmp14_; + glong _tmp17_; + glong _tmp18_; + glong _tmp19_; + glong _tmp20_; + glong _tmp21_; + gchar* _tmp22_; +#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = offset; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 7575 "PhotoMetadata.c" - glong _tmp2_ = 0L; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 7617 "PhotoMetadata.c" + glong _tmp2_; +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 7581 "PhotoMetadata.c" +#line 7623 "PhotoMetadata.c" } else { -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 7585 "PhotoMetadata.c" +#line 7627 "PhotoMetadata.c" } -#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 7589 "PhotoMetadata.c" - glong _tmp3_ = 0L; - glong _tmp4_ = 0L; - glong _tmp5_ = 0L; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 7631 "PhotoMetadata.c" + glong _tmp3_; + glong _tmp4_; + glong _tmp5_; +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp3_ = offset; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = len; -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 7601 "PhotoMetadata.c" +#line 7643 "PhotoMetadata.c" } else { - gint _tmp6_ = 0; - gint _tmp7_ = 0; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + gint _tmp6_; + gint _tmp7_; +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp6_ = strlen (self); -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp7_ = _tmp6_; -#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 7611 "PhotoMetadata.c" +#line 7653 "PhotoMetadata.c" } -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; -#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 7617 "PhotoMetadata.c" - glong _tmp9_ = 0L; - glong _tmp10_ = 0L; - glong _tmp11_ = 0L; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 7659 "PhotoMetadata.c" + glong _tmp9_; + glong _tmp10_; + glong _tmp11_; +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp9_ = string_length; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp10_ = offset; -#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" offset = _tmp9_ + _tmp10_; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp11_ = offset; -#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 7631 "PhotoMetadata.c" +#line 7673 "PhotoMetadata.c" } else { - glong _tmp12_ = 0L; - glong _tmp13_ = 0L; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" + glong _tmp12_; + glong _tmp13_; +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = offset; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp13_ = string_length; -#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 7641 "PhotoMetadata.c" +#line 7683 "PhotoMetadata.c" } -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; -#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 7647 "PhotoMetadata.c" - glong _tmp15_ = 0L; - glong _tmp16_ = 0L; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 7689 "PhotoMetadata.c" + glong _tmp15_; + glong _tmp16_; +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = string_length; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp16_ = offset; -#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 7656 "PhotoMetadata.c" +#line 7698 "PhotoMetadata.c" } -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp18_ = len; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp19_ = string_length; -#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp20_ = offset; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp21_ = len; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" result = _tmp22_; -#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi" +#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7676 "PhotoMetadata.c" +#line 7718 "PhotoMetadata.c" } static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, HierarchicalTagIndex* index) { - HierarchicalKeywordField** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - HierarchicalTagIndex* _tmp4_ = NULL; - HierarchicalKeywordField** _tmp5_ = NULL; - gint _tmp5__length1 = 0; + HierarchicalKeywordField** _tmp0_; + gint _tmp0__length1; + HierarchicalTagIndex* _tmp4_; + HierarchicalKeywordField** _tmp5_; + gint _tmp5__length1; #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7695,7 +7737,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7694 "PhotoMetadata.c" +#line 7736 "PhotoMetadata.c" { HierarchicalKeywordField** current_field_collection = NULL; gint current_field_collection_length1 = 0; @@ -7707,17 +7749,17 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se current_field_collection_length1 = _tmp0__length1; #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) { -#line 7706 "PhotoMetadata.c" - HierarchicalKeywordField* _tmp1_ = NULL; +#line 7748 "PhotoMetadata.c" + HierarchicalKeywordField* _tmp1_; HierarchicalKeywordField* current_field = NULL; #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field = _tmp1_; -#line 7713 "PhotoMetadata.c" +#line 7755 "PhotoMetadata.c" { - HierarchicalKeywordField* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; + HierarchicalKeywordField* _tmp2_; + const gchar* _tmp3_; #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = current_field; #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7726,7 +7768,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se photo_metadata_remove_tag (self, _tmp3_); #line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7725 "PhotoMetadata.c" +#line 7767 "PhotoMetadata.c" } } } @@ -7736,13 +7778,13 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se if (_tmp4_ == NULL) { #line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 7735 "PhotoMetadata.c" +#line 7777 "PhotoMetadata.c" } #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7741 "PhotoMetadata.c" +#line 7783 "PhotoMetadata.c" { HierarchicalKeywordField** current_field_collection = NULL; gint current_field_collection_length1 = 0; @@ -7754,22 +7796,22 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se current_field_collection_length1 = _tmp5__length1; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) { -#line 7753 "PhotoMetadata.c" - HierarchicalKeywordField* _tmp6_ = NULL; +#line 7795 "PhotoMetadata.c" + HierarchicalKeywordField* _tmp6_; HierarchicalKeywordField* current_field = NULL; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field = _tmp6_; -#line 7760 "PhotoMetadata.c" +#line 7802 "PhotoMetadata.c" { - HierarchicalKeywordField* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + HierarchicalKeywordField* _tmp7_; + gboolean _tmp8_; GeeSet* writeable_set = NULL; - GeeTreeSet* _tmp9_ = NULL; - HierarchicalKeywordField* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - GeeSet* _tmp31_ = NULL; + GeeTreeSet* _tmp9_; + HierarchicalKeywordField* _tmp29_; + const gchar* _tmp30_; + GeeSet* _tmp31_; #line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = current_field; #line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7780,20 +7822,20 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se _hierarchical_keyword_field_unref0 (current_field); #line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 7779 "PhotoMetadata.c" +#line 7821 "PhotoMetadata.c" } #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet); -#line 7785 "PhotoMetadata.c" +#line 7827 "PhotoMetadata.c" { GeeIterator* _current_path_it = NULL; - HierarchicalTagIndex* _tmp10_ = NULL; - GeeCollection* _tmp11_ = NULL; - GeeCollection* _tmp12_ = NULL; - GeeIterator* _tmp13_ = NULL; - GeeIterator* _tmp14_ = NULL; + HierarchicalTagIndex* _tmp10_; + GeeCollection* _tmp11_; + GeeCollection* _tmp12_; + GeeIterator* _tmp13_; + GeeIterator* _tmp14_; #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = index; #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7810,21 +7852,21 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se _current_path_it = _tmp14_; #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7809 "PhotoMetadata.c" - GeeIterator* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; +#line 7851 "PhotoMetadata.c" + GeeIterator* _tmp15_; + gboolean _tmp16_; gchar* current_path = NULL; - GeeIterator* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; + GeeIterator* _tmp17_; + gpointer _tmp18_; gchar* writeable_path = NULL; - const gchar* _tmp19_ = NULL; - HierarchicalKeywordField* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - HierarchicalKeywordField* _tmp23_ = NULL; - gboolean _tmp24_ = FALSE; - GeeSet* _tmp27_ = NULL; - const gchar* _tmp28_ = NULL; + const gchar* _tmp19_; + HierarchicalKeywordField* _tmp20_; + const gchar* _tmp21_; + gchar* _tmp22_; + HierarchicalKeywordField* _tmp23_; + gboolean _tmp24_; + GeeSet* _tmp27_; + const gchar* _tmp28_; #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _current_path_it; #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7833,7 +7875,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se if (!_tmp16_) { #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7832 "PhotoMetadata.c" +#line 7874 "PhotoMetadata.c" } #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = _current_path_it; @@ -7857,9 +7899,9 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se _tmp24_ = _tmp23_->wants_leading_separator; #line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp24_) { -#line 7856 "PhotoMetadata.c" - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; +#line 7898 "PhotoMetadata.c" + const gchar* _tmp25_; + gchar* _tmp26_; #line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = writeable_path; #line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7868,7 +7910,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se _g_free0 (writeable_path); #line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" writeable_path = _tmp26_; -#line 7867 "PhotoMetadata.c" +#line 7909 "PhotoMetadata.c" } #line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = writeable_set; @@ -7880,11 +7922,11 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se _g_free0 (writeable_path); #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_path); -#line 7879 "PhotoMetadata.c" +#line 7921 "PhotoMetadata.c" } #line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_path_it); -#line 7883 "PhotoMetadata.c" +#line 7925 "PhotoMetadata.c" } #line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = current_field; @@ -7898,7 +7940,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se _g_object_unref0 (writeable_set); #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7897 "PhotoMetadata.c" +#line 7939 "PhotoMetadata.c" } } } @@ -7907,11 +7949,11 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, PhotoMetadataSetOption option) { HierarchicalTagIndex* htag_index = NULL; - HierarchicalTagIndex* _tmp0_ = NULL; + HierarchicalTagIndex* _tmp0_; GeeSet* flat_keywords = NULL; - GeeTreeSet* _tmp1_ = NULL; - GeeCollection* _tmp2_ = NULL; - GeeCollection* _tmp28_ = NULL; + GeeTreeSet* _tmp1_; + GeeCollection* _tmp2_; + GeeCollection* _tmp28_; #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7928,15 +7970,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, _tmp2_ = keywords; #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ != NULL) { -#line 7927 "PhotoMetadata.c" - GeeSet* _tmp24_ = NULL; - HierarchicalTagIndex* _tmp25_ = NULL; - GeeCollection* _tmp26_ = NULL; - GeeCollection* _tmp27_ = NULL; +#line 7969 "PhotoMetadata.c" + GeeSet* _tmp24_; + HierarchicalTagIndex* _tmp25_; + GeeCollection* _tmp26_; + GeeCollection* _tmp27_; { GeeIterator* _keyword_it = NULL; - GeeCollection* _tmp3_ = NULL; - GeeIterator* _tmp4_ = NULL; + GeeCollection* _tmp3_; + GeeIterator* _tmp4_; #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = keywords; #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7945,14 +7987,14 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, _keyword_it = _tmp4_; #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7944 "PhotoMetadata.c" - GeeIterator* _tmp5_ = NULL; - gboolean _tmp6_ = FALSE; +#line 7986 "PhotoMetadata.c" + GeeIterator* _tmp5_; + gboolean _tmp6_; gchar* keyword = NULL; - GeeIterator* _tmp7_ = NULL; - gpointer _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gboolean _tmp10_ = FALSE; + GeeIterator* _tmp7_; + gpointer _tmp8_; + const gchar* _tmp9_; + gboolean _tmp10_; #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _keyword_it; #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7961,7 +8003,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, if (!_tmp6_) { #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7960 "PhotoMetadata.c" +#line 8002 "PhotoMetadata.c" } #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _keyword_it; @@ -7975,21 +8017,21 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, _tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING); #line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { -#line 7974 "PhotoMetadata.c" +#line 8016 "PhotoMetadata.c" GeeCollection* path_components = NULL; - const gchar* _tmp11_ = NULL; - GeeList* _tmp12_ = NULL; + const gchar* _tmp11_; + GeeList* _tmp12_; #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = keyword; #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_); #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection); -#line 7984 "PhotoMetadata.c" +#line 8026 "PhotoMetadata.c" { GeeIterator* _component_it = NULL; - GeeCollection* _tmp13_ = NULL; - GeeIterator* _tmp14_ = NULL; + GeeCollection* _tmp13_; + GeeIterator* _tmp14_; #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = path_components; #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7998,15 +8040,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, _component_it = _tmp14_; #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7997 "PhotoMetadata.c" - GeeIterator* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; +#line 8039 "PhotoMetadata.c" + GeeIterator* _tmp15_; + gboolean _tmp16_; gchar* component = NULL; - GeeIterator* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; - HierarchicalTagIndex* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; + GeeIterator* _tmp17_; + gpointer _tmp18_; + HierarchicalTagIndex* _tmp19_; + const gchar* _tmp20_; + const gchar* _tmp21_; #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _component_it; #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8015,7 +8057,7 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, if (!_tmp16_) { #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8014 "PhotoMetadata.c" +#line 8056 "PhotoMetadata.c" } #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = _component_it; @@ -8033,33 +8075,33 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_); #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (component); -#line 8032 "PhotoMetadata.c" +#line 8074 "PhotoMetadata.c" } #line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_component_it); -#line 8036 "PhotoMetadata.c" +#line 8078 "PhotoMetadata.c" } #line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (path_components); -#line 8040 "PhotoMetadata.c" +#line 8082 "PhotoMetadata.c" } else { - GeeSet* _tmp22_ = NULL; - const gchar* _tmp23_ = NULL; + GeeSet* _tmp22_; + const gchar* _tmp23_; #line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = flat_keywords; #line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = keyword; #line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 8050 "PhotoMetadata.c" +#line 8092 "PhotoMetadata.c" } #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (keyword); -#line 8054 "PhotoMetadata.c" +#line 8096 "PhotoMetadata.c" } #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_keyword_it); -#line 8058 "PhotoMetadata.c" +#line 8100 "PhotoMetadata.c" } #line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = flat_keywords; @@ -8073,18 +8115,18 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); #line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp27_); -#line 8072 "PhotoMetadata.c" +#line 8114 "PhotoMetadata.c" } #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = keywords; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp28_ != NULL) { -#line 8078 "PhotoMetadata.c" - gchar** _tmp29_ = NULL; - gint _tmp29__length1 = 0; - GeeSet* _tmp30_ = NULL; - PhotoMetadataSetOption _tmp31_ = 0; - HierarchicalTagIndex* _tmp32_ = NULL; +#line 8120 "PhotoMetadata.c" + gchar** _tmp29_; + gint _tmp29__length1; + GeeSet* _tmp30_; + PhotoMetadataSetOption _tmp31_; + HierarchicalTagIndex* _tmp32_; #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = photo_metadata_KEYWORD_TAGS; #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8099,10 +8141,10 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, _tmp32_ = htag_index; #line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_); -#line 8098 "PhotoMetadata.c" +#line 8140 "PhotoMetadata.c" } else { - gchar** _tmp33_ = NULL; - gint _tmp33__length1 = 0; + gchar** _tmp33_; + gint _tmp33__length1; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33_ = photo_metadata_KEYWORD_TAGS; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8111,27 +8153,27 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1); #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_set_hierarchical_keywords (self, NULL); -#line 8110 "PhotoMetadata.c" +#line 8152 "PhotoMetadata.c" } #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (flat_keywords); #line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_tag_index_unref0 (htag_index); -#line 8116 "PhotoMetadata.c" +#line 8158 "PhotoMetadata.c" } gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { gboolean result = FALSE; - HierarchicalKeywordField** _tmp0_ = NULL; - gint _tmp0__length1 = 0; + HierarchicalKeywordField** _tmp0_; + gint _tmp0__length1; #line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8130 "PhotoMetadata.c" +#line 8172 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; @@ -8143,21 +8185,21 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { field_collection_length1 = _tmp0__length1; #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) { -#line 8142 "PhotoMetadata.c" - HierarchicalKeywordField* _tmp1_ = NULL; +#line 8184 "PhotoMetadata.c" + HierarchicalKeywordField* _tmp1_; HierarchicalKeywordField* field = NULL; #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field = _tmp1_; -#line 8149 "PhotoMetadata.c" +#line 8191 "PhotoMetadata.c" { GeeCollection* values = NULL; - HierarchicalKeywordField* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - GeeList* _tmp4_ = NULL; + HierarchicalKeywordField* _tmp2_; + const gchar* _tmp3_; + GeeList* _tmp4_; gboolean _tmp5_ = FALSE; - GeeCollection* _tmp6_ = NULL; + GeeCollection* _tmp6_; #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = field; #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8170,10 +8212,10 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _tmp6_ = values; #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp6_ != NULL) { -#line 8169 "PhotoMetadata.c" - GeeCollection* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; +#line 8211 "PhotoMetadata.c" + GeeCollection* _tmp7_; + gint _tmp8_; + gint _tmp9_; #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = values; #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8182,11 +8224,11 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _tmp9_ = _tmp8_; #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp9_ > 0; -#line 8181 "PhotoMetadata.c" +#line 8223 "PhotoMetadata.c" } else { #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = FALSE; -#line 8185 "PhotoMetadata.c" +#line 8227 "PhotoMetadata.c" } #line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_) { @@ -8198,13 +8240,13 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _hierarchical_keyword_field_unref0 (field); #line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8197 "PhotoMetadata.c" +#line 8239 "PhotoMetadata.c" } #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8203 "PhotoMetadata.c" +#line 8245 "PhotoMetadata.c" } } } @@ -8212,17 +8254,17 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { result = FALSE; #line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8211 "PhotoMetadata.c" +#line 8253 "PhotoMetadata.c" } GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { GeeSet* result = NULL; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; GeeSet* h_keywords = NULL; - GeeSet* _tmp1_ = NULL; - HierarchicalKeywordField** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + GeeSet* _tmp1_; + HierarchicalKeywordField** _tmp2_; + gint _tmp2__length1; GError * _inner_error_ = NULL; #line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); @@ -8238,7 +8280,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8237 "PhotoMetadata.c" +#line 8279 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; @@ -8250,23 +8292,23 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { field_collection_length1 = _tmp2__length1; #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) { -#line 8249 "PhotoMetadata.c" - HierarchicalKeywordField* _tmp3_ = NULL; +#line 8291 "PhotoMetadata.c" + HierarchicalKeywordField* _tmp3_; HierarchicalKeywordField* field = NULL; #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field = _tmp3_; -#line 8256 "PhotoMetadata.c" +#line 8298 "PhotoMetadata.c" { GeeCollection* values = NULL; - HierarchicalKeywordField* _tmp4_ = NULL; - const gchar* _tmp5_ = NULL; - GeeList* _tmp6_ = NULL; + HierarchicalKeywordField* _tmp4_; + const gchar* _tmp5_; + GeeList* _tmp6_; gboolean _tmp7_ = FALSE; - GeeCollection* _tmp8_ = NULL; + GeeCollection* _tmp8_; GeeArrayList* transformed_values = NULL; - GeeArrayList* _tmp12_ = NULL; + GeeArrayList* _tmp12_; #line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = field; #line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8281,11 +8323,11 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { if (_tmp8_ == NULL) { #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = TRUE; -#line 8280 "PhotoMetadata.c" +#line 8322 "PhotoMetadata.c" } else { - GeeCollection* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; + GeeCollection* _tmp9_; + gint _tmp10_; + gint _tmp11_; #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = values; #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8294,7 +8336,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _tmp11_ = _tmp10_; #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _tmp11_ < 1; -#line 8293 "PhotoMetadata.c" +#line 8335 "PhotoMetadata.c" } #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp7_) { @@ -8304,17 +8346,17 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _hierarchical_keyword_field_unref0 (field); #line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 8303 "PhotoMetadata.c" +#line 8345 "PhotoMetadata.c" } #line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" transformed_values = _tmp12_; -#line 8309 "PhotoMetadata.c" +#line 8351 "PhotoMetadata.c" { GeeIterator* _current_value_it = NULL; - GeeCollection* _tmp13_ = NULL; - GeeIterator* _tmp14_ = NULL; + GeeCollection* _tmp13_; + GeeIterator* _tmp14_; #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = values; #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8323,12 +8365,12 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _current_value_it = _tmp14_; #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8322 "PhotoMetadata.c" - GeeIterator* _tmp15_ = NULL; - gboolean _tmp16_ = FALSE; +#line 8364 "PhotoMetadata.c" + GeeIterator* _tmp15_; + gboolean _tmp16_; gchar* current_value = NULL; - GeeIterator* _tmp17_ = NULL; - gpointer _tmp18_ = NULL; + GeeIterator* _tmp17_; + gpointer _tmp18_; #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _current_value_it; #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8337,7 +8379,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { if (!_tmp16_) { #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8336 "PhotoMetadata.c" +#line 8378 "PhotoMetadata.c" } #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = _current_value_it; @@ -8345,15 +8387,15 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _tmp18_ = gee_iterator_get (_tmp17_); #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_value = (gchar*) _tmp18_; -#line 8344 "PhotoMetadata.c" +#line 8386 "PhotoMetadata.c" { GeeList* transformed = NULL; - HierarchicalKeywordField* _tmp19_ = NULL; - KeywordTransformer* _tmp20_ = NULL; - const gchar* _tmp21_ = NULL; - GeeList* _tmp22_ = NULL; - GeeArrayList* _tmp23_ = NULL; - GeeList* _tmp24_ = NULL; + HierarchicalKeywordField* _tmp19_; + KeywordTransformer* _tmp20_; + const gchar* _tmp21_; + GeeList* _tmp22_; + GeeArrayList* _tmp23_; + GeeList* _tmp24_; #line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = field; #line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8366,7 +8408,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { transformed = _tmp22_; #line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8365 "PhotoMetadata.c" +#line 8407 "PhotoMetadata.c" goto __catch28_g_error; } #line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8377,15 +8419,15 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { gee_array_list_add_all (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed); -#line 8376 "PhotoMetadata.c" +#line 8418 "PhotoMetadata.c" } goto __finally28; __catch28_g_error: { GError* _error_ = NULL; - const gchar* _tmp25_ = NULL; - GError* _tmp26_ = NULL; - const gchar* _tmp27_ = NULL; + const gchar* _tmp25_; + GError* _tmp26_; + const gchar* _tmp27_; #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _error_ = _inner_error_; #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8400,7 +8442,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { g_critical ("PhotoMetadata.vala:1099: Failed to transform tag value %s: %s", _tmp25_, _tmp27_); #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_error_free0 (_error_); -#line 8399 "PhotoMetadata.c" +#line 8441 "PhotoMetadata.c" } __finally28: #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8423,24 +8465,24 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { g_clear_error (&_inner_error_); #line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 8422 "PhotoMetadata.c" +#line 8464 "PhotoMetadata.c" } #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8426 "PhotoMetadata.c" +#line 8468 "PhotoMetadata.c" } #line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 8430 "PhotoMetadata.c" +#line 8472 "PhotoMetadata.c" } { GeeArrayList* _current_value_list = NULL; - GeeArrayList* _tmp28_ = NULL; - GeeArrayList* _tmp29_ = NULL; + GeeArrayList* _tmp28_; + GeeArrayList* _tmp29_; gint _current_value_size = 0; - GeeArrayList* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; + GeeArrayList* _tmp30_; + gint _tmp31_; + gint _tmp32_; gint _current_value_index = 0; #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = transformed_values; @@ -8460,20 +8502,20 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _current_value_index = -1; #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8459 "PhotoMetadata.c" - gint _tmp33_ = 0; - gint _tmp34_ = 0; - gint _tmp35_ = 0; +#line 8501 "PhotoMetadata.c" + gint _tmp33_; + gint _tmp34_; + gint _tmp35_; gchar* current_value = NULL; - GeeArrayList* _tmp36_ = NULL; - gint _tmp37_ = 0; - gpointer _tmp38_ = NULL; + GeeArrayList* _tmp36_; + gint _tmp37_; + gpointer _tmp38_; gchar* canonicalized = NULL; - const gchar* _tmp39_ = NULL; - HierarchicalKeywordField* _tmp40_ = NULL; - const gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - const gchar* _tmp43_ = NULL; + const gchar* _tmp39_; + HierarchicalKeywordField* _tmp40_; + const gchar* _tmp41_; + gchar* _tmp42_; + const gchar* _tmp43_; #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33_ = _current_value_index; #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8486,7 +8528,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { if (!(_tmp34_ < _tmp35_)) { #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8485 "PhotoMetadata.c" +#line 8527 "PhotoMetadata.c" } #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp36_ = _current_value_list; @@ -8510,26 +8552,26 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _tmp43_ = canonicalized; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp43_ != NULL) { -#line 8509 "PhotoMetadata.c" - GeeSet* _tmp44_ = NULL; - const gchar* _tmp45_ = NULL; +#line 8551 "PhotoMetadata.c" + GeeSet* _tmp44_; + const gchar* _tmp45_; #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp44_ = h_keywords; #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp45_ = canonicalized; #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_); -#line 8518 "PhotoMetadata.c" +#line 8560 "PhotoMetadata.c" } #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (canonicalized); #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8524 "PhotoMetadata.c" +#line 8566 "PhotoMetadata.c" } #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_list); -#line 8528 "PhotoMetadata.c" +#line 8570 "PhotoMetadata.c" } #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed_values); @@ -8537,7 +8579,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _g_object_unref0 (values); #line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8536 "PhotoMetadata.c" +#line 8578 "PhotoMetadata.c" } } } @@ -8545,14 +8587,14 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { result = h_keywords; #line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8544 "PhotoMetadata.c" +#line 8586 "PhotoMetadata.c" } gboolean photo_metadata_has_orientation (PhotoMetadata* self) { gboolean result = FALSE; - GExiv2Metadata* _tmp0_ = NULL; - GExiv2Orientation _tmp1_ = 0; + GExiv2Metadata* _tmp0_; + GExiv2Orientation _tmp1_; #line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8563,18 +8605,18 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) { result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8562 "PhotoMetadata.c" +#line 8604 "PhotoMetadata.c" } Orientation photo_metadata_get_orientation (PhotoMetadata* self) { Orientation result = 0; GExiv2Orientation orientation = 0; - GExiv2Metadata* _tmp0_ = NULL; - GExiv2Orientation _tmp1_ = 0; + GExiv2Metadata* _tmp0_; + GExiv2Orientation _tmp1_; gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; - GExiv2Orientation _tmp4_ = 0; + GExiv2Orientation _tmp4_; #line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); #line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8589,27 +8631,27 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) { if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) { #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 8588 "PhotoMetadata.c" +#line 8630 "PhotoMetadata.c" } else { - GExiv2Orientation _tmp5_ = 0; + GExiv2Orientation _tmp5_; #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = orientation; #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5_ < ORIENTATION_MIN; -#line 8595 "PhotoMetadata.c" +#line 8637 "PhotoMetadata.c" } #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = TRUE; -#line 8601 "PhotoMetadata.c" +#line 8643 "PhotoMetadata.c" } else { - GExiv2Orientation _tmp6_ = 0; + GExiv2Orientation _tmp6_; #line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = orientation; #line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = _tmp6_ > ORIENTATION_MAX; -#line 8608 "PhotoMetadata.c" +#line 8650 "PhotoMetadata.c" } #line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_) { @@ -8617,23 +8659,23 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) { result = ORIENTATION_TOP_LEFT; #line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8616 "PhotoMetadata.c" +#line 8658 "PhotoMetadata.c" } else { - GExiv2Orientation _tmp7_ = 0; + GExiv2Orientation _tmp7_; #line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = orientation; #line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = (Orientation) _tmp7_; #line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8625 "PhotoMetadata.c" +#line 8667 "PhotoMetadata.c" } } void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation) { - GExiv2Metadata* _tmp0_ = NULL; - Orientation _tmp1_ = 0; + GExiv2Metadata* _tmp0_; + Orientation _tmp1_; #line 1134 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8642,24 +8684,24 @@ void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientatio _tmp1_ = orientation; #line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_); -#line 8641 "PhotoMetadata.c" +#line 8683 "PhotoMetadata.c" } -gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar** long_ref, gdouble* latitude, gchar** lat_ref, gdouble* altitude) { +gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude) { gdouble _vala_longitude = 0.0; gchar* _vala_long_ref = NULL; gdouble _vala_latitude = 0.0; gchar* _vala_lat_ref = NULL; gdouble _vala_altitude = 0.0; gboolean result = FALSE; - GExiv2Metadata* _tmp0_ = NULL; + GExiv2Metadata* _tmp0_; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; gdouble _tmp3_ = 0.0; - gboolean _tmp4_ = FALSE; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; + gboolean _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 1139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8688,43 +8730,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* if (longitude) { #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8687 "PhotoMetadata.c" +#line 8729 "PhotoMetadata.c" } #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8693 "PhotoMetadata.c" +#line 8735 "PhotoMetadata.c" } else { #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8697 "PhotoMetadata.c" +#line 8739 "PhotoMetadata.c" } #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8703 "PhotoMetadata.c" +#line 8745 "PhotoMetadata.c" } #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8709 "PhotoMetadata.c" +#line 8751 "PhotoMetadata.c" } else { #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8713 "PhotoMetadata.c" +#line 8755 "PhotoMetadata.c" } #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8719 "PhotoMetadata.c" +#line 8761 "PhotoMetadata.c" } #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8723 "PhotoMetadata.c" +#line 8765 "PhotoMetadata.c" } #line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS); @@ -8744,43 +8786,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* if (longitude) { #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8743 "PhotoMetadata.c" +#line 8785 "PhotoMetadata.c" } #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8749 "PhotoMetadata.c" +#line 8791 "PhotoMetadata.c" } else { #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8753 "PhotoMetadata.c" +#line 8795 "PhotoMetadata.c" } #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8759 "PhotoMetadata.c" +#line 8801 "PhotoMetadata.c" } #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8765 "PhotoMetadata.c" +#line 8807 "PhotoMetadata.c" } else { #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8769 "PhotoMetadata.c" +#line 8811 "PhotoMetadata.c" } #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8775 "PhotoMetadata.c" +#line 8817 "PhotoMetadata.c" } #line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8779 "PhotoMetadata.c" +#line 8821 "PhotoMetadata.c" } @@ -8788,7 +8830,7 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp MetadataRational _vala_exposure = {0}; gboolean result = FALSE; MetadataRational _tmp0_ = {0}; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 1154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8801,11 +8843,11 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp if (exposure) { #line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *exposure = _vala_exposure; -#line 8800 "PhotoMetadata.c" +#line 8842 "PhotoMetadata.c" } #line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8804 "PhotoMetadata.c" +#line 8846 "PhotoMetadata.c" } @@ -8813,9 +8855,9 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { gchar* result = NULL; MetadataRational exposure_time = {0}; MetadataRational _tmp0_ = {0}; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; - gchar* _tmp3_ = NULL; + gboolean _tmp1_; + gboolean _tmp2_; + gchar* _tmp3_; #line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8828,7 +8870,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { result = NULL; #line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8827 "PhotoMetadata.c" +#line 8869 "PhotoMetadata.c" } #line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = metadata_rational_is_valid (&exposure_time); @@ -8838,7 +8880,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { result = NULL; #line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8837 "PhotoMetadata.c" +#line 8879 "PhotoMetadata.c" } #line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS); @@ -8846,7 +8888,7 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { result = _tmp3_; #line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8845 "PhotoMetadata.c" +#line 8887 "PhotoMetadata.c" } @@ -8855,10 +8897,10 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { gboolean result = FALSE; gboolean fetched_ok = FALSE; glong _tmp0_ = 0L; - gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; + gboolean _tmp1_; + gboolean _tmp2_; gboolean _tmp3_ = FALSE; - glong _tmp4_ = 0L; + glong _tmp4_; #line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8877,11 +8919,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (iso) { #line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8876 "PhotoMetadata.c" +#line 8918 "PhotoMetadata.c" } #line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8880 "PhotoMetadata.c" +#line 8922 "PhotoMetadata.c" } #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _vala_iso; @@ -8889,14 +8931,14 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (_tmp4_ < ((glong) 6)) { #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 8888 "PhotoMetadata.c" +#line 8930 "PhotoMetadata.c" } else { - glong _tmp5_ = 0L; + glong _tmp5_; #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _vala_iso; #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5_ > ((glong) 409600); -#line 8895 "PhotoMetadata.c" +#line 8937 "PhotoMetadata.c" } #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { @@ -8906,11 +8948,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (iso) { #line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8905 "PhotoMetadata.c" +#line 8947 "PhotoMetadata.c" } #line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8909 "PhotoMetadata.c" +#line 8951 "PhotoMetadata.c" } #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; @@ -8918,11 +8960,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (iso) { #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8917 "PhotoMetadata.c" +#line 8959 "PhotoMetadata.c" } #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8921 "PhotoMetadata.c" +#line 8963 "PhotoMetadata.c" } @@ -8930,8 +8972,8 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { gchar* result = NULL; glong iso = 0L; glong _tmp0_ = 0L; - gboolean _tmp1_ = FALSE; - gchar* _tmp2_ = NULL; + gboolean _tmp1_; + gchar* _tmp2_; #line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8944,7 +8986,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { result = NULL; #line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8943 "PhotoMetadata.c" +#line 8985 "PhotoMetadata.c" } #line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS); @@ -8952,7 +8994,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { result = _tmp2_; #line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8951 "PhotoMetadata.c" +#line 8993 "PhotoMetadata.c" } @@ -8960,7 +9002,7 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape MetadataRational _vala_aperture = {0}; gboolean result = FALSE; MetadataRational _tmp0_ = {0}; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8973,11 +9015,11 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape if (aperture) { #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *aperture = _vala_aperture; -#line 8972 "PhotoMetadata.c" +#line 9014 "PhotoMetadata.c" } #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8976 "PhotoMetadata.c" +#line 9018 "PhotoMetadata.c" } @@ -8985,22 +9027,22 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f gchar* result = NULL; MetadataRational aperture = {0}; MetadataRational _tmp0_ = {0}; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; gdouble aperture_value = 0.0; - MetadataRational _tmp2_ = {0}; - gint _tmp3_ = 0; - MetadataRational _tmp4_ = {0}; - gint _tmp5_ = 0; - gdouble _tmp6_ = 0.0; + MetadataRational _tmp2_; + gint _tmp3_; + MetadataRational _tmp4_; + gint _tmp5_; + gdouble _tmp6_; const gchar* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; + gboolean _tmp8_; const gchar* _tmp9_ = NULL; - gdouble _tmp10_ = 0.0; - gdouble _tmp11_ = 0.0; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + gdouble _tmp10_; + gdouble _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9013,7 +9055,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f result = NULL; #line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9012 "PhotoMetadata.c" +#line 9054 "PhotoMetadata.c" } #line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = aperture; @@ -9035,11 +9077,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f if (_tmp8_) { #line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "f/"; -#line 9034 "PhotoMetadata.c" +#line 9076 "PhotoMetadata.c" } else { #line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "f/"; -#line 9038 "PhotoMetadata.c" +#line 9080 "PhotoMetadata.c" } #line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = aperture_value; @@ -9047,11 +9089,11 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f if (fmod (_tmp10_, 1) == ((gdouble) 0)) { #line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = "%.0f"; -#line 9046 "PhotoMetadata.c" +#line 9088 "PhotoMetadata.c" } else { #line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = "%.1f"; -#line 9050 "PhotoMetadata.c" +#line 9092 "PhotoMetadata.c" } #line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = aperture_value; @@ -9069,13 +9111,13 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f result = _tmp15_; #line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9068 "PhotoMetadata.c" +#line 9110 "PhotoMetadata.c" } gchar* photo_metadata_get_camera_make (PhotoMetadata* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9084,13 +9126,13 @@ gchar* photo_metadata_get_camera_make (PhotoMetadata* self) { result = _tmp0_; #line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9083 "PhotoMetadata.c" +#line 9125 "PhotoMetadata.c" } gchar* photo_metadata_get_camera_model (PhotoMetadata* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9099,7 +9141,7 @@ gchar* photo_metadata_get_camera_model (PhotoMetadata* self) { result = _tmp0_; #line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9098 "PhotoMetadata.c" +#line 9140 "PhotoMetadata.c" } @@ -9107,7 +9149,7 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) { glong _vala_flash = 0L; gboolean result = FALSE; glong _tmp0_ = 0L; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9120,17 +9162,17 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) { if (flash) { #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *flash = _vala_flash; -#line 9119 "PhotoMetadata.c" +#line 9161 "PhotoMetadata.c" } #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9123 "PhotoMetadata.c" +#line 9165 "PhotoMetadata.c" } gchar* photo_metadata_get_flash_string (PhotoMetadata* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1220 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9139,7 +9181,7 @@ gchar* photo_metadata_get_flash_string (PhotoMetadata* self) { result = _tmp0_; #line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9138 "PhotoMetadata.c" +#line 9180 "PhotoMetadata.c" } @@ -9147,7 +9189,7 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* MetadataRational _vala_focal_length = {0}; gboolean result = FALSE; MetadataRational _tmp0_ = {0}; - gboolean _tmp1_ = FALSE; + gboolean _tmp1_; #line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9160,17 +9202,17 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* if (focal_length) { #line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *focal_length = _vala_focal_length; -#line 9159 "PhotoMetadata.c" +#line 9201 "PhotoMetadata.c" } #line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9163 "PhotoMetadata.c" +#line 9205 "PhotoMetadata.c" } gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1229 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9179,15 +9221,15 @@ gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) { result = _tmp0_; #line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9178 "PhotoMetadata.c" +#line 9220 "PhotoMetadata.c" } gchar* photo_metadata_get_artist (PhotoMetadata* self) { gchar* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar* _tmp1_ = NULL; + gchar** _tmp0_; + gint _tmp0__length1; + gchar* _tmp1_; #line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9200,13 +9242,13 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) { result = _tmp1_; #line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9199 "PhotoMetadata.c" +#line 9241 "PhotoMetadata.c" } gchar* photo_metadata_get_copyright (PhotoMetadata* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9215,13 +9257,13 @@ gchar* photo_metadata_get_copyright (PhotoMetadata* self) { result = _tmp0_; #line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9214 "PhotoMetadata.c" +#line 9256 "PhotoMetadata.c" } gchar* photo_metadata_get_software (PhotoMetadata* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9230,16 +9272,16 @@ gchar* photo_metadata_get_software (PhotoMetadata* self) { result = _tmp0_; #line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9229 "PhotoMetadata.c" +#line 9271 "PhotoMetadata.c" } void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version) { - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gboolean _tmp4_ = FALSE; + const gchar* _tmp0_; + const gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gboolean _tmp4_; #line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9262,9 +9304,9 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co _tmp4_ = photo_metadata_has_iptc (self); #line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 9261 "PhotoMetadata.c" - const gchar* _tmp5_ = NULL; - const gchar* _tmp6_ = NULL; +#line 9303 "PhotoMetadata.c" + const gchar* _tmp5_; + const gchar* _tmp6_; #line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = software; #line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9273,7 +9315,7 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co _tmp6_ = version; #line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 9272 "PhotoMetadata.c" +#line 9314 "PhotoMetadata.c" } } @@ -9287,13 +9329,13 @@ void photo_metadata_remove_software (PhotoMetadata* self) { photo_metadata_remove_tag (self, "Iptc.Application2.Program"); #line 1264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion"); -#line 9286 "PhotoMetadata.c" +#line 9328 "PhotoMetadata.c" } gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) { gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9302,23 +9344,23 @@ gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) { result = _tmp0_; #line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9301 "PhotoMetadata.c" +#line 9343 "PhotoMetadata.c" } Rating photo_metadata_get_rating (PhotoMetadata* self) { Rating result = 0; gchar* rating_string = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - gchar* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; + gchar** _tmp0_; + gint _tmp0__length1; + gchar* _tmp1_; + const gchar* _tmp2_; + gchar* _tmp6_; + const gchar* _tmp7_; gint int_percent_rating = 0; - const gchar* _tmp8_ = NULL; - gint _tmp9_ = 0; - Rating _tmp18_ = 0; + const gchar* _tmp8_; + gint _tmp9_; + Rating _tmp18_; #line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); #line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9333,10 +9375,10 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { _tmp2_ = rating_string; #line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ != NULL) { -#line 9332 "PhotoMetadata.c" - const gchar* _tmp3_ = NULL; - gint _tmp4_ = 0; - Rating _tmp5_ = 0; +#line 9374 "PhotoMetadata.c" + const gchar* _tmp3_; + gint _tmp4_; + Rating _tmp5_; #line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = rating_string; #line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9349,7 +9391,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { _g_free0 (rating_string); #line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9348 "PhotoMetadata.c" +#line 9390 "PhotoMetadata.c" } #line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS); @@ -9367,7 +9409,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { _g_free0 (rating_string); #line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9366 "PhotoMetadata.c" +#line 9408 "PhotoMetadata.c" } #line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = rating_string; @@ -9375,32 +9417,32 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { _tmp9_ = atoi (_tmp8_); #line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" int_percent_rating = _tmp9_; -#line 9374 "PhotoMetadata.c" +#line 9416 "PhotoMetadata.c" { gint i = 0; #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" i = 5; -#line 9379 "PhotoMetadata.c" +#line 9421 "PhotoMetadata.c" { gboolean _tmp10_ = FALSE; #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = TRUE; #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 9386 "PhotoMetadata.c" - gint _tmp12_ = 0; - gint _tmp13_ = 0; - gint _tmp14_ = 0; - gint _tmp15_ = 0; +#line 9428 "PhotoMetadata.c" + gint _tmp12_; + gint _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp10_) { -#line 9393 "PhotoMetadata.c" - gint _tmp11_ = 0; +#line 9435 "PhotoMetadata.c" + gint _tmp11_; #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = i; #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" i = _tmp11_ - 1; -#line 9399 "PhotoMetadata.c" +#line 9441 "PhotoMetadata.c" } #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = FALSE; @@ -9410,7 +9452,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { if (!(_tmp12_ >= 0)) { #line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 9409 "PhotoMetadata.c" +#line 9451 "PhotoMetadata.c" } #line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = int_percent_rating; @@ -9420,9 +9462,9 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { _tmp15_ = RESOURCES_rating_thresholds[_tmp14_]; #line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp13_ >= _tmp15_) { -#line 9419 "PhotoMetadata.c" - gint _tmp16_ = 0; - Rating _tmp17_ = 0; +#line 9461 "PhotoMetadata.c" + gint _tmp16_; + Rating _tmp17_; #line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = i; #line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9433,7 +9475,7 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { _g_free0 (rating_string); #line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9432 "PhotoMetadata.c" +#line 9474 "PhotoMetadata.c" } } } @@ -9446,21 +9488,21 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { _g_free0 (rating_string); #line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9445 "PhotoMetadata.c" +#line 9487 "PhotoMetadata.c" } void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { gint int_rating = 0; - Rating _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gint _tmp5_ = 0; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gint _tmp8_ = 0; + Rating _tmp0_; + gint _tmp1_; + gint _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gint _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gint _tmp8_; #line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9493,11 +9535,11 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { _tmp8_ = int_rating; #line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (0 <= _tmp8_) { -#line 9492 "PhotoMetadata.c" - gint _tmp9_ = 0; - gint _tmp10_ = 0; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; +#line 9534 "PhotoMetadata.c" + gint _tmp9_; + gint _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = int_rating; #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9510,11 +9552,11 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp12_); -#line 9509 "PhotoMetadata.c" +#line 9551 "PhotoMetadata.c" } else { - gint _tmp13_ = 0; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + gint _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = int_rating; #line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9525,7 +9567,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp15_); -#line 9524 "PhotoMetadata.c" +#line 9566 "PhotoMetadata.c" } } @@ -9533,27 +9575,27 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { static gpointer _media_metadata_ref0 (gpointer self) { #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? media_metadata_ref (self) : NULL; -#line 9532 "PhotoMetadata.c" +#line 9574 "PhotoMetadata.c" } static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_construct (GType object_type, PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) { PhotoMetadataInternalPhotoPreview* self = NULL; - const gchar* _tmp0_ = NULL; - GExiv2PreviewProperties* _tmp1_ = NULL; - guint32 _tmp2_ = 0U; - GExiv2PreviewProperties* _tmp3_ = NULL; - guint32 _tmp4_ = 0U; + const gchar* _tmp0_; + GExiv2PreviewProperties* _tmp1_; + guint32 _tmp2_; + GExiv2PreviewProperties* _tmp3_; + guint32 _tmp4_; Dimensions _tmp5_ = {0}; - GExiv2PreviewProperties* _tmp6_ = NULL; - guint32 _tmp7_ = 0U; - GExiv2PreviewProperties* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - GExiv2PreviewProperties* _tmp10_ = NULL; - const gchar* _tmp11_ = NULL; - PhotoMetadata* _tmp12_ = NULL; - PhotoMetadata* _tmp13_ = NULL; - guint _tmp14_ = 0U; + GExiv2PreviewProperties* _tmp6_; + guint32 _tmp7_; + GExiv2PreviewProperties* _tmp8_; + const gchar* _tmp9_; + GExiv2PreviewProperties* _tmp10_; + const gchar* _tmp11_; + PhotoMetadata* _tmp12_; + PhotoMetadata* _tmp13_; + guint _tmp14_; #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (owner), NULL); #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9600,21 +9642,21 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_ self->number = _tmp14_; #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 9599 "PhotoMetadata.c" +#line 9641 "PhotoMetadata.c" } static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) { #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props); -#line 9606 "PhotoMetadata.c" +#line 9648 "PhotoMetadata.c" } static guint8* _vala_array_dup6 (guint8* self, int length) { #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_memdup (self, length * sizeof (guint8)); -#line 9613 "PhotoMetadata.c" +#line 9655 "PhotoMetadata.c" } @@ -9622,31 +9664,31 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* PhotoMetadataInternalPhotoPreview * self; guint8* result = NULL; GExiv2PreviewProperties** props = NULL; - PhotoMetadata* _tmp0_ = NULL; - GExiv2Metadata* _tmp1_ = NULL; - GExiv2PreviewProperties** _tmp2_ = NULL; - GExiv2PreviewProperties** _tmp3_ = NULL; - gint props_length1 = 0; - gint _props_size_ = 0; + PhotoMetadata* _tmp0_; + GExiv2Metadata* _tmp1_; + GExiv2PreviewProperties** _tmp2_; + GExiv2PreviewProperties** _tmp3_; + gint props_length1; + gint _props_size_; gboolean _tmp4_ = FALSE; - GExiv2PreviewProperties** _tmp5_ = NULL; - gint _tmp5__length1 = 0; - PhotoMetadata* _tmp8_ = NULL; - GExiv2Metadata* _tmp9_ = NULL; - GExiv2PreviewProperties** _tmp10_ = NULL; - gint _tmp10__length1 = 0; - guint _tmp11_ = 0U; - GExiv2PreviewProperties* _tmp12_ = NULL; - GExiv2PreviewImage* _tmp13_ = NULL; - GExiv2PreviewImage* _tmp14_ = NULL; + GExiv2PreviewProperties** _tmp5_; + gint _tmp5__length1; + PhotoMetadata* _tmp8_; + GExiv2Metadata* _tmp9_; + GExiv2PreviewProperties** _tmp10_; + gint _tmp10__length1; + guint _tmp11_; + GExiv2PreviewProperties* _tmp12_; + GExiv2PreviewImage* _tmp13_; + GExiv2PreviewImage* _tmp14_; guint32 _tmp15_; - guint8* _tmp16_ = NULL; - guint8* _tmp17_ = NULL; - gint _tmp17__length1 = 0; - guint8* _tmp18_ = NULL; - gint _tmp18__length1 = 0; - guint8* _tmp19_ = NULL; - gint _tmp19__length1 = 0; + guint8* _tmp16_; + guint8* _tmp17_; + gint _tmp17__length1; + guint8* _tmp18_; + gint _tmp18__length1; + guint8* _tmp19_; + gint _tmp19__length1; #line 239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview); #line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9667,10 +9709,10 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* _tmp5__length1 = props_length1; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 9666 "PhotoMetadata.c" - GExiv2PreviewProperties** _tmp6_ = NULL; - gint _tmp6__length1 = 0; - guint _tmp7_ = 0U; +#line 9708 "PhotoMetadata.c" + GExiv2PreviewProperties** _tmp6_; + gint _tmp6__length1; + guint _tmp7_; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = props; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9679,11 +9721,11 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* _tmp7_ = self->number; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = ((guint) _tmp6__length1) > _tmp7_; -#line 9678 "PhotoMetadata.c" +#line 9720 "PhotoMetadata.c" } else { #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 9682 "PhotoMetadata.c" +#line 9724 "PhotoMetadata.c" } #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp4_, "props != null && props.length > number"); @@ -9723,13 +9765,13 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* if (result_length1) { #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *result_length1 = _tmp19__length1; -#line 9722 "PhotoMetadata.c" +#line 9764 "PhotoMetadata.c" } #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp19_; #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9728 "PhotoMetadata.c" +#line 9770 "PhotoMetadata.c" } @@ -9739,8 +9781,8 @@ static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInter #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize; #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((PhotoPreviewClass *) klass)->flatten = (guint8* (*)(PhotoPreview*, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten; -#line 9739 "PhotoMetadata.c" + ((PhotoPreviewClass *) klass)->flatten = (guint8* (*) (PhotoPreview *, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten; +#line 9781 "PhotoMetadata.c" } @@ -9748,7 +9790,7 @@ static void photo_metadata_internal_photo_preview_instance_init (PhotoMetadataIn } -static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) { +static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj) { PhotoMetadataInternalPhotoPreview * self; #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview); @@ -9756,7 +9798,7 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview* obj) { _media_metadata_unref0 (self->owner); #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj); -#line 9755 "PhotoMetadata.c" +#line 9797 "PhotoMetadata.c" } @@ -9773,70 +9815,70 @@ static GType photo_metadata_internal_photo_preview_get_type (void) { static void photo_metadata_class_init (PhotoMetadataClass * klass) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar** _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar** _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar** _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar** _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar** _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar** _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar** _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - gchar* _tmp36_ = NULL; - gchar** _tmp37_ = NULL; - NullKeywordTransformer* _tmp38_ = NULL; - NullKeywordTransformer* _tmp39_ = NULL; - HierarchicalKeywordField* _tmp40_ = NULL; - NullKeywordTransformer* _tmp41_ = NULL; - NullKeywordTransformer* _tmp42_ = NULL; - HierarchicalKeywordField* _tmp43_ = NULL; - ACDSeeKeywordTransformer* _tmp44_ = NULL; - ACDSeeKeywordTransformer* _tmp45_ = NULL; - HierarchicalKeywordField* _tmp46_ = NULL; - NullKeywordTransformer* _tmp47_ = NULL; - NullKeywordTransformer* _tmp48_ = NULL; - HierarchicalKeywordField* _tmp49_ = NULL; - NullKeywordTransformer* _tmp50_ = NULL; - NullKeywordTransformer* _tmp51_ = NULL; - HierarchicalKeywordField* _tmp52_ = NULL; - HierarchicalKeywordField** _tmp53_ = NULL; - gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - gchar** _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar** _tmp63_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar** _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar** _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar** _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar** _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gchar** _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar** _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gchar** _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + gchar* _tmp36_; + gchar** _tmp37_; + NullKeywordTransformer* _tmp38_; + NullKeywordTransformer* _tmp39_; + HierarchicalKeywordField* _tmp40_; + NullKeywordTransformer* _tmp41_; + NullKeywordTransformer* _tmp42_; + HierarchicalKeywordField* _tmp43_; + ACDSeeKeywordTransformer* _tmp44_; + ACDSeeKeywordTransformer* _tmp45_; + HierarchicalKeywordField* _tmp46_; + NullKeywordTransformer* _tmp47_; + NullKeywordTransformer* _tmp48_; + HierarchicalKeywordField* _tmp49_; + NullKeywordTransformer* _tmp50_; + NullKeywordTransformer* _tmp51_; + HierarchicalKeywordField* _tmp52_; + HierarchicalKeywordField** _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + gchar** _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar** _tmp63_; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_parent_class = g_type_class_peek_parent (klass); #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9844,13 +9886,13 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) { #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_class_add_private (klass, sizeof (PhotoMetadataPrivate)); #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((MediaMetadataClass *) klass)->read_from_file = (void (*)(MediaMetadata*, GFile*, GError**)) photo_metadata_real_read_from_file; + ((MediaMetadataClass *) klass)->read_from_file = (void (*) (MediaMetadata *, GFile*, GError**)) photo_metadata_real_read_from_file; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*)(MediaMetadata*)) photo_metadata_real_get_creation_date_time; + ((MediaMetadataClass *) klass)->get_creation_date_time = (MetadataDateTime* (*) (MediaMetadata *)) photo_metadata_real_get_creation_date_time; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((MediaMetadataClass *) klass)->get_title = (gchar* (*)(MediaMetadata*)) photo_metadata_real_get_title; + ((MediaMetadataClass *) klass)->get_title = (gchar* (*) (MediaMetadata *)) photo_metadata_real_get_title; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((MediaMetadataClass *) klass)->get_comment = (gchar* (*)(MediaMetadata*)) photo_metadata_real_get_comment; + ((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) photo_metadata_real_get_comment; #line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = g_strdup ("Exif.Image.DateTime"); #line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -10109,13 +10151,13 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) { photo_metadata_RATING_TAGS = _tmp63_; #line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_RATING_TAGS_length1 = 5; -#line 10108 "PhotoMetadata.c" +#line 10150 "PhotoMetadata.c" } static void photo_metadata_instance_init (PhotoMetadata * self) { - GExiv2Metadata* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + GExiv2Metadata* _tmp0_; + gchar* _tmp1_; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv = PHOTO_METADATA_GET_PRIVATE (self); #line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -10128,11 +10170,11 @@ static void photo_metadata_instance_init (PhotoMetadata * self) { _tmp1_ = g_strdup (""); #line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->source_name = _tmp1_; -#line 10127 "PhotoMetadata.c" +#line 10169 "PhotoMetadata.c" } -static void photo_metadata_finalize (MediaMetadata* obj) { +static void photo_metadata_finalize (MediaMetadata * obj) { PhotoMetadata * self; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_METADATA, PhotoMetadata); @@ -10144,7 +10186,7 @@ static void photo_metadata_finalize (MediaMetadata* obj) { _g_free0 (self->priv->source_name); #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj); -#line 10143 "PhotoMetadata.c" +#line 10185 "PhotoMetadata.c" } diff --git a/src/photos/Photos.c b/src/photos/Photos.c index 72c2778..d859d37 100644 --- a/src/photos/Photos.c +++ b/src/photos/Photos.c @@ -1,4 +1,4 @@ -/* Photos.c generated by valac 0.34.7, the Vala compiler +/* Photos.c generated by valac 0.36.6, the Vala compiler * generated from Photos.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -45,8 +45,8 @@ void photos_preconfigure (void) { void photos_init (GError** error) { - gint _tmp0_ = 0; - PhotoFileFormat* _tmp1_ = NULL; + gint _tmp0_; + PhotoFileFormat* _tmp1_; #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala" _tmp1_ = photo_file_format_get_supported (&_tmp0_); #line 53 "Photos.c" @@ -67,7 +67,7 @@ void photos_init (GError** error) { format = format_collection[format_it]; #line 69 "Photos.c" { - PhotoFileFormat _tmp2_ = 0; + PhotoFileFormat _tmp2_; #line 24 "/home/jens/Source/shotwell/src/photos/Photos.vala" _tmp2_ = format; #line 24 "/home/jens/Source/shotwell/src/photos/Photos.vala" diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c index 20e79a9..4658dd2 100644 --- a/src/photos/PngSupport.c +++ b/src/photos/PngSupport.c @@ -1,4 +1,4 @@ -/* PngSupport.c generated by valac 0.34.7, the Vala compiler +/* PngSupport.c generated by valac 0.36.6, the Vala compiler * generated from PngSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -506,7 +506,7 @@ static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFo static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); static gchar** _vala_array_dup15 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); -static void png_file_format_properties_finalize (PhotoFileFormatProperties* obj); +static void png_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); @@ -611,12 +611,12 @@ static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileForm PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); -static void png_file_format_driver_finalize (PhotoFileFormatDriver* obj); +static void png_file_format_driver_finalize (PhotoFileFormatDriver * obj); static const guint8 PNG_SNIFFER_MAGIC_SEQUENCE[8] = {(guint8) 137, (guint8) 80, (guint8) 78, (guint8) 71, (guint8) 13, (guint8) 10, (guint8) 26, (guint8) 10}; void png_file_format_properties_init (void) { - PngFileFormatProperties* _tmp0_ = NULL; + PngFileFormatProperties* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = png_file_format_properties_new (); #line 14 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -636,8 +636,8 @@ static gpointer _photo_file_format_properties_ref0 (gpointer self) { PngFileFormatProperties* png_file_format_properties_get_instance (void) { PngFileFormatProperties* result = NULL; - PngFileFormatProperties* _tmp0_ = NULL; - PngFileFormatProperties* _tmp1_ = NULL; + PngFileFormatProperties* _tmp0_; + PngFileFormatProperties* _tmp1_; #line 18 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = png_file_format_properties_instance; #line 18 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -679,29 +679,26 @@ static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFile static gchar* png_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { PngFileFormatProperties * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 29 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties); #line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = _ ("PNG"); + _tmp0_ = g_strdup (_ ("PNG")); #line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 695 "PngSupport.c" +#line 692 "PngSupport.c" } static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { PngFileFormatProperties * 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 33 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties); #line 34 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -716,7 +713,7 @@ static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFo result = _tmp2_; #line 34 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 720 "PngSupport.c" +#line 717 "PngSupport.c" } @@ -727,29 +724,29 @@ static gchar** _vala_array_dup14 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" for (i = 0; i < length; i++) { -#line 731 "PngSupport.c" - gchar* _tmp0_ = NULL; +#line 728 "PngSupport.c" + gchar* _tmp0_; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = g_strdup (self[i]); #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result[i] = _tmp0_; -#line 737 "PngSupport.c" +#line 734 "PngSupport.c" } #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 741 "PngSupport.c" +#line 738 "PngSupport.c" } static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { PngFileFormatProperties * 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 37 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties); #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -768,23 +765,23 @@ static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFo if (result_length1) { #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *result_length1 = _tmp2__length1; -#line 772 "PngSupport.c" +#line 769 "PngSupport.c" } #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = _tmp2_; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 778 "PngSupport.c" +#line 775 "PngSupport.c" } static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { PngFileFormatProperties * 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 41 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties); #line 42 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -799,7 +796,7 @@ static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFo result = _tmp2_; #line 42 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 803 "PngSupport.c" +#line 800 "PngSupport.c" } @@ -810,29 +807,29 @@ static gchar** _vala_array_dup15 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" for (i = 0; i < length; i++) { -#line 814 "PngSupport.c" - gchar* _tmp0_ = NULL; +#line 811 "PngSupport.c" + gchar* _tmp0_; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = g_strdup (self[i]); #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result[i] = _tmp0_; -#line 820 "PngSupport.c" +#line 817 "PngSupport.c" } #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 824 "PngSupport.c" +#line 821 "PngSupport.c" } static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { PngFileFormatProperties * 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 45 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties); #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -851,13 +848,13 @@ static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatPr if (result_length1) { #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *result_length1 = _tmp2__length1; -#line 855 "PngSupport.c" +#line 852 "PngSupport.c" } #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = _tmp2_; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 861 "PngSupport.c" +#line 858 "PngSupport.c" } @@ -867,40 +864,40 @@ PngFileFormatProperties* png_file_format_properties_construct (GType object_type self = (PngFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 871 "PngSupport.c" +#line 868 "PngSupport.c" } PngFileFormatProperties* png_file_format_properties_new (void) { #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_file_format_properties_construct (TYPE_PNG_FILE_FORMAT_PROPERTIES); -#line 878 "PngSupport.c" +#line 875 "PngSupport.c" } static void png_file_format_properties_class_init (PngFileFormatPropertiesClass * klass) { - gchar* _tmp0_ = NULL; - gchar** _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar** _tmp3_ = NULL; + gchar* _tmp0_; + gchar** _tmp1_; + gchar* _tmp2_; + gchar** _tmp3_; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_properties_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileFormatPropertiesClass *) klass)->finalize = png_file_format_properties_finalize; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_file_format; + ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_file_format; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_flags; + ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_flags; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_user_visible_name; + ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_user_visible_name; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_default_extension; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_default_extension; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) png_file_format_properties_real_get_known_extensions; + ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) png_file_format_properties_real_get_known_extensions; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) png_file_format_properties_real_get_default_mime_type; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) png_file_format_properties_real_get_default_mime_type; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) png_file_format_properties_real_get_mime_types; + ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) png_file_format_properties_real_get_mime_types; #line 8 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = g_strdup ("png"); #line 8 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -921,7 +918,7 @@ static void png_file_format_properties_class_init (PngFileFormatPropertiesClass png_file_format_properties_KNOWN_MIME_TYPES = _tmp3_; #line 9 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 925 "PngSupport.c" +#line 922 "PngSupport.c" } @@ -929,13 +926,13 @@ static void png_file_format_properties_instance_init (PngFileFormatProperties * } -static void png_file_format_properties_finalize (PhotoFileFormatProperties* obj) { +static void png_file_format_properties_finalize (PhotoFileFormatProperties * obj) { PngFileFormatProperties * self; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties); #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (png_file_format_properties_parent_class)->finalize (obj); -#line 939 "PngSupport.c" +#line 936 "PngSupport.c" } @@ -953,8 +950,8 @@ GType png_file_format_properties_get_type (void) { PngSniffer* png_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { PngSniffer* self = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 54 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -965,29 +962,29 @@ PngSniffer* png_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif self = (PngSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 969 "PngSupport.c" +#line 966 "PngSupport.c" } PngSniffer* png_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_sniffer_construct (TYPE_PNG_SNIFFER, file, options); -#line 976 "PngSupport.c" +#line 973 "PngSupport.c" } static gboolean png_sniffer_is_png_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 57 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); @@ -999,13 +996,13 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { instream = _tmp1_; #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1003 "PngSupport.c" +#line 1000 "PngSupport.c" gboolean _tmp2_ = FALSE; #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return _tmp2_; -#line 1009 "PngSupport.c" +#line 1006 "PngSupport.c" } #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE)); @@ -1025,7 +1022,7 @@ static gboolean png_sniffer_is_png_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 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1029 "PngSupport.c" +#line 1026 "PngSupport.c" gboolean _tmp6_ = FALSE; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); @@ -1035,36 +1032,36 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return _tmp6_; -#line 1039 "PngSupport.c" +#line 1036 "PngSupport.c" } { gint i = 0; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" i = 0; -#line 1045 "PngSupport.c" +#line 1042 "PngSupport.c" { gboolean _tmp7_ = FALSE; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp7_ = TRUE; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" while (TRUE) { -#line 1052 "PngSupport.c" - gint _tmp9_ = 0; - guint8* _tmp10_ = NULL; - gint _tmp10__length1 = 0; - gint _tmp11_ = 0; - guint8 _tmp12_ = 0U; - gint _tmp13_ = 0; - guint8 _tmp14_ = 0U; +#line 1049 "PngSupport.c" + gint _tmp9_; + guint8* _tmp10_; + gint _tmp10__length1; + gint _tmp11_; + guint8 _tmp12_; + gint _tmp13_; + guint8 _tmp14_; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (!_tmp7_) { -#line 1062 "PngSupport.c" - gint _tmp8_ = 0; +#line 1059 "PngSupport.c" + gint _tmp8_; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp8_ = i; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" i = _tmp8_ + 1; -#line 1068 "PngSupport.c" +#line 1065 "PngSupport.c" } #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp7_ = FALSE; @@ -1074,7 +1071,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { if (!(_tmp9_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) { #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" break; -#line 1078 "PngSupport.c" +#line 1075 "PngSupport.c" } #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp10_ = file_lead_sequence; @@ -1098,7 +1095,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1102 "PngSupport.c" +#line 1099 "PngSupport.c" } } } @@ -1111,14 +1108,14 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 69 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1115 "PngSupport.c" +#line 1112 "PngSupport.c" } static gpointer _detected_photo_information_ref0 (gpointer self) { #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1122 "PngSupport.c" +#line 1119 "PngSupport.c" } @@ -1127,16 +1124,16 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, 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 72 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_SNIFFER, PngSniffer); @@ -1154,7 +1151,7 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, g_propagate_error (error, _inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1158 "PngSupport.c" +#line 1155 "PngSupport.c" } #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (!_tmp0_) { @@ -1164,11 +1161,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1168 "PngSupport.c" +#line 1165 "PngSupport.c" } #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1172 "PngSupport.c" +#line 1169 "PngSupport.c" } #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (png_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_); @@ -1182,7 +1179,7 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, g_propagate_error (error, _inner_error_); #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1186 "PngSupport.c" +#line 1183 "PngSupport.c" } #line 80 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp5_ = detected; @@ -1196,11 +1193,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1200 "PngSupport.c" +#line 1197 "PngSupport.c" } #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1204 "PngSupport.c" +#line 1201 "PngSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp7_ = detected; @@ -1208,17 +1205,17 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, _tmp8_ = _tmp7_->file_format; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (_tmp8_ == PHOTO_FILE_FORMAT_PNG) { -#line 1212 "PngSupport.c" - DetectedPhotoInformation* _tmp9_ = NULL; +#line 1209 "PngSupport.c" + DetectedPhotoInformation* _tmp9_; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp9_ = detected; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp6_ = _tmp9_; -#line 1218 "PngSupport.c" +#line 1215 "PngSupport.c" } else { #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp6_ = NULL; -#line 1222 "PngSupport.c" +#line 1219 "PngSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp10_ = _detected_photo_information_ref0 (_tmp6_); @@ -1230,11 +1227,11 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1234 "PngSupport.c" +#line 1231 "PngSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1238 "PngSupport.c" +#line 1235 "PngSupport.c" } @@ -1242,8 +1239,8 @@ static void png_sniffer_class_init (PngSnifferClass * klass) { #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_sniffer_parent_class = g_type_class_peek_parent (klass); #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) png_sniffer_real_sniff; -#line 1247 "PngSupport.c" + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) png_sniffer_real_sniff; +#line 1244 "PngSupport.c" } @@ -1265,7 +1262,7 @@ GType png_sniffer_get_type (void) { PngReader* png_reader_construct (GType object_type, const gchar* filepath) { PngReader* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 89 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1274,14 +1271,14 @@ PngReader* png_reader_construct (GType object_type, const gchar* filepath) { self = (PngReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG); #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1278 "PngSupport.c" +#line 1275 "PngSupport.c" } PngReader* png_reader_new (const gchar* filepath) { #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_reader_construct (TYPE_PNG_READER, filepath); -#line 1285 "PngSupport.c" +#line 1282 "PngSupport.c" } @@ -1291,8 +1288,8 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions GdkPixbuf* _result_ = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - Dimensions _tmp2_ = {0}; - gint _tmp3_ = 0; + Dimensions _tmp2_; + gint _tmp3_; GError * _inner_error_ = NULL; #line 92 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_READER, PngReader); @@ -1310,24 +1307,24 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions if (_tmp3_ > 9999) { #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1_ = TRUE; -#line 1314 "PngSupport.c" +#line 1311 "PngSupport.c" } else { - Dimensions _tmp4_ = {0}; - gint _tmp5_ = 0; + Dimensions _tmp4_; + gint _tmp5_; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp4_ = *full; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp5_ = _tmp4_.height; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1_ = _tmp5_ > 9999; -#line 1324 "PngSupport.c" +#line 1321 "PngSupport.c" } #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (_tmp1_) { -#line 1328 "PngSupport.c" +#line 1325 "PngSupport.c" gboolean _tmp6_ = FALSE; - Dimensions _tmp7_ = {0}; - gint _tmp8_ = 0; + Dimensions _tmp7_; + gint _tmp8_; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp7_ = *scaled; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1336,47 +1333,47 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions if (_tmp8_ < 100) { #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp6_ = TRUE; -#line 1340 "PngSupport.c" +#line 1337 "PngSupport.c" } else { - Dimensions _tmp9_ = {0}; - gint _tmp10_ = 0; + Dimensions _tmp9_; + gint _tmp10_; #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp9_ = *scaled; #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp10_ = _tmp9_.height; #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp6_ = _tmp10_ < 100; -#line 1350 "PngSupport.c" +#line 1347 "PngSupport.c" } #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = _tmp6_; -#line 1354 "PngSupport.c" +#line 1351 "PngSupport.c" } else { #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = FALSE; -#line 1358 "PngSupport.c" +#line 1355 "PngSupport.c" } #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (_tmp0_) { -#line 1362 "PngSupport.c" +#line 1359 "PngSupport.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 104 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" dimensions_get_scaled_by_constraint (full, 1000, SCALE_CONSTRAINT_DIMENSIONS, &_tmp11_); #line 104 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1409,7 +1406,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_result_); #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1413 "PngSupport.c" +#line 1410 "PngSupport.c" } #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp21_ = _tmp12_; @@ -1437,18 +1434,18 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _result_ = _tmp27_; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _g_object_unref0 (_tmp12_); -#line 1441 "PngSupport.c" +#line 1438 "PngSupport.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 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp29_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1477,7 +1474,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_result_); #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1481 "PngSupport.c" +#line 1478 "PngSupport.c" } #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp37_ = _tmp28_; @@ -1489,13 +1486,13 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _result_ = _tmp37_; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _g_object_unref0 (_tmp28_); -#line 1493 "PngSupport.c" +#line 1490 "PngSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = _result_; #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1499 "PngSupport.c" +#line 1496 "PngSupport.c" } @@ -1503,8 +1500,8 @@ static void png_reader_class_init (PngReaderClass * klass) { #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_reader_parent_class = g_type_class_peek_parent (klass); #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) png_reader_real_scaled_read; -#line 1508 "PngSupport.c" + ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) png_reader_real_scaled_read; +#line 1505 "PngSupport.c" } @@ -1526,7 +1523,7 @@ GType png_reader_get_type (void) { PngWriter* png_writer_construct (GType object_type, const gchar* filepath) { PngWriter* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1535,22 +1532,22 @@ PngWriter* png_writer_construct (GType object_type, const gchar* filepath) { self = (PngWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG); #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1539 "PngSupport.c" +#line 1536 "PngSupport.c" } PngWriter* png_writer_new (const gchar* filepath) { #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_writer_construct (TYPE_PNG_WRITER, filepath); -#line 1546 "PngSupport.c" +#line 1543 "PngSupport.c" } static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { PngWriter * self; - GdkPixbuf* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GdkPixbuf* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; GError * _inner_error_ = NULL; #line 125 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_WRITER, PngWriter); @@ -1572,7 +1569,7 @@ static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, Jpe g_propagate_error (error, _inner_error_); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return; -#line 1576 "PngSupport.c" +#line 1573 "PngSupport.c" } } @@ -1581,8 +1578,8 @@ static void png_writer_class_init (PngWriterClass * klass) { #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_writer_parent_class = g_type_class_peek_parent (klass); #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) png_writer_real_write; -#line 1586 "PngSupport.c" + ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) png_writer_real_write; +#line 1583 "PngSupport.c" } @@ -1604,7 +1601,7 @@ GType png_writer_get_type (void) { PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar* filepath) { PngMetadataWriter* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 132 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1613,22 +1610,22 @@ PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar self = (PngMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG); #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1617 "PngSupport.c" +#line 1614 "PngSupport.c" } PngMetadataWriter* png_metadata_writer_new (const gchar* filepath) { #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_metadata_writer_construct (TYPE_PNG_METADATA_WRITER, filepath); -#line 1624 "PngSupport.c" +#line 1621 "PngSupport.c" } static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { PngMetadataWriter * self; - PhotoMetadata* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + PhotoMetadata* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_METADATA_WRITER, PngMetadataWriter); @@ -1650,7 +1647,7 @@ static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* ba g_propagate_error (error, _inner_error_); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return; -#line 1654 "PngSupport.c" +#line 1651 "PngSupport.c" } } @@ -1659,8 +1656,8 @@ static void png_metadata_writer_class_init (PngMetadataWriterClass * klass) { #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) png_metadata_writer_real_write_metadata; -#line 1664 "PngSupport.c" + ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) png_metadata_writer_real_write_metadata; +#line 1661 "PngSupport.c" } @@ -1681,7 +1678,7 @@ GType png_metadata_writer_get_type (void) { void png_file_format_driver_init (void) { - PngFileFormatDriver* _tmp0_ = NULL; + PngFileFormatDriver* _tmp0_; #line 144 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = png_file_format_driver_new (); #line 144 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1690,21 +1687,21 @@ void png_file_format_driver_init (void) { png_file_format_driver_instance = _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_properties_init (); -#line 1694 "PngSupport.c" +#line 1691 "PngSupport.c" } static gpointer _photo_file_format_driver_ref0 (gpointer self) { #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 1701 "PngSupport.c" +#line 1698 "PngSupport.c" } PngFileFormatDriver* png_file_format_driver_get_instance (void) { PngFileFormatDriver* result = NULL; - PngFileFormatDriver* _tmp0_ = NULL; - PngFileFormatDriver* _tmp1_ = NULL; + PngFileFormatDriver* _tmp0_; + PngFileFormatDriver* _tmp1_; #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = png_file_format_driver_instance; #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1713,14 +1710,14 @@ PngFileFormatDriver* png_file_format_driver_get_instance (void) { result = _tmp1_; #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1717 "PngSupport.c" +#line 1714 "PngSupport.c" } static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { PngFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; - PngFileFormatProperties* _tmp0_ = NULL; + PngFileFormatProperties* _tmp0_; #line 152 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 153 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1729,15 +1726,15 @@ static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (Ph result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 153 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1733 "PngSupport.c" +#line 1730 "PngSupport.c" } static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { PngFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_ = NULL; - PngReader* _tmp1_ = NULL; + const gchar* _tmp0_; + PngReader* _tmp1_; #line 156 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 156 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1750,7 +1747,7 @@ static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileForm result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1754 "PngSupport.c" +#line 1751 "PngSupport.c" } @@ -1763,7 +1760,7 @@ static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriv result = TRUE; #line 161 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1767 "PngSupport.c" +#line 1764 "PngSupport.c" } @@ -1776,15 +1773,15 @@ static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatD result = TRUE; #line 165 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1780 "PngSupport.c" +#line 1777 "PngSupport.c" } static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { PngFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_ = NULL; - PngWriter* _tmp1_ = NULL; + const gchar* _tmp0_; + PngWriter* _tmp1_; #line 168 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 168 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1797,15 +1794,15 @@ static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileForm result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1801 "PngSupport.c" +#line 1798 "PngSupport.c" } static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { PngFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_ = NULL; - PngMetadataWriter* _tmp1_ = NULL; + const gchar* _tmp0_; + PngMetadataWriter* _tmp1_; #line 172 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 172 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1818,16 +1815,16 @@ static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writ result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1822 "PngSupport.c" +#line 1819 "PngSupport.c" } static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { PngFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; - PngSniffer* _tmp2_ = NULL; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; + PngSniffer* _tmp2_; #line 176 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 176 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1842,14 +1839,14 @@ static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFo result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1846 "PngSupport.c" +#line 1843 "PngSupport.c" } static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { PngFileFormatDriver * self; PhotoMetadata* result = NULL; - PhotoMetadata* _tmp0_ = NULL; + PhotoMetadata* _tmp0_; #line 180 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 181 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1858,7 +1855,7 @@ static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileForm result = _tmp0_; #line 181 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1862 "PngSupport.c" +#line 1859 "PngSupport.c" } @@ -1868,14 +1865,14 @@ PngFileFormatDriver* png_file_format_driver_construct (GType object_type) { self = (PngFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1872 "PngSupport.c" +#line 1869 "PngSupport.c" } PngFileFormatDriver* png_file_format_driver_new (void) { #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_file_format_driver_construct (TYPE_PNG_FILE_FORMAT_DRIVER); -#line 1879 "PngSupport.c" +#line 1876 "PngSupport.c" } @@ -1885,22 +1882,22 @@ static void png_file_format_driver_class_init (PngFileFormatDriverClass * klass) #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileFormatDriverClass *) klass)->finalize = png_file_format_driver_finalize; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_get_properties; + ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_get_properties; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_reader; + ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) png_file_format_driver_real_create_reader; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_can_write_image; + ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_can_write_image; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_can_write_metadata; + ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_can_write_metadata; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_writer; + ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) png_file_format_driver_real_create_writer; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) png_file_format_driver_real_create_metadata_writer; + ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) png_file_format_driver_real_create_metadata_writer; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) png_file_format_driver_real_create_sniffer; + ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) png_file_format_driver_real_create_sniffer; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) png_file_format_driver_real_create_metadata; -#line 1904 "PngSupport.c" + ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_create_metadata; +#line 1901 "PngSupport.c" } @@ -1908,13 +1905,13 @@ static void png_file_format_driver_instance_init (PngFileFormatDriver * self) { } -static void png_file_format_driver_finalize (PhotoFileFormatDriver* obj) { +static void png_file_format_driver_finalize (PhotoFileFormatDriver * obj) { PngFileFormatDriver * self; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (png_file_format_driver_parent_class)->finalize (obj); -#line 1918 "PngSupport.c" +#line 1915 "PngSupport.c" } diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c index 8e23487..8b670ea 100644 --- a/src/photos/RawSupport.c +++ b/src/photos/RawSupport.c @@ -1,4 +1,4 @@ -/* RawSupport.c generated by valac 0.34.7, the Vala compiler +/* RawSupport.c generated by valac 0.36.6, the Vala compiler * generated from RawSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -546,7 +546,7 @@ RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options); RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); GType raw_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); -static void raw_file_format_driver_finalize (PhotoFileFormatDriver* obj); +static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; enum { @@ -564,7 +564,7 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); static gchar** _vala_array_dup13 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); -static void raw_file_format_properties_finalize (PhotoFileFormatProperties* obj); +static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -646,7 +646,8 @@ GType backing_photo_row_get_type (void) G_GNUC_CONST; BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error); BackingPhotoRow* backing_photo_row_new (void); BackingPhotoRow* backing_photo_row_construct (GType object_type); -void disassemble_filename (const gchar* basename, gchar** name, gchar** ext); +void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +gchar* library_files_convert_basename (const gchar* basename); GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); gboolean claim_file (GFile* file, GError** error); GType backing_photo_id_get_type (void) G_GNUC_CONST; @@ -656,7 +657,7 @@ GType orientation_get_type (void) G_GNUC_CONST; void raw_file_format_driver_init (void) { - RawFileFormatDriver* _tmp0_ = NULL; + RawFileFormatDriver* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_driver_new (); #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -665,21 +666,21 @@ void raw_file_format_driver_init (void) { raw_file_format_driver_instance = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_init (); -#line 669 "RawSupport.c" +#line 670 "RawSupport.c" } static gpointer _photo_file_format_driver_ref0 (gpointer self) { #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 676 "RawSupport.c" +#line 677 "RawSupport.c" } RawFileFormatDriver* raw_file_format_driver_get_instance (void) { RawFileFormatDriver* result = NULL; - RawFileFormatDriver* _tmp0_ = NULL; - RawFileFormatDriver* _tmp1_ = NULL; + RawFileFormatDriver* _tmp0_; + RawFileFormatDriver* _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_driver_instance; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -688,14 +689,14 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) { result = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 692 "RawSupport.c" +#line 693 "RawSupport.c" } static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { RawFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; - RawFileFormatProperties* _tmp0_ = NULL; + RawFileFormatProperties* _tmp0_; #line 19 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -704,15 +705,15 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 708 "RawSupport.c" +#line 709 "RawSupport.c" } static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { RawFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_ = NULL; - RawReader* _tmp1_ = NULL; + const gchar* _tmp0_; + RawReader* _tmp1_; #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -725,14 +726,14 @@ static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileForm result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 729 "RawSupport.c" +#line 730 "RawSupport.c" } static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { RawFileFormatDriver * self; PhotoMetadata* result = NULL; - PhotoMetadata* _tmp0_ = NULL; + PhotoMetadata* _tmp0_; #line 27 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -741,7 +742,7 @@ static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileForm result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 745 "RawSupport.c" +#line 746 "RawSupport.c" } @@ -754,7 +755,7 @@ static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriv result = FALSE; #line 32 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 758 "RawSupport.c" +#line 759 "RawSupport.c" } @@ -767,7 +768,7 @@ static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatD result = FALSE; #line 36 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 771 "RawSupport.c" +#line 772 "RawSupport.c" } @@ -782,7 +783,7 @@ static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileForm result = NULL; #line 40 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 786 "RawSupport.c" +#line 787 "RawSupport.c" } @@ -797,16 +798,16 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ result = NULL; #line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 801 "RawSupport.c" +#line 802 "RawSupport.c" } static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { RawFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; - RawSniffer* _tmp2_ = NULL; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; + RawSniffer* _tmp2_; #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -821,7 +822,7 @@ static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFo result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 825 "RawSupport.c" +#line 826 "RawSupport.c" } @@ -831,14 +832,14 @@ RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) { self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 835 "RawSupport.c" +#line 836 "RawSupport.c" } RawFileFormatDriver* raw_file_format_driver_new (void) { #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_file_format_driver_construct (TYPE_RAW_FILE_FORMAT_DRIVER); -#line 842 "RawSupport.c" +#line 843 "RawSupport.c" } @@ -848,22 +849,22 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileFormatDriverClass *) klass)->finalize = raw_file_format_driver_finalize; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_get_properties; + ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_get_properties; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_reader; + ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_reader; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_create_metadata; + ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_create_metadata; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_image; + ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_can_write_image; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_metadata; + ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_can_write_metadata; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_writer; + ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_writer; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_metadata_writer; + ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_metadata_writer; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer; -#line 867 "RawSupport.c" + ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer; +#line 868 "RawSupport.c" } @@ -871,13 +872,13 @@ static void raw_file_format_driver_instance_init (RawFileFormatDriver * self) { } -static void raw_file_format_driver_finalize (PhotoFileFormatDriver* obj) { +static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) { RawFileFormatDriver * self; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj); -#line 881 "RawSupport.c" +#line 882 "RawSupport.c" } @@ -894,28 +895,28 @@ GType raw_file_format_driver_get_type (void) { void raw_file_format_properties_init (void) { - RawFileFormatProperties* _tmp0_ = NULL; + RawFileFormatProperties* _tmp0_; #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_properties_new (); #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _photo_file_format_properties_unref0 (raw_file_format_properties_instance); #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_instance = _tmp0_; -#line 905 "RawSupport.c" +#line 906 "RawSupport.c" } static gpointer _photo_file_format_properties_ref0 (gpointer self) { #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 912 "RawSupport.c" +#line 913 "RawSupport.c" } RawFileFormatProperties* raw_file_format_properties_get_instance (void) { RawFileFormatProperties* result = NULL; - RawFileFormatProperties* _tmp0_ = NULL; - RawFileFormatProperties* _tmp1_ = NULL; + RawFileFormatProperties* _tmp0_; + RawFileFormatProperties* _tmp1_; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_properties_instance; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -924,7 +925,7 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) { result = _tmp1_; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 928 "RawSupport.c" +#line 929 "RawSupport.c" } @@ -937,26 +938,23 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil result = PHOTO_FILE_FORMAT_RAW; #line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 941 "RawSupport.c" +#line 942 "RawSupport.c" } static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { RawFileFormatProperties * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 133 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = _ ("RAW"); + _tmp0_ = g_strdup (_ ("RAW")); #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 960 "RawSupport.c" +#line 958 "RawSupport.c" } @@ -969,14 +967,14 @@ static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFile result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 138 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 973 "RawSupport.c" +#line 971 "RawSupport.c" } static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { RawFileFormatProperties * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 141 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -985,7 +983,7 @@ static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFo result = _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 989 "RawSupport.c" +#line 987 "RawSupport.c" } @@ -996,29 +994,29 @@ static gchar** _vala_array_dup12 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 1000 "RawSupport.c" - gchar* _tmp0_ = NULL; +#line 998 "RawSupport.c" + gchar* _tmp0_; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup (self[i]); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result[i] = _tmp0_; -#line 1006 "RawSupport.c" +#line 1004 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1010 "RawSupport.c" +#line 1008 "RawSupport.c" } static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { RawFileFormatProperties * 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 148 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1037,23 +1035,23 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo if (result_length1) { #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp2__length1; -#line 1041 "RawSupport.c" +#line 1039 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1047 "RawSupport.c" +#line 1045 "RawSupport.c" } static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { RawFileFormatProperties * 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 152 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1068,7 +1066,7 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo result = _tmp2_; #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1072 "RawSupport.c" +#line 1070 "RawSupport.c" } @@ -1079,29 +1077,29 @@ static gchar** _vala_array_dup13 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 1083 "RawSupport.c" - gchar* _tmp0_ = NULL; +#line 1081 "RawSupport.c" + gchar* _tmp0_; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup (self[i]); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result[i] = _tmp0_; -#line 1089 "RawSupport.c" +#line 1087 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1093 "RawSupport.c" +#line 1091 "RawSupport.c" } static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { RawFileFormatProperties * 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 156 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1120,13 +1118,13 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr if (result_length1) { #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp2__length1; -#line 1124 "RawSupport.c" +#line 1122 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1130 "RawSupport.c" +#line 1128 "RawSupport.c" } @@ -1136,125 +1134,125 @@ RawFileFormatProperties* raw_file_format_properties_construct (GType object_type self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1140 "RawSupport.c" +#line 1138 "RawSupport.c" } RawFileFormatProperties* raw_file_format_properties_new (void) { #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_file_format_properties_construct (TYPE_RAW_FILE_FORMAT_PROPERTIES); -#line 1147 "RawSupport.c" +#line 1145 "RawSupport.c" } static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - gchar** _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; - gchar* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; - gchar* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; - gchar* _tmp79_ = NULL; - gchar* _tmp80_ = NULL; - gchar* _tmp81_ = NULL; - gchar* _tmp82_ = NULL; - gchar* _tmp83_ = NULL; - gchar* _tmp84_ = NULL; - gchar* _tmp85_ = NULL; - gchar* _tmp86_ = NULL; - gchar* _tmp87_ = NULL; - gchar** _tmp88_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + gchar** _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + gchar* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; + gchar* _tmp75_; + gchar* _tmp76_; + gchar* _tmp77_; + gchar* _tmp78_; + gchar* _tmp79_; + gchar* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; + gchar* _tmp83_; + gchar* _tmp84_; + gchar* _tmp85_; + gchar* _tmp86_; + gchar* _tmp87_; + gchar** _tmp88_; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_parent_class = g_type_class_peek_parent (klass); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileFormatPropertiesClass *) klass)->finalize = raw_file_format_properties_finalize; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_file_format; + ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_file_format; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_user_visible_name; + ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_user_visible_name; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_flags; + ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_flags; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_extension; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_default_extension; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_known_extensions; + ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) raw_file_format_properties_real_get_known_extensions; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_mime_type; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_default_mime_type; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_mime_types; + ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) raw_file_format_properties_real_get_mime_types; #line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup ("3fr"); #line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1615,7 +1613,7 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass raw_file_format_properties_KNOWN_MIME_TYPES = _tmp88_; #line 59 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_KNOWN_MIME_TYPES_length1 = 51; -#line 1619 "RawSupport.c" +#line 1617 "RawSupport.c" } @@ -1623,13 +1621,13 @@ static void raw_file_format_properties_instance_init (RawFileFormatProperties * } -static void raw_file_format_properties_finalize (PhotoFileFormatProperties* obj) { +static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) { RawFileFormatProperties * self; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj); -#line 1633 "RawSupport.c" +#line 1631 "RawSupport.c" } @@ -1647,8 +1645,8 @@ GType raw_file_format_properties_get_type (void) { RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { RawSniffer* self = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1659,21 +1657,21 @@ RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_); #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1663 "RawSupport.c" +#line 1661 "RawSupport.c" } RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_sniffer_construct (TYPE_RAW_SNIFFER, file, options); -#line 1670 "RawSupport.c" +#line 1668 "RawSupport.c" } static gpointer _g_error_copy0 (gpointer self) { #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? g_error_copy (self) : NULL; -#line 1677 "RawSupport.c" +#line 1675 "RawSupport.c" } @@ -1682,34 +1680,34 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; DetectedPhotoInformation* detected = NULL; - DetectedPhotoInformation* _tmp0_ = NULL; + DetectedPhotoInformation* _tmp0_; GRawProcessor* processor = NULL; - GRawProcessor* _tmp1_ = NULL; - GRawProcessor* _tmp2_ = NULL; - libraw_output_params_t* _tmp3_ = NULL; - libraw_output_params_t* _tmp4_ = NULL; - DetectedPhotoInformation* _tmp14_ = NULL; - GRawProcessor* _tmp15_ = NULL; - libraw_image_sizes_t _tmp16_ = {0}; - gushort _tmp17_ = 0U; - GRawProcessor* _tmp18_ = NULL; - libraw_image_sizes_t _tmp19_ = {0}; - gushort _tmp20_ = 0U; - DetectedPhotoInformation* _tmp21_ = NULL; - DetectedPhotoInformation* _tmp22_ = NULL; - DetectedPhotoInformation* _tmp23_ = NULL; + GRawProcessor* _tmp1_; + GRawProcessor* _tmp2_; + libraw_output_params_t* _tmp3_; + libraw_output_params_t* _tmp4_; + DetectedPhotoInformation* _tmp14_; + GRawProcessor* _tmp15_; + libraw_image_sizes_t _tmp16_; + gushort _tmp17_; + GRawProcessor* _tmp18_; + libraw_image_sizes_t _tmp19_; + gushort _tmp20_; + DetectedPhotoInformation* _tmp21_; + DetectedPhotoInformation* _tmp22_; + DetectedPhotoInformation* _tmp23_; RawReader* reader = NULL; - GFile* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - RawReader* _tmp27_ = NULL; - RawReader* _tmp28_ = NULL; - DetectedPhotoInformation* _tmp34_ = NULL; - PhotoMetadata* _tmp35_ = NULL; - gboolean _tmp58_ = FALSE; - DetectedPhotoInformation* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - DetectedPhotoInformation* _tmp66_ = NULL; + GFile* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + RawReader* _tmp27_; + RawReader* _tmp28_; + DetectedPhotoInformation* _tmp34_; + PhotoMetadata* _tmp35_; + gboolean _tmp58_; + DetectedPhotoInformation* _tmp64_; + gchar* _tmp65_; + DetectedPhotoInformation* _tmp66_; GError * _inner_error_ = NULL; #line 166 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_SNIFFER, RawSniffer); @@ -1731,14 +1729,14 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp4_ = _tmp3_; #line 173 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" (*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE; -#line 1735 "RawSupport.c" +#line 1733 "RawSupport.c" { - GRawProcessor* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - GRawProcessor* _tmp9_ = NULL; - GRawProcessor* _tmp10_ = NULL; + GRawProcessor* _tmp5_; + GFile* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRawProcessor* _tmp9_; + GRawProcessor* _tmp10_; #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp5_ = processor; #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1755,7 +1753,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1759 "RawSupport.c" +#line 1757 "RawSupport.c" goto __catch32_graw_exception; } #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1768,7 +1766,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1772 "RawSupport.c" +#line 1770 "RawSupport.c" } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -1778,7 +1776,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1782 "RawSupport.c" +#line 1780 "RawSupport.c" goto __catch32_graw_exception; } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1791,7 +1789,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1795 "RawSupport.c" +#line 1793 "RawSupport.c" } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = processor; @@ -1801,7 +1799,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1805 "RawSupport.c" +#line 1803 "RawSupport.c" goto __catch32_graw_exception; } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1814,16 +1812,16 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1818 "RawSupport.c" +#line 1816 "RawSupport.c" } } goto __finally32; __catch32_graw_exception: { GError* exception = NULL; - GError* _tmp11_ = NULL; - GError* _tmp12_ = NULL; - GError* _tmp13_ = NULL; + GError* _tmp11_; + GError* _tmp12_; + GError* _tmp13_; #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" exception = _inner_error_; #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1844,11 +1842,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1848 "RawSupport.c" +#line 1846 "RawSupport.c" } #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1852 "RawSupport.c" +#line 1850 "RawSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp12_ = exception; @@ -1858,7 +1856,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = _tmp13_; #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (exception); -#line 1862 "RawSupport.c" +#line 1860 "RawSupport.c" goto __finally32; } __finally32: @@ -1872,7 +1870,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1876 "RawSupport.c" +#line 1874 "RawSupport.c" } #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp14_ = detected; @@ -1916,13 +1914,13 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp26_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" reader = _tmp28_; -#line 1920 "RawSupport.c" +#line 1918 "RawSupport.c" { PhotoMetadata* _tmp29_ = NULL; - RawReader* _tmp30_ = NULL; - PhotoMetadata* _tmp31_ = NULL; - DetectedPhotoInformation* _tmp32_ = NULL; - PhotoMetadata* _tmp33_ = NULL; + RawReader* _tmp30_; + PhotoMetadata* _tmp31_; + DetectedPhotoInformation* _tmp32_; + PhotoMetadata* _tmp33_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp30_ = reader; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1931,7 +1929,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp29_ = _tmp31_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1935 "RawSupport.c" +#line 1933 "RawSupport.c" goto __catch33_g_error; } #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1946,7 +1944,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp32_->metadata = _tmp33_; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _media_metadata_unref0 (_tmp29_); -#line 1950 "RawSupport.c" +#line 1948 "RawSupport.c" } goto __finally33; __catch33_g_error: @@ -1958,7 +1956,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = NULL; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (err); -#line 1962 "RawSupport.c" +#line 1960 "RawSupport.c" } __finally33: #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1973,7 +1971,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1977 "RawSupport.c" +#line 1975 "RawSupport.c" } #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp34_ = detected; @@ -1981,27 +1979,27 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp35_ = _tmp34_->metadata; #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp35_ != NULL) { -#line 1985 "RawSupport.c" +#line 1983 "RawSupport.c" guint8* flattened_sans_thumbnail = NULL; - DetectedPhotoInformation* _tmp36_ = NULL; - PhotoMetadata* _tmp37_ = NULL; - gint _tmp38_ = 0; - guint8* _tmp39_ = NULL; - gint flattened_sans_thumbnail_length1 = 0; - gint _flattened_sans_thumbnail_size_ = 0; + DetectedPhotoInformation* _tmp36_; + PhotoMetadata* _tmp37_; + gint _tmp38_; + guint8* _tmp39_; + gint flattened_sans_thumbnail_length1; + gint _flattened_sans_thumbnail_size_; gboolean _tmp40_ = FALSE; - guint8* _tmp41_ = NULL; - gint _tmp41__length1 = 0; + guint8* _tmp41_; + gint _tmp41__length1; guint8* flattened_thumbnail = NULL; - DetectedPhotoInformation* _tmp47_ = NULL; - PhotoMetadata* _tmp48_ = NULL; - gint _tmp49_ = 0; - guint8* _tmp50_ = NULL; - gint flattened_thumbnail_length1 = 0; - gint _flattened_thumbnail_size_ = 0; + DetectedPhotoInformation* _tmp47_; + PhotoMetadata* _tmp48_; + gint _tmp49_; + guint8* _tmp50_; + gint flattened_thumbnail_length1; + gint _flattened_thumbnail_size_; gboolean _tmp51_ = FALSE; - guint8* _tmp52_ = NULL; - gint _tmp52__length1 = 0; + guint8* _tmp52_; + gint _tmp52__length1; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp36_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2020,30 +2018,30 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp41__length1 = flattened_sans_thumbnail_length1; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp41_ != NULL) { -#line 2024 "RawSupport.c" - guint8* _tmp42_ = NULL; - gint _tmp42__length1 = 0; +#line 2022 "RawSupport.c" + guint8* _tmp42_; + gint _tmp42__length1; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp42_ = flattened_sans_thumbnail; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp42__length1 = flattened_sans_thumbnail_length1; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp40_ = _tmp42__length1 > 0; -#line 2033 "RawSupport.c" +#line 2031 "RawSupport.c" } else { #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp40_ = FALSE; -#line 2037 "RawSupport.c" +#line 2035 "RawSupport.c" } #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp40_) { -#line 2041 "RawSupport.c" - DetectedPhotoInformation* _tmp43_ = NULL; - guint8* _tmp44_ = NULL; - gint _tmp44__length1 = 0; - guint8* _tmp45_ = NULL; - gint _tmp45__length1 = 0; - gchar* _tmp46_ = NULL; +#line 2039 "RawSupport.c" + DetectedPhotoInformation* _tmp43_; + guint8* _tmp44_; + gint _tmp44__length1; + guint8* _tmp45_; + gint _tmp45__length1; + gchar* _tmp46_; #line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp43_ = detected; #line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2060,7 +2058,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp43_->exif_md5); #line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp43_->exif_md5 = _tmp46_; -#line 2064 "RawSupport.c" +#line 2062 "RawSupport.c" } #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp47_ = detected; @@ -2080,30 +2078,30 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp52__length1 = flattened_thumbnail_length1; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp52_ != NULL) { -#line 2084 "RawSupport.c" - guint8* _tmp53_ = NULL; - gint _tmp53__length1 = 0; +#line 2082 "RawSupport.c" + guint8* _tmp53_; + gint _tmp53__length1; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp53_ = flattened_thumbnail; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp53__length1 = flattened_thumbnail_length1; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp51_ = _tmp53__length1 > 0; -#line 2093 "RawSupport.c" +#line 2091 "RawSupport.c" } else { #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp51_ = FALSE; -#line 2097 "RawSupport.c" +#line 2095 "RawSupport.c" } #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp51_) { -#line 2101 "RawSupport.c" - DetectedPhotoInformation* _tmp54_ = NULL; - guint8* _tmp55_ = NULL; - gint _tmp55__length1 = 0; - guint8* _tmp56_ = NULL; - gint _tmp56__length1 = 0; - gchar* _tmp57_ = NULL; +#line 2099 "RawSupport.c" + DetectedPhotoInformation* _tmp54_; + guint8* _tmp55_; + gint _tmp55__length1; + guint8* _tmp56_; + gint _tmp56__length1; + gchar* _tmp57_; #line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp54_ = detected; #line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2120,24 +2118,24 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp54_->thumbnail_md5); #line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp54_->thumbnail_md5 = _tmp57_; -#line 2124 "RawSupport.c" +#line 2122 "RawSupport.c" } #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" flattened_thumbnail = (g_free (flattened_thumbnail), NULL); #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL); -#line 2130 "RawSupport.c" +#line 2128 "RawSupport.c" } #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp58_) { -#line 2136 "RawSupport.c" +#line 2134 "RawSupport.c" gchar* _tmp59_ = NULL; - GFile* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - DetectedPhotoInformation* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; + GFile* _tmp60_; + gchar* _tmp61_; + DetectedPhotoInformation* _tmp62_; + gchar* _tmp63_; #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2156,7 +2154,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2160 "RawSupport.c" +#line 2158 "RawSupport.c" } #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp62_ = detected; @@ -2170,7 +2168,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp62_->md5 = _tmp63_; #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp59_); -#line 2174 "RawSupport.c" +#line 2172 "RawSupport.c" } #line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp64_ = detected; @@ -2194,11 +2192,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 2198 "RawSupport.c" +#line 2196 "RawSupport.c" } #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2202 "RawSupport.c" +#line 2200 "RawSupport.c" } @@ -2206,8 +2204,8 @@ static void raw_sniffer_class_init (RawSnifferClass * klass) { #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_sniffer_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) raw_sniffer_real_sniff; -#line 2211 "RawSupport.c" + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) raw_sniffer_real_sniff; +#line 2209 "RawSupport.c" } @@ -2229,7 +2227,7 @@ GType raw_sniffer_get_type (void) { RawReader* raw_reader_construct (GType object_type, const gchar* filepath) { RawReader* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2238,14 +2236,14 @@ RawReader* raw_reader_construct (GType object_type, const gchar* filepath) { self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW); #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 2242 "RawSupport.c" +#line 2240 "RawSupport.c" } RawReader* raw_reader_new (const gchar* filepath) { #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_reader_construct (TYPE_RAW_READER, filepath); -#line 2249 "RawSupport.c" +#line 2247 "RawSupport.c" } @@ -2253,9 +2251,9 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr RawReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + PhotoMetadata* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; GError * _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); @@ -2279,13 +2277,13 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr _media_metadata_unref0 (metadata); #line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2283 "RawSupport.c" +#line 2281 "RawSupport.c" } #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = metadata; #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2289 "RawSupport.c" +#line 2287 "RawSupport.c" } @@ -2293,23 +2291,20 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** RawReader * self; GdkPixbuf* result = NULL; GRawProcessor* processor = NULL; - GRawProcessor* _tmp0_ = NULL; - GRawProcessor* _tmp1_ = NULL; - GRawProcessor* _tmp2_ = NULL; - libraw_output_params_t* _tmp3_ = NULL; - libraw_output_params_t* _tmp4_ = NULL; - GRawProcessor* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GRawProcessor* _tmp8_ = NULL; - GRawProcessor* _tmp9_ = NULL; + GRawProcessor* _tmp0_; + GRawProcessor* _tmp1_; + GRawProcessor* _tmp2_; + libraw_output_params_t* _tmp3_; + libraw_output_params_t* _tmp4_; + GRawProcessor* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + GRawProcessor* _tmp8_; + GRawProcessor* _tmp9_; GRawProcessedImage* _tmp10_ = NULL; - GRawProcessor* _tmp11_ = NULL; - GRawProcessedImage* _tmp12_ = NULL; - GRawProcessedImage* _tmp13_ = NULL; - GRawProcessedImage* _tmp14_ = NULL; - GdkPixbuf* _tmp15_ = NULL; - GdkPixbuf* _tmp16_ = NULL; + GRawProcessor* _tmp11_; + GRawProcessedImage* _tmp12_; + GdkPixbuf* _tmp13_; GError * _inner_error_ = NULL; #line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); @@ -2347,7 +2342,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2351 "RawSupport.c" +#line 2346 "RawSupport.c" } #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = processor; @@ -2361,7 +2356,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2365 "RawSupport.c" +#line 2360 "RawSupport.c" } #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -2375,7 +2370,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2379 "RawSupport.c" +#line 2374 "RawSupport.c" } #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp11_ = processor; @@ -2391,29 +2386,19 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2395 "RawSupport.c" +#line 2390 "RawSupport.c" } #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp13_ = _tmp10_; -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp10_ = NULL; + _tmp13_ = graw_processed_image_get_pixbuf_copy (_tmp10_); #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp14_ = _tmp13_; -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp15_ = graw_processed_image_get_pixbuf_copy (_tmp14_); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp16_ = _tmp15_; -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _graw_processed_image_unref0 (_tmp14_); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp16_; + result = _tmp13_; #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (_tmp10_); #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2417 "RawSupport.c" +#line 2402 "RawSupport.c" } @@ -2421,39 +2406,39 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions RawReader * self; GdkPixbuf* result = NULL; gdouble width_proportion = 0.0; - Dimensions _tmp0_ = {0}; - gint _tmp1_ = 0; - Dimensions _tmp2_ = {0}; - gint _tmp3_ = 0; + Dimensions _tmp0_; + gint _tmp1_; + Dimensions _tmp2_; + gint _tmp3_; gdouble height_proportion = 0.0; - Dimensions _tmp4_ = {0}; - gint _tmp5_ = 0; - Dimensions _tmp6_ = {0}; - gint _tmp7_ = 0; + Dimensions _tmp4_; + gint _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; gboolean _tmp8_ = FALSE; - gdouble _tmp9_ = 0.0; + gdouble _tmp9_; gboolean half_size = FALSE; GRawProcessor* processor = NULL; - GRawProcessor* _tmp11_ = NULL; - GRawProcessor* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - GRawProcessor* _tmp14_ = NULL; - libraw_output_params_t* _tmp15_ = NULL; - libraw_output_params_t* _tmp16_ = NULL; - GRawProcessor* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - GRawProcessor* _tmp30_ = NULL; - GRawProcessor* _tmp31_ = NULL; + GRawProcessor* _tmp11_; + GRawProcessor* _tmp12_; + gboolean _tmp13_; + GRawProcessor* _tmp14_; + libraw_output_params_t* _tmp15_; + libraw_output_params_t* _tmp16_; + GRawProcessor* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + GRawProcessor* _tmp30_; + GRawProcessor* _tmp31_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp32_ = NULL; - GRawProcessedImage* _tmp33_ = NULL; - GRawProcessedImage* _tmp34_ = NULL; - GdkPixbuf* _tmp35_ = NULL; - GdkPixbuf* _tmp36_ = NULL; - Dimensions _tmp37_ = {0}; - GdkPixbuf* _tmp38_ = NULL; - GdkPixbuf* _tmp39_ = NULL; + GRawProcessor* _tmp32_; + GRawProcessedImage* _tmp33_; + GRawProcessedImage* _tmp34_; + GdkPixbuf* _tmp35_; + GdkPixbuf* _tmp36_; + Dimensions _tmp37_; + GdkPixbuf* _tmp38_; + GdkPixbuf* _tmp39_; GError * _inner_error_ = NULL; #line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); @@ -2485,17 +2470,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _tmp9_ = width_proportion; #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp9_ < 0.5) { -#line 2489 "RawSupport.c" - gdouble _tmp10_ = 0.0; +#line 2474 "RawSupport.c" + gdouble _tmp10_; #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = height_proportion; #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = _tmp10_ < 0.5; -#line 2495 "RawSupport.c" +#line 2480 "RawSupport.c" } else { #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = FALSE; -#line 2499 "RawSupport.c" +#line 2484 "RawSupport.c" } #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" half_size = _tmp8_; @@ -2535,32 +2520,32 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2539 "RawSupport.c" +#line 2524 "RawSupport.c" } { - PhotoFileReaderRole _tmp20_ = 0; + PhotoFileReaderRole _tmp20_; #line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp20_ = photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader)); #line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) { -#line 2547 "RawSupport.c" - GRawProcessor* _tmp21_ = NULL; +#line 2532 "RawSupport.c" + GRawProcessor* _tmp21_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp22_ = NULL; - GRawProcessedImage* _tmp23_ = NULL; - GRawProcessedImage* _tmp24_ = NULL; - GdkPixbuf* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - Dimensions _tmp27_ = {0}; - GdkPixbuf* _tmp28_ = NULL; - GdkPixbuf* _tmp29_ = NULL; + GRawProcessor* _tmp22_; + GRawProcessedImage* _tmp23_; + GRawProcessedImage* _tmp24_; + GdkPixbuf* _tmp25_; + GdkPixbuf* _tmp26_; + Dimensions _tmp27_; + GdkPixbuf* _tmp28_; + GdkPixbuf* _tmp29_; #line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp21_ = processor; #line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_unpack_thumb (_tmp21_, &_inner_error_); #line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2564 "RawSupport.c" +#line 2549 "RawSupport.c" goto __catch34_g_error; } #line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2571,7 +2556,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions image = _tmp23_; #line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2575 "RawSupport.c" +#line 2560 "RawSupport.c" goto __catch34_g_error; } #line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2596,7 +2581,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2600 "RawSupport.c" +#line 2585 "RawSupport.c" } } goto __finally34; @@ -2609,7 +2594,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _inner_error_ = NULL; #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (_error_); -#line 2613 "RawSupport.c" +#line 2598 "RawSupport.c" } __finally34: #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2620,7 +2605,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2624 "RawSupport.c" +#line 2609 "RawSupport.c" } #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp30_ = processor; @@ -2634,7 +2619,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2638 "RawSupport.c" +#line 2623 "RawSupport.c" } #line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp31_ = processor; @@ -2648,7 +2633,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2652 "RawSupport.c" +#line 2637 "RawSupport.c" } #line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp32_ = processor; @@ -2664,7 +2649,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2668 "RawSupport.c" +#line 2653 "RawSupport.c" } #line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp34_ = image; @@ -2688,7 +2673,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2692 "RawSupport.c" +#line 2677 "RawSupport.c" } @@ -2696,12 +2681,12 @@ static void raw_reader_class_init (RawReaderClass * klass) { #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_reader_parent_class = g_type_class_peek_parent (klass); #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) raw_reader_real_read_metadata; + ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) raw_reader_real_read_metadata; #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) raw_reader_real_unscaled_read; + ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) raw_reader_real_unscaled_read; #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read; -#line 2705 "RawSupport.c" + ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read; +#line 2690 "RawSupport.c" } @@ -2723,9 +2708,9 @@ GType raw_reader_get_type (void) { RawDeveloper* raw_developer_as_array (int* result_length1) { RawDeveloper* result = NULL; - RawDeveloper* _tmp0_ = NULL; - RawDeveloper* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + RawDeveloper* _tmp0_; + RawDeveloper* _tmp1_; + gint _tmp1__length1; #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_new0 (RawDeveloper, 3); #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2742,13 +2727,13 @@ RawDeveloper* raw_developer_as_array (int* result_length1) { if (result_length1) { #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp1__length1; -#line 2746 "RawSupport.c" +#line 2731 "RawSupport.c" } #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2752 "RawSupport.c" +#line 2737 "RawSupport.c" } @@ -2758,48 +2743,48 @@ gchar* raw_developer_to_string (RawDeveloper self) { switch (self) { #line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2762 "RawSupport.c" +#line 2747 "RawSupport.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup ("SHOTWELL"); #line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp0_; #line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2771 "RawSupport.c" +#line 2756 "RawSupport.c" } #line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: -#line 2775 "RawSupport.c" +#line 2760 "RawSupport.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = g_strdup ("CAMERA"); #line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; #line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2784 "RawSupport.c" +#line 2769 "RawSupport.c" } #line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2788 "RawSupport.c" +#line 2773 "RawSupport.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = g_strdup ("EMBEDDED"); #line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2797 "RawSupport.c" +#line 2782 "RawSupport.c" } default: { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2803 "RawSupport.c" +#line 2788 "RawSupport.c" } } } @@ -2807,8 +2792,8 @@ gchar* raw_developer_to_string (RawDeveloper self) { RawDeveloper raw_developer_from_string (const gchar* value) { RawDeveloper result = 0; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; GQuark _tmp3_ = 0U; #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" static GQuark _tmp2_label0 = 0; @@ -2828,51 +2813,51 @@ RawDeveloper raw_developer_from_string (const gchar* value) { if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) { #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2832 "RawSupport.c" +#line 2817 "RawSupport.c" default: { #line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_SHOTWELL; #line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2839 "RawSupport.c" +#line 2824 "RawSupport.c" } } } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) { #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2845 "RawSupport.c" +#line 2830 "RawSupport.c" default: { #line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_CAMERA; #line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2852 "RawSupport.c" +#line 2837 "RawSupport.c" } } } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) { #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2858 "RawSupport.c" +#line 2843 "RawSupport.c" default: { #line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_EMBEDDED; #line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2865 "RawSupport.c" +#line 2850 "RawSupport.c" } } } else { #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2871 "RawSupport.c" +#line 2856 "RawSupport.c" default: { #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2876 "RawSupport.c" +#line 2861 "RawSupport.c" } } } @@ -2885,43 +2870,37 @@ gchar* raw_developer_get_label (RawDeveloper self) { switch (self) { #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2889 "RawSupport.c" +#line 2874 "RawSupport.c" { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = _ ("Shotwell"); + gchar* _tmp0_; #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Shotwell")); #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2901 "RawSupport.c" +#line 2883 "RawSupport.c" } #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2907 "RawSupport.c" +#line 2889 "RawSupport.c" { - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = _ ("Camera"); + gchar* _tmp1_; #line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (_ ("Camera")); #line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp3_; + result = _tmp1_; #line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2919 "RawSupport.c" +#line 2898 "RawSupport.c" } default: { #line 318 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2925 "RawSupport.c" +#line 2904 "RawSupport.c" } } } @@ -2929,7 +2908,7 @@ gchar* raw_developer_get_label (RawDeveloper self) { gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { gboolean result = FALSE; - RawDeveloper _tmp0_ = 0; + RawDeveloper _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; #line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2940,46 +2919,46 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { result = TRUE; #line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2944 "RawSupport.c" +#line 2923 "RawSupport.c" } #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_CAMERA) { -#line 2948 "RawSupport.c" - RawDeveloper _tmp3_ = 0; +#line 2927 "RawSupport.c" + RawDeveloper _tmp3_; #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp3_ = d; #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 2954 "RawSupport.c" +#line 2933 "RawSupport.c" } else { #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = FALSE; -#line 2958 "RawSupport.c" +#line 2937 "RawSupport.c" } #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp2_) { #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = TRUE; -#line 2964 "RawSupport.c" +#line 2943 "RawSupport.c" } else { gboolean _tmp4_ = FALSE; #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_EMBEDDED) { -#line 2969 "RawSupport.c" - RawDeveloper _tmp5_ = 0; +#line 2948 "RawSupport.c" + RawDeveloper _tmp5_; #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp5_ = d; #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA; -#line 2975 "RawSupport.c" +#line 2954 "RawSupport.c" } else { #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp4_ = FALSE; -#line 2979 "RawSupport.c" +#line 2958 "RawSupport.c" } #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = _tmp4_; -#line 2983 "RawSupport.c" +#line 2962 "RawSupport.c" } #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp1_) { @@ -2987,46 +2966,49 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { result = TRUE; #line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2991 "RawSupport.c" +#line 2970 "RawSupport.c" } #line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = FALSE; #line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2997 "RawSupport.c" +#line 2976 "RawSupport.c" } BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error) { BackingPhotoRow* result = NULL; BackingPhotoRow* ns = NULL; - BackingPhotoRow* _tmp0_ = NULL; + BackingPhotoRow* _tmp0_; GFile* master = NULL; - const gchar* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + const gchar* _tmp1_; + GFile* _tmp2_; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* basename = NULL; - const gchar* _tmp8_ = NULL; + const gchar* _tmp8_; + gchar* newbasename = NULL; + const gchar* _tmp27_; + gchar* _tmp28_; gboolean c = FALSE; GFile* new_back = NULL; - GFile* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; - GFile* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; - GFile* _tmp32_ = NULL; - GFile* _tmp33_ = NULL; - GFile* _tmp34_ = NULL; - BackingPhotoRow* _tmp35_ = NULL; - BackingPhotoRow* _tmp36_ = NULL; - GFile* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; + GFile* _tmp29_; + GFile* _tmp30_; + GFile* _tmp31_; + const gchar* _tmp32_; + gboolean _tmp33_ = FALSE; + GFile* _tmp34_; + GFile* _tmp35_; + GFile* _tmp36_; + BackingPhotoRow* _tmp37_; + BackingPhotoRow* _tmp38_; + GFile* _tmp39_; + gchar* _tmp40_; GError * _inner_error_ = NULL; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (raw_filepath != NULL, NULL); @@ -3062,25 +3044,25 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _tmp8_ = camera_development_filename; #line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp8_ == NULL) { -#line 3066 "RawSupport.c" +#line 3048 "RawSupport.c" gchar* _tmp9_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self != RAW_DEVELOPER_CAMERA) { -#line 3079 "RawSupport.c" - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; +#line 3061 "RawSupport.c" + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = raw_developer_to_string (self); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3099,16 +3081,16 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _g_free0 (_tmp13_); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp11_); -#line 3103 "RawSupport.c" +#line 3085 "RawSupport.c" } else { - gchar* _tmp15_ = NULL; + gchar* _tmp15_; #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp15_ = g_strdup (""); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp9_); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = _tmp15_; -#line 3112 "RawSupport.c" +#line 3094 "RawSupport.c" } #line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp16_ = name; @@ -3140,10 +3122,10 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _g_free0 (_tmp18_); #line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp9_); -#line 3144 "RawSupport.c" +#line 3126 "RawSupport.c" } else { - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; + const gchar* _tmp25_; + gchar* _tmp26_; #line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp25_ = camera_development_filename; #line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3152,97 +3134,109 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _g_free0 (basename); #line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" basename = _tmp26_; -#line 3156 "RawSupport.c" +#line 3138 "RawSupport.c" } -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = master; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = g_file_get_parent (_tmp27_); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = _tmp28_; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = basename; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = generate_unique_file (_tmp29_, _tmp30_, &_tmp31_, &_inner_error_); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - c = _tmp31_; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp33_ = _tmp32_; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp29_); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - new_back = _tmp33_; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp27_ = basename; +#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp28_ = library_files_convert_basename (_tmp27_); +#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + newbasename = _tmp28_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp29_ = master; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp30_ = g_file_get_parent (_tmp29_); +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp31_ = _tmp30_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp32_ = newbasename; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp34_ = generate_unique_file (_tmp31_, _tmp32_, &_tmp33_, &_inner_error_); +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + c = _tmp33_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp35_ = _tmp34_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_object_unref0 (_tmp31_); +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + new_back = _tmp35_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (newbasename); +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (master); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _backing_photo_row_unref0 (ns); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3192 "RawSupport.c" +#line 3182 "RawSupport.c" } -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = new_back; -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - claim_file (_tmp34_, &_inner_error_); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp36_ = new_back; +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + claim_file (_tmp36_, &_inner_error_); +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (new_back); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (newbasename); +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (master); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _backing_photo_row_unref0 (ns); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3216 "RawSupport.c" +#line 3208 "RawSupport.c" } -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = ns; -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_->file_format = PHOTO_FILE_FORMAT_JFIF; -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = ns; -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = new_back; -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = g_file_get_path (_tmp37_); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp36_->filepath); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_->filepath = _tmp38_; +#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp37_ = ns; +#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp37_->file_format = PHOTO_FILE_FORMAT_JFIF; #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = ns; + _tmp38_ = ns; #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (new_back); + _tmp39_ = new_back; #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (basename); + _tmp40_ = g_file_get_path (_tmp39_); #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (ext); + _g_free0 (_tmp38_->filepath); #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp38_->filepath = _tmp40_; +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + result = ns; +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_object_unref0 (new_back); +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (newbasename); +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (basename); +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (ext); +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (master); -#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 3246 "RawSupport.c" +#line 3240 "RawSupport.c" } diff --git a/src/photos/RawSupport.vala b/src/photos/RawSupport.vala index 05f652c..d11d06e 100644 --- a/src/photos/RawSupport.vala +++ b/src/photos/RawSupport.vala @@ -352,8 +352,10 @@ public enum RawDeveloper { basename = camera_development_filename; } + string newbasename = LibraryFiles.convert_basename(basename); + bool c; - File? new_back = generate_unique_file(master.get_parent(), basename, out c); + File? new_back = generate_unique_file(master.get_parent(), newbasename, out c); claim_file(new_back); ns.file_format = PhotoFileFormat.JFIF; ns.filepath = new_back.get_path(); diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c index 1fcbfa7..4962cb8 100644 --- a/src/photos/TiffSupport.c +++ b/src/photos/TiffSupport.c @@ -1,4 +1,4 @@ -/* TiffSupport.c generated by valac 0.34.7, the Vala compiler +/* TiffSupport.c generated by valac 0.36.6, the Vala compiler * generated from TiffSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -545,7 +545,7 @@ PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType photos_tiff_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); -static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver* obj); +static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; enum { @@ -563,7 +563,7 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); static gchar** _vala_array_dup17 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); -static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties* obj); +static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -607,7 +607,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); void photos_tiff_file_format_driver_init (void) { - PhotosTiffFileFormatDriver* _tmp0_ = NULL; + PhotosTiffFileFormatDriver* _tmp0_; #line 13 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = photos_tiff_file_format_driver_new (); #line 13 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -629,8 +629,8 @@ static gpointer _photo_file_format_driver_ref0 (gpointer self) { PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) { PhotosTiffFileFormatDriver* result = NULL; - PhotosTiffFileFormatDriver* _tmp0_ = NULL; - PhotosTiffFileFormatDriver* _tmp1_ = NULL; + PhotosTiffFileFormatDriver* _tmp0_; + PhotosTiffFileFormatDriver* _tmp1_; #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = photos_tiff_file_format_driver_instance; #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -646,7 +646,7 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) { static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { PhotosTiffFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; - PhotosTiffFileFormatProperties* _tmp0_ = NULL; + PhotosTiffFileFormatProperties* _tmp0_; #line 21 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 22 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -662,8 +662,8 @@ static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_proper static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { PhotosTiffFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_ = NULL; - PhotosTiffReader* _tmp1_ = NULL; + const gchar* _tmp0_; + PhotosTiffReader* _tmp1_; #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -683,7 +683,7 @@ static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (Photo static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { PhotosTiffFileFormatDriver * self; PhotoMetadata* result = NULL; - PhotoMetadata* _tmp0_ = NULL; + PhotoMetadata* _tmp0_; #line 29 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 30 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -725,8 +725,8 @@ static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFil static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { PhotosTiffFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_ = NULL; - PhotosTiffWriter* _tmp1_ = NULL; + const gchar* _tmp0_; + PhotosTiffWriter* _tmp1_; #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -746,8 +746,8 @@ static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (Photo static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { PhotosTiffFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_ = NULL; - PhotosTiffMetadataWriter* _tmp1_ = NULL; + const gchar* _tmp0_; + PhotosTiffMetadataWriter* _tmp1_; #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -767,9 +767,9 @@ static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metad static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { PhotosTiffFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; - PhotosTiffSniffer* _tmp2_ = NULL; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; + PhotosTiffSniffer* _tmp2_; #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -811,21 +811,21 @@ static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDrive #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileFormatDriverClass *) klass)->finalize = photos_tiff_file_format_driver_finalize; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_get_properties; + ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_get_properties; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_reader; + ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_reader; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_create_metadata; + ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_create_metadata; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_image; + ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_can_write_image; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) photos_tiff_file_format_driver_real_can_write_metadata; + ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) photos_tiff_file_format_driver_real_can_write_metadata; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_writer; + ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_writer; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer; + ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer; + ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer; #line 830 "TiffSupport.c" } @@ -834,7 +834,7 @@ static void photos_tiff_file_format_driver_instance_init (PhotosTiffFileFormatDr } -static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver* obj) { +static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj) { PhotosTiffFileFormatDriver * self; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); @@ -857,7 +857,7 @@ GType photos_tiff_file_format_driver_get_type (void) { void photos_tiff_file_format_properties_init (void) { - PhotosTiffFileFormatProperties* _tmp0_ = NULL; + PhotosTiffFileFormatProperties* _tmp0_; #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = photos_tiff_file_format_properties_new (); #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -877,8 +877,8 @@ static gpointer _photo_file_format_properties_ref0 (gpointer self) { PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance (void) { PhotosTiffFileFormatProperties* result = NULL; - PhotosTiffFileFormatProperties* _tmp0_ = NULL; - PhotosTiffFileFormatProperties* _tmp1_ = NULL; + PhotosTiffFileFormatProperties* _tmp0_; + PhotosTiffFileFormatProperties* _tmp1_; #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = photos_tiff_file_format_properties_instance; #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -920,7 +920,7 @@ static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (P static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { PhotosTiffFileFormatProperties * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 81 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties); #line 82 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -936,19 +936,16 @@ static gchar* photos_tiff_file_format_properties_real_get_default_extension (Pho static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { PhotosTiffFileFormatProperties * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 85 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties); #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = _ ("TIFF"); + _tmp0_ = g_strdup (_ ("TIFF")); #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 952 "TiffSupport.c" +#line 949 "TiffSupport.c" } @@ -959,29 +956,29 @@ static gchar** _vala_array_dup16 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" for (i = 0; i < length; i++) { -#line 963 "TiffSupport.c" - gchar* _tmp0_ = NULL; +#line 960 "TiffSupport.c" + gchar* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = g_strdup (self[i]); #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result[i] = _tmp0_; -#line 969 "TiffSupport.c" +#line 966 "TiffSupport.c" } #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 973 "TiffSupport.c" +#line 970 "TiffSupport.c" } static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { PhotosTiffFileFormatProperties * 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 89 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties); #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1000,23 +997,23 @@ static gchar** photos_tiff_file_format_properties_real_get_known_extensions (Pho if (result_length1) { #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *result_length1 = _tmp2__length1; -#line 1004 "TiffSupport.c" +#line 1001 "TiffSupport.c" } #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = _tmp2_; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1010 "TiffSupport.c" +#line 1007 "TiffSupport.c" } static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { PhotosTiffFileFormatProperties * 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 93 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties); #line 94 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1031,7 +1028,7 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho result = _tmp2_; #line 94 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1035 "TiffSupport.c" +#line 1032 "TiffSupport.c" } @@ -1042,29 +1039,29 @@ static gchar** _vala_array_dup17 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" for (i = 0; i < length; i++) { -#line 1046 "TiffSupport.c" - gchar* _tmp0_ = NULL; +#line 1043 "TiffSupport.c" + gchar* _tmp0_; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = g_strdup (self[i]); #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result[i] = _tmp0_; -#line 1052 "TiffSupport.c" +#line 1049 "TiffSupport.c" } #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1056 "TiffSupport.c" +#line 1053 "TiffSupport.c" } static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { PhotosTiffFileFormatProperties * 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 97 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties); #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1083,13 +1080,13 @@ static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFile if (result_length1) { #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *result_length1 = _tmp2__length1; -#line 1087 "TiffSupport.c" +#line 1084 "TiffSupport.c" } #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = _tmp2_; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1093 "TiffSupport.c" +#line 1090 "TiffSupport.c" } @@ -1099,41 +1096,41 @@ PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_construct (GT self = (PhotosTiffFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1103 "TiffSupport.c" +#line 1100 "TiffSupport.c" } PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_new (void) { #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_file_format_properties_construct (PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES); -#line 1110 "TiffSupport.c" +#line 1107 "TiffSupport.c" } static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatPropertiesClass * 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 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_properties_parent_class = g_type_class_peek_parent (klass); #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileFormatPropertiesClass *) klass)->finalize = photos_tiff_file_format_properties_finalize; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_file_format; + ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_file_format; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_flags; + ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_flags; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_extension; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_default_extension; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_user_visible_name; + ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_user_visible_name; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_known_extensions; + ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) photos_tiff_file_format_properties_real_get_known_extensions; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) photos_tiff_file_format_properties_real_get_default_mime_type; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) photos_tiff_file_format_properties_real_get_default_mime_type; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) photos_tiff_file_format_properties_real_get_mime_types; + ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) photos_tiff_file_format_properties_real_get_mime_types; #line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = g_strdup ("tif"); #line 55 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1158,7 +1155,7 @@ static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatP photos_tiff_file_format_properties_KNOWN_MIME_TYPES = _tmp4_; #line 59 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 1162 "TiffSupport.c" +#line 1159 "TiffSupport.c" } @@ -1166,13 +1163,13 @@ static void photos_tiff_file_format_properties_instance_init (PhotosTiffFileForm } -static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties* obj) { +static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj) { PhotosTiffFileFormatProperties * self; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties); #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_tiff_file_format_properties_parent_class)->finalize (obj); -#line 1176 "TiffSupport.c" +#line 1173 "TiffSupport.c" } @@ -1190,8 +1187,8 @@ GType photos_tiff_file_format_properties_get_type (void) { PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { PhotosTiffSniffer* self = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1202,21 +1199,21 @@ PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file self = (PhotosTiffSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1206 "TiffSupport.c" +#line 1203 "TiffSupport.c" } PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_sniffer_construct (PHOTOS_TYPE_TIFF_SNIFFER, file, options); -#line 1213 "TiffSupport.c" +#line 1210 "TiffSupport.c" } static gpointer _detected_photo_information_ref0 (gpointer self) { #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1220 "TiffSupport.c" +#line 1217 "TiffSupport.c" } @@ -1225,16 +1222,16 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe 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 107 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_SNIFFER, PhotosTiffSniffer); @@ -1252,7 +1249,7 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe g_propagate_error (error, _inner_error_); #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return NULL; -#line 1256 "TiffSupport.c" +#line 1253 "TiffSupport.c" } #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (!_tmp0_) { @@ -1262,11 +1259,11 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe if (is_corrupted) { #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1266 "TiffSupport.c" +#line 1263 "TiffSupport.c" } #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1270 "TiffSupport.c" +#line 1267 "TiffSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_tiff_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_); @@ -1280,7 +1277,7 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe g_propagate_error (error, _inner_error_); #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return NULL; -#line 1284 "TiffSupport.c" +#line 1281 "TiffSupport.c" } #line 115 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp5_ = detected; @@ -1294,11 +1291,11 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe if (is_corrupted) { #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1298 "TiffSupport.c" +#line 1295 "TiffSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1302 "TiffSupport.c" +#line 1299 "TiffSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp7_ = detected; @@ -1306,17 +1303,17 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe _tmp8_ = _tmp7_->file_format; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (_tmp8_ == PHOTO_FILE_FORMAT_TIFF) { -#line 1310 "TiffSupport.c" - DetectedPhotoInformation* _tmp9_ = NULL; +#line 1307 "TiffSupport.c" + DetectedPhotoInformation* _tmp9_; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp9_ = detected; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp6_ = _tmp9_; -#line 1316 "TiffSupport.c" +#line 1313 "TiffSupport.c" } else { #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp6_ = NULL; -#line 1320 "TiffSupport.c" +#line 1317 "TiffSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp10_ = _detected_photo_information_ref0 (_tmp6_); @@ -1328,11 +1325,11 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe if (is_corrupted) { #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1332 "TiffSupport.c" +#line 1329 "TiffSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1336 "TiffSupport.c" +#line 1333 "TiffSupport.c" } @@ -1340,8 +1337,8 @@ static void photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) { #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_sniffer_parent_class = g_type_class_peek_parent (klass); #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) photos_tiff_sniffer_real_sniff; -#line 1345 "TiffSupport.c" + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_tiff_sniffer_real_sniff; +#line 1342 "TiffSupport.c" } @@ -1363,7 +1360,7 @@ GType photos_tiff_sniffer_get_type (void) { PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* filepath) { PhotosTiffReader* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 124 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1372,21 +1369,21 @@ PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* self = (PhotosTiffReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF); #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1376 "TiffSupport.c" +#line 1373 "TiffSupport.c" } PhotosTiffReader* photos_tiff_reader_new (const gchar* filepath) { #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_reader_construct (PHOTOS_TYPE_TIFF_READER, filepath); -#line 1383 "TiffSupport.c" +#line 1380 "TiffSupport.c" } static void photos_tiff_reader_class_init (PhotosTiffReaderClass * klass) { #line 122 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_reader_parent_class = g_type_class_peek_parent (klass); -#line 1390 "TiffSupport.c" +#line 1387 "TiffSupport.c" } @@ -1408,7 +1405,7 @@ GType photos_tiff_reader_get_type (void) { PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* filepath) { PhotosTiffWriter* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 136 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1417,22 +1414,22 @@ PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* self = (PhotosTiffWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF); #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1421 "TiffSupport.c" +#line 1418 "TiffSupport.c" } PhotosTiffWriter* photos_tiff_writer_new (const gchar* filepath) { #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_writer_construct (PHOTOS_TYPE_TIFF_WRITER, filepath); -#line 1428 "TiffSupport.c" +#line 1425 "TiffSupport.c" } static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { PhotosTiffWriter * self; - GdkPixbuf* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + GdkPixbuf* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; GError * _inner_error_ = NULL; #line 139 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_WRITER, PhotosTiffWriter); @@ -1454,7 +1451,7 @@ static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pix g_propagate_error (error, _inner_error_); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return; -#line 1458 "TiffSupport.c" +#line 1455 "TiffSupport.c" } } @@ -1463,8 +1460,8 @@ static void photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) { #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_writer_parent_class = g_type_class_peek_parent (klass); #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write; -#line 1468 "TiffSupport.c" + ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write; +#line 1465 "TiffSupport.c" } @@ -1486,7 +1483,7 @@ GType photos_tiff_writer_get_type (void) { PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, const gchar* filepath) { PhotosTiffMetadataWriter* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 146 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1495,22 +1492,22 @@ PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_ty self = (PhotosTiffMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF); #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1499 "TiffSupport.c" +#line 1496 "TiffSupport.c" } PhotosTiffMetadataWriter* photos_tiff_metadata_writer_new (const gchar* filepath) { #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_metadata_writer_construct (PHOTOS_TYPE_TIFF_METADATA_WRITER, filepath); -#line 1506 "TiffSupport.c" +#line 1503 "TiffSupport.c" } static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { PhotosTiffMetadataWriter * self; - PhotoMetadata* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + PhotoMetadata* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; GError * _inner_error_ = NULL; #line 149 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_METADATA_WRITER, PhotosTiffMetadataWriter); @@ -1532,7 +1529,7 @@ static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWr g_propagate_error (error, _inner_error_); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return; -#line 1536 "TiffSupport.c" +#line 1533 "TiffSupport.c" } } @@ -1541,8 +1538,8 @@ static void photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClas #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata; -#line 1546 "TiffSupport.c" + ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata; +#line 1543 "TiffSupport.c" } @@ -1565,22 +1562,22 @@ GType photos_tiff_metadata_writer_get_type (void) { gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) { gboolean result = FALSE; GFileInputStream* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFileInputStream* _tmp2_ = NULL; + GFile* _tmp1_; + GFileInputStream* _tmp2_; GDataInputStream* dins = NULL; - GDataInputStream* _tmp4_ = NULL; + GDataInputStream* _tmp4_; GDataStreamByteOrder order = 0; guint16 _tmp5_ = 0U; - GDataInputStream* _tmp6_ = NULL; - GCancellable* _tmp7_ = NULL; - guint16 _tmp8_ = 0U; - GDataInputStream* _tmp10_ = NULL; - GDataStreamByteOrder _tmp11_ = 0; + GDataInputStream* _tmp6_; + GCancellable* _tmp7_; + guint16 _tmp8_; + GDataInputStream* _tmp10_; + GDataStreamByteOrder _tmp11_; guint16 lue = 0U; - GDataInputStream* _tmp12_ = NULL; - GCancellable* _tmp13_ = NULL; - guint16 _tmp14_ = 0U; - guint16 _tmp16_ = 0U; + GDataInputStream* _tmp12_; + GCancellable* _tmp13_; + guint16 _tmp14_; + guint16 _tmp16_; GError * _inner_error_ = NULL; #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); @@ -1594,13 +1591,13 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _tmp0_ = _tmp2_; #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1598 "TiffSupport.c" +#line 1595 "TiffSupport.c" gboolean _tmp3_ = FALSE; #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return _tmp3_; -#line 1604 "TiffSupport.c" +#line 1601 "TiffSupport.c" } #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp4_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); @@ -1616,7 +1613,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _tmp5_ = _tmp8_; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1620 "TiffSupport.c" +#line 1617 "TiffSupport.c" gboolean _tmp9_ = FALSE; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); @@ -1626,29 +1623,29 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return _tmp9_; -#line 1630 "TiffSupport.c" +#line 1627 "TiffSupport.c" } #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" switch (_tmp5_) { #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" case 0x4949: -#line 1636 "TiffSupport.c" +#line 1633 "TiffSupport.c" { #line 161 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" order = G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN; #line 162 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" break; -#line 1642 "TiffSupport.c" +#line 1639 "TiffSupport.c" } #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" case 0x4D4D: -#line 1646 "TiffSupport.c" +#line 1643 "TiffSupport.c" { #line 165 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" order = G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN; #line 166 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" break; -#line 1652 "TiffSupport.c" +#line 1649 "TiffSupport.c" } default: { @@ -1660,7 +1657,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 169 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1664 "TiffSupport.c" +#line 1661 "TiffSupport.c" } } #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1679,7 +1676,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) lue = _tmp14_; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1683 "TiffSupport.c" +#line 1680 "TiffSupport.c" gboolean _tmp15_ = FALSE; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); @@ -1689,7 +1686,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return _tmp15_; -#line 1693 "TiffSupport.c" +#line 1690 "TiffSupport.c" } #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp16_ = lue; @@ -1703,7 +1700,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1707 "TiffSupport.c" +#line 1704 "TiffSupport.c" } #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = TRUE; @@ -1713,7 +1710,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1717 "TiffSupport.c" +#line 1714 "TiffSupport.c" } -- cgit v1.2.3