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/GdkSupport.c | 284 ++++++++++++++++++++++++------------------------ 1 file changed, 142 insertions(+), 142 deletions(-) (limited to 'src/photos/GdkSupport.c') diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c index 1fb61f7..4b94f76 100644 --- a/src/photos/GdkSupport.c +++ b/src/photos/GdkSupport.c @@ -1,4 +1,4 @@ -/* GdkSupport.c generated by valac 0.34.7, the Vala compiler +/* GdkSupport.c generated by valac 0.36.6, the Vala compiler * generated from GdkSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -289,13 +289,13 @@ guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_le static guint8* _vala_array_dup7 (guint8* self, int length); void dimensions_init (Dimensions *self, gint width, gint height); PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name); -static void gdk_sniffer_finalize (PhotoFileSniffer* obj); +static void gdk_sniffer_finalize (PhotoFileSniffer * obj); GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { GdkReader* self = NULL; - const gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; + const gchar* _tmp0_; + PhotoFileFormat _tmp1_; #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -314,9 +314,9 @@ static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GErr GdkReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + PhotoMetadata* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; GError * _inner_error_ = NULL; #line 12 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_READER, GdkReader); @@ -354,11 +354,11 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; - GdkPixbuf* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; + gchar* _tmp1_; + gchar* _tmp2_; + GdkPixbuf* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; GError * _inner_error_ = NULL; #line 19 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_READER, GdkReader); @@ -400,15 +400,15 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - Dimensions _tmp3_ = {0}; - gint _tmp4_ = 0; - Dimensions _tmp5_ = {0}; - gint _tmp6_ = 0; - GdkPixbuf* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; - GdkPixbuf* _tmp9_ = NULL; + gchar* _tmp1_; + gchar* _tmp2_; + Dimensions _tmp3_; + gint _tmp4_; + Dimensions _tmp5_; + gint _tmp6_; + GdkPixbuf* _tmp7_; + GdkPixbuf* _tmp8_; + GdkPixbuf* _tmp9_; GError * _inner_error_ = NULL; #line 23 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_READER, GdkReader); @@ -462,11 +462,11 @@ static void gdk_reader_class_init (GdkReaderClass * klass) { #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_reader_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) gdk_reader_real_read_metadata; + ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) gdk_reader_real_read_metadata; #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) gdk_reader_real_unscaled_read; + ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) gdk_reader_real_unscaled_read; #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read; + ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read; #line 471 "GdkSupport.c" } @@ -489,8 +489,8 @@ GType gdk_reader_get_type (void) { GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { GdkSniffer* self = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -537,36 +537,36 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, GdkSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; - DetectedPhotoInformation* _tmp0_ = NULL; + DetectedPhotoInformation* _tmp0_; GdkPixbufLoader* pixbuf_loader = NULL; - GdkPixbufLoader* _tmp1_ = NULL; - GdkPixbufLoader* _tmp2_ = NULL; - GdkPixbufLoader* _tmp3_ = NULL; + GdkPixbufLoader* _tmp1_; + GdkPixbufLoader* _tmp2_; + GdkPixbufLoader* _tmp3_; GChecksum* md5_checksum = NULL; - gboolean _tmp4_ = FALSE; - DetectedPhotoInformation* _tmp6_ = NULL; - PhotoMetadata* _tmp7_ = NULL; + gboolean _tmp4_; + DetectedPhotoInformation* _tmp6_; + PhotoMetadata* _tmp7_; gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; + gboolean _tmp13_; guint8* _tmp38_ = NULL; gint _tmp38__length1 = 0; gint __tmp38__size_ = 0; - gboolean _tmp39_ = FALSE; + gboolean _tmp39_; guint8* buffer = NULL; - guint8* _tmp42_ = NULL; - gint _tmp42__length1 = 0; - gint buffer_length1 = 0; - gint _buffer_size_ = 0; + guint8* _tmp42_; + gint _tmp42__length1; + gint buffer_length1; + gint _buffer_size_; gsize count = 0UL; GFileInputStream* fins = NULL; - GFile* _tmp43_ = NULL; - GFileInputStream* _tmp44_ = NULL; - GFileInputStream* _tmp68_ = NULL; - gboolean _tmp70_ = FALSE; + GFile* _tmp43_; + GFileInputStream* _tmp44_; + GFileInputStream* _tmp68_; + gboolean _tmp70_; gboolean _tmp75_ = FALSE; - gboolean _tmp76_ = FALSE; - DetectedPhotoInformation* _tmp78_ = NULL; - DetectedPhotoInformation* _tmp79_ = NULL; + gboolean _tmp76_; + DetectedPhotoInformation* _tmp78_; + DetectedPhotoInformation* _tmp79_; GError * _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_SNIFFER, GdkSniffer); @@ -595,7 +595,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 46 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp4_) { #line 598 "GdkSupport.c" - GChecksum* _tmp5_ = NULL; + GChecksum* _tmp5_; #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = g_checksum_new (G_CHECKSUM_MD5); #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -614,9 +614,9 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp6_->metadata = _tmp7_; #line 616 "GdkSupport.c" { - DetectedPhotoInformation* _tmp8_ = NULL; - PhotoMetadata* _tmp9_ = NULL; - GFile* _tmp10_ = NULL; + DetectedPhotoInformation* _tmp8_; + PhotoMetadata* _tmp9_; + GFile* _tmp10_; #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp8_ = self->priv->detected; #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -635,7 +635,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, __catch30_g_error: { GError* err = NULL; - DetectedPhotoInformation* _tmp11_ = NULL; + DetectedPhotoInformation* _tmp11_; #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" err = _inner_error_; #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -668,8 +668,8 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp13_) { #line 671 "GdkSupport.c" - DetectedPhotoInformation* _tmp14_ = NULL; - PhotoMetadata* _tmp15_ = NULL; + DetectedPhotoInformation* _tmp14_; + PhotoMetadata* _tmp15_; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp14_ = self->priv->detected; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -686,25 +686,25 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, if (_tmp12_) { #line 688 "GdkSupport.c" guint8* flattened_sans_thumbnail = NULL; - DetectedPhotoInformation* _tmp16_ = NULL; - PhotoMetadata* _tmp17_ = NULL; - gint _tmp18_ = 0; - guint8* _tmp19_ = NULL; - gint flattened_sans_thumbnail_length1 = 0; - gint _flattened_sans_thumbnail_size_ = 0; + DetectedPhotoInformation* _tmp16_; + PhotoMetadata* _tmp17_; + gint _tmp18_; + guint8* _tmp19_; + gint flattened_sans_thumbnail_length1; + gint _flattened_sans_thumbnail_size_; gboolean _tmp20_ = FALSE; - guint8* _tmp21_ = NULL; - gint _tmp21__length1 = 0; + guint8* _tmp21_; + gint _tmp21__length1; guint8* flattened_thumbnail = NULL; - DetectedPhotoInformation* _tmp27_ = NULL; - PhotoMetadata* _tmp28_ = NULL; - gint _tmp29_ = 0; - guint8* _tmp30_ = NULL; - gint flattened_thumbnail_length1 = 0; - gint _flattened_thumbnail_size_ = 0; + DetectedPhotoInformation* _tmp27_; + PhotoMetadata* _tmp28_; + gint _tmp29_; + guint8* _tmp30_; + gint flattened_thumbnail_length1; + gint _flattened_thumbnail_size_; gboolean _tmp31_ = FALSE; - guint8* _tmp32_ = NULL; - gint _tmp32__length1 = 0; + guint8* _tmp32_; + gint _tmp32__length1; #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp16_ = self->priv->detected; #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -724,8 +724,8 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp21_ != NULL) { #line 727 "GdkSupport.c" - guint8* _tmp22_ = NULL; - gint _tmp22__length1 = 0; + guint8* _tmp22_; + gint _tmp22__length1; #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp22_ = flattened_sans_thumbnail; #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -741,12 +741,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp20_) { #line 744 "GdkSupport.c" - DetectedPhotoInformation* _tmp23_ = NULL; - guint8* _tmp24_ = NULL; - gint _tmp24__length1 = 0; - guint8* _tmp25_ = NULL; - gint _tmp25__length1 = 0; - gchar* _tmp26_ = NULL; + DetectedPhotoInformation* _tmp23_; + guint8* _tmp24_; + gint _tmp24__length1; + guint8* _tmp25_; + gint _tmp25__length1; + gchar* _tmp26_; #line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp23_ = self->priv->detected; #line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -784,8 +784,8 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp32_ != NULL) { #line 787 "GdkSupport.c" - guint8* _tmp33_ = NULL; - gint _tmp33__length1 = 0; + guint8* _tmp33_; + gint _tmp33__length1; #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp33_ = flattened_thumbnail; #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -801,12 +801,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp31_) { #line 804 "GdkSupport.c" - DetectedPhotoInformation* _tmp34_ = NULL; - guint8* _tmp35_ = NULL; - gint _tmp35__length1 = 0; - guint8* _tmp36_ = NULL; - gint _tmp36__length1 = 0; - gchar* _tmp37_ = NULL; + DetectedPhotoInformation* _tmp34_; + guint8* _tmp35_; + gint _tmp35__length1; + guint8* _tmp36_; + gint _tmp36__length1; + gchar* _tmp37_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp34_ = self->priv->detected; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -836,7 +836,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp39_) { #line 839 "GdkSupport.c" - guint8* _tmp40_ = NULL; + guint8* _tmp40_; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp40_ = g_new0 (guint8, 64 * 1024); #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -849,7 +849,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, __tmp38__size_ = _tmp38__length1; #line 851 "GdkSupport.c" } else { - guint8* _tmp41_ = NULL; + guint8* _tmp41_; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp41_ = g_new0 (guint8, 8 * 1024); #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -904,19 +904,19 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, while (TRUE) { #line 906 "GdkSupport.c" gsize bytes_read = 0UL; - GFileInputStream* _tmp46_ = NULL; - guint8* _tmp47_ = NULL; - gint _tmp47__length1 = 0; - gssize _tmp48_ = 0L; - gsize _tmp49_ = 0UL; - gsize _tmp50_ = 0UL; - gsize _tmp51_ = 0UL; - gboolean _tmp52_ = FALSE; + GFileInputStream* _tmp46_; + guint8* _tmp47_; + gint _tmp47__length1; + gssize _tmp48_; + gsize _tmp49_; + gsize _tmp50_; + gsize _tmp51_; + gboolean _tmp52_; gboolean _tmp56_ = FALSE; - gboolean _tmp57_ = FALSE; + gboolean _tmp57_; gboolean _tmp62_ = FALSE; gboolean _tmp63_ = FALSE; - gboolean _tmp64_ = FALSE; + gboolean _tmp64_; #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (!_tmp45_) { #line 923 "GdkSupport.c" @@ -970,10 +970,10 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp52_) { #line 973 "GdkSupport.c" - GChecksum* _tmp53_ = NULL; - guint8* _tmp54_ = NULL; - gint _tmp54__length1 = 0; - gsize _tmp55_ = 0UL; + GChecksum* _tmp53_; + guint8* _tmp54_; + gint _tmp54__length1; + gsize _tmp55_; #line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp53_ = md5_checksum; #line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -994,7 +994,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp56_ = TRUE; #line 996 "GdkSupport.c" } else { - gboolean _tmp58_ = FALSE; + gboolean _tmp58_; #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp58_ = self->priv->area_prepared; #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1004,10 +1004,10 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp56_) { #line 1007 "GdkSupport.c" - GdkPixbufLoader* _tmp59_ = NULL; - guint8* _tmp60_ = NULL; - gint _tmp60__length1 = 0; - gsize _tmp61_ = 0UL; + GdkPixbufLoader* _tmp59_; + guint8* _tmp60_; + gint _tmp60__length1; + gsize _tmp61_; #line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp59_ = pixbuf_loader; #line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1042,7 +1042,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (!_tmp64_) { #line 1045 "GdkSupport.c" - gboolean _tmp65_ = FALSE; + gboolean _tmp65_; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp65_ = self->priv->size_ready; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1056,7 +1056,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp63_) { #line 1059 "GdkSupport.c" - gboolean _tmp66_ = FALSE; + gboolean _tmp66_; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp66_ = self->priv->area_prepared; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1076,7 +1076,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, } } { - GdkPixbufLoader* _tmp67_ = NULL; + GdkPixbufLoader* _tmp67_; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp67_ = pixbuf_loader; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1123,7 +1123,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 99 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp68_ != NULL) { #line 1126 "GdkSupport.c" - GFileInputStream* _tmp69_ = NULL; + GFileInputStream* _tmp69_; #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp69_ = fins; #line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1152,10 +1152,10 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 102 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp70_) { #line 1155 "GdkSupport.c" - DetectedPhotoInformation* _tmp71_ = NULL; - GChecksum* _tmp72_ = NULL; - const gchar* _tmp73_ = NULL; - gchar* _tmp74_ = NULL; + DetectedPhotoInformation* _tmp71_; + GChecksum* _tmp72_; + const gchar* _tmp73_; + gchar* _tmp74_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp71_ = self->priv->detected; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1178,7 +1178,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp75_ = TRUE; #line 1180 "GdkSupport.c" } else { - gboolean _tmp77_ = FALSE; + gboolean _tmp77_; #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp77_ = self->priv->area_prepared; #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1216,9 +1216,9 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loader, gint width, gint height) { - DetectedPhotoInformation* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + DetectedPhotoInformation* _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (IS_GDK_SNIFFER (self)); #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1246,29 +1246,29 @@ static gpointer _g_object_ref0 (gpointer self) { static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader) { GdkPixbuf* pixbuf = NULL; - GdkPixbufLoader* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; - GdkPixbuf* _tmp2_ = NULL; - GdkPixbuf* _tmp3_ = NULL; - DetectedPhotoInformation* _tmp4_ = NULL; - GdkPixbuf* _tmp5_ = NULL; - GdkColorspace _tmp6_ = 0; - DetectedPhotoInformation* _tmp7_ = NULL; - GdkPixbuf* _tmp8_ = NULL; - gint _tmp9_ = 0; - DetectedPhotoInformation* _tmp10_ = NULL; - GdkPixbuf* _tmp11_ = NULL; - gint _tmp12_ = 0; + GdkPixbufLoader* _tmp0_; + GdkPixbuf* _tmp1_; + GdkPixbuf* _tmp2_; + GdkPixbuf* _tmp3_; + DetectedPhotoInformation* _tmp4_; + GdkPixbuf* _tmp5_; + GdkColorspace _tmp6_; + DetectedPhotoInformation* _tmp7_; + GdkPixbuf* _tmp8_; + gint _tmp9_; + DetectedPhotoInformation* _tmp10_; + GdkPixbuf* _tmp11_; + gint _tmp12_; GdkPixbufFormat* format = NULL; - GdkPixbufLoader* _tmp13_ = NULL; - GdkPixbufFormat* _tmp14_ = NULL; - DetectedPhotoInformation* _tmp15_ = NULL; - GdkPixbufFormat* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - DetectedPhotoInformation* _tmp18_ = NULL; - DetectedPhotoInformation* _tmp19_ = NULL; - const gchar* _tmp20_ = NULL; - PhotoFileFormat _tmp21_ = 0; + GdkPixbufLoader* _tmp13_; + GdkPixbufFormat* _tmp14_; + DetectedPhotoInformation* _tmp15_; + GdkPixbufFormat* _tmp16_; + gchar* _tmp17_; + DetectedPhotoInformation* _tmp18_; + DetectedPhotoInformation* _tmp19_; + const gchar* _tmp20_; + PhotoFileFormat _tmp21_; #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (IS_GDK_SNIFFER (self)); #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1357,7 +1357,7 @@ static void gdk_sniffer_class_init (GdkSnifferClass * klass) { #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_type_class_add_private (klass, sizeof (GdkSnifferPrivate)); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) gdk_sniffer_real_sniff; + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) gdk_sniffer_real_sniff; #line 1362 "GdkSupport.c" } @@ -1375,7 +1375,7 @@ static void gdk_sniffer_instance_init (GdkSniffer * self) { } -static void gdk_sniffer_finalize (PhotoFileSniffer* obj) { +static void gdk_sniffer_finalize (PhotoFileSniffer * obj) { GdkSniffer * self; #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GDK_SNIFFER, GdkSniffer); -- cgit v1.2.3