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/PhotoFileSniffer.c | 108 +++++++++++++++++++++--------------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'src/photos/PhotoFileSniffer.c') 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)) { -- cgit v1.2.3