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/JfifSupport.c | 437 +++++++++++++++++++++++------------------------ 1 file changed, 211 insertions(+), 226 deletions(-) (limited to 'src/photos/JfifSupport.c') 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" } -- cgit v1.2.3