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/PngSupport.c | 441 ++++++++++++++++++++++++------------------------ 1 file changed, 219 insertions(+), 222 deletions(-) (limited to 'src/photos/PngSupport.c') 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" } -- cgit v1.2.3