From 49120f48474fc8fdc2448c75d961bc238213cfac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 1 May 2018 14:34:32 +0200 Subject: New upstream version 0.28.2 --- src/photos/GdkSupport.c | 929 +++++++++++++++++++++--------------------------- 1 file changed, 408 insertions(+), 521 deletions(-) (limited to 'src/photos/GdkSupport.c') diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c index 4b94f76..8955711 100644 --- a/src/photos/GdkSupport.c +++ b/src/photos/GdkSupport.c @@ -283,10 +283,9 @@ static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loa static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self); static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader); static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self); -guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1); -gchar* md5_binary (guint8* buffer, gsize length); -guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1); -static guint8* _vala_array_dup7 (guint8* self, int length); +gchar* photo_metadata_exif_hash (PhotoMetadata* self); +gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); +static guint8* _vala_array_dup5 (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); @@ -306,7 +305,7 @@ GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, Photo self = (GdkReader*) photo_file_reader_construct (object_type, _tmp0_, _tmp1_); #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self; -#line 310 "GdkSupport.c" +#line 309 "GdkSupport.c" } @@ -340,13 +339,13 @@ static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GErr _media_metadata_unref0 (metadata); #line 14 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 344 "GdkSupport.c" +#line 343 "GdkSupport.c" } #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" result = metadata; #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 350 "GdkSupport.c" +#line 349 "GdkSupport.c" } @@ -380,7 +379,7 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** g_propagate_error (error, _inner_error_); #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 384 "GdkSupport.c" +#line 383 "GdkSupport.c" } #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = _tmp0_; @@ -392,7 +391,7 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** _g_object_unref0 (_tmp0_); #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 396 "GdkSupport.c" +#line 395 "GdkSupport.c" } @@ -442,7 +441,7 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions g_propagate_error (error, _inner_error_); #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 446 "GdkSupport.c" +#line 445 "GdkSupport.c" } #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp9_ = _tmp0_; @@ -454,7 +453,7 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_tmp0_); #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 458 "GdkSupport.c" +#line 457 "GdkSupport.c" } @@ -467,7 +466,7 @@ static void gdk_reader_class_init (GdkReaderClass * klass) { ((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; -#line 471 "GdkSupport.c" +#line 470 "GdkSupport.c" } @@ -501,35 +500,35 @@ GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif self = (GdkSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_); #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self; -#line 505 "GdkSupport.c" +#line 504 "GdkSupport.c" } static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self) { #line 41 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_on_size_prepared ((GdkSniffer*) self, _sender, width, height); -#line 512 "GdkSupport.c" +#line 511 "GdkSupport.c" } static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self) { #line 42 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_on_area_prepared ((GdkSniffer*) self, _sender); -#line 519 "GdkSupport.c" +#line 518 "GdkSupport.c" } -static guint8* _vala_array_dup7 (guint8* self, int length) { -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +static guint8* _vala_array_dup5 (guint8* self, int length) { +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return g_memdup (self, length * sizeof (guint8)); -#line 526 "GdkSupport.c" +#line 525 "GdkSupport.c" } static gpointer _detected_photo_information_ref0 (gpointer self) { -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 533 "GdkSupport.c" +#line 532 "GdkSupport.c" } @@ -548,25 +547,25 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, PhotoMetadata* _tmp7_; gboolean _tmp12_ = FALSE; gboolean _tmp13_; - guint8* _tmp38_ = NULL; - gint _tmp38__length1 = 0; - gint __tmp38__size_ = 0; - gboolean _tmp39_; + guint8* _tmp24_ = NULL; + gint _tmp24__length1 = 0; + gint __tmp24__size_ = 0; + gboolean _tmp25_; guint8* buffer = NULL; - guint8* _tmp42_; - gint _tmp42__length1; + guint8* _tmp28_; + gint _tmp28__length1; gint buffer_length1; gint _buffer_size_; gsize count = 0UL; GFileInputStream* fins = NULL; - GFile* _tmp43_; - GFileInputStream* _tmp44_; - GFileInputStream* _tmp68_; - gboolean _tmp70_; - gboolean _tmp75_ = FALSE; - gboolean _tmp76_; - DetectedPhotoInformation* _tmp78_; - DetectedPhotoInformation* _tmp79_; + GFile* _tmp29_; + GFileInputStream* _tmp30_; + GFileInputStream* _tmp54_; + gboolean _tmp56_; + gboolean _tmp61_ = FALSE; + gboolean _tmp62_; + DetectedPhotoInformation* _tmp64_; + DetectedPhotoInformation* _tmp65_; 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); @@ -594,7 +593,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 46 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp4_) { -#line 598 "GdkSupport.c" +#line 597 "GdkSupport.c" GChecksum* _tmp5_; #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = g_checksum_new (G_CHECKSUM_MD5); @@ -602,7 +601,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_checksum_free0 (md5_checksum); #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" md5_checksum = _tmp5_; -#line 606 "GdkSupport.c" +#line 605 "GdkSupport.c" } #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp6_ = self->priv->detected; @@ -612,7 +611,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _media_metadata_unref0 (_tmp6_->metadata); #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp6_->metadata = _tmp7_; -#line 616 "GdkSupport.c" +#line 615 "GdkSupport.c" { DetectedPhotoInformation* _tmp8_; PhotoMetadata* _tmp9_; @@ -627,12 +626,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp10_, &_inner_error_); #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 631 "GdkSupport.c" - goto __catch30_g_error; +#line 630 "GdkSupport.c" + goto __catch34_g_error; } } - goto __finally30; - __catch30_g_error: + goto __finally34; + __catch34_g_error: { GError* err = NULL; DetectedPhotoInformation* _tmp11_; @@ -648,9 +647,9 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp11_->metadata = NULL; #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_error_free0 (err); -#line 652 "GdkSupport.c" +#line 651 "GdkSupport.c" } - __finally30: + __finally34: #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -661,13 +660,13 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 665 "GdkSupport.c" +#line 664 "GdkSupport.c" } #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp13_) { -#line 671 "GdkSupport.c" +#line 670 "GdkSupport.c" DetectedPhotoInformation* _tmp14_; PhotoMetadata* _tmp15_; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -676,542 +675,430 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp15_ = _tmp14_->metadata; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp12_ = _tmp15_ != NULL; -#line 680 "GdkSupport.c" +#line 679 "GdkSupport.c" } else { #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp12_ = FALSE; -#line 684 "GdkSupport.c" +#line 683 "GdkSupport.c" } #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp12_) { -#line 688 "GdkSupport.c" - guint8* flattened_sans_thumbnail = NULL; +#line 687 "GdkSupport.c" DetectedPhotoInformation* _tmp16_; - PhotoMetadata* _tmp17_; - gint _tmp18_; - guint8* _tmp19_; - gint flattened_sans_thumbnail_length1; - gint _flattened_sans_thumbnail_size_; - gboolean _tmp20_ = FALSE; - guint8* _tmp21_; - gint _tmp21__length1; - guint8* flattened_thumbnail = NULL; - DetectedPhotoInformation* _tmp27_; - PhotoMetadata* _tmp28_; - gint _tmp29_; - guint8* _tmp30_; - gint flattened_thumbnail_length1; - gint _flattened_thumbnail_size_; - gboolean _tmp31_ = FALSE; - guint8* _tmp32_; - gint _tmp32__length1; + DetectedPhotoInformation* _tmp17_; + PhotoMetadata* _tmp18_; + gchar* _tmp19_; + DetectedPhotoInformation* _tmp20_; + DetectedPhotoInformation* _tmp21_; + PhotoMetadata* _tmp22_; + gchar* _tmp23_; #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp16_ = self->priv->detected; #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp17_ = _tmp16_->metadata; + _tmp17_ = self->priv->detected; #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp19_ = photo_metadata_flatten_exif (_tmp17_, FALSE, &_tmp18_); + _tmp18_ = _tmp17_->metadata; #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - flattened_sans_thumbnail = _tmp19_; + _tmp19_ = photo_metadata_exif_hash (_tmp18_); #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - flattened_sans_thumbnail_length1 = _tmp18_; + _g_free0 (_tmp16_->exif_md5); #line 58 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1; -#line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp21_ = flattened_sans_thumbnail; + _tmp16_->exif_md5 = _tmp19_; #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp21__length1 = flattened_sans_thumbnail_length1; + _tmp20_ = self->priv->detected; #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp21_ != NULL) { -#line 727 "GdkSupport.c" - guint8* _tmp22_; - gint _tmp22__length1; + _tmp21_ = self->priv->detected; #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp22_ = flattened_sans_thumbnail; + _tmp22_ = _tmp21_->metadata; #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp22__length1 = flattened_sans_thumbnail_length1; + _tmp23_ = photo_metadata_thumbnail_hash (_tmp22_); #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp20_ = _tmp22__length1 > 0; -#line 736 "GdkSupport.c" - } else { -#line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp20_ = FALSE; -#line 740 "GdkSupport.c" - } + _g_free0 (_tmp20_->thumbnail_md5); #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp20_) { -#line 744 "GdkSupport.c" - 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" - _tmp24_ = flattened_sans_thumbnail; -#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp24__length1 = flattened_sans_thumbnail_length1; -#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp25_ = flattened_sans_thumbnail; -#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp25__length1 = flattened_sans_thumbnail_length1; -#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp26_ = md5_binary (_tmp24_, (gsize) _tmp25__length1); -#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _g_free0 (_tmp23_->exif_md5); -#line 60 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp23_->exif_md5 = _tmp26_; -#line 767 "GdkSupport.c" - } -#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp27_ = self->priv->detected; -#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp28_ = _tmp27_->metadata; -#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp30_ = photo_metadata_flatten_exif_preview (_tmp28_, &_tmp29_); -#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - flattened_thumbnail = _tmp30_; -#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - flattened_thumbnail_length1 = _tmp29_; -#line 62 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _flattened_thumbnail_size_ = flattened_thumbnail_length1; -#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp32_ = flattened_thumbnail; -#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp32__length1 = flattened_thumbnail_length1; -#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp32_ != NULL) { -#line 787 "GdkSupport.c" - 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" - _tmp33__length1 = flattened_thumbnail_length1; -#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp31_ = _tmp33__length1 > 0; -#line 796 "GdkSupport.c" - } else { -#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp31_ = FALSE; -#line 800 "GdkSupport.c" - } -#line 63 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp31_) { -#line 804 "GdkSupport.c" - 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; + _tmp20_->thumbnail_md5 = _tmp23_; +#line 720 "GdkSupport.c" + } #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp35_ = flattened_thumbnail; + _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp35__length1 = flattened_thumbnail_length1; + if (_tmp25_) { +#line 726 "GdkSupport.c" + guint8* _tmp26_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp36_ = flattened_thumbnail; + _tmp26_ = g_new0 (guint8, 64 * 1024); #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp36__length1 = flattened_thumbnail_length1; + _tmp24_ = (g_free (_tmp24_), NULL); #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp37_ = md5_binary (_tmp35_, (gsize) _tmp36__length1); + _tmp24_ = _tmp26_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _g_free0 (_tmp34_->thumbnail_md5); + _tmp24__length1 = 64 * 1024; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp34_->thumbnail_md5 = _tmp37_; -#line 827 "GdkSupport.c" - } -#line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - flattened_thumbnail = (g_free (flattened_thumbnail), NULL); -#line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL); -#line 833 "GdkSupport.c" - } -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp39_) { -#line 839 "GdkSupport.c" - 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" - _tmp38_ = (g_free (_tmp38_), NULL); -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = _tmp40_; -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38__length1 = 64 * 1024; -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - __tmp38__size_ = _tmp38__length1; -#line 851 "GdkSupport.c" + __tmp24__size_ = _tmp24__length1; +#line 738 "GdkSupport.c" } else { - 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" - _tmp38_ = (g_free (_tmp38_), NULL); -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = _tmp41_; -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38__length1 = 8 * 1024; -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - __tmp38__size_ = _tmp38__length1; -#line 864 "GdkSupport.c" + guint8* _tmp27_; +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp27_ = g_new0 (guint8, 8 * 1024); +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp24_ = (g_free (_tmp24_), NULL); +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp24_ = _tmp27_; +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp24__length1 = 8 * 1024; +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + __tmp24__size_ = _tmp24__length1; +#line 751 "GdkSupport.c" } -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp42_ = (_tmp38_ != NULL) ? _vala_array_dup7 (_tmp38_, _tmp38__length1) : ((gpointer) _tmp38_); -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp42__length1 = _tmp38__length1; -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - buffer = _tmp42_; -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - buffer_length1 = _tmp42__length1; -#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp28_ = (_tmp24_ != NULL) ? _vala_array_dup5 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_); +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp28__length1 = _tmp24__length1; +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + buffer = _tmp28_; +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + buffer_length1 = _tmp28__length1; +#line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _buffer_size_ = buffer_length1; -#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 65 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" count = (gsize) 0; -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp44_ = g_file_read (_tmp43_, NULL, &_inner_error_); -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - fins = _tmp44_; -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp30_ = g_file_read (_tmp29_, NULL, &_inner_error_); +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + fins = _tmp30_; +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_propagate_error (error, _inner_error_); -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" buffer = (g_free (buffer), NULL); -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = (g_free (_tmp38_), NULL); -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp24_ = (g_free (_tmp24_), NULL); +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_checksum_free0 (md5_checksum); -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf_loader); -#line 73 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 898 "GdkSupport.c" +#line 785 "GdkSupport.c" } { - gboolean _tmp45_ = FALSE; -#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp45_ = TRUE; -#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + gboolean _tmp31_ = FALSE; +#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp31_ = TRUE; +#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" while (TRUE) { -#line 906 "GdkSupport.c" +#line 793 "GdkSupport.c" gsize bytes_read = 0UL; - GFileInputStream* _tmp46_; - guint8* _tmp47_; - gint _tmp47__length1; - gssize _tmp48_; - gsize _tmp49_; - gsize _tmp50_; - gsize _tmp51_; - gboolean _tmp52_; - gboolean _tmp56_ = FALSE; - gboolean _tmp57_; - gboolean _tmp62_ = FALSE; - gboolean _tmp63_ = FALSE; - gboolean _tmp64_; -#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp45_) { -#line 923 "GdkSupport.c" + GFileInputStream* _tmp32_; + guint8* _tmp33_; + gint _tmp33__length1; + gssize _tmp34_; + gsize _tmp35_; + gsize _tmp36_; + gsize _tmp37_; + gboolean _tmp38_; + gboolean _tmp42_ = FALSE; + gboolean _tmp43_; + gboolean _tmp48_ = FALSE; + gboolean _tmp49_ = FALSE; + gboolean _tmp50_; +#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (!_tmp31_) { +#line 810 "GdkSupport.c" } -#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp45_ = FALSE; -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp46_ = fins; -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp47_ = buffer; -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp47__length1 = buffer_length1; -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp48_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, g_input_stream_get_type (), GInputStream), _tmp47_, (gsize) _tmp47__length1, NULL, &_inner_error_); -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - bytes_read = (gsize) _tmp48_; -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp31_ = FALSE; +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp32_ = fins; +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp33_ = buffer; +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp33__length1 = buffer_length1; +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp34_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), _tmp33_, (gsize) _tmp33__length1, NULL, &_inner_error_); +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + bytes_read = (gsize) _tmp34_; +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_propagate_error (error, _inner_error_); -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (fins); -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" buffer = (g_free (buffer), NULL); -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = (g_free (_tmp38_), NULL); -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp24_ = (g_free (_tmp24_), NULL); +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_checksum_free0 (md5_checksum); -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf_loader); -#line 75 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 953 "GdkSupport.c" +#line 840 "GdkSupport.c" } +#line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp35_ = bytes_read; +#line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (_tmp35_ <= ((gsize) 0)) { +#line 72 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + break; +#line 848 "GdkSupport.c" + } +#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp36_ = count; +#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp37_ = bytes_read; +#line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + count = _tmp36_ + _tmp37_; #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp49_ = bytes_read; + _tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp49_ <= ((gsize) 0)) { + if (_tmp38_) { +#line 860 "GdkSupport.c" + GChecksum* _tmp39_; + guint8* _tmp40_; + gint _tmp40__length1; + gsize _tmp41_; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - break; -#line 961 "GdkSupport.c" - } -#line 79 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp50_ = count; -#line 79 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp51_ = bytes_read; -#line 79 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - count = _tmp50_ + _tmp51_; -#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp52_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; -#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp52_) { -#line 973 "GdkSupport.c" - 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" - _tmp54_ = buffer; -#line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp54__length1 = buffer_length1; -#line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp55_ = bytes_read; -#line 82 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - g_checksum_update (_tmp53_, _tmp54_, _tmp55_); -#line 988 "GdkSupport.c" + _tmp39_ = md5_checksum; +#line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp40_ = buffer; +#line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp40__length1 = buffer_length1; +#line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp41_ = bytes_read; +#line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + g_checksum_update (_tmp39_, _tmp40_, _tmp41_); +#line 875 "GdkSupport.c" } -#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp57_ = self->priv->size_ready; -#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp57_) { -#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp56_ = TRUE; -#line 996 "GdkSupport.c" +#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp43_ = self->priv->size_ready; +#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (!_tmp43_) { +#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp42_ = TRUE; +#line 883 "GdkSupport.c" } else { - 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" - _tmp56_ = !_tmp58_; -#line 1003 "GdkSupport.c" + gboolean _tmp44_; +#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp44_ = self->priv->area_prepared; +#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp42_ = !_tmp44_; +#line 890 "GdkSupport.c" } -#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp56_) { -#line 1007 "GdkSupport.c" - 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" - _tmp60_ = buffer; -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp60__length1 = buffer_length1; -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp61_ = bytes_read; -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - gdk_pixbuf_loader_write (_tmp59_, _tmp60_ + 0, (gsize) (((gint) _tmp61_) - 0), &_inner_error_); -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (_tmp42_) { +#line 894 "GdkSupport.c" + GdkPixbufLoader* _tmp45_; + guint8* _tmp46_; + gint _tmp46__length1; + gsize _tmp47_; +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp45_ = pixbuf_loader; +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp46_ = buffer; +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp46__length1 = buffer_length1; +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp47_ = bytes_read; +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + gdk_pixbuf_loader_write (_tmp45_, _tmp46_ + 0, (gsize) (((gint) _tmp47_) - 0), &_inner_error_); +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_propagate_error (error, _inner_error_); -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (fins); -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" buffer = (g_free (buffer), NULL); -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = (g_free (_tmp38_), NULL); -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp24_ = (g_free (_tmp24_), NULL); +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_checksum_free0 (md5_checksum); -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf_loader); -#line 86 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 1038 "GdkSupport.c" +#line 925 "GdkSupport.c" } } -#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp64_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; -#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp64_) { -#line 1045 "GdkSupport.c" - 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" - _tmp63_ = _tmp65_; -#line 1051 "GdkSupport.c" +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (!_tmp50_) { +#line 932 "GdkSupport.c" + gboolean _tmp51_; +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp51_ = self->priv->size_ready; +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp49_ = _tmp51_; +#line 938 "GdkSupport.c" } else { -#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp63_ = FALSE; -#line 1055 "GdkSupport.c" +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp49_ = FALSE; +#line 942 "GdkSupport.c" } -#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp63_) { -#line 1059 "GdkSupport.c" - 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" - _tmp62_ = _tmp66_; -#line 1065 "GdkSupport.c" +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (_tmp49_) { +#line 946 "GdkSupport.c" + gboolean _tmp52_; +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp52_ = self->priv->area_prepared; +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp48_ = _tmp52_; +#line 952 "GdkSupport.c" } else { -#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp62_ = FALSE; -#line 1069 "GdkSupport.c" +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp48_ = FALSE; +#line 956 "GdkSupport.c" } -#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp62_) { -#line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (_tmp48_) { +#line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" break; -#line 1075 "GdkSupport.c" +#line 962 "GdkSupport.c" } } } { - 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" - gdk_pixbuf_loader_close (_tmp67_, &_inner_error_); -#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + GdkPixbufLoader* _tmp53_; +#line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp53_ = pixbuf_loader; +#line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + gdk_pixbuf_loader_close (_tmp53_, &_inner_error_); +#line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1087 "GdkSupport.c" - goto __catch31_g_error; +#line 974 "GdkSupport.c" + goto __catch35_g_error; } } - goto __finally31; - __catch31_g_error: + goto __finally35; + __catch35_g_error: { GError* err = NULL; -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" err = _inner_error_; -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _inner_error_ = NULL; -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_error_free0 (err); -#line 1101 "GdkSupport.c" +#line 988 "GdkSupport.c" } - __finally31: -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + __finally35: +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_propagate_error (error, _inner_error_); -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (fins); -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" buffer = (g_free (buffer), NULL); -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = (g_free (_tmp38_), NULL); -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp24_ = (g_free (_tmp24_), NULL); +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_checksum_free0 (md5_checksum); -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf_loader); -#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 1120 "GdkSupport.c" +#line 1007 "GdkSupport.c" } -#line 99 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp68_ = fins; -#line 99 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp68_ != NULL) { -#line 1126 "GdkSupport.c" - GFileInputStream* _tmp69_; -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp69_ = fins; -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp54_ = fins; +#line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (_tmp54_ != NULL) { +#line 1013 "GdkSupport.c" + GFileInputStream* _tmp55_; +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp55_ = fins; +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_propagate_error (error, _inner_error_); -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (fins); -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" buffer = (g_free (buffer), NULL); -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = (g_free (_tmp38_), NULL); -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp24_ = (g_free (_tmp24_), NULL); +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_checksum_free0 (md5_checksum); -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf_loader); -#line 100 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 1148 "GdkSupport.c" +#line 1035 "GdkSupport.c" } } -#line 102 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp70_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; -#line 102 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp70_) { -#line 1155 "GdkSupport.c" - 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" - _tmp72_ = md5_checksum; +#line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; +#line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (_tmp56_) { +#line 1042 "GdkSupport.c" + DetectedPhotoInformation* _tmp57_; + GChecksum* _tmp58_; + const gchar* _tmp59_; + gchar* _tmp60_; +#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp57_ = self->priv->detected; +#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp58_ = md5_checksum; +#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp59_ = g_checksum_get_string (_tmp58_); +#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp60_ = g_strdup (_tmp59_); +#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _g_free0 (_tmp57_->md5); +#line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp57_->md5 = _tmp60_; +#line 1059 "GdkSupport.c" + } +#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp62_ = self->priv->size_ready; +#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + if (!_tmp62_) { +#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp61_ = TRUE; +#line 1067 "GdkSupport.c" + } else { + gboolean _tmp63_; +#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp63_ = self->priv->area_prepared; +#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp61_ = !_tmp63_; +#line 1074 "GdkSupport.c" + } +#line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _vala_is_corrupted = _tmp61_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp73_ = g_checksum_get_string (_tmp72_); + _tmp64_ = self->priv->detected; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp74_ = g_strdup (_tmp73_); + _tmp65_ = _detected_photo_information_ref0 (_tmp64_); #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _g_free0 (_tmp71_->md5); + result = _tmp65_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp71_->md5 = _tmp74_; -#line 1172 "GdkSupport.c" - } -#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp76_ = self->priv->size_ready; -#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp76_) { -#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp75_ = TRUE; -#line 1180 "GdkSupport.c" - } else { - 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" - _tmp75_ = !_tmp77_; -#line 1187 "GdkSupport.c" - } -#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _vala_is_corrupted = _tmp75_; -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp78_ = self->priv->detected; -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp79_ = _detected_photo_information_ref0 (_tmp78_); -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - result = _tmp79_; -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (fins); -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" buffer = (g_free (buffer), NULL); -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = (g_free (_tmp38_), NULL); -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" + _tmp24_ = (g_free (_tmp24_), NULL); +#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_checksum_free0 (md5_checksum); -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf_loader); -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (is_corrupted) { -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1211 "GdkSupport.c" +#line 1098 "GdkSupport.c" } -#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 1215 "GdkSupport.c" +#line 1102 "GdkSupport.c" } @@ -1219,28 +1106,28 @@ static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loa DetectedPhotoInformation* _tmp0_; gint _tmp1_; gint _tmp2_; -#line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 106 "/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" +#line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (GDK_IS_PIXBUF_LOADER (loader)); -#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp0_ = self->priv->detected; -#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp1_ = width; -#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp2_ = height; -#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" dimensions_init (&_tmp0_->image_dim, _tmp1_, _tmp2_); -#line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->size_ready = TRUE; -#line 1237 "GdkSupport.c" +#line 1124 "GdkSupport.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self ? g_object_ref (self) : NULL; -#line 1244 "GdkSupport.c" +#line 1131 "GdkSupport.c" } @@ -1269,83 +1156,83 @@ static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pix DetectedPhotoInformation* _tmp19_; const gchar* _tmp20_; PhotoFileFormat _tmp21_; -#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 111 "/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" +#line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (GDK_IS_PIXBUF_LOADER (pixbuf_loader)); -#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp0_ = pixbuf_loader; -#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp1_ = gdk_pixbuf_loader_get_pixbuf (_tmp0_); -#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp2_ = _g_object_ref0 (_tmp1_); -#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" pixbuf = _tmp2_; -#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp3_ = pixbuf; -#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp3_ == NULL) { -#line 119 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf); -#line 119 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return; -#line 1293 "GdkSupport.c" +#line 1180 "GdkSupport.c" } -#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp4_ = self->priv->detected; -#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = pixbuf; -#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp6_ = gdk_pixbuf_get_colorspace (_tmp5_); -#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp4_->colorspace = _tmp6_; -#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp7_ = self->priv->detected; -#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp8_ = pixbuf; -#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp9_ = gdk_pixbuf_get_n_channels (_tmp8_); -#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp7_->channels = _tmp9_; -#line 123 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp10_ = self->priv->detected; -#line 123 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp11_ = pixbuf; -#line 123 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp12_ = gdk_pixbuf_get_bits_per_sample (_tmp11_); -#line 123 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp10_->bits_per_channel = _tmp12_; -#line 125 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp13_ = pixbuf_loader; -#line 125 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp14_ = gdk_pixbuf_loader_get_format (_tmp13_); -#line 125 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" format = _tmp14_; -#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp15_ = self->priv->detected; -#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp16_ = format; -#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp17_ = gdk_pixbuf_format_get_name (_tmp16_); -#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_free0 (_tmp15_->format_name); -#line 126 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp15_->format_name = _tmp17_; -#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp18_ = self->priv->detected; -#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp19_ = self->priv->detected; -#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp20_ = _tmp19_->format_name; -#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp21_ = photo_file_format_from_pixbuf_name (_tmp20_); -#line 127 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp18_->file_format = _tmp21_; -#line 129 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 124 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->area_prepared = TRUE; -#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" +#line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf); -#line 1349 "GdkSupport.c" +#line 1236 "GdkSupport.c" } @@ -1358,7 +1245,7 @@ static void gdk_sniffer_class_init (GdkSnifferClass * klass) { 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; -#line 1362 "GdkSupport.c" +#line 1249 "GdkSupport.c" } @@ -1371,7 +1258,7 @@ static void gdk_sniffer_instance_init (GdkSniffer * self) { self->priv->size_ready = FALSE; #line 31 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->area_prepared = FALSE; -#line 1375 "GdkSupport.c" +#line 1262 "GdkSupport.c" } @@ -1383,7 +1270,7 @@ static void gdk_sniffer_finalize (PhotoFileSniffer * obj) { _detected_photo_information_unref0 (self->priv->detected); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" PHOTO_FILE_SNIFFER_CLASS (gdk_sniffer_parent_class)->finalize (obj); -#line 1387 "GdkSupport.c" +#line 1274 "GdkSupport.c" } -- cgit v1.2.3 From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/photos/GdkSupport.c | 632 +++++++++++++++++++++++++++--------------------- 1 file changed, 350 insertions(+), 282 deletions(-) (limited to 'src/photos/GdkSupport.c') diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c index 8955711..c0b4e05 100644 --- a/src/photos/GdkSupport.c +++ b/src/photos/GdkSupport.c @@ -1,4 +1,4 @@ -/* GdkSupport.c generated by valac 0.36.6, the Vala compiler +/* GdkSupport.c generated by valac 0.40.4, the Vala compiler * generated from GdkSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -222,17 +223,29 @@ static gpointer gdk_sniffer_parent_class = NULL; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -240,76 +253,111 @@ GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType gdk_reader_get_type (void) G_GNUC_CONST; -enum { - GDK_READER_DUMMY_PROPERTY -}; GType photo_file_format_get_type (void) G_GNUC_CONST; -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GError** error); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +PhotoFileReader* photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, + GError** error); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** error); +static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, + GError** error); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); 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); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; 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); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; GType gdk_sniffer_get_type (void) G_GNUC_CONST; #define GDK_SNIFFER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_GDK_SNIFFER, GdkSnifferPrivate)) -enum { - GDK_SNIFFER_DUMMY_PROPERTY -}; -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); DetectedPhotoInformation* detected_photo_information_new (void); DetectedPhotoInformation* detected_photo_information_construct (GType object_type); -static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loader, gint width, gint height); -static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self); -static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader); -static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self); +static void gdk_sniffer_on_size_prepared (GdkSniffer* self, + GdkPixbufLoader* loader, + gint width, + gint height); +static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, + gint width, + gint height, + gpointer self); +static void gdk_sniffer_on_area_prepared (GdkSniffer* self, + GdkPixbufLoader* pixbuf_loader); +static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, + gpointer self); gchar* photo_metadata_exif_hash (PhotoMetadata* self); gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); -static guint8* _vala_array_dup5 (guint8* self, int length); -void dimensions_init (Dimensions *self, gint width, gint height); +static guint8* _vala_array_dup5 (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); -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +GdkReader* +gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ GdkReader* self = NULL; - 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" - _tmp0_ = filepath; -#line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = file_format; -#line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - self = (GdkReader*) photo_file_reader_construct (object_type, _tmp0_, _tmp1_); + self = (GdkReader*) photo_file_reader_construct (object_type, filepath, file_format); #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self; -#line 309 "GdkSupport.c" +#line 354 "GdkSupport.c" } -static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GError** error) { +static PhotoMetadata* +gdk_reader_real_read_metadata (PhotoFileReader* base, + GError** error) +{ GdkReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; @@ -339,17 +387,20 @@ static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GErr _media_metadata_unref0 (metadata); #line 14 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 343 "GdkSupport.c" +#line 391 "GdkSupport.c" } #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" result = metadata; #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 349 "GdkSupport.c" +#line 397 "GdkSupport.c" } -static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** error) { +static GdkPixbuf* +gdk_reader_real_unscaled_read (PhotoFileReader* base, + GError** error) +{ GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -379,7 +430,7 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** g_propagate_error (error, _inner_error_); #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 383 "GdkSupport.c" +#line 434 "GdkSupport.c" } #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = _tmp0_; @@ -391,11 +442,16 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** _g_object_unref0 (_tmp0_); #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 395 "GdkSupport.c" +#line 446 "GdkSupport.c" } -static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +gdk_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -441,7 +497,7 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions g_propagate_error (error, _inner_error_); #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 445 "GdkSupport.c" +#line 501 "GdkSupport.c" } #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp9_ = _tmp0_; @@ -453,11 +509,13 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_tmp0_); #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 457 "GdkSupport.c" +#line 513 "GdkSupport.c" } -static void gdk_reader_class_init (GdkReaderClass * klass) { +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" @@ -466,15 +524,19 @@ static void gdk_reader_class_init (GdkReaderClass * klass) { ((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; -#line 470 "GdkSupport.c" +#line 528 "GdkSupport.c" } -static void gdk_reader_instance_init (GdkReader * self) { +static void +gdk_reader_instance_init (GdkReader * self) +{ } -GType gdk_reader_get_type (void) { +GType +gdk_reader_get_type (void) +{ static volatile gsize gdk_reader_type_id__volatile = 0; if (g_once_init_enter (&gdk_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (GdkReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gdk_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GdkReader), 0, (GInstanceInitFunc) gdk_reader_instance_init, NULL }; @@ -486,53 +548,68 @@ GType gdk_reader_get_type (void) { } -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +GdkSniffer* +gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ GdkSniffer* self = NULL; - 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" - _tmp0_ = file; -#line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = options; -#line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - self = (GdkSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (GdkSniffer*) photo_file_sniffer_construct (object_type, file, options); #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self; -#line 504 "GdkSupport.c" +#line 564 "GdkSupport.c" } -static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self) { +static void +_gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, + gint width, + gint height, + gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_on_size_prepared ((GdkSniffer*) self, _sender, width, height); -#line 511 "GdkSupport.c" +#line 576 "GdkSupport.c" } -static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self) { +static void +_gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_on_area_prepared ((GdkSniffer*) self, _sender); -#line 518 "GdkSupport.c" +#line 586 "GdkSupport.c" } -static guint8* _vala_array_dup5 (guint8* self, int length) { +static guint8* +_vala_array_dup5 (guint8* self, + int length) +{ #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return g_memdup (self, length * sizeof (guint8)); -#line 525 "GdkSupport.c" +#line 596 "GdkSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 532 "GdkSupport.c" +#line 605 "GdkSupport.c" } -static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +gdk_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ GdkSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; @@ -560,12 +637,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, GFileInputStream* fins = NULL; GFile* _tmp29_; GFileInputStream* _tmp30_; - GFileInputStream* _tmp54_; - gboolean _tmp56_; - gboolean _tmp61_ = FALSE; - gboolean _tmp62_; + GFileInputStream* _tmp53_; + gboolean _tmp55_; + gboolean _tmp60_ = FALSE; + gboolean _tmp61_; + DetectedPhotoInformation* _tmp63_; DetectedPhotoInformation* _tmp64_; - DetectedPhotoInformation* _tmp65_; 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); @@ -593,7 +670,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 46 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp4_) { -#line 597 "GdkSupport.c" +#line 674 "GdkSupport.c" GChecksum* _tmp5_; #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = g_checksum_new (G_CHECKSUM_MD5); @@ -601,7 +678,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_checksum_free0 (md5_checksum); #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" md5_checksum = _tmp5_; -#line 605 "GdkSupport.c" +#line 682 "GdkSupport.c" } #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp6_ = self->priv->detected; @@ -611,7 +688,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _media_metadata_unref0 (_tmp6_->metadata); #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp6_->metadata = _tmp7_; -#line 615 "GdkSupport.c" +#line 692 "GdkSupport.c" { DetectedPhotoInformation* _tmp8_; PhotoMetadata* _tmp9_; @@ -626,7 +703,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp10_, &_inner_error_); #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 630 "GdkSupport.c" +#line 707 "GdkSupport.c" goto __catch34_g_error; } } @@ -647,7 +724,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp11_->metadata = NULL; #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_error_free0 (err); -#line 651 "GdkSupport.c" +#line 728 "GdkSupport.c" } __finally34: #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -660,13 +737,13 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 664 "GdkSupport.c" +#line 741 "GdkSupport.c" } #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp13_) { -#line 670 "GdkSupport.c" +#line 747 "GdkSupport.c" DetectedPhotoInformation* _tmp14_; PhotoMetadata* _tmp15_; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -675,15 +752,15 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp15_ = _tmp14_->metadata; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp12_ = _tmp15_ != NULL; -#line 679 "GdkSupport.c" +#line 756 "GdkSupport.c" } else { #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp12_ = FALSE; -#line 683 "GdkSupport.c" +#line 760 "GdkSupport.c" } #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp12_) { -#line 687 "GdkSupport.c" +#line 764 "GdkSupport.c" DetectedPhotoInformation* _tmp16_; DetectedPhotoInformation* _tmp17_; PhotoMetadata* _tmp18_; @@ -716,13 +793,13 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp20_->thumbnail_md5); #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp20_->thumbnail_md5 = _tmp23_; -#line 720 "GdkSupport.c" +#line 797 "GdkSupport.c" } #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp25_) { -#line 726 "GdkSupport.c" +#line 803 "GdkSupport.c" guint8* _tmp26_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp26_ = g_new0 (guint8, 64 * 1024); @@ -734,7 +811,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp24__length1 = 64 * 1024; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" __tmp24__size_ = _tmp24__length1; -#line 738 "GdkSupport.c" +#line 815 "GdkSupport.c" } else { guint8* _tmp27_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -747,7 +824,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp24__length1 = 8 * 1024; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" __tmp24__size_ = _tmp24__length1; -#line 751 "GdkSupport.c" +#line 828 "GdkSupport.c" } #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp28_ = (_tmp24_ != NULL) ? _vala_array_dup5 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_); @@ -781,7 +858,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 785 "GdkSupport.c" +#line 862 "GdkSupport.c" } { gboolean _tmp31_ = FALSE; @@ -789,24 +866,23 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp31_ = TRUE; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" while (TRUE) { -#line 793 "GdkSupport.c" +#line 870 "GdkSupport.c" gsize bytes_read = 0UL; GFileInputStream* _tmp32_; guint8* _tmp33_; gint _tmp33__length1; - gssize _tmp34_; + gsize _tmp34_; gsize _tmp35_; gsize _tmp36_; - gsize _tmp37_; - gboolean _tmp38_; - gboolean _tmp42_ = FALSE; - gboolean _tmp43_; + gboolean _tmp37_; + gboolean _tmp41_ = FALSE; + gboolean _tmp42_; + gboolean _tmp47_ = FALSE; gboolean _tmp48_ = FALSE; - gboolean _tmp49_ = FALSE; - gboolean _tmp50_; + gboolean _tmp49_; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (!_tmp31_) { -#line 810 "GdkSupport.c" +#line 886 "GdkSupport.c" } #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp31_ = FALSE; @@ -817,9 +893,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp33__length1 = buffer_length1; #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp34_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), _tmp33_, (gsize) _tmp33__length1, NULL, &_inner_error_); -#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - bytes_read = (gsize) _tmp34_; + bytes_read = (gsize) g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), _tmp33_, (gsize) _tmp33__length1, NULL, &_inner_error_); #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -836,75 +910,75 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 840 "GdkSupport.c" +#line 914 "GdkSupport.c" } #line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp35_ = bytes_read; + _tmp34_ = bytes_read; #line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp35_ <= ((gsize) 0)) { + if (_tmp34_ <= ((gsize) 0)) { #line 72 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" break; -#line 848 "GdkSupport.c" +#line 922 "GdkSupport.c" } #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp36_ = count; + _tmp35_ = count; #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp37_ = bytes_read; + _tmp36_ = bytes_read; #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - count = _tmp36_ + _tmp37_; + count = _tmp35_ + _tmp36_; #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp38_) { -#line 860 "GdkSupport.c" - GChecksum* _tmp39_; - guint8* _tmp40_; - gint _tmp40__length1; - gsize _tmp41_; + if (_tmp37_) { +#line 934 "GdkSupport.c" + GChecksum* _tmp38_; + guint8* _tmp39_; + gint _tmp39__length1; + gsize _tmp40_; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp39_ = md5_checksum; + _tmp38_ = md5_checksum; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp40_ = buffer; + _tmp39_ = buffer; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp40__length1 = buffer_length1; + _tmp39__length1 = buffer_length1; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp41_ = bytes_read; + _tmp40_ = bytes_read; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - g_checksum_update (_tmp39_, _tmp40_, _tmp41_); -#line 875 "GdkSupport.c" + g_checksum_update (_tmp38_, _tmp39_, _tmp40_); +#line 949 "GdkSupport.c" } #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp43_ = self->priv->size_ready; + _tmp42_ = self->priv->size_ready; #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp43_) { + if (!_tmp42_) { #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp42_ = TRUE; -#line 883 "GdkSupport.c" + _tmp41_ = TRUE; +#line 957 "GdkSupport.c" } else { - gboolean _tmp44_; + gboolean _tmp43_; #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp44_ = self->priv->area_prepared; + _tmp43_ = self->priv->area_prepared; #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp42_ = !_tmp44_; -#line 890 "GdkSupport.c" + _tmp41_ = !_tmp43_; +#line 964 "GdkSupport.c" } #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp42_) { -#line 894 "GdkSupport.c" - GdkPixbufLoader* _tmp45_; - guint8* _tmp46_; - gint _tmp46__length1; - gsize _tmp47_; + if (_tmp41_) { +#line 968 "GdkSupport.c" + GdkPixbufLoader* _tmp44_; + guint8* _tmp45_; + gint _tmp45__length1; + gsize _tmp46_; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp45_ = pixbuf_loader; + _tmp44_ = pixbuf_loader; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp46_ = buffer; + _tmp45_ = buffer; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp46__length1 = buffer_length1; + _tmp45__length1 = buffer_length1; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp47_ = bytes_read; + _tmp46_ = bytes_read; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - gdk_pixbuf_loader_write (_tmp45_, _tmp46_ + 0, (gsize) (((gint) _tmp47_) - 0), &_inner_error_); + gdk_pixbuf_loader_write (_tmp44_, _tmp45_ + 0, (gsize) (((gint) _tmp46_) - 0), &_inner_error_); #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -921,56 +995,56 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 925 "GdkSupport.c" +#line 999 "GdkSupport.c" } } #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp49_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp50_) { -#line 932 "GdkSupport.c" - gboolean _tmp51_; + if (!_tmp49_) { +#line 1006 "GdkSupport.c" + gboolean _tmp50_; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp51_ = self->priv->size_ready; + _tmp50_ = self->priv->size_ready; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp49_ = _tmp51_; -#line 938 "GdkSupport.c" + _tmp48_ = _tmp50_; +#line 1012 "GdkSupport.c" } else { #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp49_ = FALSE; -#line 942 "GdkSupport.c" + _tmp48_ = FALSE; +#line 1016 "GdkSupport.c" } #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp49_) { -#line 946 "GdkSupport.c" - gboolean _tmp52_; + if (_tmp48_) { +#line 1020 "GdkSupport.c" + gboolean _tmp51_; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp52_ = self->priv->area_prepared; + _tmp51_ = self->priv->area_prepared; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp48_ = _tmp52_; -#line 952 "GdkSupport.c" + _tmp47_ = _tmp51_; +#line 1026 "GdkSupport.c" } else { #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp48_ = FALSE; -#line 956 "GdkSupport.c" + _tmp47_ = FALSE; +#line 1030 "GdkSupport.c" } #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp48_) { + if (_tmp47_) { #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" break; -#line 962 "GdkSupport.c" +#line 1036 "GdkSupport.c" } } } { - GdkPixbufLoader* _tmp53_; + GdkPixbufLoader* _tmp52_; #line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp53_ = pixbuf_loader; + _tmp52_ = pixbuf_loader; #line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - gdk_pixbuf_loader_close (_tmp53_, &_inner_error_); + gdk_pixbuf_loader_close (_tmp52_, &_inner_error_); #line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 974 "GdkSupport.c" +#line 1048 "GdkSupport.c" goto __catch35_g_error; } } @@ -984,7 +1058,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = NULL; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_error_free0 (err); -#line 988 "GdkSupport.c" +#line 1062 "GdkSupport.c" } __finally35: #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1003,18 +1077,18 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 1007 "GdkSupport.c" +#line 1081 "GdkSupport.c" } #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp54_ = fins; + _tmp53_ = fins; #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp54_ != NULL) { -#line 1013 "GdkSupport.c" - GFileInputStream* _tmp55_; + if (_tmp53_ != NULL) { +#line 1087 "GdkSupport.c" + GFileInputStream* _tmp54_; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp55_ = fins; + _tmp54_ = fins; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); + g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1031,55 +1105,55 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 1035 "GdkSupport.c" +#line 1109 "GdkSupport.c" } } #line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp56_) { -#line 1042 "GdkSupport.c" - DetectedPhotoInformation* _tmp57_; - GChecksum* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; + if (_tmp55_) { +#line 1116 "GdkSupport.c" + DetectedPhotoInformation* _tmp56_; + GChecksum* _tmp57_; + const gchar* _tmp58_; + gchar* _tmp59_; #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp57_ = self->priv->detected; + _tmp56_ = self->priv->detected; #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp58_ = md5_checksum; + _tmp57_ = md5_checksum; #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp59_ = g_checksum_get_string (_tmp58_); + _tmp58_ = g_checksum_get_string (_tmp57_); #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp60_ = g_strdup (_tmp59_); + _tmp59_ = g_strdup (_tmp58_); #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _g_free0 (_tmp57_->md5); + _g_free0 (_tmp56_->md5); #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp57_->md5 = _tmp60_; -#line 1059 "GdkSupport.c" + _tmp56_->md5 = _tmp59_; +#line 1133 "GdkSupport.c" } #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp62_ = self->priv->size_ready; + _tmp61_ = self->priv->size_ready; #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp62_) { + if (!_tmp61_) { #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp61_ = TRUE; -#line 1067 "GdkSupport.c" + _tmp60_ = TRUE; +#line 1141 "GdkSupport.c" } else { - gboolean _tmp63_; + gboolean _tmp62_; #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp63_ = self->priv->area_prepared; + _tmp62_ = self->priv->area_prepared; #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp61_ = !_tmp63_; -#line 1074 "GdkSupport.c" + _tmp60_ = !_tmp62_; +#line 1148 "GdkSupport.c" } #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _vala_is_corrupted = _tmp61_; + _vala_is_corrupted = _tmp60_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp64_ = self->priv->detected; + _tmp63_ = self->priv->detected; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp65_ = _detected_photo_information_ref0 (_tmp64_); + _tmp64_ = _detected_photo_information_ref0 (_tmp63_); #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - result = _tmp65_; + result = _tmp64_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (fins); #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1094,18 +1168,21 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1098 "GdkSupport.c" +#line 1172 "GdkSupport.c" } #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 1102 "GdkSupport.c" +#line 1176 "GdkSupport.c" } -static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loader, gint width, gint height) { +static void +gdk_sniffer_on_size_prepared (GdkSniffer* self, + GdkPixbufLoader* loader, + gint width, + gint height) +{ DetectedPhotoInformation* _tmp0_; - gint _tmp1_; - gint _tmp2_; #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (IS_GDK_SNIFFER (self)); #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1113,130 +1190,115 @@ static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loa #line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp0_ = self->priv->detected; #line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = width; -#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp2_ = height; -#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - dimensions_init (&_tmp0_->image_dim, _tmp1_, _tmp2_); + dimensions_init (&_tmp0_->image_dim, width, height); #line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->size_ready = TRUE; -#line 1124 "GdkSupport.c" +#line 1197 "GdkSupport.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self ? g_object_ref (self) : NULL; -#line 1131 "GdkSupport.c" +#line 1206 "GdkSupport.c" } -static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader) { +static void +gdk_sniffer_on_area_prepared (GdkSniffer* self, + GdkPixbufLoader* pixbuf_loader) +{ GdkPixbuf* pixbuf = NULL; - GdkPixbufLoader* _tmp0_; + GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; - DetectedPhotoInformation* _tmp4_; - GdkPixbuf* _tmp5_; - GdkColorspace _tmp6_; + DetectedPhotoInformation* _tmp3_; + GdkPixbuf* _tmp4_; + DetectedPhotoInformation* _tmp5_; + GdkPixbuf* _tmp6_; DetectedPhotoInformation* _tmp7_; GdkPixbuf* _tmp8_; - gint _tmp9_; - DetectedPhotoInformation* _tmp10_; - GdkPixbuf* _tmp11_; - gint _tmp12_; GdkPixbufFormat* format = NULL; - GdkPixbufLoader* _tmp13_; - GdkPixbufFormat* _tmp14_; - DetectedPhotoInformation* _tmp15_; - GdkPixbufFormat* _tmp16_; - gchar* _tmp17_; - DetectedPhotoInformation* _tmp18_; - DetectedPhotoInformation* _tmp19_; - const gchar* _tmp20_; - PhotoFileFormat _tmp21_; + GdkPixbufFormat* _tmp9_; + DetectedPhotoInformation* _tmp10_; + GdkPixbufFormat* _tmp11_; + gchar* _tmp12_; + DetectedPhotoInformation* _tmp13_; + DetectedPhotoInformation* _tmp14_; + const gchar* _tmp15_; #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" g_return_if_fail (GDK_IS_PIXBUF_LOADER (pixbuf_loader)); #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp0_ = pixbuf_loader; + _tmp0_ = gdk_pixbuf_loader_get_pixbuf (pixbuf_loader); #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = gdk_pixbuf_loader_get_pixbuf (_tmp0_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); -#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - pixbuf = _tmp2_; + pixbuf = _tmp1_; #line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp3_ = pixbuf; + _tmp2_ = pixbuf; #line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf); #line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return; -#line 1180 "GdkSupport.c" +#line 1250 "GdkSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp4_ = self->priv->detected; -#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp5_ = pixbuf; + _tmp3_ = self->priv->detected; #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp6_ = gdk_pixbuf_get_colorspace (_tmp5_); + _tmp4_ = pixbuf; #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp4_->colorspace = _tmp6_; + _tmp3_->colorspace = gdk_pixbuf_get_colorspace (_tmp4_); #line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp7_ = self->priv->detected; + _tmp5_ = self->priv->detected; #line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp8_ = pixbuf; + _tmp6_ = pixbuf; #line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp9_ = gdk_pixbuf_get_n_channels (_tmp8_); -#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp7_->channels = _tmp9_; -#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp10_ = self->priv->detected; + _tmp5_->channels = gdk_pixbuf_get_n_channels (_tmp6_); #line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp11_ = pixbuf; + _tmp7_ = self->priv->detected; #line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp12_ = gdk_pixbuf_get_bits_per_sample (_tmp11_); + _tmp8_ = pixbuf; #line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp10_->bits_per_channel = _tmp12_; -#line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp13_ = pixbuf_loader; + _tmp7_->bits_per_channel = gdk_pixbuf_get_bits_per_sample (_tmp8_); #line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp14_ = gdk_pixbuf_loader_get_format (_tmp13_); + _tmp9_ = gdk_pixbuf_loader_get_format (pixbuf_loader); #line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - format = _tmp14_; + format = _tmp9_; #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp15_ = self->priv->detected; + _tmp10_ = self->priv->detected; #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp16_ = format; + _tmp11_ = format; #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp17_ = gdk_pixbuf_format_get_name (_tmp16_); + _tmp12_ = gdk_pixbuf_format_get_name (_tmp11_); #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _g_free0 (_tmp15_->format_name); + _g_free0 (_tmp10_->format_name); #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp15_->format_name = _tmp17_; -#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp18_ = self->priv->detected; + _tmp10_->format_name = _tmp12_; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp19_ = self->priv->detected; + _tmp13_ = self->priv->detected; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp20_ = _tmp19_->format_name; + _tmp14_ = self->priv->detected; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp21_ = photo_file_format_from_pixbuf_name (_tmp20_); + _tmp15_ = _tmp14_->format_name; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp18_->file_format = _tmp21_; + _tmp13_->file_format = photo_file_format_from_pixbuf_name (_tmp15_); #line 124 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->area_prepared = TRUE; #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf); -#line 1236 "GdkSupport.c" +#line 1296 "GdkSupport.c" } -static void gdk_sniffer_class_init (GdkSnifferClass * klass) { +static void +gdk_sniffer_class_init (GdkSnifferClass * klass) +{ #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_parent_class = g_type_class_peek_parent (klass); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1245,11 +1307,13 @@ static void gdk_sniffer_class_init (GdkSnifferClass * klass) { 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; -#line 1249 "GdkSupport.c" +#line 1311 "GdkSupport.c" } -static void gdk_sniffer_instance_init (GdkSniffer * self) { +static void +gdk_sniffer_instance_init (GdkSniffer * self) +{ #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv = GDK_SNIFFER_GET_PRIVATE (self); #line 29 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1258,11 +1322,13 @@ static void gdk_sniffer_instance_init (GdkSniffer * self) { self->priv->size_ready = FALSE; #line 31 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->area_prepared = FALSE; -#line 1262 "GdkSupport.c" +#line 1326 "GdkSupport.c" } -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); @@ -1270,11 +1336,13 @@ static void gdk_sniffer_finalize (PhotoFileSniffer * obj) { _detected_photo_information_unref0 (self->priv->detected); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" PHOTO_FILE_SNIFFER_CLASS (gdk_sniffer_parent_class)->finalize (obj); -#line 1274 "GdkSupport.c" +#line 1340 "GdkSupport.c" } -GType gdk_sniffer_get_type (void) { +GType +gdk_sniffer_get_type (void) +{ static volatile gsize gdk_sniffer_type_id__volatile = 0; if (g_once_init_enter (&gdk_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (GdkSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gdk_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GdkSniffer), 0, (GInstanceInitFunc) gdk_sniffer_instance_init, NULL }; -- cgit v1.2.3