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/BmpSupport.c | 12 +- src/photos/GRaw.c | 10 +- src/photos/GdkSupport.c | 929 +++--- src/photos/GdkSupport.vala | 9 +- src/photos/JfifSupport.c | 522 ++-- src/photos/JfifSupport.vala | 22 +- src/photos/PhotoFileAdapter.c | 2 +- src/photos/PhotoFileFormat.c | 54 +- src/photos/PhotoMetadata.c | 6371 ++++++++++++++++++++--------------------- src/photos/PhotoMetadata.vala | 92 +- src/photos/PngSupport.c | 12 +- src/photos/RawSupport.c | 1215 ++++---- src/photos/RawSupport.vala | 9 +- src/photos/TiffSupport.c | 12 +- 14 files changed, 4548 insertions(+), 4723 deletions(-) (limited to 'src/photos') diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c index eeffbb9..e6f204c 100644 --- a/src/photos/BmpSupport.c +++ b/src/photos/BmpSupport.c @@ -502,10 +502,10 @@ static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (Ph static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup10 (gchar** self, int length); +static gchar** _vala_array_dup8 (gchar** self, int length); static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup11 (gchar** self, int length); +static gchar** _vala_array_dup9 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer photo_file_sniffer_ref (gpointer instance); @@ -716,7 +716,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_extension (Phot } -static gchar** _vala_array_dup10 (gchar** self, int length) { +static gchar** _vala_array_dup8 (gchar** self, int length) { gchar** result; int i; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -753,7 +753,7 @@ static gchar** photos_bmp_file_format_properties_real_get_known_extensions (Phot #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0__length1 = photos_bmp_file_format_properties_KNOWN_EXTENSIONS_length1; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup10 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1__length1 = _tmp0__length1; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -799,7 +799,7 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot } -static gchar** _vala_array_dup11 (gchar** self, int length) { +static gchar** _vala_array_dup9 (gchar** self, int length) { gchar** result; int i; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -836,7 +836,7 @@ static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileF #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0__length1 = photos_bmp_file_format_properties_KNOWN_MIME_TYPES_length1; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup11 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1__length1 = _tmp0__length1; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c index 6ea3ba4..304cc1a 100644 --- a/src/photos/GRaw.c +++ b/src/photos/GRaw.c @@ -531,7 +531,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_bytes_unref0 (bytes); #line 534 "GRaw.c" - goto __catch29_g_error; + goto __catch33_g_error; } #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp13_ = _tmp7_; @@ -547,8 +547,8 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type _g_bytes_unref0 (bytes); #line 549 "GRaw.c" } - goto __finally29; - __catch29_g_error: + goto __finally33; + __catch33_g_error: { GError* err = NULL; GError* _tmp14_; @@ -569,9 +569,9 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_error_free0 (err); #line 572 "GRaw.c" - goto __finally29; + goto __finally33; } - __finally29: + __finally33: #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" 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" } diff --git a/src/photos/GdkSupport.vala b/src/photos/GdkSupport.vala index 51ae72c..2fd1926 100644 --- a/src/photos/GdkSupport.vala +++ b/src/photos/GdkSupport.vala @@ -55,13 +55,8 @@ public abstract class GdkSniffer : PhotoFileSniffer { } if (calc_md5 && detected.metadata != null) { - uint8[]? flattened_sans_thumbnail = detected.metadata.flatten_exif(false); - if (flattened_sans_thumbnail != null && flattened_sans_thumbnail.length > 0) - detected.exif_md5 = md5_binary(flattened_sans_thumbnail, flattened_sans_thumbnail.length); - - uint8[]? flattened_thumbnail = detected.metadata.flatten_exif_preview(); - if (flattened_thumbnail != null && flattened_thumbnail.length > 0) - detected.thumbnail_md5 = md5_binary(flattened_thumbnail, flattened_thumbnail.length); + detected.exif_md5 = detected.metadata.exif_hash(); + detected.thumbnail_md5 = detected.metadata.thumbnail_hash(); } // if no MD5, don't read as much, as the needed info will probably be gleaned diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c index baaaf55..190c4c2 100644 --- a/src/photos/JfifSupport.c +++ b/src/photos/JfifSupport.c @@ -568,10 +568,10 @@ static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFil static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup8 (gchar** self, int length); +static gchar** _vala_array_dup6 (gchar** self, int length); static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup9 (gchar** self, int length); +static gchar** _vala_array_dup7 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); @@ -616,7 +616,9 @@ guint8 jpeg_marker_get_byte (JpegMarker self); gint jpeg_quality_get_pct (JpegQuality self); JpegQuality* jpeg_quality_get_all (int* result_length1); gchar* jpeg_quality_to_string (JpegQuality self); -gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** error); +gboolean jpeg_is_jpeg_stream (GInputStream* ins, GError** error); +gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error); +gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error); void jfif_file_format_driver_init (void) { @@ -629,14 +631,14 @@ void jfif_file_format_driver_init (void) { jfif_file_format_driver_instance = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_properties_init (); -#line 633 "JfifSupport.c" +#line 635 "JfifSupport.c" } static gpointer _photo_file_format_driver_ref0 (gpointer self) { #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 640 "JfifSupport.c" +#line 642 "JfifSupport.c" } @@ -652,7 +654,7 @@ JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) { result = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 656 "JfifSupport.c" +#line 658 "JfifSupport.c" } @@ -668,7 +670,7 @@ static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (P result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 20 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 672 "JfifSupport.c" +#line 674 "JfifSupport.c" } @@ -689,7 +691,7 @@ static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFor result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 693 "JfifSupport.c" +#line 695 "JfifSupport.c" } @@ -705,7 +707,7 @@ static PhotoMetadata* jfif_file_format_driver_real_create_metadata (PhotoFileFor result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 709 "JfifSupport.c" +#line 711 "JfifSupport.c" } @@ -718,7 +720,7 @@ static gboolean jfif_file_format_driver_real_can_write_image (PhotoFileFormatDri result = TRUE; #line 32 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 722 "JfifSupport.c" +#line 724 "JfifSupport.c" } @@ -731,7 +733,7 @@ static gboolean jfif_file_format_driver_real_can_write_metadata (PhotoFileFormat result = TRUE; #line 36 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 735 "JfifSupport.c" +#line 737 "JfifSupport.c" } @@ -752,7 +754,7 @@ static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFor result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 756 "JfifSupport.c" +#line 758 "JfifSupport.c" } @@ -773,7 +775,7 @@ static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_wri result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 777 "JfifSupport.c" +#line 779 "JfifSupport.c" } @@ -797,7 +799,7 @@ static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileF result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 801 "JfifSupport.c" +#line 803 "JfifSupport.c" } @@ -807,14 +809,14 @@ JfifFileFormatDriver* jfif_file_format_driver_construct (GType object_type) { self = (JfifFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 811 "JfifSupport.c" +#line 813 "JfifSupport.c" } JfifFileFormatDriver* jfif_file_format_driver_new (void) { #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_file_format_driver_construct (TYPE_JFIF_FILE_FORMAT_DRIVER); -#line 818 "JfifSupport.c" +#line 820 "JfifSupport.c" } @@ -839,7 +841,7 @@ static void jfif_file_format_driver_class_init (JfifFileFormatDriverClass * klas ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) jfif_file_format_driver_real_create_metadata_writer; #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) jfif_file_format_driver_real_create_sniffer; -#line 843 "JfifSupport.c" +#line 845 "JfifSupport.c" } @@ -853,7 +855,7 @@ static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (jfif_file_format_driver_parent_class)->finalize (obj); -#line 857 "JfifSupport.c" +#line 859 "JfifSupport.c" } @@ -877,14 +879,14 @@ void jfif_file_format_properties_init (void) { _photo_file_format_properties_unref0 (jfif_file_format_properties_instance); #line 64 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_properties_instance = _tmp0_; -#line 881 "JfifSupport.c" +#line 883 "JfifSupport.c" } static gpointer _photo_file_format_properties_ref0 (gpointer self) { #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 888 "JfifSupport.c" +#line 890 "JfifSupport.c" } @@ -900,7 +902,7 @@ JfifFileFormatProperties* jfif_file_format_properties_get_instance (void) { result = _tmp1_; #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 904 "JfifSupport.c" +#line 906 "JfifSupport.c" } @@ -913,7 +915,7 @@ static PhotoFileFormat jfif_file_format_properties_real_get_file_format (PhotoFi result = PHOTO_FILE_FORMAT_JFIF; #line 72 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 917 "JfifSupport.c" +#line 919 "JfifSupport.c" } @@ -926,7 +928,7 @@ static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFil result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 76 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 930 "JfifSupport.c" +#line 932 "JfifSupport.c" } @@ -942,7 +944,7 @@ static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileF result = _tmp0_; #line 80 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 946 "JfifSupport.c" +#line 948 "JfifSupport.c" } @@ -958,28 +960,28 @@ static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileF result = _tmp0_; #line 84 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 962 "JfifSupport.c" +#line 964 "JfifSupport.c" } -static gchar** _vala_array_dup8 (gchar** self, int length) { +static gchar** _vala_array_dup6 (gchar** self, int length) { gchar** result; int i; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = g_new0 (gchar*, length + 1); #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" for (i = 0; i < length; i++) { -#line 973 "JfifSupport.c" +#line 975 "JfifSupport.c" gchar* _tmp0_; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = g_strdup (self[i]); #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result[i] = _tmp0_; -#line 979 "JfifSupport.c" +#line 981 "JfifSupport.c" } #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 983 "JfifSupport.c" +#line 985 "JfifSupport.c" } @@ -999,7 +1001,7 @@ static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileF #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0__length1 = jfif_file_format_properties_KNOWN_EXTENSIONS_length1; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup8 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup6 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp1__length1 = _tmp0__length1; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1010,13 +1012,13 @@ static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileF if (result_length1) { #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *result_length1 = _tmp2__length1; -#line 1014 "JfifSupport.c" +#line 1016 "JfifSupport.c" } #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp2_; #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1020 "JfifSupport.c" +#line 1022 "JfifSupport.c" } @@ -1041,28 +1043,28 @@ static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileF result = _tmp2_; #line 92 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1045 "JfifSupport.c" +#line 1047 "JfifSupport.c" } -static gchar** _vala_array_dup9 (gchar** self, int length) { +static gchar** _vala_array_dup7 (gchar** self, int length) { gchar** result; int i; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = g_new0 (gchar*, length + 1); #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" for (i = 0; i < length; i++) { -#line 1056 "JfifSupport.c" +#line 1058 "JfifSupport.c" gchar* _tmp0_; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = g_strdup (self[i]); #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result[i] = _tmp0_; -#line 1062 "JfifSupport.c" +#line 1064 "JfifSupport.c" } #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1066 "JfifSupport.c" +#line 1068 "JfifSupport.c" } @@ -1082,7 +1084,7 @@ static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatP #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0__length1 = jfif_file_format_properties_KNOWN_MIME_TYPES_length1; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup9 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup7 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp1__length1 = _tmp0__length1; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1093,13 +1095,13 @@ static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatP if (result_length1) { #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *result_length1 = _tmp2__length1; -#line 1097 "JfifSupport.c" +#line 1099 "JfifSupport.c" } #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1103 "JfifSupport.c" +#line 1105 "JfifSupport.c" } @@ -1109,14 +1111,14 @@ JfifFileFormatProperties* jfif_file_format_properties_construct (GType object_ty self = (JfifFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1113 "JfifSupport.c" +#line 1115 "JfifSupport.c" } JfifFileFormatProperties* jfif_file_format_properties_new (void) { #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_file_format_properties_construct (TYPE_JFIF_FILE_FORMAT_PROPERTIES); -#line 1120 "JfifSupport.c" +#line 1122 "JfifSupport.c" } @@ -1178,7 +1180,7 @@ static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClas jfif_file_format_properties_KNOWN_MIME_TYPES = _tmp6_; #line 57 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 1182 "JfifSupport.c" +#line 1184 "JfifSupport.c" } @@ -1192,7 +1194,7 @@ static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * ob self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_JFIF_FILE_FORMAT_PROPERTIES, JfifFileFormatProperties); #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (jfif_file_format_properties_parent_class)->finalize (obj); -#line 1196 "JfifSupport.c" +#line 1198 "JfifSupport.c" } @@ -1222,21 +1224,21 @@ JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSn self = (JfifSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1226 "JfifSupport.c" +#line 1228 "JfifSupport.c" } JfifSniffer* jfif_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_sniffer_construct (TYPE_JFIF_SNIFFER, file, options); -#line 1233 "JfifSupport.c" +#line 1235 "JfifSupport.c" } static gpointer _detected_photo_information_ref0 (gpointer self) { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1240 "JfifSupport.c" +#line 1242 "JfifSupport.c" } @@ -1272,7 +1274,7 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base g_propagate_error (error, _inner_error_); #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return NULL; -#line 1276 "JfifSupport.c" +#line 1278 "JfifSupport.c" } #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (!_tmp0_) { @@ -1282,11 +1284,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base if (is_corrupted) { #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1286 "JfifSupport.c" +#line 1288 "JfifSupport.c" } #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1290 "JfifSupport.c" +#line 1292 "JfifSupport.c" } #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (jfif_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_); @@ -1300,7 +1302,7 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base g_propagate_error (error, _inner_error_); #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return NULL; -#line 1304 "JfifSupport.c" +#line 1306 "JfifSupport.c" } #line 113 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp5_ = detected; @@ -1314,11 +1316,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base if (is_corrupted) { #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1318 "JfifSupport.c" +#line 1320 "JfifSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1322 "JfifSupport.c" +#line 1324 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp7_ = detected; @@ -1326,17 +1328,17 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base _tmp8_ = _tmp7_->file_format; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (_tmp8_ == PHOTO_FILE_FORMAT_JFIF) { -#line 1330 "JfifSupport.c" +#line 1332 "JfifSupport.c" DetectedPhotoInformation* _tmp9_; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp9_ = detected; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp6_ = _tmp9_; -#line 1336 "JfifSupport.c" +#line 1338 "JfifSupport.c" } else { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp6_ = NULL; -#line 1340 "JfifSupport.c" +#line 1342 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp10_ = _detected_photo_information_ref0 (_tmp6_); @@ -1348,11 +1350,11 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base if (is_corrupted) { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1352 "JfifSupport.c" +#line 1354 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1356 "JfifSupport.c" +#line 1358 "JfifSupport.c" } @@ -1361,7 +1363,7 @@ static void jfif_sniffer_class_init (JfifSnifferClass * klass) { jfif_sniffer_parent_class = g_type_class_peek_parent (klass); #line 100 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) jfif_sniffer_real_sniff; -#line 1365 "JfifSupport.c" +#line 1367 "JfifSupport.c" } @@ -1392,21 +1394,21 @@ JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath) { self = (JfifReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1396 "JfifSupport.c" +#line 1398 "JfifSupport.c" } JfifReader* jfif_reader_new (const gchar* filepath) { #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_reader_construct (TYPE_JFIF_READER, filepath); -#line 1403 "JfifSupport.c" +#line 1405 "JfifSupport.c" } static void jfif_reader_class_init (JfifReaderClass * klass) { #line 120 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_reader_parent_class = g_type_class_peek_parent (klass); -#line 1410 "JfifSupport.c" +#line 1412 "JfifSupport.c" } @@ -1437,14 +1439,14 @@ JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath) { self = (JfifWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1441 "JfifSupport.c" +#line 1443 "JfifSupport.c" } JfifWriter* jfif_writer_new (const gchar* filepath) { #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_writer_construct (TYPE_JFIF_WRITER, filepath); -#line 1448 "JfifSupport.c" +#line 1450 "JfifSupport.c" } @@ -1485,7 +1487,7 @@ static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, Jp g_propagate_error (error, _inner_error_); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return; -#line 1489 "JfifSupport.c" +#line 1491 "JfifSupport.c" } } @@ -1495,7 +1497,7 @@ static void jfif_writer_class_init (JfifWriterClass * klass) { jfif_writer_parent_class = g_type_class_peek_parent (klass); #line 126 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) jfif_writer_real_write; -#line 1499 "JfifSupport.c" +#line 1501 "JfifSupport.c" } @@ -1526,14 +1528,14 @@ JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gch self = (JfifMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1530 "JfifSupport.c" +#line 1532 "JfifSupport.c" } JfifMetadataWriter* jfif_metadata_writer_new (const gchar* filepath) { #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return jfif_metadata_writer_construct (TYPE_JFIF_METADATA_WRITER, filepath); -#line 1537 "JfifSupport.c" +#line 1539 "JfifSupport.c" } @@ -1563,7 +1565,7 @@ static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* b g_propagate_error (error, _inner_error_); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return; -#line 1567 "JfifSupport.c" +#line 1569 "JfifSupport.c" } } @@ -1573,7 +1575,7 @@ static void jfif_metadata_writer_class_init (JfifMetadataWriterClass * klass) { jfif_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 136 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) jfif_metadata_writer_real_write_metadata; -#line 1577 "JfifSupport.c" +#line 1579 "JfifSupport.c" } @@ -1599,7 +1601,7 @@ guint8 jpeg_marker_get_byte (JpegMarker self) { result = (guint8) self; #line 160 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1603 "JfifSupport.c" +#line 1605 "JfifSupport.c" } @@ -1621,7 +1623,7 @@ gint jpeg_quality_get_pct (JpegQuality self) { result = (gint) self; #line 171 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1625 "JfifSupport.c" +#line 1627 "JfifSupport.c" } @@ -1634,7 +1636,7 @@ gchar* jpeg_quality_get_pct_text (JpegQuality self) { result = _tmp0_; #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1638 "JfifSupport.c" +#line 1640 "JfifSupport.c" } @@ -1661,13 +1663,13 @@ JpegQuality* jpeg_quality_get_all (int* result_length1) { if (result_length1) { #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *result_length1 = _tmp1__length1; -#line 1665 "JfifSupport.c" +#line 1667 "JfifSupport.c" } #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = _tmp1_; #line 179 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1671 "JfifSupport.c" +#line 1673 "JfifSupport.c" } @@ -1677,7 +1679,7 @@ gchar* jpeg_quality_to_string (JpegQuality self) { switch (self) { #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_LOW: -#line 1681 "JfifSupport.c" +#line 1683 "JfifSupport.c" { gchar* _tmp0_; #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1686,11 +1688,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp0_; #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1690 "JfifSupport.c" +#line 1692 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_MEDIUM: -#line 1694 "JfifSupport.c" +#line 1696 "JfifSupport.c" { gchar* _tmp1_; #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1699,11 +1701,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp1_; #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1703 "JfifSupport.c" +#line 1705 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_HIGH: -#line 1707 "JfifSupport.c" +#line 1709 "JfifSupport.c" { gchar* _tmp2_; #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1712,11 +1714,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp2_; #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1716 "JfifSupport.c" +#line 1718 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_MAXIMUM: -#line 1720 "JfifSupport.c" +#line 1722 "JfifSupport.c" { gchar* _tmp3_; #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1725,12 +1727,12 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp3_; #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1729 "JfifSupport.c" +#line 1731 "JfifSupport.c" } default: #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" break; -#line 1734 "JfifSupport.c" +#line 1736 "JfifSupport.c" } #line 197 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_warn_if_reached (); @@ -1738,7 +1740,7 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = NULL; #line 199 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1742 "JfifSupport.c" +#line 1744 "JfifSupport.c" } @@ -1759,13 +1761,9 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) { GFileInputStream* fins = NULL; GFile* _tmp0_; GFileInputStream* _tmp1_; - JpegMarker marker = 0; - gint segment_length = 0; - GFileInputStream* _tmp3_; - JpegMarker _tmp4_ = 0; - gint _tmp5_; - gboolean _tmp7_ = FALSE; - JpegMarker _tmp8_; + gboolean _tmp3_ = FALSE; + GFileInputStream* _tmp4_; + gboolean _tmp5_; GError * _inner_error_ = NULL; #line 203 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); @@ -1777,65 +1775,136 @@ gboolean jpeg_is_jpeg (GFile* file, GError** error) { fins = _tmp1_; #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1781 "JfifSupport.c" +#line 1779 "JfifSupport.c" gboolean _tmp2_ = FALSE; #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return _tmp2_; -#line 1787 "JfifSupport.c" +#line 1785 "JfifSupport.c" } -#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp3_ = fins; -#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp5_ = jpeg_read_marker (_tmp3_, &_tmp4_, &_inner_error_); -#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - marker = _tmp4_; -#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - segment_length = _tmp5_; -#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp4_ = fins; +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp5_ = jpeg_is_jpeg_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), &_inner_error_); +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp3_ = _tmp5_; +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1799 "JfifSupport.c" +#line 1795 "JfifSupport.c" gboolean _tmp6_ = FALSE; -#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); -#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (fins); -#line 207 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return _tmp6_; -#line 1807 "JfifSupport.c" +#line 1803 "JfifSupport.c" } +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + result = _tmp3_; +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _g_object_unref0 (fins); +#line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + return result; +#line 1811 "JfifSupport.c" +} + + +gboolean jpeg_is_jpeg_stream (GInputStream* ins, GError** error) { + gboolean result = FALSE; + JpegMarker marker = 0; + gint segment_length = 0; + GInputStream* _tmp0_; + JpegMarker _tmp1_ = 0; + gint _tmp2_; + gboolean _tmp4_ = FALSE; + GError * _inner_error_ = NULL; +#line 208 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + g_return_val_if_fail (G_IS_INPUT_STREAM (ins), FALSE); #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp8_ = marker; -#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp8_ == JPEG_MARKER_SOI) { -#line 1813 "JfifSupport.c" - gint _tmp9_; + _tmp0_ = ins; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp9_ = segment_length; + _tmp2_ = jpeg_read_marker (_tmp0_, &_tmp1_, &_inner_error_); #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp7_ = _tmp9_ == 0; -#line 1819 "JfifSupport.c" - } else { + marker = _tmp1_; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp7_ = FALSE; -#line 1823 "JfifSupport.c" - } + segment_length = _tmp2_; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp7_; + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1836 "JfifSupport.c" + gboolean _tmp3_ = FALSE; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _g_object_unref0 (fins); + g_propagate_error (error, _inner_error_); #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + return _tmp3_; +#line 1842 "JfifSupport.c" + } +#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + if (marker == JPEG_MARKER_SOI) { +#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp4_ = segment_length == 0; +#line 1848 "JfifSupport.c" + } else { +#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp4_ = FALSE; +#line 1852 "JfifSupport.c" + } +#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + result = _tmp4_; +#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + return result; +#line 1858 "JfifSupport.c" +} + + +gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error) { + gboolean result = FALSE; + GMemoryInputStream* mins = NULL; + GBytes* _tmp0_; + GMemoryInputStream* _tmp1_; + gboolean _tmp2_ = FALSE; + gboolean _tmp3_; + GError * _inner_error_ = NULL; +#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + g_return_val_if_fail (bytes != NULL, FALSE); +#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp0_ = bytes; +#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp1_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp0_); +#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + mins = _tmp1_; +#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp3_ = jpeg_is_jpeg_stream (G_TYPE_CHECK_INSTANCE_CAST (mins, g_input_stream_get_type (), GInputStream), &_inner_error_); +#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp2_ = _tmp3_; +#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + if (G_UNLIKELY (_inner_error_ != NULL)) { +#line 1884 "JfifSupport.c" + gboolean _tmp4_ = FALSE; +#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + g_propagate_error (error, _inner_error_); +#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _g_object_unref0 (mins); +#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + return _tmp4_; +#line 1892 "JfifSupport.c" + } +#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + result = _tmp2_; +#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _g_object_unref0 (mins); +#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1831 "JfifSupport.c" +#line 1900 "JfifSupport.c" } -gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** error) { +gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error) { JpegMarker _vala_marker = 0; gint result = 0; GDataInputStream* dins = NULL; - GFileInputStream* _tmp0_; + GInputStream* _tmp0_; GDataInputStream* _tmp1_; GDataInputStream* _tmp2_; guint8 _tmp3_ = 0U; @@ -1849,171 +1918,186 @@ gint jpeg_read_marker (GFileInputStream* fins, JpegMarker* marker, GError** erro guint16 length = 0U; GDataInputStream* _tmp14_; guint16 _tmp15_; - guint16 _tmp17_; - guint16 _tmp21_; + gboolean _tmp17_ = FALSE; + guint16 _tmp18_; + guint16 _tmp23_; GError * _inner_error_ = NULL; -#line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - g_return_val_if_fail (G_IS_FILE_INPUT_STREAM (fins), 0); -#line 214 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + g_return_val_if_fail (G_IS_INPUT_STREAM (fins), 0); +#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _vala_marker = JPEG_MARKER_INVALID; -#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = fins; -#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); -#line 216 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp1_ = g_data_input_stream_new (_tmp0_); +#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" dins = _tmp1_; -#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 226 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp2_ = dins; -#line 217 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 226 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_data_input_stream_set_byte_order (_tmp2_, G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN); -#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp4_ = dins; -#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp5_ = g_data_input_stream_read_byte (_tmp4_, NULL, &_inner_error_); -#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp3_ = _tmp5_; -#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1878 "JfifSupport.c" +#line 1948 "JfifSupport.c" gint _tmp6_ = 0; -#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); -#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); -#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return _tmp6_; -#line 1886 "JfifSupport.c" +#line 1956 "JfifSupport.c" } -#line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (_tmp3_ != JPEG_MARKER_PREFIX) { -#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = -1; -#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); -#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (marker) { -#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 1898 "JfifSupport.c" +#line 1968 "JfifSupport.c" } -#line 220 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1902 "JfifSupport.c" +#line 1972 "JfifSupport.c" } -#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp8_ = dins; -#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp9_ = g_data_input_stream_read_byte (_tmp8_, NULL, &_inner_error_); -#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp7_ = _tmp9_; -#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1912 "JfifSupport.c" +#line 1982 "JfifSupport.c" gint _tmp10_ = 0; -#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); -#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); -#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return _tmp10_; -#line 1920 "JfifSupport.c" +#line 1990 "JfifSupport.c" } -#line 222 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _vala_marker = (JpegMarker) _tmp7_; -#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp12_ = _vala_marker; -#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (_tmp12_ == JPEG_MARKER_SOI) { -#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp11_ = TRUE; -#line 1930 "JfifSupport.c" +#line 2000 "JfifSupport.c" } else { JpegMarker _tmp13_; -#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp13_ = _vala_marker; -#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp11_ = _tmp13_ == JPEG_MARKER_EOI; -#line 1937 "JfifSupport.c" +#line 2007 "JfifSupport.c" } -#line 223 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (_tmp11_) { -#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = 0; -#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); -#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (marker) { -#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 1949 "JfifSupport.c" +#line 2019 "JfifSupport.c" } -#line 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1953 "JfifSupport.c" +#line 2023 "JfifSupport.c" } -#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp14_ = dins; -#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp15_ = g_data_input_stream_read_uint16 (_tmp14_, NULL, &_inner_error_); -#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" length = _tmp15_; -#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1963 "JfifSupport.c" +#line 2033 "JfifSupport.c" gint _tmp16_ = 0; -#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); -#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); -#line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return _tmp16_; -#line 1971 "JfifSupport.c" +#line 2041 "JfifSupport.c" } -#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp17_ = length; -#line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (((gint) _tmp17_) < 2) { -#line 1977 "JfifSupport.c" - guint16 _tmp18_; - GFileInputStream* _tmp19_; - gint64 _tmp20_; -#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp18_ = length; -#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp18_ = length; +#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + if (((gint) _tmp18_) < 2) { +#line 2047 "JfifSupport.c" + GInputStream* _tmp19_; +#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp19_ = fins; -#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp20_ = G_FILE_INPUT_STREAM_GET_CLASS (_tmp19_)->tell (_tmp19_); -#line 230 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp18_, _tmp20_ - 2); -#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, g_seekable_get_type ()); +#line 2053 "JfifSupport.c" + } else { +#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp17_ = FALSE; +#line 2057 "JfifSupport.c" + } +#line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + if (_tmp17_) { +#line 2061 "JfifSupport.c" + guint16 _tmp20_; + GInputStream* _tmp21_; + gint64 _tmp22_; +#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp20_ = length; +#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp21_ = fins; +#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp22_ = g_seekable_tell (G_TYPE_CHECK_INSTANCE_TYPE (_tmp21_, g_seekable_get_type ()) ? ((GSeekable*) _tmp21_) : NULL); +#line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp20_, _tmp22_ - 2); +#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = -1; -#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); -#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (marker) { -#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 1997 "JfifSupport.c" +#line 2081 "JfifSupport.c" } -#line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2001 "JfifSupport.c" +#line 2085 "JfifSupport.c" } -#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp21_ = length; -#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp21_ - 2; -#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + _tmp23_ = length; +#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" + result = _tmp23_ - 2; +#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); -#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (marker) { -#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 2013 "JfifSupport.c" +#line 2097 "JfifSupport.c" } -#line 236 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" +#line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2017 "JfifSupport.c" +#line 2101 "JfifSupport.c" } diff --git a/src/photos/JfifSupport.vala b/src/photos/JfifSupport.vala index 2861353..5ea64a5 100644 --- a/src/photos/JfifSupport.vala +++ b/src/photos/JfifSupport.vala @@ -201,16 +201,25 @@ namespace Jpeg { } public bool is_jpeg(File file) throws Error { - FileInputStream fins = file.read(null); - + var fins = file.read(null); + return is_jpeg_stream(fins); + } + + public bool is_jpeg_stream(InputStream ins) throws Error { Marker marker; - int segment_length = read_marker(fins, out marker); + int segment_length = read_marker(ins, out marker); // for now, merely checking for SOI return (marker == Marker.SOI) && (segment_length == 0); } - private int read_marker(FileInputStream fins, out Jpeg.Marker marker) throws Error { + public bool is_jpeg_bytes(Bytes bytes) throws Error { + var mins = new MemoryInputStream.from_bytes(bytes); + + return is_jpeg_stream(mins); + } + + private int read_marker(InputStream fins, out Jpeg.Marker marker) throws Error { marker = Jpeg.Marker.INVALID; DataInputStream dins = new DataInputStream(fins); @@ -226,8 +235,9 @@ namespace Jpeg { } uint16 length = dins.read_uint16(); - if (length < 2) { - debug("Invalid length %Xh at ofs %" + int64.FORMAT + "Xh", length, fins.tell() - 2); + if (length < 2 && fins is Seekable) { + debug("Invalid length %Xh at ofs %" + int64.FORMAT + "Xh", length, + (fins as Seekable).tell() - 2); return -1; } diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c index 6ec6ea2..4f46fdc 100644 --- a/src/photos/PhotoFileAdapter.c +++ b/src/photos/PhotoFileAdapter.c @@ -386,7 +386,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { _result_ = _tmp5_; #line 388 "PhotoFileAdapter.c" } - __finally24: + __finally28: { GFile* _tmp6_; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c index a6cb235..604499f 100644 --- a/src/photos/PhotoFileFormat.c +++ b/src/photos/PhotoFileFormat.c @@ -263,22 +263,22 @@ GQuark photo_format_error_quark (void); GType photo_file_format_get_type (void) G_GNUC_CONST; PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1); PhotoFileFormat* photo_file_format_get_supported (int* result_length1); -static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value); +static void _vala_array_add46 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value); PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1); static gboolean ___lambda4_ (PhotoFileFormat format); gboolean photo_file_format_can_write (PhotoFileFormat self); static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); -static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length); +static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length); PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1); -static gboolean ___lambda24_ (PhotoFileFormat format); +static gboolean ___lambda26_ (PhotoFileFormat format); gboolean photo_file_format_can_write_image (PhotoFileFormat self); -static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); -static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length); +static gboolean ____lambda26__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); +static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length); PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1); -static gboolean ___lambda25_ (PhotoFileFormat format); +static gboolean ___lambda27_ (PhotoFileFormat format); gboolean photo_file_format_can_write_metadata (PhotoFileFormat self); -static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); -static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length); +static gboolean ____lambda27__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); +static PhotoFileFormat* _vala_array_dup4 (PhotoFileFormat* self, int length); PhotoFileFormat* photo_file_format_get_writeable (int* result_length1); PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1); PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1); @@ -373,7 +373,7 @@ gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProper gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1); gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, int* result_length1); gchar** photo_file_format_get_editable_mime_types (int* result_length1); -static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add47 (gchar** * array, int* length, int* size, gchar* value); enum { PHOTO_FILE_FORMAT_DRIVER_DUMMY_PROPERTY }; @@ -416,7 +416,7 @@ GQuark photo_format_error_quark (void) { } -static void _vala_array_add43 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value) { +static void _vala_array_add46 (PhotoFileFormat* * array, int* length, int* size, PhotoFileFormat value) { #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if ((*length) == (*size)) { #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -494,7 +494,7 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp7_ = format; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _vala_array_add43 (&applicable, &applicable_length1, &_applicable_size_, _tmp7_); + _vala_array_add46 (&applicable, &applicable_length1, &_applicable_size_, _tmp7_); #line 499 "PhotoFileFormat.c" } } @@ -546,7 +546,7 @@ static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFo } -static PhotoFileFormat* _vala_array_dup1 (PhotoFileFormat* self, int length) { +static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length) { #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_memdup (self, length * sizeof (PhotoFileFormat)); #line 553 "PhotoFileFormat.c" @@ -589,7 +589,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3__length1 = photo_file_format_data_writeable_length1; #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup1 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_); + _tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup2 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_); #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp4__length1 = _tmp3__length1; #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -610,7 +610,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { } -static gboolean ___lambda24_ (PhotoFileFormat format) { +static gboolean ___lambda26_ (PhotoFileFormat format) { gboolean result = FALSE; PhotoFileFormat _tmp0_; gboolean _tmp1_; @@ -626,16 +626,16 @@ static gboolean ___lambda24_ (PhotoFileFormat format) { } -static gboolean ____lambda24__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean ____lambda26__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { gboolean result; - result = ___lambda24_ (format); + result = ___lambda26_ (format); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; #line 635 "PhotoFileFormat.c" } -static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, int length) { +static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length) { #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_memdup (self, length * sizeof (PhotoFileFormat)); #line 642 "PhotoFileFormat.c" @@ -662,7 +662,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 gint _tmp1_; PhotoFileFormat* _tmp2_; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_data_find_applicable (____lambda24__photo_file_format_data_applicable_test, NULL, &_tmp1_); + _tmp2_ = photo_file_format_data_find_applicable (____lambda26__photo_file_format_data_applicable_test, NULL, &_tmp1_); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_data_image_writeable = (g_free (photo_file_format_data_image_writeable), NULL); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -678,7 +678,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3__length1 = photo_file_format_data_image_writeable_length1; #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup2 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_); + _tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup3 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_); #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp4__length1 = _tmp3__length1; #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -699,7 +699,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 } -static gboolean ___lambda25_ (PhotoFileFormat format) { +static gboolean ___lambda27_ (PhotoFileFormat format) { gboolean result = FALSE; PhotoFileFormat _tmp0_; gboolean _tmp1_; @@ -715,16 +715,16 @@ static gboolean ___lambda25_ (PhotoFileFormat format) { } -static gboolean ____lambda25__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean ____lambda27__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { gboolean result; - result = ___lambda25_ (format); + result = ___lambda27_ (format); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; #line 724 "PhotoFileFormat.c" } -static PhotoFileFormat* _vala_array_dup3 (PhotoFileFormat* self, int length) { +static PhotoFileFormat* _vala_array_dup4 (PhotoFileFormat* self, int length) { #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_memdup (self, length * sizeof (PhotoFileFormat)); #line 731 "PhotoFileFormat.c" @@ -751,7 +751,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng gint _tmp1_; PhotoFileFormat* _tmp2_; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_data_find_applicable (____lambda25__photo_file_format_data_applicable_test, NULL, &_tmp1_); + _tmp2_ = photo_file_format_data_find_applicable (____lambda27__photo_file_format_data_applicable_test, NULL, &_tmp1_); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_data_metadata_writeable = (g_free (photo_file_format_data_metadata_writeable), NULL); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -767,7 +767,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3__length1 = photo_file_format_data_metadata_writeable_length1; #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup3 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_); + _tmp4_ = (_tmp3_ != NULL) ? _vala_array_dup4 (_tmp3_, _tmp3__length1) : ((gpointer) _tmp3_); #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp4__length1 = _tmp3__length1; #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2122,7 +2122,7 @@ gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_leng } -static void _vala_array_add44 (gchar** * array, int* length, int* size, gchar* value) { +static void _vala_array_add47 (gchar** * array, int* length, int* size, gchar* value) { #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if ((*length) == (*size)) { #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2218,7 +2218,7 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp9_ = g_strdup (_tmp8_); #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _vala_array_add44 (&mime_types, &mime_types_length1, &_mime_types_size_, _tmp9_); + _vala_array_add47 (&mime_types, &mime_types_length1, &_mime_types_size_, _tmp9_); #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (mime_type); #line 2225 "PhotoFileFormat.c" diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c index 9950bc1..144f24a 100644 --- a/src/photos/PhotoMetadata.c +++ b/src/photos/PhotoMetadata.c @@ -105,6 +105,7 @@ typedef struct _PhotoPreviewPrivate PhotoPreviewPrivate; #define TYPE_DIMENSIONS (dimensions_get_type ()) typedef struct _Dimensions Dimensions; +#define _g_bytes_unref0(var) ((var == NULL) ? NULL : (var = (g_bytes_unref (var), NULL))) typedef struct _ParamSpecPhotoPreview ParamSpecPhotoPreview; #define TYPE_MEDIA_METADATA (media_metadata_get_type ()) @@ -154,6 +155,7 @@ typedef struct _Block4Data Block4Data; #define _metadata_date_time_unref0(var) ((var == NULL) ? NULL : (var = (metadata_date_time_unref (var), NULL))) typedef struct _Block5Data Block5Data; #define _exif_mem_unref0(var) ((var == NULL) ? NULL : (var = (exif_mem_unref (var), NULL))) +#define _g_checksum_free0(var) ((var == NULL) ? NULL : (var = (g_checksum_free (var), NULL))) #define PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW (photo_metadata_internal_photo_preview_get_type ()) #define PHOTO_METADATA_INTERNAL_PHOTO_PREVIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview)) @@ -266,7 +268,7 @@ struct _PhotoPreview { struct _PhotoPreviewClass { GTypeClass parent_class; void (*finalize) (PhotoPreview *self); - guint8* (*flatten) (PhotoPreview* self, int* result_length1, GError** error); + GBytes* (*flatten) (PhotoPreview* self, GError** error); GdkPixbuf* (*get_pixbuf) (PhotoPreview* self, GError** error); }; @@ -315,6 +317,8 @@ struct _PhotoMetadataPrivate { GExiv2Metadata* exiv2; ExifData* exif; gchar* source_name; + gchar* metadata_hash; + gchar* thumbnail_md5; }; typedef enum { @@ -549,11 +553,10 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) guint32 photo_preview_get_size (PhotoPreview* self); gchar* photo_preview_get_mime_type (PhotoPreview* self); gchar* photo_preview_get_extension (PhotoPreview* self); -guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error); -static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_length1, GError** error); +GBytes* photo_preview_flatten (PhotoPreview* self, GError** error); +static GBytes* photo_preview_real_flatten (PhotoPreview* self, GError** error); GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error); static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error); -static guint8* _vala_array_dup4 (guint8* self, int length); static void photo_preview_finalize (PhotoPreview * obj); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); @@ -584,7 +587,7 @@ MediaMetadata* media_metadata_construct (GType object_type); static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error); void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error); void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error); -void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error); +void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error); MetadataDomain photo_metadata_get_tag_domain (const gchar* tag); gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain); gboolean photo_metadata_has_exif (PhotoMetadata* self); @@ -616,8 +619,8 @@ static void block1_data_unref (void * _userdata_); static void __lambda5_ (Block1Data* _data1_, const gchar* tag); static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self); void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, GeeCollection* collection); -static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value); -static void _vala_array_add46 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add48 (gchar** * array, int* length, int* size, gchar* value); +static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value); void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1, GeeCollection* values, PhotoMetadataSetOption option); static Block2Data* block2_data_ref (Block2Data* _data2_); static void block2_data_unref (void * _userdata_); @@ -660,9 +663,8 @@ static Block5Data* block5_data_ref (Block5Data* _data5_); static void block5_data_unref (void * _userdata_); static void __lambda9_ (Block5Data* _data5_, const gchar* tag); static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self); -guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1); -guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1); -static guint8* _vala_array_dup5 (guint8* self, int length); +gchar* photo_metadata_exif_hash (PhotoMetadata* self); +gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); guint photo_metadata_get_preview_count (PhotoMetadata* self); PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number); static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props); @@ -745,8 +747,7 @@ gint rating_serialize (Rating self); enum { PHOTO_METADATA_INTERNAL_PHOTO_PREVIEW_DUMMY_PROPERTY }; -static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, int* result_length1, GError** error); -static guint8* _vala_array_dup6 (guint8* self, int length); +static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, GError** error); static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj); static void photo_metadata_finalize (MediaMetadata * obj); static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); @@ -772,7 +773,7 @@ static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, co g_critical ("Type `%s' does not implement abstract method `keyword_transformer_transform'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 776 "PhotoMetadata.c" +#line 777 "PhotoMetadata.c" } @@ -781,7 +782,7 @@ GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* i g_return_val_if_fail (IS_KEYWORD_TRANSFORMER (self), NULL); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return KEYWORD_TRANSFORMER_GET_CLASS (self)->transform (self, input, error); -#line 785 "PhotoMetadata.c" +#line 786 "PhotoMetadata.c" } @@ -791,14 +792,14 @@ KeywordTransformer* keyword_transformer_construct (GType object_type) { self = (KeywordTransformer*) g_type_create_instance (object_type); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 795 "PhotoMetadata.c" +#line 796 "PhotoMetadata.c" } static void value_keyword_transformer_init (GValue* value) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 802 "PhotoMetadata.c" +#line 803 "PhotoMetadata.c" } @@ -807,7 +808,7 @@ static void value_keyword_transformer_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_unref (value->data[0].v_pointer); -#line 811 "PhotoMetadata.c" +#line 812 "PhotoMetadata.c" } } @@ -817,11 +818,11 @@ static void value_keyword_transformer_copy_value (const GValue* src_value, GValu if (src_value->data[0].v_pointer) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = keyword_transformer_ref (src_value->data[0].v_pointer); -#line 821 "PhotoMetadata.c" +#line 822 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 825 "PhotoMetadata.c" +#line 826 "PhotoMetadata.c" } } @@ -829,37 +830,37 @@ static void value_keyword_transformer_copy_value (const GValue* src_value, GValu static gpointer value_keyword_transformer_peek_pointer (const GValue* value) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 833 "PhotoMetadata.c" +#line 834 "PhotoMetadata.c" } static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { -#line 840 "PhotoMetadata.c" +#line 841 "PhotoMetadata.c" KeywordTransformer * object; object = collect_values[0].v_pointer; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 847 "PhotoMetadata.c" +#line 848 "PhotoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 851 "PhotoMetadata.c" +#line 852 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = keyword_transformer_ref (object); -#line 855 "PhotoMetadata.c" +#line 856 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 859 "PhotoMetadata.c" +#line 860 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 863 "PhotoMetadata.c" +#line 864 "PhotoMetadata.c" } @@ -870,25 +871,25 @@ static gchar* value_keyword_transformer_lcopy_value (const GValue* value, guint if (!object_p) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 874 "PhotoMetadata.c" +#line 875 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!value->data[0].v_pointer) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = NULL; -#line 880 "PhotoMetadata.c" +#line 881 "PhotoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 884 "PhotoMetadata.c" +#line 885 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = keyword_transformer_ref (value->data[0].v_pointer); -#line 888 "PhotoMetadata.c" +#line 889 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 892 "PhotoMetadata.c" +#line 893 "PhotoMetadata.c" } @@ -902,7 +903,7 @@ GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick G_PARAM_SPEC (spec)->value_type = object_type; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return G_PARAM_SPEC (spec); -#line 906 "PhotoMetadata.c" +#line 907 "PhotoMetadata.c" } @@ -911,7 +912,7 @@ gpointer value_get_keyword_transformer (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER), NULL); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 915 "PhotoMetadata.c" +#line 916 "PhotoMetadata.c" } @@ -931,17 +932,17 @@ void value_set_keyword_transformer (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_ref (value->data[0].v_pointer); -#line 935 "PhotoMetadata.c" +#line 936 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 939 "PhotoMetadata.c" +#line 940 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_unref (old); -#line 945 "PhotoMetadata.c" +#line 946 "PhotoMetadata.c" } } @@ -960,17 +961,17 @@ void value_take_keyword_transformer (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = v_object; -#line 964 "PhotoMetadata.c" +#line 965 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 968 "PhotoMetadata.c" +#line 969 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_unref (old); -#line 974 "PhotoMetadata.c" +#line 975 "PhotoMetadata.c" } } @@ -982,14 +983,14 @@ static void keyword_transformer_class_init (KeywordTransformerClass * klass) { ((KeywordTransformerClass *) klass)->finalize = keyword_transformer_finalize; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) keyword_transformer_real_transform; -#line 986 "PhotoMetadata.c" +#line 987 "PhotoMetadata.c" } static void keyword_transformer_instance_init (KeywordTransformer * self) { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 993 "PhotoMetadata.c" +#line 994 "PhotoMetadata.c" } @@ -999,7 +1000,7 @@ static void keyword_transformer_finalize (KeywordTransformer * obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_signal_handlers_destroy (self); -#line 1003 "PhotoMetadata.c" +#line 1004 "PhotoMetadata.c" } @@ -1024,7 +1025,7 @@ gpointer keyword_transformer_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 1028 "PhotoMetadata.c" +#line 1029 "PhotoMetadata.c" } @@ -1037,7 +1038,7 @@ void keyword_transformer_unref (gpointer instance) { KEYWORD_TRANSFORMER_GET_CLASS (self)->finalize (self); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1041 "PhotoMetadata.c" +#line 1042 "PhotoMetadata.c" } } @@ -1064,7 +1065,7 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_LIST, GeeList); #line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1068 "PhotoMetadata.c" +#line 1069 "PhotoMetadata.c" } @@ -1074,14 +1075,14 @@ NullKeywordTransformer* null_keyword_transformer_construct (GType object_type) { self = (NullKeywordTransformer*) keyword_transformer_construct (object_type); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1078 "PhotoMetadata.c" +#line 1079 "PhotoMetadata.c" } NullKeywordTransformer* null_keyword_transformer_new (void) { #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return null_keyword_transformer_construct (TYPE_NULL_KEYWORD_TRANSFORMER); -#line 1085 "PhotoMetadata.c" +#line 1086 "PhotoMetadata.c" } @@ -1090,7 +1091,7 @@ static void null_keyword_transformer_class_init (NullKeywordTransformerClass * k null_keyword_transformer_parent_class = g_type_class_peek_parent (klass); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) null_keyword_transformer_real_transform; -#line 1094 "PhotoMetadata.c" +#line 1095 "PhotoMetadata.c" } @@ -1113,28 +1114,28 @@ GType null_keyword_transformer_get_type (void) { static void _acd_see_keyword_transformer_on_start_gmarkup_parser_start_element_func (GMarkupParseContext* context, const gchar* element_name, gchar** attribute_names, gchar** attribute_values, gpointer self, GError** error) { #line 64 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_start ((ACDSeeKeywordTransformer*) self, context, element_name, attribute_names, attribute_values, error); -#line 1117 "PhotoMetadata.c" +#line 1118 "PhotoMetadata.c" } static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, const gchar* element_name, gpointer self, GError** error) { #line 65 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_end ((ACDSeeKeywordTransformer*) self, context, element_name, error); -#line 1124 "PhotoMetadata.c" +#line 1125 "PhotoMetadata.c" } static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, const gchar* text, gsize text_len, gpointer self, GError** error) { #line 66 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_text ((ACDSeeKeywordTransformer*) self, context, text, error); -#line 1131 "PhotoMetadata.c" +#line 1132 "PhotoMetadata.c" } static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self) { #line 67 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_on_error ((ACDSeeKeywordTransformer*) self, context, _error_); -#line 1138 "PhotoMetadata.c" +#line 1139 "PhotoMetadata.c" } @@ -1168,21 +1169,21 @@ ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_ty self->priv->stack = _tmp1_; #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1172 "PhotoMetadata.c" +#line 1173 "PhotoMetadata.c" } ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void) { #line 62 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return acd_see_keyword_transformer_construct (TYPE_ACD_SEE_KEYWORD_TRANSFORMER); -#line 1179 "PhotoMetadata.c" +#line 1180 "PhotoMetadata.c" } static gpointer _g_object_ref0 (gpointer self) { #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? g_object_ref (self) : NULL; -#line 1186 "PhotoMetadata.c" +#line 1187 "PhotoMetadata.c" } @@ -1227,7 +1228,7 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* _g_markup_parse_context_unref0 (ctx); #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1231 "PhotoMetadata.c" +#line 1232 "PhotoMetadata.c" } #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = self->priv->result; @@ -1239,7 +1240,7 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* _g_markup_parse_context_unref0 (ctx); #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1243 "PhotoMetadata.c" +#line 1244 "PhotoMetadata.c" } @@ -1266,7 +1267,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self if (g_strcmp0 (_tmp0_, "Categories") == 0) { #line 90 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1270 "PhotoMetadata.c" +#line 1271 "PhotoMetadata.c" } #line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = name; @@ -1274,7 +1275,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self if (g_strcmp0 (_tmp1_, "Category") != 0) { #line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1278 "PhotoMetadata.c" +#line 1279 "PhotoMetadata.c" } #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = name; @@ -1296,7 +1297,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self g_propagate_error (error, _inner_error_); #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1300 "PhotoMetadata.c" +#line 1301 "PhotoMetadata.c" } else { #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -1304,7 +1305,7 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self g_clear_error (&_inner_error_); #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1308 "PhotoMetadata.c" +#line 1309 "PhotoMetadata.c" } } } @@ -1322,7 +1323,7 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, _tmp0_ = name; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_strcmp0 (_tmp0_, "Category") == 0) { -#line 1326 "PhotoMetadata.c" +#line 1327 "PhotoMetadata.c" GeeArrayQueue* _tmp1_; gpointer _tmp2_; gchar* _tmp3_; @@ -1334,7 +1335,7 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, _tmp3_ = (gchar*) _tmp2_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp3_); -#line 1338 "PhotoMetadata.c" +#line 1339 "PhotoMetadata.c" } } @@ -1356,7 +1357,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, if (g_strcmp0 (_tmp0_, "") == 0) { #line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1360 "PhotoMetadata.c" +#line 1361 "PhotoMetadata.c" } #line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->stack; @@ -1368,7 +1369,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _tmp3_ = self->priv->assigned; #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 1372 "PhotoMetadata.c" +#line 1373 "PhotoMetadata.c" GString* builder = NULL; GString* _tmp4_; GString* _tmp13_; @@ -1380,7 +1381,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _tmp4_ = g_string_new (""); #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" builder = _tmp4_; -#line 1384 "PhotoMetadata.c" +#line 1385 "PhotoMetadata.c" { GeeIterator* _f_it = NULL; GeeArrayQueue* _tmp5_; @@ -1393,7 +1394,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _f_it = _tmp6_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 1397 "PhotoMetadata.c" +#line 1398 "PhotoMetadata.c" GeeIterator* _tmp7_; gboolean _tmp8_; gchar* f = NULL; @@ -1409,7 +1410,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, if (!_tmp8_) { #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 1413 "PhotoMetadata.c" +#line 1414 "PhotoMetadata.c" } #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _f_it; @@ -1425,11 +1426,11 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, g_string_append_printf (_tmp11_, "%s|", _tmp12_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (f); -#line 1429 "PhotoMetadata.c" +#line 1430 "PhotoMetadata.c" } #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_f_it); -#line 1433 "PhotoMetadata.c" +#line 1434 "PhotoMetadata.c" } #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = builder; @@ -1437,7 +1438,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _tmp14_ = _tmp13_->len; #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp14_ > ((gssize) 0)) { -#line 1441 "PhotoMetadata.c" +#line 1442 "PhotoMetadata.c" GString* _tmp15_; GString* _tmp16_; gssize _tmp17_; @@ -1449,7 +1450,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, _tmp17_ = _tmp16_->len; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_string_truncate (_tmp15_, (gsize) (_tmp17_ - 1)); -#line 1453 "PhotoMetadata.c" +#line 1454 "PhotoMetadata.c" } #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = self->priv->result; @@ -1461,7 +1462,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_string_free0 (builder); -#line 1465 "PhotoMetadata.c" +#line 1466 "PhotoMetadata.c" } } @@ -1469,7 +1470,7 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, static gpointer _g_error_copy0 (gpointer self) { #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? g_error_copy (self) : NULL; -#line 1473 "PhotoMetadata.c" +#line 1474 "PhotoMetadata.c" } @@ -1488,7 +1489,7 @@ static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self _g_error_free0 (self->priv->error); #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->error = _tmp1_; -#line 1492 "PhotoMetadata.c" +#line 1493 "PhotoMetadata.c" } @@ -1501,14 +1502,14 @@ static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClas g_type_class_add_private (klass, sizeof (ACDSeeKeywordTransformerPrivate)); #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((KeywordTransformerClass *) klass)->transform = (GeeList* (*) (KeywordTransformer *, const gchar*, GError**)) acd_see_keyword_transformer_real_transform; -#line 1505 "PhotoMetadata.c" +#line 1506 "PhotoMetadata.c" } static void acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer * self) { #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv = ACD_SEE_KEYWORD_TRANSFORMER_GET_PRIVATE (self); -#line 1512 "PhotoMetadata.c" +#line 1513 "PhotoMetadata.c" } @@ -1524,7 +1525,7 @@ static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj) { _g_object_unref0 (self->priv->result); #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" KEYWORD_TRANSFORMER_CLASS (acd_see_keyword_transformer_parent_class)->finalize (obj); -#line 1528 "PhotoMetadata.c" +#line 1529 "PhotoMetadata.c" } @@ -1543,7 +1544,7 @@ GType acd_see_keyword_transformer_get_type (void) { static gpointer _keyword_transformer_ref0 (gpointer self) { #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? keyword_transformer_ref (self) : NULL; -#line 1547 "PhotoMetadata.c" +#line 1548 "PhotoMetadata.c" } @@ -1599,21 +1600,21 @@ HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_typ self->transformer = _tmp7_; #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1603 "PhotoMetadata.c" +#line 1604 "PhotoMetadata.c" } HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) { #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return hierarchical_keyword_field_construct (TYPE_HIERARCHICAL_KEYWORD_FIELD, field_name, path_separator, wants_leading_separator, is_writeable, transformer); -#line 1610 "PhotoMetadata.c" +#line 1611 "PhotoMetadata.c" } static void value_hierarchical_keyword_field_init (GValue* value) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1617 "PhotoMetadata.c" +#line 1618 "PhotoMetadata.c" } @@ -1622,7 +1623,7 @@ static void value_hierarchical_keyword_field_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_unref (value->data[0].v_pointer); -#line 1626 "PhotoMetadata.c" +#line 1627 "PhotoMetadata.c" } } @@ -1632,11 +1633,11 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value if (src_value->data[0].v_pointer) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = hierarchical_keyword_field_ref (src_value->data[0].v_pointer); -#line 1636 "PhotoMetadata.c" +#line 1637 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 1640 "PhotoMetadata.c" +#line 1641 "PhotoMetadata.c" } } @@ -1644,37 +1645,37 @@ static void value_hierarchical_keyword_field_copy_value (const GValue* src_value static gpointer value_hierarchical_keyword_field_peek_pointer (const GValue* value) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 1648 "PhotoMetadata.c" +#line 1649 "PhotoMetadata.c" } static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { -#line 1655 "PhotoMetadata.c" +#line 1656 "PhotoMetadata.c" HierarchicalKeywordField * object; object = collect_values[0].v_pointer; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1662 "PhotoMetadata.c" +#line 1663 "PhotoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1666 "PhotoMetadata.c" +#line 1667 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = hierarchical_keyword_field_ref (object); -#line 1670 "PhotoMetadata.c" +#line 1671 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1674 "PhotoMetadata.c" +#line 1675 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1678 "PhotoMetadata.c" +#line 1679 "PhotoMetadata.c" } @@ -1685,25 +1686,25 @@ static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value, if (!object_p) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1689 "PhotoMetadata.c" +#line 1690 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!value->data[0].v_pointer) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = NULL; -#line 1695 "PhotoMetadata.c" +#line 1696 "PhotoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 1699 "PhotoMetadata.c" +#line 1700 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = hierarchical_keyword_field_ref (value->data[0].v_pointer); -#line 1703 "PhotoMetadata.c" +#line 1704 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1707 "PhotoMetadata.c" +#line 1708 "PhotoMetadata.c" } @@ -1717,7 +1718,7 @@ GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return G_PARAM_SPEC (spec); -#line 1721 "PhotoMetadata.c" +#line 1722 "PhotoMetadata.c" } @@ -1726,7 +1727,7 @@ gpointer value_get_hierarchical_keyword_field (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 1730 "PhotoMetadata.c" +#line 1731 "PhotoMetadata.c" } @@ -1746,17 +1747,17 @@ void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_ref (value->data[0].v_pointer); -#line 1750 "PhotoMetadata.c" +#line 1751 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1754 "PhotoMetadata.c" +#line 1755 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_unref (old); -#line 1760 "PhotoMetadata.c" +#line 1761 "PhotoMetadata.c" } } @@ -1775,17 +1776,17 @@ void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = v_object; -#line 1779 "PhotoMetadata.c" +#line 1780 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1783 "PhotoMetadata.c" +#line 1784 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_keyword_field_unref (old); -#line 1789 "PhotoMetadata.c" +#line 1790 "PhotoMetadata.c" } } @@ -1795,14 +1796,14 @@ static void hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass hierarchical_keyword_field_parent_class = g_type_class_peek_parent (klass); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((HierarchicalKeywordFieldClass *) klass)->finalize = hierarchical_keyword_field_finalize; -#line 1799 "PhotoMetadata.c" +#line 1800 "PhotoMetadata.c" } static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 1806 "PhotoMetadata.c" +#line 1807 "PhotoMetadata.c" } @@ -1818,7 +1819,7 @@ static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj) _g_free0 (self->path_separator); #line 142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _keyword_transformer_unref0 (self->transformer); -#line 1822 "PhotoMetadata.c" +#line 1823 "PhotoMetadata.c" } @@ -1843,7 +1844,7 @@ gpointer hierarchical_keyword_field_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 1847 "PhotoMetadata.c" +#line 1848 "PhotoMetadata.c" } @@ -1856,7 +1857,7 @@ void hierarchical_keyword_field_unref (gpointer instance) { HIERARCHICAL_KEYWORD_FIELD_GET_CLASS (self)->finalize (self); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1860 "PhotoMetadata.c" +#line 1861 "PhotoMetadata.c" } } @@ -1915,7 +1916,7 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim self->priv->extension = _tmp7_; #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1919 "PhotoMetadata.c" +#line 1920 "PhotoMetadata.c" } @@ -1933,7 +1934,7 @@ gchar* photo_preview_get_name (PhotoPreview* self) { result = _tmp1_; #line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1937 "PhotoMetadata.c" +#line 1938 "PhotoMetadata.c" } @@ -1947,7 +1948,7 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) *result = _tmp0_; #line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1951 "PhotoMetadata.c" +#line 1952 "PhotoMetadata.c" } @@ -1962,7 +1963,7 @@ guint32 photo_preview_get_size (PhotoPreview* self) { result = _tmp0_; #line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1966 "PhotoMetadata.c" +#line 1967 "PhotoMetadata.c" } @@ -1980,7 +1981,7 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) { result = _tmp1_; #line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1984 "PhotoMetadata.c" +#line 1985 "PhotoMetadata.c" } @@ -1998,140 +1999,120 @@ gchar* photo_preview_get_extension (PhotoPreview* self) { result = _tmp1_; #line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2002 "PhotoMetadata.c" +#line 2003 "PhotoMetadata.c" } -static guint8* photo_preview_real_flatten (PhotoPreview* self, int* result_length1, GError** error) { +static GBytes* photo_preview_real_flatten (PhotoPreview* self, GError** error) { #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_critical ("Type `%s' does not implement abstract method `photo_preview_flatten'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2011 "PhotoMetadata.c" +#line 2012 "PhotoMetadata.c" } -guint8* photo_preview_flatten (PhotoPreview* self, int* result_length1, GError** error) { +GBytes* photo_preview_flatten (PhotoPreview* self, GError** error) { #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL); #line 193 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, result_length1, error); -#line 2020 "PhotoMetadata.c" -} - - -static guint8* _vala_array_dup4 (guint8* self, int length) { -#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - return g_memdup (self, length * sizeof (guint8)); -#line 2027 "PhotoMetadata.c" + return PHOTO_PREVIEW_GET_CLASS (self)->flatten (self, error); +#line 2021 "PhotoMetadata.c" } static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error) { GdkPixbuf* result = NULL; - guint8* flattened = NULL; - gint _tmp0_; - guint8* _tmp1_; - gint flattened_length1; - gint _flattened_size_; + GBytes* flattened = NULL; + GBytes* _tmp0_; GError * _inner_error_ = NULL; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_preview_flatten (self, &_tmp0_, &_inner_error_); -#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened = _tmp1_; + _tmp0_ = photo_preview_flatten (self, &_inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened_length1 = _tmp0_; -#line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _flattened_size_ = flattened_length1; + flattened = _tmp0_; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2053 "PhotoMetadata.c" +#line 2040 "PhotoMetadata.c" } { - GdkPixbuf* _tmp2_ = NULL; - guint8* _tmp3_; - gint _tmp3__length1; - GMemoryInputStream* _tmp4_; - GMemoryInputStream* _tmp5_; + GdkPixbuf* _tmp1_ = NULL; + GMemoryInputStream* _tmp2_; + GMemoryInputStream* _tmp3_; + GdkPixbuf* _tmp4_; + GdkPixbuf* _tmp5_; GdkPixbuf* _tmp6_; - GdkPixbuf* _tmp7_; - GdkPixbuf* _tmp8_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = (flattened != NULL) ? _vala_array_dup4 (flattened, flattened_length1) : ((gpointer) flattened); + _tmp2_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (flattened); #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3__length1 = flattened_length1; + _tmp3_ = _tmp2_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = (GMemoryInputStream*) g_memory_input_stream_new_from_data (_tmp3_, _tmp3__length1, NULL); + _tmp4_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp4_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); -#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp6_; -#line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_object_unref0 (_tmp5_); + _g_object_unref0 (_tmp3_); #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = _tmp7_; + _tmp1_ = _tmp5_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2082 "PhotoMetadata.c" - goto __catch25_g_error; +#line 2063 "PhotoMetadata.c" + goto __catch29_g_error; } #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = _tmp2_; + _tmp6_ = _tmp1_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = NULL; + _tmp1_ = NULL; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp8_; + result = _tmp6_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened = (g_free (flattened), NULL); + _g_bytes_unref0 (flattened); #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2097 "PhotoMetadata.c" +#line 2078 "PhotoMetadata.c" } - goto __finally25; - __catch25_g_error: + goto __finally29; + __catch29_g_error: { GError* err = NULL; + const gchar* _tmp7_; + GError* _tmp8_; const gchar* _tmp9_; - GError* _tmp10_; - const gchar* _tmp11_; #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" err = _inner_error_; #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _inner_error_ = NULL; #line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = self->priv->name; + _tmp7_ = self->priv->name; #line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = err; + _tmp8_ = err; #line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = _tmp10_->message; + _tmp9_ = _tmp8_->message; #line 204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:204: Unable to decode thumbnail for %s: %s", _tmp9_, _tmp11_); + g_warning ("PhotoMetadata.vala:204: Unable to decode thumbnail for %s: %s", _tmp7_, _tmp9_); #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_error_free0 (err); #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened = (g_free (flattened), NULL); + _g_bytes_unref0 (flattened); #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2126 "PhotoMetadata.c" +#line 2107 "PhotoMetadata.c" } - __finally25: + __finally29: #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened = (g_free (flattened), NULL); + _g_bytes_unref0 (flattened); #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2135 "PhotoMetadata.c" +#line 2116 "PhotoMetadata.c" } @@ -2140,14 +2121,14 @@ GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error) { g_return_val_if_fail (IS_PHOTO_PREVIEW (self), NULL); #line 195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return PHOTO_PREVIEW_GET_CLASS (self)->get_pixbuf (self, error); -#line 2144 "PhotoMetadata.c" +#line 2125 "PhotoMetadata.c" } static void value_photo_preview_init (GValue* value) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2151 "PhotoMetadata.c" +#line 2132 "PhotoMetadata.c" } @@ -2156,7 +2137,7 @@ static void value_photo_preview_free_value (GValue* value) { if (value->data[0].v_pointer) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_unref (value->data[0].v_pointer); -#line 2160 "PhotoMetadata.c" +#line 2141 "PhotoMetadata.c" } } @@ -2166,11 +2147,11 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des if (src_value->data[0].v_pointer) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = photo_preview_ref (src_value->data[0].v_pointer); -#line 2170 "PhotoMetadata.c" +#line 2151 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 2174 "PhotoMetadata.c" +#line 2155 "PhotoMetadata.c" } } @@ -2178,37 +2159,37 @@ static void value_photo_preview_copy_value (const GValue* src_value, GValue* des static gpointer value_photo_preview_peek_pointer (const GValue* value) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 2182 "PhotoMetadata.c" +#line 2163 "PhotoMetadata.c" } static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (collect_values[0].v_pointer) { -#line 2189 "PhotoMetadata.c" +#line 2170 "PhotoMetadata.c" PhotoPreview * object; object = collect_values[0].v_pointer; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (object->parent_instance.g_class == NULL) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2196 "PhotoMetadata.c" +#line 2177 "PhotoMetadata.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2200 "PhotoMetadata.c" +#line 2181 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = photo_preview_ref (object); -#line 2204 "PhotoMetadata.c" +#line 2185 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2208 "PhotoMetadata.c" +#line 2189 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2212 "PhotoMetadata.c" +#line 2193 "PhotoMetadata.c" } @@ -2219,25 +2200,25 @@ static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_coll if (!object_p) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2223 "PhotoMetadata.c" +#line 2204 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!value->data[0].v_pointer) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = NULL; -#line 2229 "PhotoMetadata.c" +#line 2210 "PhotoMetadata.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = value->data[0].v_pointer; -#line 2233 "PhotoMetadata.c" +#line 2214 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = photo_preview_ref (value->data[0].v_pointer); -#line 2237 "PhotoMetadata.c" +#line 2218 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2241 "PhotoMetadata.c" +#line 2222 "PhotoMetadata.c" } @@ -2251,7 +2232,7 @@ GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, cons G_PARAM_SPEC (spec)->value_type = object_type; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return G_PARAM_SPEC (spec); -#line 2255 "PhotoMetadata.c" +#line 2236 "PhotoMetadata.c" } @@ -2260,7 +2241,7 @@ gpointer value_get_photo_preview (const GValue* value) { g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW), NULL); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return value->data[0].v_pointer; -#line 2264 "PhotoMetadata.c" +#line 2245 "PhotoMetadata.c" } @@ -2280,17 +2261,17 @@ void value_set_photo_preview (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_ref (value->data[0].v_pointer); -#line 2284 "PhotoMetadata.c" +#line 2265 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2288 "PhotoMetadata.c" +#line 2269 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_unref (old); -#line 2294 "PhotoMetadata.c" +#line 2275 "PhotoMetadata.c" } } @@ -2309,17 +2290,17 @@ void value_take_photo_preview (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = v_object; -#line 2313 "PhotoMetadata.c" +#line 2294 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2317 "PhotoMetadata.c" +#line 2298 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (old) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_unref (old); -#line 2323 "PhotoMetadata.c" +#line 2304 "PhotoMetadata.c" } } @@ -2332,10 +2313,10 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_class_add_private (klass, sizeof (PhotoPreviewPrivate)); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((PhotoPreviewClass *) klass)->flatten = (guint8* (*) (PhotoPreview *, int*, GError**)) photo_preview_real_flatten; + ((PhotoPreviewClass *) klass)->flatten = (GBytes* (*) (PhotoPreview *, GError**)) photo_preview_real_flatten; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((PhotoPreviewClass *) klass)->get_pixbuf = (GdkPixbuf* (*) (PhotoPreview *, GError**)) photo_preview_real_get_pixbuf; -#line 2339 "PhotoMetadata.c" +#line 2320 "PhotoMetadata.c" } @@ -2344,7 +2325,7 @@ static void photo_preview_instance_init (PhotoPreview * self) { self->priv = PHOTO_PREVIEW_GET_PRIVATE (self); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 2348 "PhotoMetadata.c" +#line 2329 "PhotoMetadata.c" } @@ -2360,7 +2341,7 @@ static void photo_preview_finalize (PhotoPreview * obj) { _g_free0 (self->priv->mime_type); #line 163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->extension); -#line 2364 "PhotoMetadata.c" +#line 2345 "PhotoMetadata.c" } @@ -2385,7 +2366,7 @@ gpointer photo_preview_ref (gpointer instance) { g_atomic_int_inc (&self->ref_count); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 2389 "PhotoMetadata.c" +#line 2370 "PhotoMetadata.c" } @@ -2398,7 +2379,7 @@ void photo_preview_unref (gpointer instance) { PHOTO_PREVIEW_GET_CLASS (self)->finalize (self); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2402 "PhotoMetadata.c" +#line 2383 "PhotoMetadata.c" } } @@ -2417,18 +2398,18 @@ GType photo_metadata_set_option_get_type (void) { PhotoMetadata* photo_metadata_construct (GType object_type) { PhotoMetadata* self = NULL; -#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (PhotoMetadata*) media_metadata_construct (object_type); -#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 2425 "PhotoMetadata.c" +#line 2406 "PhotoMetadata.c" } PhotoMetadata* photo_metadata_new (void) { -#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return photo_metadata_construct (TYPE_PHOTO_METADATA); -#line 2432 "PhotoMetadata.c" +#line 2413 "PhotoMetadata.c" } @@ -2446,63 +2427,63 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file GFile* _tmp9_; gchar* _tmp10_; GError * _inner_error_ = NULL; -#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); -#line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_IS_FILE (file)); -#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = gexiv2_metadata_new (); -#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (self->priv->exiv2); -#line 255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->exiv2 = _tmp0_; -#line 256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); -#line 256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->exif = NULL; -#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; -#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = file; -#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = g_file_get_path (_tmp2_); -#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp3_; -#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_open_path (_tmp1_, _tmp4_, &_inner_error_); -#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp4_); -#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); -#line 258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2482 "PhotoMetadata.c" +#line 2463 "PhotoMetadata.c" } -#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = file; -#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = g_file_get_path (_tmp5_); -#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _tmp6_; -#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = exif_data_new_from_file (_tmp7_); -#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); -#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->exif = _tmp8_; -#line 259 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp7_); -#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = file; -#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = g_file_get_basename (_tmp9_); -#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); -#line 260 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->source_name = _tmp10_; -#line 2506 "PhotoMetadata.c" +#line 2487 "PhotoMetadata.c" } @@ -2512,29 +2493,29 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er gchar* _tmp2_; gchar* _tmp3_; GError * _inner_error_ = NULL; -#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_IS_FILE (file)); -#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = file; -#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = g_file_get_path (_tmp1_); -#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_; -#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_save_file (_tmp0_, _tmp3_, &_inner_error_); -#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp3_); -#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); -#line 264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2538 "PhotoMetadata.c" +#line 2519 "PhotoMetadata.c" } } @@ -2556,174 +2537,160 @@ void photo_metadata_read_from_buffer (PhotoMetadata* self, guint8* buffer, int b gint _tmp11_; gchar* _tmp12_; GError * _inner_error_ = NULL; -#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = length; -#line 268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ <= 0) { -#line 2566 "PhotoMetadata.c" +#line 2547 "PhotoMetadata.c" guint8* _tmp1_; gint _tmp1__length1; -#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = buffer; -#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1__length1 = buffer_length1; -#line 269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" length = _tmp1__length1; -#line 2575 "PhotoMetadata.c" +#line 2556 "PhotoMetadata.c" } -#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = buffer; -#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2__length1 = buffer_length1; -#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = length; -#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp2__length1 >= _tmp3_, "buffer.length >= length"); -#line 273 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gexiv2_metadata_new (); -#line 273 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (self->priv->exiv2); -#line 273 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->exiv2 = _tmp4_; -#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); -#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->exif = NULL; -#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = self->priv->exiv2; -#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = buffer; -#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6__length1 = buffer_length1; -#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = length; -#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_open_buf (_tmp5_, _tmp6_, (glong) _tmp7_, &_inner_error_); -#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); -#line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2611 "PhotoMetadata.c" +#line 2592 "PhotoMetadata.c" } -#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = buffer; -#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8__length1 = buffer_length1; -#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = length; -#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = exif_data_new_from_data (_tmp8_, (gsize) _tmp9_); -#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); -#line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->exif = _tmp10_; -#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = length; -#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = g_strdup_printf ("", _tmp11_); -#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); -#line 278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->source_name = _tmp12_; -#line 2633 "PhotoMetadata.c" +#line 2614 "PhotoMetadata.c" } -void photo_metadata_read_from_app1_segment (PhotoMetadata* self, guint8* buffer, int buffer_length1, gint length, GError** error) { - gint _tmp0_; - guint8* _tmp2_; - gint _tmp2__length1; - gint _tmp3_; - GExiv2Metadata* _tmp4_; - GExiv2Metadata* _tmp5_; - guint8* _tmp6_; - gint _tmp6__length1; - gint _tmp7_; - guint8* _tmp8_; - gint _tmp8__length1; - gint _tmp9_; - ExifData* _tmp10_; - gint _tmp11_; - gchar* _tmp12_; +void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error) { + GExiv2Metadata* _tmp0_; + GExiv2Metadata* _tmp1_; + GBytes* _tmp2_; + gsize _tmp3_; + guint8* _tmp4_; + GBytes* _tmp5_; + gsize _tmp6_; + GBytes* _tmp7_; + gsize _tmp8_; + guint8* _tmp9_; + GBytes* _tmp10_; + gsize _tmp11_; + ExifData* _tmp12_; + GBytes* _tmp13_; + gsize _tmp14_; + gchar* _tmp15_; GError * _inner_error_ = NULL; -#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = length; -#line 282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ <= 0) { -#line 2660 "PhotoMetadata.c" - guint8* _tmp1_; - gint _tmp1__length1; -#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = buffer; -#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = buffer_length1; -#line 283 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - length = _tmp1__length1; -#line 2669 "PhotoMetadata.c" - } -#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = buffer; -#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = buffer_length1; +#line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_return_if_fail (buffer != NULL); #line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = length; + _tmp0_ = gexiv2_metadata_new (); #line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_assert (_tmp2__length1 >= _tmp3_, "buffer.length >= length"); -#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_new (); -#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (self->priv->exiv2); -#line 287 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exiv2 = _tmp4_; -#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self->priv->exiv2 = _tmp0_; +#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); -#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->exif = NULL; -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = self->priv->exiv2; -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = buffer; -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6__length1 = buffer_length1; -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = length; -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_from_app1_segment (_tmp5_, _tmp6_, (glong) _tmp7_, &_inner_error_); -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp1_ = self->priv->exiv2; +#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp2_ = buffer; +#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp4_ = g_bytes_get_data (_tmp2_, &_tmp3_); +#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp5_ = buffer; +#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp6_ = g_bytes_get_size (_tmp5_); +#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + gexiv2_metadata_from_app1_segment (_tmp1_, _tmp4_, (glong) _tmp6_, &_inner_error_); +#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2705 "PhotoMetadata.c" - } -#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = buffer; -#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8__length1 = buffer_length1; -#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = length; -#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = exif_data_new_from_data (_tmp8_, (gsize) _tmp9_); -#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 2668 "PhotoMetadata.c" + } +#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp7_ = buffer; +#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp9_ = g_bytes_get_data (_tmp7_, &_tmp8_); +#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp10_ = buffer; +#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp11_ = g_bytes_get_size (_tmp10_); +#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp12_ = exif_data_new_from_data (_tmp9_, _tmp11_); +#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); -#line 291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exif = _tmp10_; -#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = length; -#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = g_strdup_printf ("", _tmp11_); -#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self->priv->exif = _tmp12_; +#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp13_ = buffer; +#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp14_ = g_bytes_get_size (_tmp13_); +#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp15_ = g_strdup_printf ("", _tmp14_); +#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); -#line 292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->source_name = _tmp12_; -#line 2727 "PhotoMetadata.c" +#line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self->priv->source_name = _tmp15_; +#line 2694 "PhotoMetadata.c" } @@ -2735,119 +2702,119 @@ MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) { gboolean _tmp3_; const gchar* _tmp4_; gboolean _tmp5_; -#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, 0); -#line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gexiv2_metadata_is_exif_tag (_tmp0_); -#line 296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_) { -#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_EXIF; -#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2751 "PhotoMetadata.c" +#line 2718 "PhotoMetadata.c" } -#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = gexiv2_metadata_is_xmp_tag (_tmp2_); -#line 299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_XMP; -#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2763 "PhotoMetadata.c" +#line 2730 "PhotoMetadata.c" } -#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = tag; -#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = gexiv2_metadata_is_iptc_tag (_tmp4_); -#line 302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_) { -#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_IPTC; -#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2775 "PhotoMetadata.c" +#line 2742 "PhotoMetadata.c" } -#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_UNKNOWN; -#line 305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2781 "PhotoMetadata.c" +#line 2748 "PhotoMetadata.c" } gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) { gboolean result = FALSE; MetadataDomain _tmp0_; -#line 308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = domain; -#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" switch (_tmp0_) { -#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 2796 "PhotoMetadata.c" +#line 2763 "PhotoMetadata.c" { GExiv2Metadata* _tmp1_; gboolean _tmp2_; -#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; -#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = gexiv2_metadata_has_exif (_tmp1_); -#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp2_; -#line 311 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2808 "PhotoMetadata.c" +#line 2775 "PhotoMetadata.c" } -#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 2812 "PhotoMetadata.c" +#line 2779 "PhotoMetadata.c" { GExiv2Metadata* _tmp3_; gboolean _tmp4_; -#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = self->priv->exiv2; -#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gexiv2_metadata_has_xmp (_tmp3_); -#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp4_; -#line 314 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2824 "PhotoMetadata.c" +#line 2791 "PhotoMetadata.c" } -#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 2828 "PhotoMetadata.c" +#line 2795 "PhotoMetadata.c" { GExiv2Metadata* _tmp5_; gboolean _tmp6_; -#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = self->priv->exiv2; -#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = gexiv2_metadata_has_iptc (_tmp5_); -#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp6_; -#line 317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2840 "PhotoMetadata.c" +#line 2807 "PhotoMetadata.c" } default: -#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_UNKNOWN: -#line 2845 "PhotoMetadata.c" +#line 2812 "PhotoMetadata.c" { -#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2851 "PhotoMetadata.c" +#line 2818 "PhotoMetadata.c" } } } @@ -2856,115 +2823,115 @@ gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) gboolean photo_metadata_has_exif (PhotoMetadata* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 325 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 323 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_EXIF); -#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 326 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2868 "PhotoMetadata.c" +#line 2835 "PhotoMetadata.c" } gboolean photo_metadata_has_xmp (PhotoMetadata* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 329 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 327 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_XMP); -#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 330 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2883 "PhotoMetadata.c" +#line 2850 "PhotoMetadata.c" } gboolean photo_metadata_has_iptc (PhotoMetadata* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 333 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 331 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_IPTC); -#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 334 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2898 "PhotoMetadata.c" +#line 2865 "PhotoMetadata.c" } gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain domain) { gboolean result = FALSE; MetadataDomain _tmp0_; -#line 337 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 335 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = domain; -#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" switch (_tmp0_) { -#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 2913 "PhotoMetadata.c" +#line 2880 "PhotoMetadata.c" { GExiv2Metadata* _tmp1_; gboolean _tmp2_; -#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; -#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = gexiv2_metadata_get_supports_exif (_tmp1_); -#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp2_; -#line 340 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2925 "PhotoMetadata.c" +#line 2892 "PhotoMetadata.c" } -#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 2929 "PhotoMetadata.c" +#line 2896 "PhotoMetadata.c" { GExiv2Metadata* _tmp3_; gboolean _tmp4_; -#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = self->priv->exiv2; -#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gexiv2_metadata_get_supports_xmp (_tmp3_); -#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp4_; -#line 343 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2941 "PhotoMetadata.c" +#line 2908 "PhotoMetadata.c" } -#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 2945 "PhotoMetadata.c" +#line 2912 "PhotoMetadata.c" { GExiv2Metadata* _tmp5_; gboolean _tmp6_; -#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = self->priv->exiv2; -#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = gexiv2_metadata_get_supports_iptc (_tmp5_); -#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp6_; -#line 346 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2957 "PhotoMetadata.c" +#line 2924 "PhotoMetadata.c" } default: -#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_UNKNOWN: -#line 2962 "PhotoMetadata.c" +#line 2929 "PhotoMetadata.c" { -#line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 348 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 350 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 348 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2968 "PhotoMetadata.c" +#line 2935 "PhotoMetadata.c" } } } @@ -2973,45 +2940,45 @@ gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain gboolean photo_metadata_can_write_exif (PhotoMetadata* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 354 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 352 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_EXIF); -#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 355 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2985 "PhotoMetadata.c" +#line 2952 "PhotoMetadata.c" } gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 358 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_XMP); -#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 359 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3000 "PhotoMetadata.c" +#line 2967 "PhotoMetadata.c" } gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) { gboolean result = FALSE; gboolean _tmp0_; -#line 362 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 360 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_IPTC); -#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 363 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3015 "PhotoMetadata.c" +#line 2982 "PhotoMetadata.c" } @@ -3020,21 +2987,21 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) { GExiv2Metadata* _tmp0_; const gchar* _tmp1_; gboolean _tmp2_; -#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 364 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 366 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 364 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, FALSE); -#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tag; -#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = gexiv2_metadata_has_tag (_tmp0_, _tmp1_); -#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp2_; -#line 367 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3038 "PhotoMetadata.c" +#line 3005 "PhotoMetadata.c" } @@ -3042,73 +3009,73 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa GeeSet* result = NULL; GCompareDataFunc _tmp0_; void* _tmp0__target; -#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = compare_func; -#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__target = compare_func_target; -#line 372 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ == NULL) { -#line 3054 "PhotoMetadata.c" +#line 3021 "PhotoMetadata.c" GeeHashSet* _tmp1_; -#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); -#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet); -#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); -#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3070 "PhotoMetadata.c" +#line 3037 "PhotoMetadata.c" } else { GCompareDataFunc _tmp2_; void* _tmp2__target; GDestroyNotify _tmp2__target_destroy_notify; GeeTreeSet* _tmp3_; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = compare_func; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2__target = compare_func_target; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2__target_destroy_notify = compare_func_target_destroy_notify; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp2_, _tmp2__target, _tmp2__target_destroy_notify); -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet); -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 375 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3102 "PhotoMetadata.c" +#line 3069 "PhotoMetadata.c" } -#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); -#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 3112 "PhotoMetadata.c" +#line 3079 "PhotoMetadata.c" } @@ -3128,200 +3095,200 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma GeeSet* _tmp14_; gchar** _tmp15_; gint _tmp15__length1; -#line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 376 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = NULL; -#line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags_length1 = 0; -#line 380 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = domain; -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" switch (_tmp0_) { -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 3146 "PhotoMetadata.c" +#line 3113 "PhotoMetadata.c" { GExiv2Metadata* _tmp1_; gchar** _tmp2_; gchar** _tmp3_; -#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; -#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_ = gexiv2_metadata_get_exif_tags (_tmp1_); -#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); -#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = _tmp3_; -#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags_length1 = _vala_array_length (_tmp2_); -#line 383 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; -#line 384 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3165 "PhotoMetadata.c" +#line 3132 "PhotoMetadata.c" } -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 3169 "PhotoMetadata.c" +#line 3136 "PhotoMetadata.c" { GExiv2Metadata* _tmp4_; gchar** _tmp5_; gchar** _tmp6_; -#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = self->priv->exiv2; -#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = _tmp5_ = gexiv2_metadata_get_xmp_tags (_tmp4_); -#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); -#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = _tmp6_; -#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags_length1 = _vala_array_length (_tmp5_); -#line 387 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; -#line 388 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 386 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3188 "PhotoMetadata.c" +#line 3155 "PhotoMetadata.c" } -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 3192 "PhotoMetadata.c" +#line 3159 "PhotoMetadata.c" { GExiv2Metadata* _tmp7_; gchar** _tmp8_; gchar** _tmp9_; -#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = self->priv->exiv2; -#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _tmp8_ = gexiv2_metadata_get_iptc_tags (_tmp7_); -#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); -#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = _tmp9_; -#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags_length1 = _vala_array_length (_tmp8_); -#line 391 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; -#line 392 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 390 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3211 "PhotoMetadata.c" +#line 3178 "PhotoMetadata.c" } default: -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3216 "PhotoMetadata.c" +#line 3183 "PhotoMetadata.c" } -#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = tags; -#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11__length1 = tags_length1; -#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_ == NULL) { -#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = TRUE; -#line 3226 "PhotoMetadata.c" +#line 3193 "PhotoMetadata.c" } else { gchar** _tmp12_; gint _tmp12__length1; -#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = tags; -#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12__length1 = tags_length1; -#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = _tmp12__length1 == 0; -#line 3236 "PhotoMetadata.c" +#line 3203 "PhotoMetadata.c" } -#line 395 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { -#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); -#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); -#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3254 "PhotoMetadata.c" +#line 3221 "PhotoMetadata.c" } -#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = compare_func; -#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13__target = compare_func_target; -#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13__target_destroy_notify = compare_func_target_destroy_notify; -#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = photo_metadata_create_string_set (self, _tmp13_, _tmp13__target, _tmp13__target_destroy_notify); -#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" collection = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection); -#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = tags; -#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15__length1 = tags_length1; -#line 3276 "PhotoMetadata.c" +#line 3243 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp15_; -#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp15__length1; -#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) { -#line 3288 "PhotoMetadata.c" +#line 3255 "PhotoMetadata.c" gchar* _tmp16_; gchar* tag = NULL; -#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = g_strdup (tag_collection[tag_it]); -#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp16_; -#line 3295 "PhotoMetadata.c" +#line 3262 "PhotoMetadata.c" { GeeCollection* _tmp17_; const gchar* _tmp18_; -#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = collection; -#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = tag; -#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (_tmp17_, _tmp18_); -#line 399 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3307 "PhotoMetadata.c" +#line 3274 "PhotoMetadata.c" } } } -#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = collection; -#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); -#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); -#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 402 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3325 "PhotoMetadata.c" +#line 3292 "PhotoMetadata.c" } @@ -3349,184 +3316,184 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun gint _tmp28_; gint _tmp29_; GeeCollection* _tmp31_; -#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 403 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = compare_func; -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__target = compare_func_target; -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__target_destroy_notify = compare_func_target_destroy_notify; -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_create_string_set (self, _tmp0_, _tmp0__target, _tmp0__target_destroy_notify); -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 405 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" all_tags = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection); -#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_tags (self, METADATA_DOMAIN_EXIF, NULL, NULL, NULL); -#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 407 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" exif_tags = _tmp2_; -#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = exif_tags; -#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 3379 "PhotoMetadata.c" +#line 3346 "PhotoMetadata.c" GeeCollection* _tmp5_; gint _tmp6_; gint _tmp7_; -#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = exif_tags; -#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = gee_collection_get_size (_tmp5_); -#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _tmp6_; -#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp7_ > 0; -#line 3391 "PhotoMetadata.c" +#line 3358 "PhotoMetadata.c" } else { -#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = FALSE; -#line 3395 "PhotoMetadata.c" +#line 3362 "PhotoMetadata.c" } -#line 410 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 3399 "PhotoMetadata.c" +#line 3366 "PhotoMetadata.c" GeeCollection* _tmp8_; GeeCollection* _tmp9_; -#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = all_tags; -#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = exif_tags; -#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp8_, _tmp9_); -#line 3408 "PhotoMetadata.c" +#line 3375 "PhotoMetadata.c" } -#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL); -#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" xmp_tags = _tmp10_; -#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = xmp_tags; -#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp12_ != NULL) { -#line 3418 "PhotoMetadata.c" +#line 3385 "PhotoMetadata.c" GeeCollection* _tmp13_; gint _tmp14_; gint _tmp15_; -#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = xmp_tags; -#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = gee_collection_get_size (_tmp13_); -#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _tmp14_; -#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = _tmp15_ > 0; -#line 3430 "PhotoMetadata.c" +#line 3397 "PhotoMetadata.c" } else { -#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = FALSE; -#line 3434 "PhotoMetadata.c" +#line 3401 "PhotoMetadata.c" } -#line 414 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_) { -#line 3438 "PhotoMetadata.c" +#line 3405 "PhotoMetadata.c" GeeCollection* _tmp16_; GeeCollection* _tmp17_; -#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = all_tags; -#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = xmp_tags; -#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp16_, _tmp17_); -#line 3447 "PhotoMetadata.c" +#line 3414 "PhotoMetadata.c" } -#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL); -#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" iptc_tags = _tmp18_; -#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = iptc_tags; -#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp20_ != NULL) { -#line 3457 "PhotoMetadata.c" +#line 3424 "PhotoMetadata.c" GeeCollection* _tmp21_; gint _tmp22_; gint _tmp23_; -#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = iptc_tags; -#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = gee_collection_get_size (_tmp21_); -#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = _tmp22_; -#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = _tmp23_ > 0; -#line 3469 "PhotoMetadata.c" +#line 3436 "PhotoMetadata.c" } else { -#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = FALSE; -#line 3473 "PhotoMetadata.c" +#line 3440 "PhotoMetadata.c" } -#line 418 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp19_) { -#line 3477 "PhotoMetadata.c" +#line 3444 "PhotoMetadata.c" GeeCollection* _tmp24_; GeeCollection* _tmp25_; -#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = all_tags; -#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = iptc_tags; -#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp24_, _tmp25_); -#line 3486 "PhotoMetadata.c" +#line 3453 "PhotoMetadata.c" } -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = all_tags; -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = gee_collection_get_size (_tmp27_); -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = _tmp28_; -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp29_ > 0) { -#line 3496 "PhotoMetadata.c" +#line 3463 "PhotoMetadata.c" GeeCollection* _tmp30_; -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = all_tags; -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = _tmp30_; -#line 3502 "PhotoMetadata.c" +#line 3469 "PhotoMetadata.c" } else { -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = NULL; -#line 3506 "PhotoMetadata.c" +#line 3473 "PhotoMetadata.c" } -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = _g_object_ref0 (_tmp26_); -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp31_; -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (iptc_tags); -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (xmp_tags); -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (exif_tags); -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (all_tags); -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 421 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3530 "PhotoMetadata.c" +#line 3497 "PhotoMetadata.c" } @@ -3535,21 +3502,21 @@ gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) { const gchar* _tmp0_; const gchar* _tmp1_; gchar* _tmp2_; -#line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 424 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); -#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gexiv2_metadata_get_tag_label (_tmp0_); -#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = g_strdup (_tmp1_); -#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp2_; -#line 425 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3553 "PhotoMetadata.c" +#line 3520 "PhotoMetadata.c" } @@ -3558,21 +3525,21 @@ gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag const gchar* _tmp0_; const gchar* _tmp1_; gchar* _tmp2_; -#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 426 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 428 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 426 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); -#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gexiv2_metadata_get_tag_description (_tmp0_); -#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = g_strdup (_tmp1_); -#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp2_; -#line 429 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3576 "PhotoMetadata.c" +#line 3543 "PhotoMetadata.c" } @@ -3585,31 +3552,31 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare PrepareInputTextOptions _tmp4_; gchar* _tmp5_; gchar* _tmp6_; -#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 430 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 432 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 430 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tag; -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = gexiv2_metadata_get_tag_string (_tmp0_, _tmp1_); -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_; -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = options; -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH); -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = _tmp5_; -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp3_); -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp6_; -#line 433 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3613 "PhotoMetadata.c" +#line 3580 "PhotoMetadata.c" } @@ -3622,31 +3589,31 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* PrepareInputTextOptions _tmp4_; gchar* _tmp5_; gchar* _tmp6_; -#line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 436 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tag; -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = gexiv2_metadata_get_tag_interpreted_string (_tmp0_, _tmp1_); -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_; -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = options; -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH); -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = _tmp5_; -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp3_); -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp6_; -#line 437 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3650 "PhotoMetadata.c" +#line 3617 "PhotoMetadata.c" } @@ -3654,68 +3621,68 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t gchar* result = NULL; gchar** _tmp0_; gint _tmp0__length1; -#line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 438 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tags; -#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 3664 "PhotoMetadata.c" +#line 3631 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3676 "PhotoMetadata.c" +#line 3643 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; -#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 3683 "PhotoMetadata.c" +#line 3650 "PhotoMetadata.c" { gchar* value = NULL; const gchar* _tmp2_; gchar* _tmp3_; const gchar* _tmp4_; -#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_get_string (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value = _tmp3_; -#line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = value; -#line 443 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = value; -#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 444 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3705 "PhotoMetadata.c" +#line 3672 "PhotoMetadata.c" } -#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3711 "PhotoMetadata.c" +#line 3678 "PhotoMetadata.c" } } } -#line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 445 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 447 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 445 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3719 "PhotoMetadata.c" +#line 3686 "PhotoMetadata.c" } @@ -3723,68 +3690,68 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** gchar* result = NULL; gchar** _tmp0_; gint _tmp0__length1; -#line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 448 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tags; -#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 3733 "PhotoMetadata.c" +#line 3700 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3745 "PhotoMetadata.c" +#line 3712 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; -#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 3752 "PhotoMetadata.c" +#line 3719 "PhotoMetadata.c" { gchar* value = NULL; const gchar* _tmp2_; gchar* _tmp3_; const gchar* _tmp4_; -#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_get_string_interpreted (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value = _tmp3_; -#line 453 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = value; -#line 453 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = value; -#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 454 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3774 "PhotoMetadata.c" +#line 3741 "PhotoMetadata.c" } -#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3780 "PhotoMetadata.c" +#line 3747 "PhotoMetadata.c" } } } -#line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 457 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3788 "PhotoMetadata.c" +#line 3755 "PhotoMetadata.c" } @@ -3811,180 +3778,180 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t gint _tmp24_; gint _tmp25_; GeeList* _tmp27_; -#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 464 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 464 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); -#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tag; -#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_ = gexiv2_metadata_get_tag_multiple (_tmp0_, _tmp1_); -#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = _tmp3_; -#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values_length1 = _vala_array_length (_tmp2_); -#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _values_size_ = values_length1; -#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = values; -#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = values_length1; -#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ == NULL) { -#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = TRUE; -#line 3839 "PhotoMetadata.c" +#line 3806 "PhotoMetadata.c" } else { gchar** _tmp6_; gint _tmp6__length1; -#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = values; -#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6__length1 = values_length1; -#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp6__length1 == 0; -#line 3849 "PhotoMetadata.c" +#line 3816 "PhotoMetadata.c" } -#line 468 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); -#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3859 "PhotoMetadata.c" +#line 3826 "PhotoMetadata.c" } -#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" list = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList); -#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); -#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" collection = _tmp8_; -#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = values; -#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9__length1 = values_length1; -#line 3873 "PhotoMetadata.c" +#line 3840 "PhotoMetadata.c" { gchar** value_collection = NULL; gint value_collection_length1 = 0; gint _value_collection_size_ = 0; gint value_it = 0; -#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value_collection = _tmp9_; -#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value_collection_length1 = _tmp9__length1; -#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) { -#line 3885 "PhotoMetadata.c" +#line 3852 "PhotoMetadata.c" gchar* _tmp10_; gchar* value = NULL; -#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = g_strdup (value_collection[value_it]); -#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value = _tmp10_; -#line 3892 "PhotoMetadata.c" +#line 3859 "PhotoMetadata.c" { gchar* prepped = NULL; const gchar* _tmp11_; gchar* _tmp12_; gboolean _tmp13_ = FALSE; const gchar* _tmp14_; -#line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = value; -#line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = prepare_input_text (_tmp11_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, DEFAULT_USER_TEXT_INPUT_LENGTH); -#line 475 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" prepped = _tmp12_; -#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = prepped; -#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp14_ != NULL) { -#line 3909 "PhotoMetadata.c" +#line 3876 "PhotoMetadata.c" GeeHashSet* _tmp15_; const gchar* _tmp16_; gboolean _tmp17_; -#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = collection; -#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = prepped; -#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp16_); -#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = !_tmp17_; -#line 3921 "PhotoMetadata.c" +#line 3888 "PhotoMetadata.c" } else { -#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = FALSE; -#line 3925 "PhotoMetadata.c" +#line 3892 "PhotoMetadata.c" } -#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp13_) { -#line 3929 "PhotoMetadata.c" +#line 3896 "PhotoMetadata.c" GeeList* _tmp18_; const gchar* _tmp19_; GeeHashSet* _tmp20_; const gchar* _tmp21_; -#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = list; -#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = prepped; -#line 479 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_); -#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = collection; -#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = prepped; -#line 480 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp21_); -#line 3946 "PhotoMetadata.c" +#line 3913 "PhotoMetadata.c" } -#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); -#line 474 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 3952 "PhotoMetadata.c" +#line 3919 "PhotoMetadata.c" } } } -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = list; -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = _tmp24_; -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp25_ > 0) { -#line 3964 "PhotoMetadata.c" +#line 3931 "PhotoMetadata.c" GeeList* _tmp26_; -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = list; -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = _tmp26_; -#line 3970 "PhotoMetadata.c" +#line 3937 "PhotoMetadata.c" } else { -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = NULL; -#line 3974 "PhotoMetadata.c" +#line 3941 "PhotoMetadata.c" } -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = _g_object_ref0 (_tmp22_); -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp27_; -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (collection); -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (list); -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); -#line 484 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3988 "PhotoMetadata.c" +#line 3955 "PhotoMetadata.c" } @@ -3992,89 +3959,89 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** GeeList* result = NULL; gchar** _tmp0_; gint _tmp0__length1; -#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 491 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tags; -#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 4002 "PhotoMetadata.c" +#line 3969 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4014 "PhotoMetadata.c" +#line 3981 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; -#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 4021 "PhotoMetadata.c" +#line 3988 "PhotoMetadata.c" { GeeList* values = NULL; const gchar* _tmp2_; GeeList* _tmp3_; gboolean _tmp4_ = FALSE; GeeList* _tmp5_; -#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_); -#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = _tmp3_; -#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = values; -#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 4038 "PhotoMetadata.c" +#line 4005 "PhotoMetadata.c" GeeList* _tmp6_; gint _tmp7_; gint _tmp8_; -#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = values; -#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = _tmp7_; -#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp8_ > 0; -#line 4050 "PhotoMetadata.c" +#line 4017 "PhotoMetadata.c" } else { -#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 4054 "PhotoMetadata.c" +#line 4021 "PhotoMetadata.c" } -#line 496 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = values; -#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 497 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4064 "PhotoMetadata.c" +#line 4031 "PhotoMetadata.c" } -#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4070 "PhotoMetadata.c" +#line 4037 "PhotoMetadata.c" } } } -#line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 498 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 500 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 498 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4078 "PhotoMetadata.c" +#line 4045 "PhotoMetadata.c" } @@ -4088,67 +4055,67 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch const gchar* _tmp7_; const gchar* _tmp8_; gboolean _tmp9_; -#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (value != NULL); -#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = value; -#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = options; -#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = prepare_input_text (_tmp0_, _tmp1_, DEFAULT_USER_TEXT_INPUT_LENGTH); -#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" prepped = _tmp2_; -#line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = prepped; -#line 505 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_ == NULL) { -#line 4110 "PhotoMetadata.c" +#line 4077 "PhotoMetadata.c" const gchar* _tmp4_; const gchar* _tmp5_; -#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = tag; -#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = value; +#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_warning ("PhotoMetadata.vala:504: Not setting tag %s to string %s: invalid UTF-8", _tmp4_, _tmp5_); #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:506: Not setting tag %s to string %s: invalid UTF-8", _tmp4_, _tmp5_); -#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); -#line 508 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 4123 "PhotoMetadata.c" +#line 4090 "PhotoMetadata.c" } -#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = self->priv->exiv2; -#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = tag; -#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = prepped; -#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_); -#line 511 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp9_) { -#line 4135 "PhotoMetadata.c" +#line 4102 "PhotoMetadata.c" const gchar* _tmp10_; const gchar* _tmp11_; const gchar* _tmp12_; -#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = tag; -#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = value; -#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = self->priv->source_name; -#line 512 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:512: Unable to set tag %s to string %s from source " \ +#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_warning ("PhotoMetadata.vala:510: Unable to set tag %s to string %s from source " \ "%s", _tmp10_, _tmp11_, _tmp12_); -#line 4147 "PhotoMetadata.c" +#line 4114 "PhotoMetadata.c" } -#line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); -#line 4151 "PhotoMetadata.c" +#line 4118 "PhotoMetadata.c" } @@ -4159,118 +4126,118 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i gboolean _tmp9_ = FALSE; gboolean _tmp10_ = FALSE; PhotoMetadataSetOption _tmp11_; -#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 515 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 516 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" written = FALSE; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tags; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 4170 "PhotoMetadata.c" +#line 4137 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4182 "PhotoMetadata.c" +#line 4149 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 4189 "PhotoMetadata.c" +#line 4156 "PhotoMetadata.c" { gboolean _tmp2_ = FALSE; PhotoMetadataSetOption _tmp3_; -#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = option; -#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) { -#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = TRUE; -#line 4199 "PhotoMetadata.c" +#line 4166 "PhotoMetadata.c" } else { const gchar* _tmp4_; MetadataDomain _tmp5_; gboolean _tmp6_; -#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = tag; -#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_get_tag_domain (_tmp4_); -#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_has_domain (self, _tmp5_); -#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = _tmp6_; -#line 4212 "PhotoMetadata.c" +#line 4179 "PhotoMetadata.c" } -#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_) { -#line 4216 "PhotoMetadata.c" +#line 4183 "PhotoMetadata.c" PhotoMetadataSetGenericValue _tmp7_; void* _tmp7__target; const gchar* _tmp8_; -#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = setter; -#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7__target = setter_target; -#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = tag; -#line 521 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ (_tmp8_, _tmp7__target); -#line 522 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" written = TRUE; -#line 4230 "PhotoMetadata.c" +#line 4197 "PhotoMetadata.c" } -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4234 "PhotoMetadata.c" +#line 4201 "PhotoMetadata.c" } } } -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = option; -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) { -#line 4242 "PhotoMetadata.c" +#line 4209 "PhotoMetadata.c" gboolean _tmp12_; -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = written; -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = !_tmp12_; -#line 4248 "PhotoMetadata.c" +#line 4215 "PhotoMetadata.c" } else { -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = FALSE; -#line 4252 "PhotoMetadata.c" +#line 4219 "PhotoMetadata.c" } -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { -#line 4256 "PhotoMetadata.c" +#line 4223 "PhotoMetadata.c" gchar** _tmp13_; gint _tmp13__length1; -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = tags; -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13__length1 = tags_length1; -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _tmp13__length1 > 0; -#line 4265 "PhotoMetadata.c" +#line 4232 "PhotoMetadata.c" } else { -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = FALSE; -#line 4269 "PhotoMetadata.c" +#line 4236 "PhotoMetadata.c" } -#line 526 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_) { -#line 4273 "PhotoMetadata.c" +#line 4240 "PhotoMetadata.c" MetadataDomain default_domain = 0; gchar** _tmp14_; gint _tmp14__length1; @@ -4281,41 +4248,41 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i gchar** _tmp18_; gint _tmp18__length1; const gchar* _tmp19_; -#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = tags; -#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14__length1 = tags_length1; -#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _tmp14_[0]; -#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = photo_metadata_get_tag_domain (_tmp15_); -#line 527 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" default_domain = _tmp16_; -#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = setter; -#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17__target = setter_target; -#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = tags; -#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18__length1 = tags_length1; -#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = _tmp18_[0]; -#line 530 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ (_tmp19_, _tmp17__target); -#line 4306 "PhotoMetadata.c" +#line 4273 "PhotoMetadata.c" { gint ctr = 0; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = 1; -#line 4311 "PhotoMetadata.c" +#line 4278 "PhotoMetadata.c" { gboolean _tmp20_ = FALSE; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = TRUE; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 4318 "PhotoMetadata.c" +#line 4285 "PhotoMetadata.c" gint _tmp22_; gchar** _tmp23_; gint _tmp23__length1; @@ -4325,66 +4292,66 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i const gchar* _tmp26_; MetadataDomain _tmp27_; MetadataDomain _tmp28_; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp20_) { -#line 4330 "PhotoMetadata.c" +#line 4297 "PhotoMetadata.c" gint _tmp21_; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = ctr; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = _tmp21_ + 1; -#line 4336 "PhotoMetadata.c" +#line 4303 "PhotoMetadata.c" } -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = FALSE; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = ctr; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = tags; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23__length1 = tags_length1; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!(_tmp22_ < _tmp23__length1)) { -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 4350 "PhotoMetadata.c" +#line 4317 "PhotoMetadata.c" } -#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = tags; -#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24__length1 = tags_length1; -#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = ctr; -#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = _tmp24_[_tmp25_]; -#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = photo_metadata_get_tag_domain (_tmp26_); -#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = default_domain; -#line 534 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp27_ == _tmp28_) { -#line 4366 "PhotoMetadata.c" +#line 4333 "PhotoMetadata.c" PhotoMetadataSetGenericValue _tmp29_; void* _tmp29__target; gchar** _tmp30_; gint _tmp30__length1; gint _tmp31_; const gchar* _tmp32_; -#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = setter; -#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29__target = setter_target; -#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = tags; -#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30__length1 = tags_length1; -#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = ctr; -#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp32_ = _tmp30_[_tmp31_]; -#line 535 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ (_tmp32_, _tmp29__target); -#line 4387 "PhotoMetadata.c" +#line 4354 "PhotoMetadata.c" } } } @@ -4394,30 +4361,30 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i static Block1Data* block1_data_ref (Block1Data* _data1_) { -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data1_->_ref_count_); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data1_; -#line 4401 "PhotoMetadata.c" +#line 4368 "PhotoMetadata.c" } static void block1_data_unref (void * _userdata_) { Block1Data* _data1_; _data1_ = (Block1Data*) _userdata_; -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 4410 "PhotoMetadata.c" +#line 4377 "PhotoMetadata.c" PhotoMetadata* self; -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data1_->self; -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_data1_->value); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _media_metadata_unref0 (self); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block1Data, _data1_); -#line 4420 "PhotoMetadata.c" +#line 4387 "PhotoMetadata.c" } } @@ -4426,24 +4393,24 @@ static void __lambda5_ (Block1Data* _data1_, const gchar* tag) { PhotoMetadata* self; const gchar* _tmp0_; const gchar* _tmp1_; -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data1_->self; -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _data1_->value; -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 4439 "PhotoMetadata.c" +#line 4406 "PhotoMetadata.c" } static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda5_ (self, tag); -#line 4446 "PhotoMetadata.c" +#line 4413 "PhotoMetadata.c" } @@ -4454,71 +4421,71 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_ gchar** _tmp2_; gint _tmp2__length1; PhotoMetadataSetOption _tmp3_; -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (value != NULL); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_ = g_slice_new0 (Block1Data); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_->_ref_count_ = 1; -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_->self = media_metadata_ref (self); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = value; -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (_tmp0_); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_data1_->value); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_->value = _tmp1_; -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tags; -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2__length1 = tags_length1; -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = option; -#line 541 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda5__photo_metadata_set_generic_value, _data1_); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block1_data_unref (_data1_); -#line 540 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_ = NULL; -#line 4487 "PhotoMetadata.c" +#line 4454 "PhotoMetadata.c" } -static void _vala_array_add45 (gchar** * array, int* length, int* size, gchar* value) { -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +static void _vala_array_add48 (gchar** * array, int* length, int* size, gchar* value) { +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if ((*length) == (*size)) { -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 4498 "PhotoMetadata.c" +#line 4465 "PhotoMetadata.c" } -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[(*length)++] = value; -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[*length] = NULL; -#line 4504 "PhotoMetadata.c" +#line 4471 "PhotoMetadata.c" } -static void _vala_array_add46 (gchar** * array, int* length, int* size, gchar* value) { -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value) { +#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if ((*length) == (*size)) { -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *size = (*size) ? (2 * (*size)) : 4; -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 4515 "PhotoMetadata.c" +#line 4482 "PhotoMetadata.c" } -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[(*length)++] = value; -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[*length] = NULL; -#line 4521 "PhotoMetadata.c" +#line 4488 "PhotoMetadata.c" } @@ -4536,34 +4503,34 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, gchar** _tmp19_; gint _tmp19__length1; gboolean _tmp20_; -#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (GEE_IS_COLLECTION (collection)); -#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = g_new0 (gchar*, 0 + 1); -#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = _tmp0_; -#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values_length1 = 0; -#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _values_size_ = values_length1; -#line 4553 "PhotoMetadata.c" +#line 4520 "PhotoMetadata.c" { GeeIterator* _value_it = NULL; GeeCollection* _tmp1_; GeeIterator* _tmp2_; -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = collection; -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _value_it = _tmp2_; -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 4566 "PhotoMetadata.c" +#line 4533 "PhotoMetadata.c" GeeIterator* _tmp3_; gboolean _tmp4_; gchar* value = NULL; @@ -4573,148 +4540,148 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, const gchar* _tmp7_; gchar* _tmp8_; const gchar* _tmp9_; -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _value_it; -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gee_iterator_next (_tmp3_); -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp4_) { -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 4584 "PhotoMetadata.c" +#line 4551 "PhotoMetadata.c" } -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _value_it; -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = gee_iterator_get (_tmp5_); -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value = (gchar*) _tmp6_; -#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = value; -#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = prepare_input_text (_tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, -1); -#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" prepped = _tmp8_; -#line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = prepped; -#line 548 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_ != NULL) { -#line 4602 "PhotoMetadata.c" +#line 4569 "PhotoMetadata.c" gchar** _tmp10_; gint _tmp10__length1; const gchar* _tmp11_; gchar* _tmp12_; -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = values; -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10__length1 = values_length1; -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = prepped; -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = g_strdup (_tmp11_); -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_array_add45 (&values, &values_length1, &_values_size_, _tmp12_); -#line 4617 "PhotoMetadata.c" +#line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _vala_array_add48 (&values, &values_length1, &_values_size_, _tmp12_); +#line 4584 "PhotoMetadata.c" } else { const gchar* _tmp13_; const gchar* _tmp14_; -#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = value; -#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = tag; -#line 551 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:551: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_); -#line 4627 "PhotoMetadata.c" +#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_warning ("PhotoMetadata.vala:549: Unable to set string %s to %s: invalid UTF-8", _tmp13_, _tmp14_); +#line 4594 "PhotoMetadata.c" } -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 4633 "PhotoMetadata.c" +#line 4600 "PhotoMetadata.c" } -#line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_value_it); -#line 4637 "PhotoMetadata.c" +#line 4604 "PhotoMetadata.c" } -#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = values; -#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15__length1 = values_length1; -#line 554 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp15__length1 == 0) { -#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 553 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); -#line 555 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 553 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 4649 "PhotoMetadata.c" +#line 4616 "PhotoMetadata.c" } -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = values; -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16__length1 = values_length1; +#line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _vala_array_add49 (&values, &values_length1, &_values_size_, NULL); #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_array_add46 (&values, &values_length1, &_values_size_, NULL); -#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = self->priv->exiv2; -#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = tag; -#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = values; -#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19__length1 = values_length1; -#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_); -#line 563 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp20_) { -#line 4669 "PhotoMetadata.c" +#line 4636 "PhotoMetadata.c" gchar** _tmp21_; gint _tmp21__length1; const gchar* _tmp22_; const gchar* _tmp23_; -#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = values; -#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21__length1 = values_length1; -#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = tag; -#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = self->priv->source_name; -#line 564 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:564: Unable to set %d strings to tag %s from source" \ +#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_warning ("PhotoMetadata.vala:562: Unable to set %d strings to tag %s from source" \ " %s", _tmp21__length1, _tmp22_, _tmp23_); -#line 4684 "PhotoMetadata.c" +#line 4651 "PhotoMetadata.c" } -#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); -#line 4688 "PhotoMetadata.c" +#line 4655 "PhotoMetadata.c" } static Block2Data* block2_data_ref (Block2Data* _data2_) { -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data2_->_ref_count_); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data2_; -#line 4697 "PhotoMetadata.c" +#line 4664 "PhotoMetadata.c" } static void block2_data_unref (void * _userdata_) { Block2Data* _data2_; _data2_ = (Block2Data*) _userdata_; -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 4706 "PhotoMetadata.c" +#line 4673 "PhotoMetadata.c" PhotoMetadata* self; -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data2_->self; -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_data2_->values); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _media_metadata_unref0 (self); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block2Data, _data2_); -#line 4716 "PhotoMetadata.c" +#line 4683 "PhotoMetadata.c" } } @@ -4723,24 +4690,24 @@ static void __lambda6_ (Block2Data* _data2_, const gchar* tag) { PhotoMetadata* self; const gchar* _tmp0_; GeeCollection* _tmp1_; -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data2_->self; -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _data2_->values; -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_); -#line 4735 "PhotoMetadata.c" +#line 4702 "PhotoMetadata.c" } static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda6_ (self, tag); -#line 4742 "PhotoMetadata.c" +#line 4709 "PhotoMetadata.c" } @@ -4751,37 +4718,37 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, gchar** _tmp2_; gint _tmp2__length1; PhotoMetadataSetOption _tmp3_; -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (GEE_IS_COLLECTION (values)); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_ = g_slice_new0 (Block2Data); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_->_ref_count_ = 1; -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_->self = media_metadata_ref (self); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = values; -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _g_object_ref0 (_tmp0_); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_data2_->values); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_->values = _tmp1_; -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tags; -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2__length1 = tags_length1; -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = option; -#line 568 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda6__photo_metadata_set_generic_value, _data2_); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block2_data_unref (_data2_); -#line 567 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_ = NULL; -#line 4783 "PhotoMetadata.c" +#line 4750 "PhotoMetadata.c" } @@ -4793,49 +4760,49 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* GExiv2Metadata* _tmp2_; const gchar* _tmp3_; glong _tmp4_; -#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 569 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 569 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, FALSE); -#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_has_tag (self, _tmp0_); -#line 572 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { -#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_value = (glong) 0; -#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (value) { -#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4813 "PhotoMetadata.c" +#line 4780 "PhotoMetadata.c" } -#line 575 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4817 "PhotoMetadata.c" +#line 4784 "PhotoMetadata.c" } -#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = self->priv->exiv2; -#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = tag; -#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gexiv2_metadata_get_tag_long (_tmp2_, _tmp3_); -#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_value = _tmp4_; -#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; -#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (value) { -#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4833 "PhotoMetadata.c" +#line 4800 "PhotoMetadata.c" } -#line 580 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4837 "PhotoMetadata.c" +#line 4804 "PhotoMetadata.c" } @@ -4844,77 +4811,77 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t gboolean result = FALSE; gchar** _tmp0_; gint _tmp0__length1; -#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 581 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tags; -#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 4852 "PhotoMetadata.c" +#line 4819 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4864 "PhotoMetadata.c" +#line 4831 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; -#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 4871 "PhotoMetadata.c" +#line 4838 "PhotoMetadata.c" { const gchar* _tmp2_; glong _tmp3_ = 0L; gboolean _tmp4_; -#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_get_long (self, _tmp2_, &_tmp3_); -#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_value = _tmp3_; -#line 585 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; -#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (value) { -#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4892 "PhotoMetadata.c" +#line 4859 "PhotoMetadata.c" } -#line 586 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4896 "PhotoMetadata.c" +#line 4863 "PhotoMetadata.c" } -#line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4900 "PhotoMetadata.c" +#line 4867 "PhotoMetadata.c" } } } -#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 587 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_value = (glong) 0; -#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (value) { -#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4912 "PhotoMetadata.c" +#line 4879 "PhotoMetadata.c" } -#line 591 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4916 "PhotoMetadata.c" +#line 4883 "PhotoMetadata.c" } @@ -4923,61 +4890,61 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value const gchar* _tmp1_; glong _tmp2_; gboolean _tmp3_; -#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tag; -#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = value; -#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_); -#line 595 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp3_) { -#line 4939 "PhotoMetadata.c" +#line 4906 "PhotoMetadata.c" const gchar* _tmp4_; glong _tmp5_; const gchar* _tmp6_; -#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = tag; -#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = value; -#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = self->priv->source_name; -#line 596 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:596: Unable to set tag %s to long %ld from source %" \ +#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_warning ("PhotoMetadata.vala:594: Unable to set tag %s to long %ld from source %" \ "s", _tmp4_, _tmp5_, _tmp6_); -#line 4951 "PhotoMetadata.c" +#line 4918 "PhotoMetadata.c" } } static Block3Data* block3_data_ref (Block3Data* _data3_) { -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data3_->_ref_count_); -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data3_; -#line 4961 "PhotoMetadata.c" +#line 4928 "PhotoMetadata.c" } static void block3_data_unref (void * _userdata_) { Block3Data* _data3_; _data3_ = (Block3Data*) _userdata_; -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 4970 "PhotoMetadata.c" +#line 4937 "PhotoMetadata.c" PhotoMetadata* self; -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data3_->self; -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _media_metadata_unref0 (self); -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block3Data, _data3_); -#line 4978 "PhotoMetadata.c" +#line 4945 "PhotoMetadata.c" } } @@ -4986,24 +4953,24 @@ static void __lambda7_ (Block3Data* _data3_, const gchar* tag) { PhotoMetadata* self; const gchar* _tmp0_; glong _tmp1_; -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data3_->self; -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _data3_->value; -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_long (self, _tmp0_, _tmp1_); -#line 4997 "PhotoMetadata.c" +#line 4964 "PhotoMetadata.c" } static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda7_ (self, tag); -#line 5004 "PhotoMetadata.c" +#line 4971 "PhotoMetadata.c" } @@ -5013,31 +4980,31 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le gchar** _tmp1_; gint _tmp1__length1; PhotoMetadataSetOption _tmp2_; -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_ = g_slice_new0 (Block3Data); -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_->_ref_count_ = 1; -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_->self = media_metadata_ref (self); -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = value; -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_->value = _tmp0_; -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tags; -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1__length1 = tags_length1; -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = option; -#line 600 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, _tmp2_, ___lambda7__photo_metadata_set_generic_value, _data3_); -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block3_data_unref (_data3_); -#line 599 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_ = NULL; -#line 5038 "PhotoMetadata.c" +#line 5005 "PhotoMetadata.c" } @@ -5052,35 +5019,35 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met gint _tmp2_ = 0; gint _tmp3_ = 0; gboolean _tmp4_; -#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, FALSE); -#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tag; -#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gexiv2_metadata_get_exif_tag_rational (_tmp0_, _tmp1_, &_tmp2_, &_tmp3_); -#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" numerator = _tmp2_; -#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" denominator = _tmp3_; -#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _result_ = _tmp4_; -#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" metadata_rational_init (&_vala_rational, numerator, denominator); -#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _result_; -#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (rational) { -#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5077 "PhotoMetadata.c" +#line 5044 "PhotoMetadata.c" } -#line 609 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5081 "PhotoMetadata.c" +#line 5048 "PhotoMetadata.c" } @@ -5089,77 +5056,77 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i gboolean result = FALSE; gchar** _tmp0_; gint _tmp0__length1; -#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 610 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tags; -#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 5096 "PhotoMetadata.c" +#line 5063 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 5108 "PhotoMetadata.c" +#line 5075 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; -#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 5115 "PhotoMetadata.c" +#line 5082 "PhotoMetadata.c" { const gchar* _tmp2_; MetadataRational _tmp3_ = {0}; gboolean _tmp4_; -#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_get_rational (self, _tmp2_, &_tmp3_); -#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_rational = _tmp3_; -#line 614 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; -#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (rational) { -#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5136 "PhotoMetadata.c" +#line 5103 "PhotoMetadata.c" } -#line 615 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5140 "PhotoMetadata.c" +#line 5107 "PhotoMetadata.c" } -#line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 5144 "PhotoMetadata.c" +#line 5111 "PhotoMetadata.c" } } } -#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 616 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" metadata_rational_init (&_vala_rational, 0, 0); -#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (rational) { -#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5156 "PhotoMetadata.c" +#line 5123 "PhotoMetadata.c" } -#line 620 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5160 "PhotoMetadata.c" +#line 5127 "PhotoMetadata.c" } @@ -5171,74 +5138,74 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat MetadataRational _tmp4_; gint _tmp5_; gboolean _tmp6_; -#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (rational != NULL); -#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tag; -#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = *rational; -#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_.numerator; -#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = *rational; -#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp4_.denominator; -#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_); -#line 624 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp6_) { -#line 5194 "PhotoMetadata.c" +#line 5161 "PhotoMetadata.c" const gchar* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; const gchar* _tmp10_; -#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = tag; -#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = metadata_rational_to_string (rational); -#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _tmp8_; -#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = self->priv->source_name; -#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:625: Unable to set tag %s to rational %s from sourc" \ +#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_warning ("PhotoMetadata.vala:623: Unable to set tag %s to rational %s from sourc" \ "e %s", _tmp7_, _tmp9_, _tmp10_); -#line 625 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp9_); -#line 5211 "PhotoMetadata.c" +#line 5178 "PhotoMetadata.c" } } static Block4Data* block4_data_ref (Block4Data* _data4_) { -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data4_->_ref_count_); -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data4_; -#line 5221 "PhotoMetadata.c" +#line 5188 "PhotoMetadata.c" } static void block4_data_unref (void * _userdata_) { Block4Data* _data4_; _data4_ = (Block4Data*) _userdata_; -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 5230 "PhotoMetadata.c" +#line 5197 "PhotoMetadata.c" PhotoMetadata* self; -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data4_->self; -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _media_metadata_unref0 (self); -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block4Data, _data4_); -#line 5238 "PhotoMetadata.c" +#line 5205 "PhotoMetadata.c" } } @@ -5247,24 +5214,24 @@ static void __lambda8_ (Block4Data* _data4_, const gchar* tag) { PhotoMetadata* self; const gchar* _tmp0_; MetadataRational _tmp1_; -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data4_->self; -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _data4_->rational; -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_rational (self, _tmp0_, &_tmp1_); -#line 5257 "PhotoMetadata.c" +#line 5224 "PhotoMetadata.c" } static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda8_ (self, tag); -#line 5264 "PhotoMetadata.c" +#line 5231 "PhotoMetadata.c" } @@ -5274,33 +5241,33 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag gchar** _tmp1_; gint _tmp1__length1; PhotoMetadataSetOption _tmp2_; -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (rational != NULL); -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_ = g_slice_new0 (Block4Data); -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_->_ref_count_ = 1; -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_->self = media_metadata_ref (self); -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = *rational; -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_->rational = _tmp0_; -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tags; -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1__length1 = tags_length1; -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = option; -#line 631 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, _tmp2_, ___lambda8__photo_metadata_set_generic_value, _data4_); -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block4_data_unref (_data4_); -#line 630 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_ = NULL; -#line 5300 "PhotoMetadata.c" +#line 5267 "PhotoMetadata.c" } @@ -5311,160 +5278,160 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar gchar* _tmp1_; const gchar* _tmp2_; GError * _inner_error_ = NULL; -#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 632 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 632 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); -#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_string (self, _tmp0_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value = _tmp1_; -#line 636 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = value; -#line 636 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ == NULL) { -#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5331 "PhotoMetadata.c" +#line 5298 "PhotoMetadata.c" } { const gchar* _tmp3_; MetadataDomain _tmp4_; -#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = tag; -#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_get_tag_domain (_tmp3_); -#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" switch (_tmp4_) { -#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 5344 "PhotoMetadata.c" +#line 5311 "PhotoMetadata.c" { MetadataDateTime* _tmp5_ = NULL; const gchar* _tmp6_; MetadataDateTime* _tmp7_; MetadataDateTime* _tmp8_; -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = value; -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = metadata_date_time_new_from_xmp (_tmp6_, &_inner_error_); -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp7_; -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5358 "PhotoMetadata.c" - goto __catch26_g_error; +#line 5325 "PhotoMetadata.c" + goto __catch30_g_error; } -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = _tmp5_; -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = NULL; -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp8_; -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (_tmp5_); -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 642 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5373 "PhotoMetadata.c" +#line 5340 "PhotoMetadata.c" } -#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 5377 "PhotoMetadata.c" +#line 5344 "PhotoMetadata.c" { -#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 647 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5385 "PhotoMetadata.c" +#line 5352 "PhotoMetadata.c" } default: -#line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 5390 "PhotoMetadata.c" +#line 5357 "PhotoMetadata.c" { MetadataDateTime* _tmp9_ = NULL; const gchar* _tmp10_; MetadataDateTime* _tmp11_; MetadataDateTime* _tmp12_; -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = value; -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = metadata_date_time_new_from_exif (_tmp10_, &_inner_error_); -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _tmp11_; -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5404 "PhotoMetadata.c" - goto __catch26_g_error; +#line 5371 "PhotoMetadata.c" + goto __catch30_g_error; } -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = _tmp9_; -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = NULL; -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp12_; -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (_tmp9_); -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 651 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5419 "PhotoMetadata.c" +#line 5386 "PhotoMetadata.c" } } } - goto __finally26; - __catch26_g_error: + goto __finally30; + __catch30_g_error: { GError* err = NULL; const gchar* _tmp13_; const gchar* _tmp14_; GError* _tmp15_; const gchar* _tmp16_; -#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" err = _inner_error_; -#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _inner_error_ = NULL; -#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = tag; -#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = self->priv->source_name; -#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = err; -#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = _tmp15_->message; +#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_warning ("PhotoMetadata.vala:652: Unable to read date/time %s from source %s: %s", _tmp13_, _tmp14_, _tmp16_); #line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:654: Unable to read date/time %s from source %s: %s", _tmp13_, _tmp14_, _tmp16_); -#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_error_free0 (err); -#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 656 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5453 "PhotoMetadata.c" +#line 5420 "PhotoMetadata.c" } - __finally26: -#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + __finally30: +#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_clear_error (&_inner_error_); -#line 639 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 5464 "PhotoMetadata.c" +#line 5431 "PhotoMetadata.c" } @@ -5472,197 +5439,197 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar MetadataDateTime* result = NULL; gchar** _tmp0_; gint _tmp0__length1; -#line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 658 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tags; -#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 5478 "PhotoMetadata.c" +#line 5445 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 5490 "PhotoMetadata.c" +#line 5457 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; -#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 5497 "PhotoMetadata.c" +#line 5464 "PhotoMetadata.c" { MetadataDateTime* date_time = NULL; const gchar* _tmp2_; MetadataDateTime* _tmp3_; MetadataDateTime* _tmp4_; -#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_get_date_time (self, _tmp2_); -#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" date_time = _tmp3_; -#line 663 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = date_time; -#line 663 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = date_time; -#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 664 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5519 "PhotoMetadata.c" +#line 5486 "PhotoMetadata.c" } -#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (date_time); -#line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 5525 "PhotoMetadata.c" +#line 5492 "PhotoMetadata.c" } } } -#line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 667 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5533 "PhotoMetadata.c" +#line 5500 "PhotoMetadata.c" } void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, MetadataDateTime* date_time) { const gchar* _tmp0_; MetadataDomain _tmp1_; -#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 670 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_METADATA_DATE_TIME (date_time)); -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_tag_domain (_tmp0_); -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" switch (_tmp1_) { -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 5554 "PhotoMetadata.c" +#line 5521 "PhotoMetadata.c" { const gchar* _tmp2_; MetadataDateTime* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; -#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = date_time; -#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = metadata_date_time_get_exif_label (_tmp3_); -#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp4_; -#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, _tmp2_, _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 673 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp5_); -#line 674 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 672 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5574 "PhotoMetadata.c" +#line 5541 "PhotoMetadata.c" } -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 5578 "PhotoMetadata.c" +#line 5545 "PhotoMetadata.c" { const gchar* _tmp6_; MetadataDateTime* _tmp7_; gchar* _tmp8_; gchar* _tmp9_; -#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = tag; -#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = date_time; -#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = metadata_date_time_get_xmp_label (_tmp7_); -#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _tmp8_; -#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, _tmp6_, _tmp9_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 677 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp9_); -#line 678 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 676 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5598 "PhotoMetadata.c" +#line 5565 "PhotoMetadata.c" } default: -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 5603 "PhotoMetadata.c" +#line 5570 "PhotoMetadata.c" { const gchar* _tmp10_; const gchar* _tmp11_; const gchar* _tmp12_; MetadataDomain _tmp13_; GEnumValue* _tmp14_; -#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = tag; -#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = self->priv->source_name; -#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = tag; -#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = photo_metadata_get_tag_domain (_tmp12_); -#line 684 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 682 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = g_enum_get_value (g_type_class_ref (TYPE_METADATA_DOMAIN), _tmp13_); -#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_warning ("PhotoMetadata.vala:683: Cannot set date/time for %s from source %s: un" \ +#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_warning ("PhotoMetadata.vala:681: Cannot set date/time for %s from source %s: un" \ "supported metadata domain %s", _tmp10_, _tmp11_, (_tmp14_ != NULL) ? _tmp14_->value_name : NULL); -#line 685 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5624 "PhotoMetadata.c" +#line 5591 "PhotoMetadata.c" } } } static gpointer _metadata_date_time_ref0 (gpointer self) { -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? metadata_date_time_ref (self) : NULL; -#line 5633 "PhotoMetadata.c" +#line 5600 "PhotoMetadata.c" } static Block5Data* block5_data_ref (Block5Data* _data5_) { -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data5_->_ref_count_); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data5_; -#line 5642 "PhotoMetadata.c" +#line 5609 "PhotoMetadata.c" } static void block5_data_unref (void * _userdata_) { Block5Data* _data5_; _data5_ = (Block5Data*) _userdata_; -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { -#line 5651 "PhotoMetadata.c" +#line 5618 "PhotoMetadata.c" PhotoMetadata* self; -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data5_->self; -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (_data5_->date_time); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _media_metadata_unref0 (self); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block5Data, _data5_); -#line 5661 "PhotoMetadata.c" +#line 5628 "PhotoMetadata.c" } } @@ -5671,24 +5638,24 @@ static void __lambda9_ (Block5Data* _data5_, const gchar* tag) { PhotoMetadata* self; const gchar* _tmp0_; MetadataDateTime* _tmp1_; -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data5_->self; -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _data5_->date_time; -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_date_time (self, _tmp0_, _tmp1_); -#line 5680 "PhotoMetadata.c" +#line 5647 "PhotoMetadata.c" } static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda9_ (self, tag); -#line 5687 "PhotoMetadata.c" +#line 5654 "PhotoMetadata.c" } @@ -5699,307 +5666,310 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta gchar** _tmp2_; gint _tmp2__length1; PhotoMetadataSetOption _tmp3_; -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_METADATA_DATE_TIME (date_time)); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_ = g_slice_new0 (Block5Data); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_->_ref_count_ = 1; -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_->self = media_metadata_ref (self); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = date_time; -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _metadata_date_time_ref0 (_tmp0_); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (_data5_->date_time); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_->date_time = _tmp1_; -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tags; -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2__length1 = tags_length1; -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = option; -#line 690 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_generic (self, _tmp2_, _tmp2__length1, _tmp3_, ___lambda9__photo_metadata_set_generic_value, _data5_); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block5_data_unref (_data5_); -#line 689 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_ = NULL; -#line 5728 "PhotoMetadata.c" +#line 5695 "PhotoMetadata.c" } -guint8* photo_metadata_flatten_exif (PhotoMetadata* self, gboolean include_preview, int* result_length1) { - guint8* result = NULL; +gchar* photo_metadata_exif_hash (PhotoMetadata* self) { + gchar* result = NULL; ExifData* _tmp0_; - guchar* thumbnail = NULL; - ExifData* _tmp2_; - guchar* _tmp3_; - guint thumbnail_size = 0U; + const gchar* _tmp1_; + gchar* hash = NULL; + guchar* thumb = NULL; ExifData* _tmp4_; - guint _tmp5_; - gboolean _tmp6_; - guint8* flattened = NULL; - gint flattened_length1; - gint _flattened_size_; + guchar* _tmp5_; + guint thumb_size = 0U; + ExifData* _tmp6_; + guint _tmp7_; + ExifData* _tmp8_; + ExifData* _tmp9_; guchar* saved_data = NULL; guint saved_size = 0U; - ExifData* _tmp9_; - gboolean _tmp10_ = FALSE; - guint _tmp11_; - ExifData* _tmp21_; - guchar* _tmp22_; - ExifData* _tmp23_; - guint _tmp24_; - guint8* _tmp25_; - gint _tmp25__length1; -#line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + ExifData* _tmp10_; + ExifData* _tmp11_; + guchar* _tmp12_; + ExifData* _tmp13_; + guint _tmp14_; + gboolean _tmp15_ = FALSE; + guint _tmp16_; +#line 692 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 693 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exif; -#line 695 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 693 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ == NULL) { -#line 5762 "PhotoMetadata.c" - guint8* _tmp1_; - gint _tmp1__length1; -#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = NULL; -#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = 0; -#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (result_length1) { -#line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - *result_length1 = _tmp1__length1; -#line 5773 "PhotoMetadata.c" - } +#line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + result = NULL; +#line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + return result; +#line 5731 "PhotoMetadata.c" + } #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp1_; + _tmp1_ = self->priv->metadata_hash; #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + if (_tmp1_ != NULL) { +#line 5737 "PhotoMetadata.c" + const gchar* _tmp2_; + gchar* _tmp3_; +#line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp2_ = self->priv->metadata_hash; +#line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp3_ = g_strdup (_tmp2_); +#line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + result = _tmp3_; +#line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5779 "PhotoMetadata.c" +#line 5748 "PhotoMetadata.c" } #line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = self->priv->exif; -#line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_->data; -#line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - thumbnail = _tmp3_; -#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + hash = NULL; +#line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = self->priv->exif; -#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp4_->size; -#line 701 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - thumbnail_size = _tmp5_; #line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = include_preview; + _tmp5_ = _tmp4_->data; #line 702 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp6_) { -#line 5797 "PhotoMetadata.c" - ExifData* _tmp7_; - ExifData* _tmp8_; + thumb = _tmp5_; #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = self->priv->exif; + _tmp6_ = self->priv->exif; #line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_->data = NULL; -#line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = self->priv->exif; -#line 704 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_->size = (guint) 0; -#line 5808 "PhotoMetadata.c" - } -#line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened = NULL; + _tmp7_ = _tmp6_->size; +#line 703 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + thumb_size = _tmp7_; +#line 706 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp8_ = self->priv->exif; +#line 706 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp8_->data = NULL; #line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened_length1 = 0; + _tmp9_ = self->priv->exif; #line 707 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _flattened_size_ = flattened_length1; -#line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp9_->size = (guint) 0; +#line 709 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" saved_data = NULL; -#line 711 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 710 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" saved_size = (guint) 0; #line 712 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = self->priv->exif; + _tmp10_ = self->priv->exif; #line 712 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - exif_data_save_data (_tmp9_, &saved_data, &saved_size); -#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = saved_size; -#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp11_ > ((guint) 0)) { -#line 5828 "PhotoMetadata.c" - guchar* _tmp12_; -#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = saved_data; -#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = _tmp12_ != NULL; -#line 5834 "PhotoMetadata.c" - } else { -#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = FALSE; -#line 5838 "PhotoMetadata.c" - } -#line 713 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp10_) { -#line 5842 "PhotoMetadata.c" - guint _tmp13_; - guint8* _tmp14_; - guint8* _tmp15_; - gint _tmp15__length1; - guchar* _tmp16_; - guint _tmp17_; - ExifMem* _tmp18_; - ExifMem* _tmp19_; - guchar* _tmp20_; -#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = saved_size; -#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_new0 (guint8, _tmp13_); + exif_data_save_data (_tmp10_, &saved_data, &saved_size); #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened = (g_free (flattened), NULL); + _tmp11_ = self->priv->exif; #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened = _tmp14_; + _tmp12_ = thumb; #line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - flattened_length1 = _tmp13_; -#line 714 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _flattened_size_ = flattened_length1; -#line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = flattened; + _tmp11_->data = _tmp12_; #line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15__length1 = flattened_length1; + _tmp13_ = self->priv->exif; #line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = saved_data; + _tmp14_ = thumb_size; #line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = saved_size; -#line 715 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - memcpy (_tmp15_, _tmp16_, (gsize) _tmp17_); + _tmp13_->size = _tmp14_; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = exif_mem_new_default (); + _tmp16_ = saved_size; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = _tmp18_; + if (_tmp16_ > ((guint) 0)) { +#line 5796 "PhotoMetadata.c" + guchar* _tmp17_; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = saved_data; + _tmp17_ = saved_data; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - exif_mem_free (_tmp19_, _tmp20_); + _tmp15_ = _tmp17_ != NULL; +#line 5802 "PhotoMetadata.c" + } else { +#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp15_ = FALSE; +#line 5806 "PhotoMetadata.c" + } #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _exif_mem_unref0 (_tmp19_); -#line 5884 "PhotoMetadata.c" - } -#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = self->priv->exif; -#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = thumbnail; -#line 721 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_->data = _tmp22_; + if (_tmp15_) { +#line 5810 "PhotoMetadata.c" + GChecksum* md5 = NULL; + GChecksum* _tmp18_; + GChecksum* _tmp19_; + guchar* _tmp20_; + guint _tmp21_; + ExifMem* _tmp22_; + ExifMem* _tmp23_; + guchar* _tmp24_; + GChecksum* _tmp25_; + const gchar* _tmp26_; + gchar* _tmp27_; +#line 718 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp18_ = g_checksum_new (G_CHECKSUM_MD5); +#line 718 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + md5 = _tmp18_; +#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp19_ = md5; +#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp20_ = saved_data; +#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp21_ = saved_size; +#line 719 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_checksum_update (_tmp19_, (guchar*) _tmp20_, (gsize) _tmp21_); +#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp22_ = exif_mem_new_default (); +#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp23_ = _tmp22_; +#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp24_ = saved_data; +#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + exif_mem_free (_tmp23_, _tmp24_); +#line 720 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _exif_mem_unref0 (_tmp23_); +#line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp25_ = md5; +#line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp26_ = g_checksum_get_string (_tmp25_); #line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = self->priv->exif; + _tmp27_ = g_strdup (_tmp26_); #line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = thumbnail_size; + _g_free0 (self->priv->metadata_hash); #line 722 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_->size = _tmp24_; -#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = flattened; -#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25__length1 = flattened_length1; -#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (result_length1) { -#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - *result_length1 = _tmp25__length1; -#line 5906 "PhotoMetadata.c" - } -#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp25_; -#line 724 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self->priv->metadata_hash = _tmp27_; +#line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _g_checksum_free0 (md5); +#line 5856 "PhotoMetadata.c" + } +#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + result = hash; +#line 725 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5912 "PhotoMetadata.c" -} - - -static guint8* _vala_array_dup5 (guint8* self, int length) { -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - return g_memdup (self, length * sizeof (guint8)); -#line 5919 "PhotoMetadata.c" +#line 5862 "PhotoMetadata.c" } -guint8* photo_metadata_flatten_exif_preview (PhotoMetadata* self, int* result_length1) { - guint8* result = NULL; +gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { + gchar* result = NULL; + const gchar* _tmp0_; guchar* buffer = NULL; gint buffer_length1 = 0; gint _buffer_size_ = 0; - guchar* _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gint __tmp0__size_ = 0; - GExiv2Metadata* _tmp1_; - guint8* _tmp2_ = NULL; - gint _tmp3_; - gboolean _tmp4_; - guint8* _tmp6_; - gint _tmp6__length1; - guint8* _tmp7_; - gint _tmp7__length1; -#line 728 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + GExiv2Metadata* _tmp3_; + guint8* _tmp4_ = NULL; + gint _tmp5_; + gboolean _tmp6_; +#line 729 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->exiv2; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_get_exif_thumbnail (_tmp1_, &_tmp2_, &_tmp3_); + _tmp0_ = self->priv->thumbnail_md5; #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + if (_tmp0_ != NULL) { +#line 5882 "PhotoMetadata.c" + const gchar* _tmp1_; + gchar* _tmp2_; +#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp1_ = self->priv->thumbnail_md5; +#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp2_ = g_strdup (_tmp1_); +#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + result = _tmp2_; +#line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + return result; +#line 5893 "PhotoMetadata.c" + } +#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp3_ = self->priv->exiv2; +#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp6_ = gexiv2_metadata_get_exif_thumbnail (_tmp3_, &_tmp4_, &_tmp5_); +#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" buffer = (g_free (buffer), NULL); -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - buffer = _tmp2_; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - buffer_length1 = _tmp3_; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + buffer = _tmp4_; +#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + buffer_length1 = _tmp5_; +#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _buffer_size_ = buffer_length1; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { -#line 5955 "PhotoMetadata.c" - guchar* _tmp5_; - gint _tmp5__length1; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = buffer; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5__length1 = buffer_length1; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = _tmp5_; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = _tmp5__length1; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - __tmp0__size_ = _tmp0__length1; -#line 5968 "PhotoMetadata.c" - } else { -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = NULL; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = 0; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - __tmp0__size_ = _tmp0__length1; -#line 5976 "PhotoMetadata.c" - } -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = (_tmp0_ != NULL) ? _vala_array_dup5 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6__length1 = _tmp0__length1; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp6_; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7__length1 = _tmp6__length1; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (result_length1) { -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - *result_length1 = _tmp7__length1; -#line 5990 "PhotoMetadata.c" +#line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + if (_tmp6_) { +#line 5909 "PhotoMetadata.c" + GChecksum* md5 = NULL; + GChecksum* _tmp7_; + GChecksum* _tmp8_; + guchar* _tmp9_; + gint _tmp9__length1; + guchar* _tmp10_; + gint _tmp10__length1; + GChecksum* _tmp11_; + const gchar* _tmp12_; + gchar* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; +#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp7_ = g_checksum_new (G_CHECKSUM_MD5); +#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + md5 = _tmp7_; +#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp8_ = md5; +#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp9_ = buffer; +#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp9__length1 = buffer_length1; +#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp10_ = buffer; +#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp10__length1 = buffer_length1; +#line 737 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_checksum_update (_tmp8_, _tmp9_, (gsize) _tmp10__length1); +#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp11_ = md5; +#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp12_ = g_checksum_get_string (_tmp11_); +#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp13_ = g_strdup (_tmp12_); +#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _g_free0 (self->priv->thumbnail_md5); +#line 739 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self->priv->thumbnail_md5 = _tmp13_; +#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp14_ = self->priv->thumbnail_md5; +#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _tmp15_ = g_strdup (_tmp14_); +#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + result = _tmp15_; +#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _g_checksum_free0 (md5); +#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + buffer = (g_free (buffer), NULL); +#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + return result; +#line 5960 "PhotoMetadata.c" } -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp7_; -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + result = NULL; +#line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" buffer = (g_free (buffer), NULL); -#line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5998 "PhotoMetadata.c" +#line 5968 "PhotoMetadata.c" } @@ -6014,44 +5984,44 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) { gint _tmp3_ = 0; GExiv2PreviewProperties** _tmp4_; gint _tmp4__length1; -#line 733 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 747 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0U); -#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = _tmp1_ = gexiv2_metadata_get_preview_properties (_tmp0_); -#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" props = _tmp2_; -#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" props_length1 = _vala_array_length (_tmp1_); -#line 734 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _props_size_ = props_length1; -#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = props; -#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4__length1 = props_length1; -#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 6031 "PhotoMetadata.c" +#line 6001 "PhotoMetadata.c" GExiv2PreviewProperties** _tmp5_; gint _tmp5__length1; -#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = props; -#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = props_length1; -#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5__length1; -#line 6040 "PhotoMetadata.c" +#line 6010 "PhotoMetadata.c" } else { -#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = 0; -#line 6044 "PhotoMetadata.c" +#line 6014 "PhotoMetadata.c" } -#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = (guint) _tmp3_; -#line 736 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6050 "PhotoMetadata.c" +#line 6020 "PhotoMetadata.c" } @@ -6073,112 +6043,112 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { guint _tmp10_; GExiv2PreviewProperties* _tmp11_; PhotoMetadataInternalPhotoPreview* _tmp12_; -#line 740 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = _tmp1_ = gexiv2_metadata_get_preview_properties (_tmp0_); -#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" props = _tmp2_; -#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" props_length1 = _vala_array_length (_tmp1_); -#line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _props_size_ = props_length1; -#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = props; -#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4__length1 = props_length1; -#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ == NULL) { -#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 6092 "PhotoMetadata.c" +#line 6062 "PhotoMetadata.c" } else { GExiv2PreviewProperties** _tmp5_; gint _tmp5__length1; guint _tmp6_; -#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = props; -#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = props_length1; -#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = number; -#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = ((guint) _tmp5__length1) <= _tmp6_; -#line 6105 "PhotoMetadata.c" +#line 6075 "PhotoMetadata.c" } -#line 742 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 743 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6113 "PhotoMetadata.c" +#line 6083 "PhotoMetadata.c" } -#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = self->priv->source_name; -#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = number; -#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = props; -#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9__length1 = props_length1; -#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = number; -#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = _tmp9_[_tmp10_]; -#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = photo_metadata_internal_photo_preview_new (self, _tmp7_, _tmp8_, _tmp11_); -#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview); -#line 745 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6133 "PhotoMetadata.c" +#line 6103 "PhotoMetadata.c" } void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { GExiv2Metadata* _tmp0_; ExifData* _tmp1_; -#line 748 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 749 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 749 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_erase_exif_thumbnail (_tmp0_); -#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 764 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exif; -#line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 764 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ != NULL) { -#line 6150 "PhotoMetadata.c" +#line 6120 "PhotoMetadata.c" ExifMem* _tmp2_; ExifMem* _tmp3_; ExifData* _tmp4_; guchar* _tmp5_; ExifData* _tmp6_; ExifData* _tmp7_; -#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = exif_mem_new_default (); -#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_; -#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = self->priv->exif; -#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp4_->data; -#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" exif_mem_free (_tmp3_, _tmp5_); -#line 751 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 765 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_mem_unref0 (_tmp3_); -#line 752 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = self->priv->exif; -#line 752 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_->data = NULL; -#line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = self->priv->exif; -#line 753 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_->size = (guint) 0; -#line 6177 "PhotoMetadata.c" +#line 6147 "PhotoMetadata.c" } } @@ -6186,58 +6156,58 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) { GExiv2Metadata* _tmp0_; const gchar* _tmp1_; -#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 771 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 771 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = tag; -#line 758 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_clear_tag (_tmp0_, _tmp1_); -#line 6195 "PhotoMetadata.c" +#line 6165 "PhotoMetadata.c" } void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_length1) { gchar** _tmp0_; gint _tmp0__length1; -#line 761 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tags; -#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = tags_length1; -#line 6208 "PhotoMetadata.c" +#line 6178 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 6220 "PhotoMetadata.c" +#line 6190 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; -#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 6227 "PhotoMetadata.c" +#line 6197 "PhotoMetadata.c" { const gchar* _tmp2_; -#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 763 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, _tmp2_); -#line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 6236 "PhotoMetadata.c" +#line 6206 "PhotoMetadata.c" } } } @@ -6246,68 +6216,68 @@ void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_len void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { MetadataDomain _tmp0_; -#line 766 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 780 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = domain; -#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" switch (_tmp0_) { -#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 6253 "PhotoMetadata.c" +#line 6223 "PhotoMetadata.c" { GExiv2Metadata* _tmp1_; -#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; -#line 769 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_clear_exif (_tmp1_); -#line 770 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 784 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6262 "PhotoMetadata.c" +#line 6232 "PhotoMetadata.c" } -#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 6266 "PhotoMetadata.c" +#line 6236 "PhotoMetadata.c" { GExiv2Metadata* _tmp2_; -#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 787 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = self->priv->exiv2; -#line 773 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 787 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_clear_xmp (_tmp2_); -#line 774 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 788 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6275 "PhotoMetadata.c" +#line 6245 "PhotoMetadata.c" } -#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 6279 "PhotoMetadata.c" +#line 6249 "PhotoMetadata.c" { GExiv2Metadata* _tmp3_; -#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 791 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = self->priv->exiv2; -#line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 791 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_clear_iptc (_tmp3_); -#line 778 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 792 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6288 "PhotoMetadata.c" +#line 6258 "PhotoMetadata.c" } default: -#line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6293 "PhotoMetadata.c" +#line 6263 "PhotoMetadata.c" } } void photo_metadata_clear (PhotoMetadata* self) { GExiv2Metadata* _tmp0_; -#line 782 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 796 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_clear (_tmp0_); -#line 6306 "PhotoMetadata.c" +#line 6276 "PhotoMetadata.c" } @@ -6316,58 +6286,58 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self gchar** _tmp0_; gint _tmp0__length1; MetadataDateTime* _tmp1_; -#line 793 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 807 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_DATE_TIME_TAGS; -#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_DATE_TIME_TAGS_length1; -#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_first_date_time (self, _tmp0_, _tmp0__length1); -#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 794 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6327 "PhotoMetadata.c" +#line 6297 "PhotoMetadata.c" } void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { MetadataDateTime* _tmp0_; -#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 811 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 811 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time)); -#line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 813 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = date_time; -#line 799 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 813 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 6341 "PhotoMetadata.c" +#line 6311 "PhotoMetadata.c" gchar** _tmp1_; gint _tmp1__length1; MetadataDateTime* _tmp2_; PhotoMetadataSetOption _tmp3_; -#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_DATE_TIME_TAGS; -#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1__length1 = photo_metadata_DATE_TIME_TAGS_length1; -#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = date_time; -#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = option; -#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6356 "PhotoMetadata.c" +#line 6326 "PhotoMetadata.c" } else { gchar** _tmp4_; gint _tmp4__length1; -#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_DATE_TIME_TAGS; -#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1; -#line 802 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6366 "PhotoMetadata.c" +#line 6336 "PhotoMetadata.c" } } @@ -6377,58 +6347,58 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) { gchar** _tmp0_; gint _tmp0__length1; MetadataDateTime* _tmp1_; -#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 828 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; -#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; -#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_first_date_time (self, _tmp0_, _tmp0__length1); -#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 815 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6388 "PhotoMetadata.c" +#line 6358 "PhotoMetadata.c" } void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { MetadataDateTime* _tmp0_; -#line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 818 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time)); -#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = date_time; -#line 820 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 6402 "PhotoMetadata.c" +#line 6372 "PhotoMetadata.c" gchar** _tmp1_; gint _tmp1__length1; MetadataDateTime* _tmp2_; PhotoMetadataSetOption _tmp3_; -#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; -#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; -#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = date_time; -#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = option; -#line 821 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6417 "PhotoMetadata.c" +#line 6387 "PhotoMetadata.c" } else { gchar** _tmp4_; gint _tmp4__length1; -#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; -#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; -#line 823 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6427 "PhotoMetadata.c" +#line 6397 "PhotoMetadata.c" } } @@ -6438,58 +6408,58 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) { gchar** _tmp0_; gint _tmp0__length1; MetadataDateTime* _tmp1_; -#line 831 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; -#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; -#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_first_date_time (self, _tmp0_, _tmp0__length1); -#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6449 "PhotoMetadata.c" +#line 6419 "PhotoMetadata.c" } void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { MetadataDateTime* _tmp0_; -#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time)); -#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = date_time; -#line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 6463 "PhotoMetadata.c" +#line 6433 "PhotoMetadata.c" gchar** _tmp1_; gint _tmp1__length1; MetadataDateTime* _tmp2_; PhotoMetadataSetOption _tmp3_; -#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; -#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; -#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = date_time; -#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = option; -#line 838 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6478 "PhotoMetadata.c" +#line 6448 "PhotoMetadata.c" } else { gchar** _tmp4_; gint _tmp4__length1; -#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; -#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; -#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6488 "PhotoMetadata.c" +#line 6458 "PhotoMetadata.c" } } @@ -6500,38 +6470,38 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada MetadataDateTime* creation = NULL; MetadataDateTime* _tmp0_; MetadataDateTime* _tmp1_; -#line 843 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 857 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); -#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_exposure_date_time (self); -#line 844 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" creation = _tmp0_; -#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = creation; -#line 845 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ == NULL) { -#line 6509 "PhotoMetadata.c" +#line 6479 "PhotoMetadata.c" MetadataDateTime* _tmp2_; -#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_digitized_date_time (self); -#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (creation); -#line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" creation = _tmp2_; -#line 6517 "PhotoMetadata.c" +#line 6487 "PhotoMetadata.c" } -#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 862 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = creation; -#line 848 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 862 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6523 "PhotoMetadata.c" +#line 6493 "PhotoMetadata.c" } static gpointer _dimensions_dup0 (gpointer self) { -#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? dimensions_dup (self) : NULL; -#line 6530 "PhotoMetadata.c" +#line 6500 "PhotoMetadata.c" } @@ -6541,31 +6511,31 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { gint _tmp0__length1; gchar** _tmp1_; gint _tmp1__length1; -#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_WIDTH_TAGS; -#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_WIDTH_TAGS_length1; -#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_HEIGHT_TAGS; -#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1; -#line 867 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length"); -#line 6552 "PhotoMetadata.c" +#line 6522 "PhotoMetadata.c" { gint ctr = 0; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = 0; -#line 6557 "PhotoMetadata.c" +#line 6527 "PhotoMetadata.c" { gboolean _tmp2_ = FALSE; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = TRUE; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 6564 "PhotoMetadata.c" +#line 6534 "PhotoMetadata.c" gint _tmp4_; gchar** _tmp5_; gint _tmp5__length1; @@ -6587,99 +6557,99 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { glong _tmp17_; Dimensions _tmp18_ = {0}; Dimensions* _tmp19_; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp2_) { -#line 6588 "PhotoMetadata.c" +#line 6558 "PhotoMetadata.c" gint _tmp3_; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = ctr; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = _tmp3_ + 1; -#line 6594 "PhotoMetadata.c" +#line 6564 "PhotoMetadata.c" } -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = FALSE; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = ctr; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_WIDTH_TAGS; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = photo_metadata_WIDTH_TAGS_length1; -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!(_tmp4_ < _tmp5__length1)) { -#line 868 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6608 "PhotoMetadata.c" +#line 6578 "PhotoMetadata.c" } -#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_WIDTH_TAGS; -#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6__length1 = photo_metadata_WIDTH_TAGS_length1; -#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = ctr; -#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = _tmp6_[_tmp7_]; -#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = photo_metadata_get_long (self, _tmp8_, &_tmp9_); -#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" width = _tmp9_; -#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp10_) { -#line 873 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 6626 "PhotoMetadata.c" +#line 6596 "PhotoMetadata.c" } -#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = photo_metadata_HEIGHT_TAGS; -#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11__length1 = photo_metadata_HEIGHT_TAGS_length1; -#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = ctr; -#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = _tmp11_[_tmp12_]; -#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = photo_metadata_get_long (self, _tmp13_, &_tmp14_); -#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" height = _tmp14_; -#line 876 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp15_) { -#line 877 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 6644 "PhotoMetadata.c" +#line 6614 "PhotoMetadata.c" } -#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = width; -#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = height; -#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dimensions_init (&_tmp18_, (gint) _tmp16_, (gint) _tmp17_); -#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = _dimensions_dup0 (&_tmp18_); -#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp19_; -#line 879 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6658 "PhotoMetadata.c" +#line 6628 "PhotoMetadata.c" } } } -#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 896 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 896 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6666 "PhotoMetadata.c" +#line 6636 "PhotoMetadata.c" } void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option) { Dimensions* _tmp0_; -#line 885 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 900 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = dim; -#line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 900 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 6678 "PhotoMetadata.c" +#line 6648 "PhotoMetadata.c" gchar** _tmp1_; gint _tmp1__length1; Dimensions* _tmp2_; @@ -6690,49 +6660,49 @@ void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, Dimensions* _tmp6_; gint _tmp7_; PhotoMetadataSetOption _tmp8_; -#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_WIDTH_TAGS; -#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1__length1 = photo_metadata_WIDTH_TAGS_length1; -#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = dim; -#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = (*_tmp2_).width; -#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = option; -#line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_long (self, _tmp1_, _tmp1__length1, (glong) _tmp3_, _tmp4_); -#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_HEIGHT_TAGS; -#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = photo_metadata_HEIGHT_TAGS_length1; -#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = dim; -#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = (*_tmp6_).height; -#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = option; -#line 888 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_); -#line 6713 "PhotoMetadata.c" +#line 6683 "PhotoMetadata.c" } else { gchar** _tmp9_; gint _tmp9__length1; gchar** _tmp10_; gint _tmp10__length1; -#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = photo_metadata_WIDTH_TAGS; -#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9__length1 = photo_metadata_WIDTH_TAGS_length1; -#line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp9_, _tmp9__length1); -#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = photo_metadata_HEIGHT_TAGS; -#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1; -#line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1); -#line 6731 "PhotoMetadata.c" +#line 6701 "PhotoMetadata.c" } } @@ -6756,7 +6726,7 @@ static gchar* string_strip (const gchar* self) { result = _result_; #line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 6755 "PhotoMetadata.c" +#line 6725 "PhotoMetadata.c" } @@ -6776,7 +6746,7 @@ static gboolean string_contains (const gchar* self, const gchar* needle) { result = _tmp1_ != NULL; #line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 6775 "PhotoMetadata.c" +#line 6745 "PhotoMetadata.c" } @@ -6799,226 +6769,226 @@ static gchar* photo_metadata_real_get_title (MediaMetadata* base) { const gchar* _tmp21_; gboolean _tmp22_; gchar* _tmp28_; -#line 925 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 939 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); -#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); -#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_) { -#line 6804 "PhotoMetadata.c" +#line 6774 "PhotoMetadata.c" GeeList* _tmp2_; -#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); -#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp0_); -#line 934 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = _tmp2_; -#line 6812 "PhotoMetadata.c" +#line 6782 "PhotoMetadata.c" } else { gchar** _tmp3_; gint _tmp3__length1; GeeList* _tmp4_; -#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_STANDARD_TITLE_TAGS; -#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; -#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_get_first_string_multiple (self, _tmp3_, _tmp3__length1); -#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp0_); -#line 935 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = _tmp4_; -#line 6827 "PhotoMetadata.c" +#line 6797 "PhotoMetadata.c" } -#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _g_object_ref0 (_tmp0_); -#line 933 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" titles = _tmp5_; -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = titles; -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp8_ != NULL) { -#line 6837 "PhotoMetadata.c" +#line 6807 "PhotoMetadata.c" GeeList* _tmp9_; gint _tmp10_; gint _tmp11_; -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = titles; -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = _tmp10_; -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _tmp11_ > 0; -#line 6849 "PhotoMetadata.c" +#line 6819 "PhotoMetadata.c" } else { -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = FALSE; -#line 6853 "PhotoMetadata.c" +#line 6823 "PhotoMetadata.c" } -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp7_) { -#line 6857 "PhotoMetadata.c" +#line 6827 "PhotoMetadata.c" GeeList* _tmp12_; gpointer _tmp13_; -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = titles; -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = gee_list_get (_tmp12_, 0); -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp6_); -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = (gchar*) _tmp13_; -#line 6868 "PhotoMetadata.c" +#line 6838 "PhotoMetadata.c" } else { -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp6_); -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = NULL; -#line 6874 "PhotoMetadata.c" +#line 6844 "PhotoMetadata.c" } -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = g_strdup (_tmp6_); -#line 940 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" title = _tmp14_; -#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 957 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = title; -#line 943 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 957 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp15_ != NULL) { -#line 6884 "PhotoMetadata.c" +#line 6854 "PhotoMetadata.c" const gchar* _tmp16_; gchar* _tmp17_; -#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = title; -#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = string_strip (_tmp16_); -#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (title); -#line 944 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" title = _tmp17_; -#line 6895 "PhotoMetadata.c" +#line 6865 "PhotoMetadata.c" } -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = title; -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = is_string_empty (_tmp21_); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp22_) { -#line 6903 "PhotoMetadata.c" +#line 6873 "PhotoMetadata.c" const gchar* _tmp23_; gboolean _tmp24_; -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = title; -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = string_contains (_tmp23_, "\n"); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = !_tmp24_; -#line 6912 "PhotoMetadata.c" +#line 6882 "PhotoMetadata.c" } else { -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = FALSE; -#line 6916 "PhotoMetadata.c" +#line 6886 "PhotoMetadata.c" } -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp20_) { -#line 6920 "PhotoMetadata.c" +#line 6890 "PhotoMetadata.c" const gchar* _tmp25_; gboolean _tmp26_; -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = title; -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = string_contains (_tmp25_, "\r"); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = !_tmp26_; -#line 6929 "PhotoMetadata.c" +#line 6899 "PhotoMetadata.c" } else { -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = FALSE; -#line 6933 "PhotoMetadata.c" +#line 6903 "PhotoMetadata.c" } -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp19_) { -#line 6937 "PhotoMetadata.c" +#line 6907 "PhotoMetadata.c" const gchar* _tmp27_; -#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = title; -#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = _tmp27_; -#line 6943 "PhotoMetadata.c" +#line 6913 "PhotoMetadata.c" } else { -#line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = NULL; -#line 6947 "PhotoMetadata.c" +#line 6917 "PhotoMetadata.c" } -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = g_strdup (_tmp18_); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp28_; -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (title); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp6_); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (titles); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp0_); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6963 "PhotoMetadata.c" +#line 6933 "PhotoMetadata.c" } void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option) { const gchar* _tmp0_; gboolean _tmp1_; -#line 951 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 965 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = title; -#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = is_string_empty (_tmp0_); -#line 952 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { -#line 6978 "PhotoMetadata.c" +#line 6948 "PhotoMetadata.c" gboolean _tmp2_; -#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); -#line 953 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_) { -#line 6984 "PhotoMetadata.c" +#line 6954 "PhotoMetadata.c" const gchar* _tmp3_; -#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = title; -#line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 6990 "PhotoMetadata.c" +#line 6960 "PhotoMetadata.c" } else { gchar** _tmp4_; gint _tmp4__length1; const gchar* _tmp5_; PhotoMetadataSetOption _tmp6_; -#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_STANDARD_TITLE_TAGS; -#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; -#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = title; -#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = option; -#line 956 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_); -#line 7006 "PhotoMetadata.c" +#line 6976 "PhotoMetadata.c" } } else { gchar** _tmp7_; gint _tmp7__length1; -#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = photo_metadata_STANDARD_TITLE_TAGS; -#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; -#line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1); -#line 7017 "PhotoMetadata.c" +#line 6987 "PhotoMetadata.c" } } @@ -7029,47 +6999,47 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) { gchar** _tmp0_; gint _tmp0__length1; gchar* _tmp1_; -#line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); -#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_COMMENT_TAGS; -#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_COMMENT_TAGS_length1; -#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_first_string_interpreted (self, _tmp0_, _tmp0__length1); -#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 7040 "PhotoMetadata.c" +#line 7010 "PhotoMetadata.c" } static Block6Data* block6_data_ref (Block6Data* _data6_) { -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data6_->_ref_count_); -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data6_; -#line 7049 "PhotoMetadata.c" +#line 7019 "PhotoMetadata.c" } static void block6_data_unref (void * _userdata_) { Block6Data* _data6_; _data6_ = (Block6Data*) _userdata_; -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { -#line 7058 "PhotoMetadata.c" +#line 7028 "PhotoMetadata.c" PhotoMetadata* self; -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data6_->self; -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_data6_->comment); -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _media_metadata_unref0 (self); -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block6Data, _data6_); -#line 7068 "PhotoMetadata.c" +#line 7038 "PhotoMetadata.c" } } @@ -7078,24 +7048,24 @@ static void ___lambda10_ (Block6Data* _data6_, const gchar* tag) { PhotoMetadata* self; const gchar* _tmp0_; const gchar* _tmp1_; -#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data6_->self; -#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); -#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = tag; -#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _data6_->comment; -#line 977 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF)); -#line 7087 "PhotoMetadata.c" +#line 7057 "PhotoMetadata.c" } static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { -#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ___lambda10_ (self, tag); -#line 7094 "PhotoMetadata.c" +#line 7064 "PhotoMetadata.c" } @@ -7105,57 +7075,57 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot gchar* _tmp1_; const gchar* _tmp2_; gboolean _tmp3_; -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data6_ = g_slice_new0 (Block6Data); -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data6_->_ref_count_ = 1; -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data6_->self = media_metadata_ref (self); -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = comment; -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (_tmp0_); -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_data6_->comment); -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data6_->comment = _tmp1_; -#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = _data6_->comment; -#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = is_string_empty (_tmp2_); -#line 975 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp3_) { -#line 7126 "PhotoMetadata.c" +#line 7096 "PhotoMetadata.c" gchar** _tmp4_; gint _tmp4__length1; PhotoMetadataSetOption _tmp5_; -#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_COMMENT_TAGS; -#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4__length1 = photo_metadata_COMMENT_TAGS_length1; -#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = option; -#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_generic (self, _tmp4_, _tmp4__length1, _tmp5_, ____lambda10__photo_metadata_set_generic_value, _data6_); -#line 7138 "PhotoMetadata.c" +#line 7108 "PhotoMetadata.c" } else { gchar** _tmp6_; gint _tmp6__length1; -#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_COMMENT_TAGS; -#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6__length1 = photo_metadata_COMMENT_TAGS_length1; -#line 981 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp6_, _tmp6__length1); -#line 7148 "PhotoMetadata.c" +#line 7118 "PhotoMetadata.c" } -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block6_data_unref (_data6_); -#line 971 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data6_ = NULL; -#line 7154 "PhotoMetadata.c" +#line 7124 "PhotoMetadata.c" } @@ -7168,114 +7138,114 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa gboolean _tmp23_ = FALSE; GeeSet* _tmp24_; GeeSet* _tmp29_; -#line 1001 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1015 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1002 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keywords = NULL; -#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_KEYWORD_TAGS; -#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1; -#line 7175 "PhotoMetadata.c" +#line 7145 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; -#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection = _tmp0_; -#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag_collection_length1 = _tmp0__length1; -#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 7187 "PhotoMetadata.c" +#line 7157 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; -#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); -#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 7194 "PhotoMetadata.c" +#line 7164 "PhotoMetadata.c" { GeeCollection* values = NULL; const gchar* _tmp2_; GeeList* _tmp3_; gboolean _tmp4_ = FALSE; GeeCollection* _tmp5_; -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = tag; -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_); -#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = values; -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 7211 "PhotoMetadata.c" +#line 7181 "PhotoMetadata.c" GeeCollection* _tmp6_; gint _tmp7_; gint _tmp8_; -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = values; -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = gee_collection_get_size (_tmp6_); -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = _tmp7_; -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp8_ > 0; -#line 7223 "PhotoMetadata.c" +#line 7193 "PhotoMetadata.c" } else { -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 7227 "PhotoMetadata.c" +#line 7197 "PhotoMetadata.c" } -#line 1005 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 7231 "PhotoMetadata.c" +#line 7201 "PhotoMetadata.c" GeeSet* _tmp9_; -#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = keywords; -#line 1006 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_ == NULL) { -#line 7237 "PhotoMetadata.c" +#line 7207 "PhotoMetadata.c" GCompareDataFunc _tmp10_; void* _tmp10__target; GDestroyNotify _tmp10__target_destroy_notify; GeeSet* _tmp11_; -#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = compare_func; -#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10__target = compare_func_target; -#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10__target_destroy_notify = compare_func_target_destroy_notify; -#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = photo_metadata_create_string_set (self, _tmp10_, _tmp10__target, _tmp10__target_destroy_notify); -#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (keywords); -#line 1007 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keywords = _tmp11_; -#line 7260 "PhotoMetadata.c" +#line 7230 "PhotoMetadata.c" } { GeeIterator* _current_value_it = NULL; GeeCollection* _tmp12_; GeeIterator* _tmp13_; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = values; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_it = _tmp13_; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7274 "PhotoMetadata.c" +#line 7244 "PhotoMetadata.c" GeeIterator* _tmp14_; gboolean _tmp15_; gchar* current_value = NULL; @@ -7285,111 +7255,111 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa const gchar* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = _current_value_it; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = gee_iterator_next (_tmp14_); -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp15_) { -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7292 "PhotoMetadata.c" +#line 7262 "PhotoMetadata.c" } -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = _current_value_it; -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = gee_iterator_get (_tmp16_); -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_value = (gchar*) _tmp17_; -#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = keywords; -#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = current_value; -#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp19_); -#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = _tmp20_; -#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); -#line 1010 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp21_); -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 7314 "PhotoMetadata.c" +#line 7284 "PhotoMetadata.c" } -#line 1009 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 7318 "PhotoMetadata.c" +#line 7288 "PhotoMetadata.c" } } -#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1003 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 7325 "PhotoMetadata.c" +#line 7295 "PhotoMetadata.c" } } } -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = keywords; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp24_ != NULL) { -#line 7333 "PhotoMetadata.c" +#line 7303 "PhotoMetadata.c" GeeSet* _tmp25_; gint _tmp26_; gint _tmp27_; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = keywords; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = _tmp26_; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = _tmp27_ > 0; -#line 7345 "PhotoMetadata.c" +#line 7315 "PhotoMetadata.c" } else { -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = FALSE; -#line 7349 "PhotoMetadata.c" +#line 7319 "PhotoMetadata.c" } -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp23_) { -#line 7353 "PhotoMetadata.c" +#line 7323 "PhotoMetadata.c" GeeSet* _tmp28_; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = keywords; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = _tmp28_; -#line 7359 "PhotoMetadata.c" +#line 7329 "PhotoMetadata.c" } else { -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = NULL; -#line 7363 "PhotoMetadata.c" +#line 7333 "PhotoMetadata.c" } -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = _g_object_ref0 (_tmp22_); -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp29_; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (keywords); -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (compare_func_target_destroy_notify == NULL) ? NULL : (compare_func_target_destroy_notify (compare_func_target), NULL); -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target = NULL; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 1014 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 7381 "PhotoMetadata.c" +#line 7351 "PhotoMetadata.c" } static gpointer _hierarchical_keyword_field_ref0 (gpointer self) { -#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? hierarchical_keyword_field_ref (self) : NULL; -#line 7388 "PhotoMetadata.c" +#line 7358 "PhotoMetadata.c" } @@ -7408,20 +7378,20 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* if ((*((gchar*) self)) == '\0') { #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 7407 "PhotoMetadata.c" +#line 7377 "PhotoMetadata.c" } else { const gchar* _tmp2_; #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = old; #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp1_ = (*((gchar*) _tmp2_)) == '\0'; -#line 7414 "PhotoMetadata.c" +#line 7384 "PhotoMetadata.c" } #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_) { #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 7420 "PhotoMetadata.c" +#line 7390 "PhotoMetadata.c" } else { const gchar* _tmp3_; const gchar* _tmp4_; @@ -7431,11 +7401,11 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _tmp4_ = replacement; #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 7430 "PhotoMetadata.c" +#line 7400 "PhotoMetadata.c" } #line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 7434 "PhotoMetadata.c" +#line 7404 "PhotoMetadata.c" gchar* _tmp5_; #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp5_ = g_strdup (self); @@ -7443,7 +7413,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* result = _tmp5_; #line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7442 "PhotoMetadata.c" +#line 7412 "PhotoMetadata.c" } { GRegex* regex = NULL; @@ -7475,8 +7445,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7474 "PhotoMetadata.c" - goto __catch27_g_regex_error; +#line 7444 "PhotoMetadata.c" + goto __catch31_g_regex_error; } #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); @@ -7484,7 +7454,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 7483 "PhotoMetadata.c" +#line 7453 "PhotoMetadata.c" } #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp12_ = regex; @@ -7500,8 +7470,8 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7499 "PhotoMetadata.c" - goto __catch27_g_regex_error; +#line 7469 "PhotoMetadata.c" + goto __catch31_g_regex_error; } #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); @@ -7511,7 +7481,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 7510 "PhotoMetadata.c" +#line 7480 "PhotoMetadata.c" } #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp15_ = _tmp11_; @@ -7525,10 +7495,10 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* _g_regex_unref0 (regex); #line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7524 "PhotoMetadata.c" +#line 7494 "PhotoMetadata.c" } - goto __finally27; - __catch27_g_regex_error: + goto __finally31; + __catch31_g_regex_error: { GError* e = NULL; #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -7539,9 +7509,9 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_assert_not_reached (); #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 7538 "PhotoMetadata.c" +#line 7508 "PhotoMetadata.c" } - __finally27: + __finally31: #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -7550,7 +7520,7 @@ static gchar* string_replace (const gchar* self, const gchar* old, const gchar* g_clear_error (&_inner_error_); #line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return NULL; -#line 7549 "PhotoMetadata.c" +#line 7519 "PhotoMetadata.c" } } @@ -7574,7 +7544,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { _tmp3_ = end; #line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp3_ == NULL) { -#line 7573 "PhotoMetadata.c" +#line 7543 "PhotoMetadata.c" glong _tmp4_; #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp4_ = maxlen; @@ -7582,7 +7552,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = _tmp4_; #line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7581 "PhotoMetadata.c" +#line 7551 "PhotoMetadata.c" } else { gchar* _tmp5_; gchar* _tmp6_; @@ -7594,7 +7564,7 @@ static glong string_strnlen (gchar* str, glong maxlen) { result = (glong) (_tmp5_ - _tmp6_); #line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7593 "PhotoMetadata.c" +#line 7563 "PhotoMetadata.c" } } @@ -7618,21 +7588,21 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp1_ = offset; #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp1_ >= ((glong) 0)) { -#line 7617 "PhotoMetadata.c" +#line 7587 "PhotoMetadata.c" glong _tmp2_; #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp2_ = len; #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = _tmp2_ >= ((glong) 0); -#line 7623 "PhotoMetadata.c" +#line 7593 "PhotoMetadata.c" } else { #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 7627 "PhotoMetadata.c" +#line 7597 "PhotoMetadata.c" } #line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 7631 "PhotoMetadata.c" +#line 7601 "PhotoMetadata.c" glong _tmp3_; glong _tmp4_; glong _tmp5_; @@ -7644,7 +7614,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); #line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = _tmp5_; -#line 7643 "PhotoMetadata.c" +#line 7613 "PhotoMetadata.c" } else { gint _tmp6_; gint _tmp7_; @@ -7654,13 +7624,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp7_ = _tmp6_; #line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" string_length = (glong) _tmp7_; -#line 7653 "PhotoMetadata.c" +#line 7623 "PhotoMetadata.c" } #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp8_ = offset; #line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp8_ < ((glong) 0)) { -#line 7659 "PhotoMetadata.c" +#line 7629 "PhotoMetadata.c" glong _tmp9_; glong _tmp10_; glong _tmp11_; @@ -7674,7 +7644,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp11_ = offset; #line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 7673 "PhotoMetadata.c" +#line 7643 "PhotoMetadata.c" } else { glong _tmp12_; glong _tmp13_; @@ -7684,13 +7654,13 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp13_ = string_length; #line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#line 7683 "PhotoMetadata.c" +#line 7653 "PhotoMetadata.c" } #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp14_ = len; #line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" if (_tmp14_ < ((glong) 0)) { -#line 7689 "PhotoMetadata.c" +#line 7659 "PhotoMetadata.c" glong _tmp15_; glong _tmp16_; #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" @@ -7699,7 +7669,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { _tmp16_ = offset; #line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" len = _tmp15_ - _tmp16_; -#line 7698 "PhotoMetadata.c" +#line 7668 "PhotoMetadata.c" } #line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" _tmp17_ = offset; @@ -7719,7 +7689,7 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) { result = _tmp22_; #line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" return result; -#line 7718 "PhotoMetadata.c" +#line 7688 "PhotoMetadata.c" } @@ -7729,81 +7699,81 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se HierarchicalTagIndex* _tmp4_; HierarchicalKeywordField** _tmp5_; gint _tmp5__length1; -#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((index == NULL) || IS_HIERARCHICAL_TAG_INDEX (index)); -#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; -#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7736 "PhotoMetadata.c" +#line 7706 "PhotoMetadata.c" { HierarchicalKeywordField** current_field_collection = NULL; gint current_field_collection_length1 = 0; gint _current_field_collection_size_ = 0; gint current_field_it = 0; -#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field_collection = _tmp0_; -#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field_collection_length1 = _tmp0__length1; -#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (current_field_it = 0; current_field_it < _tmp0__length1; current_field_it = current_field_it + 1) { -#line 7748 "PhotoMetadata.c" +#line 7718 "PhotoMetadata.c" HierarchicalKeywordField* _tmp1_; HierarchicalKeywordField* current_field = NULL; -#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); -#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field = _tmp1_; -#line 7755 "PhotoMetadata.c" +#line 7725 "PhotoMetadata.c" { HierarchicalKeywordField* _tmp2_; const gchar* _tmp3_; -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = current_field; -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_->field_name; -#line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, _tmp3_); -#line 1018 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7767 "PhotoMetadata.c" +#line 7737 "PhotoMetadata.c" } } } -#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = index; -#line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ == NULL) { -#line 1022 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 7777 "PhotoMetadata.c" +#line 7747 "PhotoMetadata.c" } -#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; -#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7783 "PhotoMetadata.c" +#line 7753 "PhotoMetadata.c" { HierarchicalKeywordField** current_field_collection = NULL; gint current_field_collection_length1 = 0; gint _current_field_collection_size_ = 0; gint current_field_it = 0; -#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field_collection = _tmp5_; -#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field_collection_length1 = _tmp5__length1; -#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (current_field_it = 0; current_field_it < _tmp5__length1; current_field_it = current_field_it + 1) { -#line 7795 "PhotoMetadata.c" +#line 7765 "PhotoMetadata.c" HierarchicalKeywordField* _tmp6_; HierarchicalKeywordField* current_field = NULL; -#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); -#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field = _tmp6_; -#line 7802 "PhotoMetadata.c" +#line 7772 "PhotoMetadata.c" { HierarchicalKeywordField* _tmp7_; gboolean _tmp8_; @@ -7812,23 +7782,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se HierarchicalKeywordField* _tmp29_; const gchar* _tmp30_; GeeSet* _tmp31_; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = current_field; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = _tmp7_->is_writeable; -#line 1025 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp8_) { -#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 1026 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 7821 "PhotoMetadata.c" +#line 7791 "PhotoMetadata.c" } -#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet); -#line 7827 "PhotoMetadata.c" +#line 7797 "PhotoMetadata.c" { GeeIterator* _current_path_it = NULL; HierarchicalTagIndex* _tmp10_; @@ -7836,23 +7806,23 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se GeeCollection* _tmp12_; GeeIterator* _tmp13_; GeeIterator* _tmp14_; -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = index; -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = hierarchical_tag_index_get_all_paths (_tmp10_); -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = _tmp11_; -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = _tmp13_; -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp12_); -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_path_it = _tmp14_; -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7851 "PhotoMetadata.c" +#line 7821 "PhotoMetadata.c" GeeIterator* _tmp15_; gboolean _tmp16_; gchar* current_path = NULL; @@ -7867,80 +7837,80 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se gboolean _tmp24_; GeeSet* _tmp27_; const gchar* _tmp28_; -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _current_path_it; -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = gee_iterator_next (_tmp15_); -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp16_) { -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7874 "PhotoMetadata.c" +#line 7844 "PhotoMetadata.c" } -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = _current_path_it; -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = gee_iterator_get (_tmp17_); -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_path = (gchar*) _tmp18_; -#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = current_path; -#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = current_field; -#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = _tmp20_->path_separator; -#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = string_replace (_tmp19_, TAG_PATH_SEPARATOR_STRING, _tmp21_); -#line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" writeable_path = _tmp22_; -#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = current_field; -#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = _tmp23_->wants_leading_separator; -#line 1033 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp24_) { -#line 7898 "PhotoMetadata.c" +#line 7868 "PhotoMetadata.c" const gchar* _tmp25_; gchar* _tmp26_; -#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = writeable_path; -#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = string_substring (_tmp25_, (glong) 1, (glong) -1); -#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (writeable_path); -#line 1034 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" writeable_path = _tmp26_; -#line 7909 "PhotoMetadata.c" +#line 7879 "PhotoMetadata.c" } -#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = writeable_set; -#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = writeable_path; -#line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (writeable_path); -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_path); -#line 7921 "PhotoMetadata.c" +#line 7891 "PhotoMetadata.c" } -#line 1030 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_path_it); -#line 7925 "PhotoMetadata.c" +#line 7895 "PhotoMetadata.c" } -#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = current_field; -#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = _tmp29_->field_name; -#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = writeable_set; -#line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string_multiple (self, _tmp30_, G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (writeable_set); -#line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7939 "PhotoMetadata.c" +#line 7909 "PhotoMetadata.c" } } } @@ -7954,23 +7924,23 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, GeeTreeSet* _tmp1_; GeeCollection* _tmp2_; GeeCollection* _tmp28_; -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((keywords == NULL) || GEE_IS_COLLECTION (keywords)); -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = hierarchical_tag_index_new (); -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1058 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" htag_index = _tmp0_; -#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" flat_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet); -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = keywords; -#line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ != NULL) { -#line 7969 "PhotoMetadata.c" +#line 7939 "PhotoMetadata.c" GeeSet* _tmp24_; HierarchicalTagIndex* _tmp25_; GeeCollection* _tmp26_; @@ -7979,15 +7949,15 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, GeeIterator* _keyword_it = NULL; GeeCollection* _tmp3_; GeeIterator* _tmp4_; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = keywords; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _keyword_it = _tmp4_; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7986 "PhotoMetadata.c" +#line 7956 "PhotoMetadata.c" GeeIterator* _tmp5_; gboolean _tmp6_; gchar* keyword = NULL; @@ -7995,52 +7965,52 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, gpointer _tmp8_; const gchar* _tmp9_; gboolean _tmp10_; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _keyword_it; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = gee_iterator_next (_tmp5_); -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp6_) { -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8002 "PhotoMetadata.c" +#line 7972 "PhotoMetadata.c" } -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _keyword_it; -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = gee_iterator_get (_tmp7_); -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword = (gchar*) _tmp8_; -#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = keyword; -#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING); -#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp10_) { -#line 8016 "PhotoMetadata.c" +#line 7986 "PhotoMetadata.c" GeeCollection* path_components = NULL; const gchar* _tmp11_; GeeList* _tmp12_; -#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = keyword; -#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_); -#line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection); -#line 8026 "PhotoMetadata.c" +#line 7996 "PhotoMetadata.c" { GeeIterator* _component_it = NULL; GeeCollection* _tmp13_; GeeIterator* _tmp14_; -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = path_components; -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _component_it = _tmp14_; -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8039 "PhotoMetadata.c" +#line 8009 "PhotoMetadata.c" GeeIterator* _tmp15_; gboolean _tmp16_; gchar* component = NULL; @@ -8049,117 +8019,117 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, HierarchicalTagIndex* _tmp19_; const gchar* _tmp20_; const gchar* _tmp21_; -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _component_it; -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = gee_iterator_next (_tmp15_); -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp16_) { -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8056 "PhotoMetadata.c" +#line 8026 "PhotoMetadata.c" } -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = _component_it; -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = gee_iterator_get (_tmp17_); -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" component = (gchar*) _tmp18_; -#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = htag_index; -#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = component; -#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = keyword; -#line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_); -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (component); -#line 8074 "PhotoMetadata.c" +#line 8044 "PhotoMetadata.c" } -#line 1052 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_component_it); -#line 8078 "PhotoMetadata.c" +#line 8048 "PhotoMetadata.c" } -#line 1049 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (path_components); -#line 8082 "PhotoMetadata.c" +#line 8052 "PhotoMetadata.c" } else { GeeSet* _tmp22_; const gchar* _tmp23_; -#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = flat_keywords; -#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = keyword; -#line 1055 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_); -#line 8092 "PhotoMetadata.c" +#line 8062 "PhotoMetadata.c" } -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (keyword); -#line 8096 "PhotoMetadata.c" +#line 8066 "PhotoMetadata.c" } -#line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_keyword_it); -#line 8100 "PhotoMetadata.c" +#line 8070 "PhotoMetadata.c" } -#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = flat_keywords; -#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = htag_index; -#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = hierarchical_tag_index_get_all_tags (_tmp25_); -#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = _tmp26_; -#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp27_); -#line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp27_); -#line 8114 "PhotoMetadata.c" +#line 8084 "PhotoMetadata.c" } -#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = keywords; -#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp28_ != NULL) { -#line 8120 "PhotoMetadata.c" +#line 8090 "PhotoMetadata.c" gchar** _tmp29_; gint _tmp29__length1; GeeSet* _tmp30_; PhotoMetadataSetOption _tmp31_; HierarchicalTagIndex* _tmp32_; -#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = photo_metadata_KEYWORD_TAGS; -#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29__length1 = photo_metadata_KEYWORD_TAGS_length1; -#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = flat_keywords; -#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = option; -#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_all_string_multiple (self, _tmp29_, _tmp29__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_COLLECTION, GeeCollection), _tmp31_); -#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp32_ = htag_index; -#line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_); -#line 8140 "PhotoMetadata.c" +#line 8110 "PhotoMetadata.c" } else { gchar** _tmp33_; gint _tmp33__length1; -#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33_ = photo_metadata_KEYWORD_TAGS; -#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33__length1 = photo_metadata_KEYWORD_TAGS_length1; -#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1); -#line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1081 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_set_hierarchical_keywords (self, NULL); -#line 8152 "PhotoMetadata.c" +#line 8122 "PhotoMetadata.c" } -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (flat_keywords); -#line 1043 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_tag_index_unref0 (htag_index); -#line 8158 "PhotoMetadata.c" +#line 8128 "PhotoMetadata.c" } @@ -8167,32 +8137,32 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { gboolean result = FALSE; HierarchicalKeywordField** _tmp0_; gint _tmp0__length1; -#line 1071 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; -#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8172 "PhotoMetadata.c" +#line 8142 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; gint _field_collection_size_ = 0; gint field_it = 0; -#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field_collection = _tmp0_; -#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field_collection_length1 = _tmp0__length1; -#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) { -#line 8184 "PhotoMetadata.c" +#line 8154 "PhotoMetadata.c" HierarchicalKeywordField* _tmp1_; HierarchicalKeywordField* field = NULL; -#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); -#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field = _tmp1_; -#line 8191 "PhotoMetadata.c" +#line 8161 "PhotoMetadata.c" { GeeCollection* values = NULL; HierarchicalKeywordField* _tmp2_; @@ -8200,61 +8170,61 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { GeeList* _tmp4_; gboolean _tmp5_ = FALSE; GeeCollection* _tmp6_; -#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = field; -#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_->field_name; -#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_get_string_multiple (self, _tmp3_); -#line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = values; -#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp6_ != NULL) { -#line 8211 "PhotoMetadata.c" +#line 8181 "PhotoMetadata.c" GeeCollection* _tmp7_; gint _tmp8_; gint _tmp9_; -#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = values; -#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = gee_collection_get_size (_tmp7_); -#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = _tmp8_; -#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp9_ > 0; -#line 8223 "PhotoMetadata.c" +#line 8193 "PhotoMetadata.c" } else { -#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = FALSE; -#line 8227 "PhotoMetadata.c" +#line 8197 "PhotoMetadata.c" } -#line 1075 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_) { -#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; -#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8239 "PhotoMetadata.c" +#line 8209 "PhotoMetadata.c" } -#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1072 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8245 "PhotoMetadata.c" +#line 8215 "PhotoMetadata.c" } } } -#line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 1079 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8253 "PhotoMetadata.c" +#line 8223 "PhotoMetadata.c" } @@ -8266,40 +8236,40 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { HierarchicalKeywordField** _tmp2_; gint _tmp2__length1; GError * _inner_error_ = NULL; -#line 1082 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_has_hierarchical_keywords (self); -#line 1083 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp0_, "has_hierarchical_keywords()"); -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_create_string_set (self, NULL, NULL, NULL); -#line 1085 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" h_keywords = _tmp1_; -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8279 "PhotoMetadata.c" +#line 8249 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; gint _field_collection_size_ = 0; gint field_it = 0; -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field_collection = _tmp2_; -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field_collection_length1 = _tmp2__length1; -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) { -#line 8291 "PhotoMetadata.c" +#line 8261 "PhotoMetadata.c" HierarchicalKeywordField* _tmp3_; HierarchicalKeywordField* field = NULL; -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field = _tmp3_; -#line 8298 "PhotoMetadata.c" +#line 8268 "PhotoMetadata.c" { GeeCollection* values = NULL; HierarchicalKeywordField* _tmp4_; @@ -8309,85 +8279,85 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { GeeCollection* _tmp8_; GeeArrayList* transformed_values = NULL; GeeArrayList* _tmp12_; -#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = field; -#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp4_->field_name; -#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_get_string_multiple (self, _tmp5_); -#line 1088 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = values; -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp8_ == NULL) { -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = TRUE; -#line 8322 "PhotoMetadata.c" +#line 8292 "PhotoMetadata.c" } else { GeeCollection* _tmp9_; gint _tmp10_; gint _tmp11_; -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = values; -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = gee_collection_get_size (_tmp9_); -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = _tmp10_; -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _tmp11_ < 1; -#line 8335 "PhotoMetadata.c" +#line 8305 "PhotoMetadata.c" } -#line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp7_) { -#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 1091 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 8345 "PhotoMetadata.c" +#line 8315 "PhotoMetadata.c" } -#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); -#line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" transformed_values = _tmp12_; -#line 8351 "PhotoMetadata.c" +#line 8321 "PhotoMetadata.c" { GeeIterator* _current_value_it = NULL; GeeCollection* _tmp13_; GeeIterator* _tmp14_; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = values; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_it = _tmp14_; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8364 "PhotoMetadata.c" +#line 8334 "PhotoMetadata.c" GeeIterator* _tmp15_; gboolean _tmp16_; gchar* current_value = NULL; GeeIterator* _tmp17_; gpointer _tmp18_; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _current_value_it; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = gee_iterator_next (_tmp15_); -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp16_) { -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8378 "PhotoMetadata.c" +#line 8348 "PhotoMetadata.c" } -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = _current_value_it; -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = gee_iterator_get (_tmp17_); -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_value = (gchar*) _tmp18_; -#line 8386 "PhotoMetadata.c" +#line 8356 "PhotoMetadata.c" { GeeList* transformed = NULL; HierarchicalKeywordField* _tmp19_; @@ -8396,84 +8366,84 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { GeeList* _tmp22_; GeeArrayList* _tmp23_; GeeList* _tmp24_; -#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = field; -#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = _tmp19_->transformer; -#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = current_value; -#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = keyword_transformer_transform (_tmp20_, _tmp21_, &_inner_error_); -#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" transformed = _tmp22_; -#line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8407 "PhotoMetadata.c" - goto __catch28_g_error; +#line 8377 "PhotoMetadata.c" + goto __catch32_g_error; } -#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = transformed_values; -#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = transformed; -#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_array_list_add_all (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed); -#line 8418 "PhotoMetadata.c" +#line 8388 "PhotoMetadata.c" } - goto __finally28; - __catch28_g_error: + goto __finally32; + __catch32_g_error: { GError* _error_ = NULL; const gchar* _tmp25_; GError* _tmp26_; const gchar* _tmp27_; -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _error_ = _inner_error_; -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _inner_error_ = NULL; -#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = current_value; -#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = _error_; -#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = _tmp26_->message; -#line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_critical ("PhotoMetadata.vala:1099: Failed to transform tag value %s: %s", _tmp25_, _tmp27_); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + g_critical ("PhotoMetadata.vala:1113: Failed to transform tag value %s: %s", _tmp25_, _tmp27_); +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_error_free0 (_error_); -#line 8441 "PhotoMetadata.c" +#line 8411 "PhotoMetadata.c" } - __finally28: -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + __finally32: +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed_values); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (h_keywords); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_clear_error (&_inner_error_); -#line 1095 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 8464 "PhotoMetadata.c" +#line 8434 "PhotoMetadata.c" } -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8468 "PhotoMetadata.c" +#line 8438 "PhotoMetadata.c" } -#line 1094 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 8472 "PhotoMetadata.c" +#line 8442 "PhotoMetadata.c" } { GeeArrayList* _current_value_list = NULL; @@ -8484,25 +8454,25 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { gint _tmp31_; gint _tmp32_; gint _current_value_index = 0; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = transformed_values; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = _g_object_ref0 (_tmp28_); -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_list = _tmp29_; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = _current_value_list; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp32_ = _tmp31_; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_size = _tmp32_; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_index = -1; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8501 "PhotoMetadata.c" +#line 8471 "PhotoMetadata.c" gint _tmp33_; gint _tmp34_; gint _tmp35_; @@ -8516,78 +8486,78 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { const gchar* _tmp41_; gchar* _tmp42_; const gchar* _tmp43_; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33_ = _current_value_index; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_index = _tmp33_ + 1; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp34_ = _current_value_index; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp35_ = _current_value_size; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!(_tmp34_ < _tmp35_)) { -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8527 "PhotoMetadata.c" +#line 8497 "PhotoMetadata.c" } -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp36_ = _current_value_list; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_ = _current_value_index; -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp38_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp37_); -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_value = (gchar*) _tmp38_; -#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp39_ = current_value; -#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp40_ = field; -#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp41_ = _tmp40_->path_separator; -#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp42_ = hierarchical_tag_utilities_canonicalize (_tmp39_, _tmp41_); -#line 1106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" canonicalized = _tmp42_; -#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp43_ = canonicalized; -#line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp43_ != NULL) { -#line 8551 "PhotoMetadata.c" +#line 8521 "PhotoMetadata.c" GeeSet* _tmp44_; const gchar* _tmp45_; -#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp44_ = h_keywords; -#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp45_ = canonicalized; -#line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_COLLECTION, GeeCollection), _tmp45_); -#line 8560 "PhotoMetadata.c" +#line 8530 "PhotoMetadata.c" } -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (canonicalized); -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8566 "PhotoMetadata.c" +#line 8536 "PhotoMetadata.c" } -#line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_list); -#line 8570 "PhotoMetadata.c" +#line 8540 "PhotoMetadata.c" } -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed_values); -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); -#line 1087 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8578 "PhotoMetadata.c" +#line 8548 "PhotoMetadata.c" } } } -#line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = h_keywords; -#line 1115 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8586 "PhotoMetadata.c" +#line 8556 "PhotoMetadata.c" } @@ -8595,17 +8565,17 @@ gboolean photo_metadata_has_orientation (PhotoMetadata* self) { gboolean result = FALSE; GExiv2Metadata* _tmp0_; GExiv2Orientation _tmp1_; -#line 1118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1132 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gexiv2_metadata_get_orientation (_tmp0_); -#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED; -#line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8604 "PhotoMetadata.c" +#line 8574 "PhotoMetadata.c" } @@ -8617,58 +8587,58 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) { gboolean _tmp2_ = FALSE; gboolean _tmp3_ = FALSE; GExiv2Orientation _tmp4_; -#line 1123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); -#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = gexiv2_metadata_get_orientation (_tmp0_); -#line 1126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" orientation = _tmp1_; -#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = orientation; -#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) { -#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 8630 "PhotoMetadata.c" +#line 8600 "PhotoMetadata.c" } else { GExiv2Orientation _tmp5_; -#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = orientation; -#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5_ < ORIENTATION_MIN; -#line 8637 "PhotoMetadata.c" +#line 8607 "PhotoMetadata.c" } -#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = TRUE; -#line 8643 "PhotoMetadata.c" +#line 8613 "PhotoMetadata.c" } else { GExiv2Orientation _tmp6_; -#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = orientation; -#line 1128 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = _tmp6_ > ORIENTATION_MAX; -#line 8650 "PhotoMetadata.c" +#line 8620 "PhotoMetadata.c" } -#line 1127 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_) { -#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = ORIENTATION_TOP_LEFT; -#line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8658 "PhotoMetadata.c" +#line 8628 "PhotoMetadata.c" } else { GExiv2Orientation _tmp7_; -#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = orientation; -#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = (Orientation) _tmp7_; -#line 1131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8667 "PhotoMetadata.c" +#line 8637 "PhotoMetadata.c" } } @@ -8676,15 +8646,15 @@ Orientation photo_metadata_get_orientation (PhotoMetadata* self) { void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation) { GExiv2Metadata* _tmp0_; Orientation _tmp1_; -#line 1134 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = orientation; -#line 1136 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_); -#line 8683 "PhotoMetadata.c" +#line 8653 "PhotoMetadata.c" } @@ -8702,127 +8672,127 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* gboolean _tmp4_; gchar* _tmp5_; gchar* _tmp6_; -#line 1139 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; -#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = gexiv2_metadata_get_gps_info (_tmp0_, &_tmp1_, &_tmp2_, &_tmp3_); -#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_longitude = _tmp1_; -#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_latitude = _tmp2_; -#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_altitude = _tmp3_; -#line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp4_) { -#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1156 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_long_ref = NULL; -#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1157 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_lat_ref = NULL; -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (longitude) { -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8729 "PhotoMetadata.c" +#line 8699 "PhotoMetadata.c" } -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8735 "PhotoMetadata.c" +#line 8705 "PhotoMetadata.c" } else { -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8739 "PhotoMetadata.c" +#line 8709 "PhotoMetadata.c" } -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8745 "PhotoMetadata.c" +#line 8715 "PhotoMetadata.c" } -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8751 "PhotoMetadata.c" +#line 8721 "PhotoMetadata.c" } else { -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8755 "PhotoMetadata.c" +#line 8725 "PhotoMetadata.c" } -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8761 "PhotoMetadata.c" +#line 8731 "PhotoMetadata.c" } -#line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8765 "PhotoMetadata.c" +#line 8735 "PhotoMetadata.c" } -#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_long_ref = _tmp5_; -#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLatitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 1149 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_lat_ref = _tmp6_; -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (longitude) { -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8785 "PhotoMetadata.c" +#line 8755 "PhotoMetadata.c" } -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8791 "PhotoMetadata.c" +#line 8761 "PhotoMetadata.c" } else { -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8795 "PhotoMetadata.c" +#line 8765 "PhotoMetadata.c" } -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8801 "PhotoMetadata.c" +#line 8771 "PhotoMetadata.c" } -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8807 "PhotoMetadata.c" +#line 8777 "PhotoMetadata.c" } else { -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8811 "PhotoMetadata.c" +#line 8781 "PhotoMetadata.c" } -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8817 "PhotoMetadata.c" +#line 8787 "PhotoMetadata.c" } -#line 1151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8821 "PhotoMetadata.c" +#line 8791 "PhotoMetadata.c" } @@ -8831,23 +8801,23 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp gboolean result = FALSE; MetadataRational _tmp0_ = {0}; gboolean _tmp1_; -#line 1154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_); -#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_exposure = _tmp0_; -#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (exposure) { -#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *exposure = _vala_exposure; -#line 8842 "PhotoMetadata.c" +#line 8812 "PhotoMetadata.c" } -#line 1155 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8846 "PhotoMetadata.c" +#line 8816 "PhotoMetadata.c" } @@ -8858,37 +8828,37 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { gboolean _tmp1_; gboolean _tmp2_; gchar* _tmp3_; -#line 1158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.ExposureTime", &_tmp0_); -#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" exposure_time = _tmp0_; -#line 1160 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { -#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 1161 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8869 "PhotoMetadata.c" +#line 8839 "PhotoMetadata.c" } -#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = metadata_rational_is_valid (&exposure_time); -#line 1163 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp2_) { -#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 1164 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8879 "PhotoMetadata.c" +#line 8849 "PhotoMetadata.c" } -#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp3_; -#line 1166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8887 "PhotoMetadata.c" +#line 8857 "PhotoMetadata.c" } @@ -8901,70 +8871,70 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { gboolean _tmp2_; gboolean _tmp3_ = FALSE; glong _tmp4_; -#line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1184 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_long (self, "Exif.Photo.ISOSpeedRatings", &_tmp0_); -#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1184 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_iso = _tmp0_; -#line 1170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1184 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" fetched_ok = _tmp1_; -#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = fetched_ok; -#line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ == FALSE) { -#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (iso) { -#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8918 "PhotoMetadata.c" +#line 8888 "PhotoMetadata.c" } -#line 1173 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8922 "PhotoMetadata.c" +#line 8892 "PhotoMetadata.c" } -#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _vala_iso; -#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ < ((glong) 6)) { -#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 8930 "PhotoMetadata.c" +#line 8900 "PhotoMetadata.c" } else { glong _tmp5_; -#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _vala_iso; -#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5_ > ((glong) 409600); -#line 8937 "PhotoMetadata.c" +#line 8907 "PhotoMetadata.c" } -#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; -#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (iso) { -#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8947 "PhotoMetadata.c" +#line 8917 "PhotoMetadata.c" } -#line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8951 "PhotoMetadata.c" +#line 8921 "PhotoMetadata.c" } -#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; -#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (iso) { -#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8959 "PhotoMetadata.c" +#line 8929 "PhotoMetadata.c" } -#line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8963 "PhotoMetadata.c" +#line 8933 "PhotoMetadata.c" } @@ -8974,27 +8944,27 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { glong _tmp0_ = 0L; gboolean _tmp1_; gchar* _tmp2_; -#line 1183 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_iso (self, &_tmp0_); -#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" iso = _tmp0_; -#line 1185 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1199 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { -#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 1186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8985 "PhotoMetadata.c" +#line 8955 "PhotoMetadata.c" } -#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ISOSpeedRatings", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp2_; -#line 1188 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8993 "PhotoMetadata.c" +#line 8963 "PhotoMetadata.c" } @@ -9003,23 +8973,23 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape gboolean result = FALSE; MetadataRational _tmp0_ = {0}; gboolean _tmp1_; -#line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1205 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FNumber", &_tmp0_); -#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_aperture = _tmp0_; -#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (aperture) { -#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *aperture = _vala_aperture; -#line 9014 "PhotoMetadata.c" +#line 8984 "PhotoMetadata.c" } -#line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9018 "PhotoMetadata.c" +#line 8988 "PhotoMetadata.c" } @@ -9043,105 +9013,105 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f gchar* _tmp13_; gchar* _tmp14_; gchar* _tmp15_; -#line 1195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_aperture (self, &_tmp0_); -#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" aperture = _tmp0_; -#line 1197 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp1_) { -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; -#line 1198 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9054 "PhotoMetadata.c" +#line 9024 "PhotoMetadata.c" } -#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = aperture; -#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_.numerator; -#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = aperture; -#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp4_.denominator; -#line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" aperture_value = ((gdouble) _tmp3_) / ((gdouble) _tmp5_); -#line 1201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = aperture_value; -#line 1201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" aperture_value = ((gint) (_tmp6_ * 10.0)) / 10.0; -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = pango_formatted; -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp8_) { -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "f/"; -#line 9076 "PhotoMetadata.c" +#line 9046 "PhotoMetadata.c" } else { -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "f/"; -#line 9080 "PhotoMetadata.c" +#line 9050 "PhotoMetadata.c" } -#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = aperture_value; -#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (fmod (_tmp10_, 1) == ((gdouble) 0)) { -#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = "%.0f"; -#line 9088 "PhotoMetadata.c" +#line 9058 "PhotoMetadata.c" } else { -#line 1204 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = "%.1f"; -#line 9092 "PhotoMetadata.c" +#line 9062 "PhotoMetadata.c" } -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = aperture_value; -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = g_strdup_printf (_tmp9_, _tmp11_); -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = _tmp12_; -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = g_strconcat (_tmp7_, _tmp13_, NULL); -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _tmp14_; -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp13_); -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp15_; -#line 1203 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9110 "PhotoMetadata.c" +#line 9080 "PhotoMetadata.c" } gchar* photo_metadata_get_camera_make (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_; -#line 1207 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Make", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1208 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9125 "PhotoMetadata.c" +#line 9095 "PhotoMetadata.c" } gchar* photo_metadata_get_camera_model (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_; -#line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Model", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9140 "PhotoMetadata.c" +#line 9110 "PhotoMetadata.c" } @@ -9150,38 +9120,38 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) { gboolean result = FALSE; glong _tmp0_ = 0L; gboolean _tmp1_; -#line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1229 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_long (self, "Exif.Photo.Flash", &_tmp0_); -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_flash = _tmp0_; -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (flash) { -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *flash = _vala_flash; -#line 9161 "PhotoMetadata.c" +#line 9131 "PhotoMetadata.c" } -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9165 "PhotoMetadata.c" +#line 9135 "PhotoMetadata.c" } gchar* photo_metadata_get_flash_string (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_; -#line 1220 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.Flash", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9180 "PhotoMetadata.c" +#line 9150 "PhotoMetadata.c" } @@ -9190,38 +9160,38 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* gboolean result = FALSE; MetadataRational _tmp0_ = {0}; gboolean _tmp1_; -#line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_rational (self, "Exif.Photo.FocalLength", &_tmp0_); -#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_focal_length = _tmp0_; -#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (focal_length) { -#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *focal_length = _vala_focal_length; -#line 9201 "PhotoMetadata.c" +#line 9171 "PhotoMetadata.c" } -#line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9205 "PhotoMetadata.c" +#line 9175 "PhotoMetadata.c" } gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_; -#line 1229 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.FocalLength", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9220 "PhotoMetadata.c" +#line 9190 "PhotoMetadata.c" } @@ -9230,49 +9200,49 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) { gchar** _tmp0_; gint _tmp0__length1; gchar* _tmp1_; -#line 1239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_ARTIST_TAGS; -#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_ARTIST_TAGS_length1; -#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_first_string_interpreted (self, _tmp0_, _tmp0__length1); -#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp1_; -#line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9241 "PhotoMetadata.c" +#line 9211 "PhotoMetadata.c" } gchar* photo_metadata_get_copyright (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_; -#line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Copyright", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9256 "PhotoMetadata.c" +#line 9226 "PhotoMetadata.c" } gchar* photo_metadata_get_software (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_; -#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Image.Software", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9271 "PhotoMetadata.c" +#line 9241 "PhotoMetadata.c" } @@ -9282,69 +9252,69 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co gchar* _tmp2_; gchar* _tmp3_; gboolean _tmp4_; -#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (software != NULL); -#line 1251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (version != NULL); -#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = software; -#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = version; -#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = g_strdup_printf ("%s %s", _tmp0_, _tmp1_); -#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp2_; -#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Exif.Image.Software", _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1253 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp3_); -#line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = photo_metadata_has_iptc (self); -#line 1255 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 9303 "PhotoMetadata.c" +#line 9273 "PhotoMetadata.c" const gchar* _tmp5_; const gchar* _tmp6_; -#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = software; -#line 1256 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Iptc.Application2.Program", _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = version; -#line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", _tmp6_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 9314 "PhotoMetadata.c" +#line 9284 "PhotoMetadata.c" } } void photo_metadata_remove_software (PhotoMetadata* self) { -#line 1261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, "Exif.Image.Software"); -#line 1263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, "Iptc.Application2.Program"); -#line 1264 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion"); -#line 9328 "PhotoMetadata.c" +#line 9298 "PhotoMetadata.c" } gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) { gchar* result = NULL; gchar* _tmp0_; -#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureBiasValue", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp0_; -#line 1268 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9343 "PhotoMetadata.c" +#line 9313 "PhotoMetadata.c" } @@ -9361,134 +9331,134 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { const gchar* _tmp8_; gint _tmp9_; Rating _tmp18_; -#line 1279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1293 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); -#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = photo_metadata_RATING_TAGS; -#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_RATING_TAGS_length1; -#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = photo_metadata_get_first_string (self, _tmp0_, _tmp0__length1); -#line 1280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" rating_string = _tmp1_; -#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = rating_string; -#line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ != NULL) { -#line 9374 "PhotoMetadata.c" +#line 9344 "PhotoMetadata.c" const gchar* _tmp3_; gint _tmp4_; Rating _tmp5_; -#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = rating_string; -#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = atoi (_tmp3_); -#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = rating_unserialize (_tmp4_); -#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp5_; -#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9390 "PhotoMetadata.c" +#line 9360 "PhotoMetadata.c" } -#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" rating_string = _tmp6_; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = rating_string; -#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp7_ == NULL) { -#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = RATING_UNRATED; -#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1286 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9408 "PhotoMetadata.c" +#line 9378 "PhotoMetadata.c" } -#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = rating_string; -#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = atoi (_tmp8_); -#line 1289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" int_percent_rating = _tmp9_; -#line 9416 "PhotoMetadata.c" +#line 9386 "PhotoMetadata.c" { gint i = 0; -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" i = 5; -#line 9421 "PhotoMetadata.c" +#line 9391 "PhotoMetadata.c" { gboolean _tmp10_ = FALSE; -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = TRUE; -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 9428 "PhotoMetadata.c" +#line 9398 "PhotoMetadata.c" gint _tmp12_; gint _tmp13_; gint _tmp14_; gint _tmp15_; -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp10_) { -#line 9435 "PhotoMetadata.c" +#line 9405 "PhotoMetadata.c" gint _tmp11_; -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = i; -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" i = _tmp11_ - 1; -#line 9441 "PhotoMetadata.c" +#line 9411 "PhotoMetadata.c" } -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = FALSE; -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = i; -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!(_tmp12_ >= 0)) { -#line 1290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 9451 "PhotoMetadata.c" +#line 9421 "PhotoMetadata.c" } -#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = int_percent_rating; -#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = i; -#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = RESOURCES_rating_thresholds[_tmp14_]; -#line 1291 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp13_ >= _tmp15_) { -#line 9461 "PhotoMetadata.c" +#line 9431 "PhotoMetadata.c" gint _tmp16_; Rating _tmp17_; -#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = i; -#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = rating_unserialize (_tmp16_); -#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp17_; -#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1292 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9474 "PhotoMetadata.c" +#line 9444 "PhotoMetadata.c" } } } } -#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = rating_unserialize (-1); -#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = _tmp18_; -#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); -#line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9487 "PhotoMetadata.c" +#line 9457 "PhotoMetadata.c" } @@ -9503,71 +9473,71 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { gchar* _tmp6_; gchar* _tmp7_; gint _tmp8_; -#line 1302 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1316 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = rating; -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = rating_serialize (_tmp0_); -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" int_rating = _tmp1_; -#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = int_rating; -#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = g_strdup_printf ("%i", _tmp2_); -#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp3_; -#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Xmp.xmp.Rating", _tmp4_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp4_); -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = int_rating; -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = g_strdup_printf ("%i", _tmp5_); -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = _tmp6_; -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Exif.Image.Rating", _tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp7_); -#line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = int_rating; -#line 1307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (0 <= _tmp8_) { -#line 9534 "PhotoMetadata.c" +#line 9504 "PhotoMetadata.c" gint _tmp9_; gint _tmp10_; gchar* _tmp11_; gchar* _tmp12_; -#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = int_rating; -#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = RESOURCES_rating_thresholds[_tmp9_]; -#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = g_strdup_printf ("%i", _tmp10_); -#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = _tmp11_; -#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp12_); -#line 9551 "PhotoMetadata.c" +#line 9521 "PhotoMetadata.c" } else { gint _tmp13_; gchar* _tmp14_; gchar* _tmp15_; -#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = int_rating; -#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = g_strdup_printf ("%i", _tmp13_); -#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _tmp14_; -#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 1310 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_tmp15_); -#line 9566 "PhotoMetadata.c" +#line 9536 "PhotoMetadata.c" } } @@ -9575,7 +9545,7 @@ void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { static gpointer _media_metadata_ref0 (gpointer self) { #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? media_metadata_ref (self) : NULL; -#line 9574 "PhotoMetadata.c" +#line 9544 "PhotoMetadata.c" } @@ -9642,27 +9612,20 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_ self->number = _tmp14_; #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 9641 "PhotoMetadata.c" +#line 9611 "PhotoMetadata.c" } static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) { #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return photo_metadata_internal_photo_preview_construct (PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, owner, name, number, props); -#line 9648 "PhotoMetadata.c" -} - - -static guint8* _vala_array_dup6 (guint8* self, int length) { -#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - return g_memdup (self, length * sizeof (guint8)); -#line 9655 "PhotoMetadata.c" +#line 9618 "PhotoMetadata.c" } -static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, int* result_length1, GError** error) { +static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, GError** error) { PhotoMetadataInternalPhotoPreview * self; - guint8* result = NULL; + GBytes* result = NULL; GExiv2PreviewProperties** props = NULL; PhotoMetadata* _tmp0_; GExiv2Metadata* _tmp1_; @@ -9683,12 +9646,8 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* GExiv2PreviewImage* _tmp14_; guint32 _tmp15_; guint8* _tmp16_; - guint8* _tmp17_; - gint _tmp17__length1; - guint8* _tmp18_; - gint _tmp18__length1; - guint8* _tmp19_; - gint _tmp19__length1; + GBytes* _tmp17_; + GBytes* _tmp18_; #line 239 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview); #line 240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9709,7 +9668,7 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* _tmp5__length1 = props_length1; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 9708 "PhotoMetadata.c" +#line 9667 "PhotoMetadata.c" GExiv2PreviewProperties** _tmp6_; gint _tmp6__length1; guint _tmp7_; @@ -9721,11 +9680,11 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* _tmp7_ = self->number; #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = ((guint) _tmp6__length1) > _tmp7_; -#line 9720 "PhotoMetadata.c" +#line 9679 "PhotoMetadata.c" } else { #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 9724 "PhotoMetadata.c" +#line 9683 "PhotoMetadata.c" } #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp4_, "props != null && props.length > number"); @@ -9748,30 +9707,16 @@ static guint8* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = gexiv2_preview_image_get_data (_tmp14_, &_tmp15_); #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = (_tmp16_ != NULL) ? _vala_array_dup6 (_tmp16_, _tmp15_) : ((gpointer) _tmp16_); -#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17__length1 = _tmp15_; + _tmp17_ = g_bytes_new (_tmp16_, _tmp15_); #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = _tmp17_; -#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18__length1 = _tmp17__length1; #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp14_); #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = _tmp18_; -#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19__length1 = _tmp18__length1; -#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (result_length1) { -#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - *result_length1 = _tmp19__length1; -#line 9764 "PhotoMetadata.c" - } -#line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp19_; + result = _tmp18_; #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9770 "PhotoMetadata.c" +#line 9715 "PhotoMetadata.c" } @@ -9781,8 +9726,8 @@ static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInter #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((PhotoPreviewClass *) klass)->finalize = photo_metadata_internal_photo_preview_finalize; #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ((PhotoPreviewClass *) klass)->flatten = (guint8* (*) (PhotoPreview *, int*, GError**)) photo_metadata_internal_photo_preview_real_flatten; -#line 9781 "PhotoMetadata.c" + ((PhotoPreviewClass *) klass)->flatten = (GBytes* (*) (PhotoPreview *, GError**)) photo_metadata_internal_photo_preview_real_flatten; +#line 9726 "PhotoMetadata.c" } @@ -9798,7 +9743,7 @@ static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj) _media_metadata_unref0 (self->owner); #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" PHOTO_PREVIEW_CLASS (photo_metadata_internal_photo_preview_parent_class)->finalize (obj); -#line 9797 "PhotoMetadata.c" +#line 9742 "PhotoMetadata.c" } @@ -9893,265 +9838,265 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) { ((MediaMetadataClass *) klass)->get_title = (gchar* (*) (MediaMetadata *)) photo_metadata_real_get_title; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((MediaMetadataClass *) klass)->get_comment = (gchar* (*) (MediaMetadata *)) photo_metadata_real_get_comment; -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = g_strdup ("Exif.Image.DateTime"); -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup ("Xmp.tiff.DateTime"); -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = g_strdup ("Xmp.xmp.ModifyDate"); -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = g_strdup ("Xmp.acdsee.datetime"); -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = g_new0 (gchar*, 4 + 1); -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_[0] = _tmp0_; -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_[1] = _tmp1_; -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_[2] = _tmp2_; -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_[3] = _tmp3_; -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_DATE_TIME_TAGS = _tmp4_; -#line 786 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 800 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_DATE_TIME_TAGS_length1 = 4; -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = g_strdup ("Exif.Photo.DateTimeOriginal"); -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = g_strdup ("Xmp.exif.DateTimeOriginal"); -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = g_strdup ("Xmp.xmp.CreateDate"); -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp8_ = g_strdup ("Exif.Photo.DateTimeDigitized"); -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = g_strdup ("Xmp.exif.DateTimeDigitized"); -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = g_strdup ("Exif.Image.DateTime"); -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = g_new0 (gchar*, 6 + 1); -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_[0] = _tmp5_; -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_[1] = _tmp6_; -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_[2] = _tmp7_; -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_[3] = _tmp8_; -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_[4] = _tmp9_; -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_[5] = _tmp10_; -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_EXPOSURE_DATE_TIME_TAGS = _tmp11_; -#line 805 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 819 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1 = 6; -#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp12_ = g_strdup ("Exif.Photo.DateTimeDigitized"); -#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp13_ = g_strdup ("Xmp.exif.DateTimeDigitized"); -#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = g_new0 (gchar*, 2 + 1); -#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_[0] = _tmp12_; -#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_[1] = _tmp13_; -#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_DIGITIZED_DATE_TIME_TAGS = _tmp14_; -#line 826 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 840 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1 = 2; -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = g_strdup ("Exif.Photo.PixelXDimension"); -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = g_strdup ("Xmp.exif.PixelXDimension"); -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = g_strdup ("Xmp.tiff.ImageWidth"); -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = g_strdup ("Xmp.exif.PixelXDimension"); -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = g_new0 (gchar*, 4 + 1); -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_[0] = _tmp15_; -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_[1] = _tmp16_; -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_[2] = _tmp17_; -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_[3] = _tmp18_; -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_WIDTH_TAGS = _tmp19_; -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 865 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_WIDTH_TAGS_length1 = 4; -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp20_ = g_strdup ("Exif.Photo.PixelYDimension"); -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp21_ = g_strdup ("Xmp.exif.PixelYDimension"); -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp22_ = g_strdup ("Xmp.tiff.ImageHeight"); -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp23_ = g_strdup ("Xmp.exif.PixelYDimension"); -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_ = g_new0 (gchar*, 4 + 1); -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_[0] = _tmp20_; -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_[1] = _tmp21_; -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_[2] = _tmp22_; -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp24_[3] = _tmp23_; -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_HEIGHT_TAGS = _tmp24_; -#line 858 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 872 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_HEIGHT_TAGS_length1 = 4; -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp25_ = g_strdup ("Iptc.Application2.Caption"); -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = g_strdup ("Xmp.dc.title"); -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = g_strdup ("Iptc.Application2.Headline"); -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp28_ = g_strdup ("Xmp.photoshop.Headline"); -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp29_ = g_strdup ("Xmp.acdsee.caption"); -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = g_new0 (gchar*, 5 + 1); -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_[0] = _tmp25_; -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_[1] = _tmp26_; -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_[2] = _tmp27_; -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_[3] = _tmp28_; -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_[4] = _tmp29_; -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_STANDARD_TITLE_TAGS = _tmp30_; -#line 917 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 931 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_STANDARD_TITLE_TAGS_length1 = 5; -#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = g_strdup ("Exif.Photo.UserComment"); -#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp32_ = g_strdup ("Xmp.acdsee.notes"); -#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33_ = g_new0 (gchar*, 2 + 1); -#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33_[0] = _tmp31_; -#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp33_[1] = _tmp32_; -#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_COMMENT_TAGS = _tmp33_; -#line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 976 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_COMMENT_TAGS_length1 = 2; -#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp34_ = g_strdup ("Xmp.dc.subject"); -#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp35_ = g_strdup ("Iptc.Application2.Keywords"); -#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp36_ = g_strdup ("Xmp.xmp.Label"); -#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_ = g_new0 (gchar*, 3 + 1); -#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_[0] = _tmp34_; -#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_[1] = _tmp35_; -#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp37_[2] = _tmp36_; -#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_KEYWORD_TAGS = _tmp37_; -#line 984 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 998 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_KEYWORD_TAGS_length1 = 3; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp38_ = null_keyword_transformer_new (); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp39_ = _tmp38_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp40_ = hierarchical_keyword_field_new ("Xmp.lr.hierarchicalSubject", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp41_ = null_keyword_transformer_new (); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp42_ = _tmp41_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp43_ = hierarchical_keyword_field_new ("Xmp.acdsee.keywords", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp44_ = acd_see_keyword_transformer_new (); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp45_ = _tmp44_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp46_ = hierarchical_keyword_field_new ("Xmp.acdsee.categories", "|", FALSE, FALSE, G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp47_ = null_keyword_transformer_new (); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp48_ = _tmp47_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp49_ = hierarchical_keyword_field_new ("Xmp.digiKam.TagsList", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp50_ = null_keyword_transformer_new (); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp51_ = _tmp50_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp52_ = hierarchical_keyword_field_new ("Xmp.MicrosoftPhoto.LastKeywordXMP", "/", FALSE, TRUE, G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, TYPE_KEYWORD_TRANSFORMER, KeywordTransformer)); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_ = g_new0 (HierarchicalKeywordField*, 5 + 1); -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[0] = _tmp40_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[1] = _tmp43_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[2] = _tmp46_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[3] = _tmp49_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp53_[4] = _tmp52_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_HIERARCHICAL_KEYWORD_TAGS = _tmp53_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1004 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1 = 5; -#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp54_ = g_strdup ("Exif.Image.Artist"); -#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp55_ = g_strdup ("Exif.Canon.OwnerName"); -#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp56_ = g_strdup ("Xmp.acdsee.author"); -#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp57_ = g_new0 (gchar*, 3 + 1); -#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp57_[0] = _tmp54_; -#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp57_[1] = _tmp55_; -#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp57_[2] = _tmp56_; -#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_ARTIST_TAGS = _tmp57_; -#line 1233 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_ARTIST_TAGS_length1 = 3; -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp58_ = g_strdup ("Xmp.xmp.Rating"); -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp59_ = g_strdup ("Iptc.Application2.Urgency"); -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp60_ = g_strdup ("Xmp.photoshop.Urgency"); -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp61_ = g_strdup ("Exif.Image.Rating"); -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp62_ = g_strdup ("Xmp.acdsee.rating"); -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_ = g_new0 (gchar*, 5 + 1); -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[0] = _tmp58_; -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[1] = _tmp59_; -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[2] = _tmp60_; -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[3] = _tmp61_; -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp63_[4] = _tmp62_; -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_RATING_TAGS = _tmp63_; -#line 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_RATING_TAGS_length1 = 5; -#line 10150 "PhotoMetadata.c" +#line 10095 "PhotoMetadata.c" } @@ -10160,17 +10105,21 @@ static void photo_metadata_instance_init (PhotoMetadata * self) { gchar* _tmp1_; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv = PHOTO_METADATA_GET_PRIVATE (self); -#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = gexiv2_metadata_new (); -#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exiv2 = _tmp0_; #line 248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exif = NULL; + self->priv->exiv2 = _tmp0_; #line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self->priv->exif = NULL; +#line 250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (""); -#line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" +#line 250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->source_name = _tmp1_; -#line 10169 "PhotoMetadata.c" +#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self->priv->metadata_hash = NULL; +#line 252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + self->priv->thumbnail_md5 = NULL; +#line 10118 "PhotoMetadata.c" } @@ -10178,15 +10127,19 @@ static void photo_metadata_finalize (MediaMetadata * obj) { PhotoMetadata * self; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_METADATA, PhotoMetadata); -#line 247 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_object_unref0 (self->priv->exiv2); #line 248 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _exif_data_unref0 (self->priv->exif); + _g_object_unref0 (self->priv->exiv2); #line 249 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _exif_data_unref0 (self->priv->exif); +#line 250 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); +#line 251 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _g_free0 (self->priv->metadata_hash); +#line 252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" + _g_free0 (self->priv->thumbnail_md5); #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" MEDIA_METADATA_CLASS (photo_metadata_parent_class)->finalize (obj); -#line 10185 "PhotoMetadata.c" +#line 10138 "PhotoMetadata.c" } diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala index e9a9042..2c2d6c5 100644 --- a/src/photos/PhotoMetadata.vala +++ b/src/photos/PhotoMetadata.vala @@ -190,16 +190,16 @@ public abstract class PhotoPreview { return extension; } - public abstract uint8[] flatten() throws Error; + public abstract Bytes flatten() throws Error; public virtual Gdk.Pixbuf? get_pixbuf() throws Error { - uint8[] flattened = flatten(); + var flattened = flatten(); // Need to create from stream or file for decode ... catch decode error and return null, // different from an I/O error causing the problem try { - return new Gdk.Pixbuf.from_stream(new MemoryInputStream.from_data(flattened, null), - null); + return new Gdk.Pixbuf.from_stream(new + MemoryInputStream.from_bytes(flattened)); } catch (Error err) { warning("Unable to decode thumbnail for %s: %s", name, err.message); @@ -236,17 +236,20 @@ public class PhotoMetadata : MediaMetadata { this.number = number; } - public override uint8[] flatten() throws Error { + public override Bytes flatten() throws Error { unowned GExiv2.PreviewProperties?[] props = owner.exiv2.get_preview_properties(); assert(props != null && props.length > number); - return owner.exiv2.get_preview_image(props[number]).get_data(); + return new + Bytes(owner.exiv2.get_preview_image(props[number]).get_data()); } } private GExiv2.Metadata exiv2 = new GExiv2.Metadata(); private Exif.Data? exif = null; string source_name = ""; + private string? metadata_hash = null; + private string? thumbnail_md5 = null; public PhotoMetadata() { } @@ -278,18 +281,13 @@ public class PhotoMetadata : MediaMetadata { source_name = "".printf(length); } - public void read_from_app1_segment(uint8[] buffer, int length = 0) throws Error { - if (length <= 0) - length = buffer.length; - - assert(buffer.length >= length); - + public void read_from_app1_segment(Bytes buffer) throws Error { exiv2 = new GExiv2.Metadata(); exif = null; - exiv2.from_app1_segment(buffer, length); - exif = Exif.Data.new_from_data(buffer, length); - source_name = "".printf(length); + exiv2.from_app1_segment(buffer.get_data(), (long) buffer.get_size()); + exif = Exif.Data.new_from_data(buffer.get_data(), buffer.get_size()); + source_name = "".printf(buffer.get_size()); } public static MetadataDomain get_tag_domain(string tag) { @@ -691,43 +689,59 @@ public class PhotoMetadata : MediaMetadata { } // Returns raw bytes of EXIF metadata, including signature and optionally the preview (if present). - public uint8[]? flatten_exif(bool include_preview) { + public string? exif_hash() { if (exif == null) return null; - - // save thumbnail to strip if no attachments requested (so it can be added back and - // deallocated automatically) - uchar *thumbnail = exif.data; - uint thumbnail_size = exif.size; - if (!include_preview) { - exif.data = null; - exif.size = 0; + + if (this.metadata_hash != null) { + return this.metadata_hash; } - - uint8[]? flattened = null; - - // save the struct to a buffer and copy into a Vala-friendly one + + string? hash = null; + + var thumb = exif.data; + var thumb_size = exif.size; + + // Strip potential thumbnail + exif.data = null; + exif.size = 0; + uchar *saved_data = null; uint saved_size = 0; + exif.save_data(&saved_data, &saved_size); + + exif.data = thumb; + exif.size = thumb_size; + if (saved_size > 0 && saved_data != null) { - flattened = new uint8[saved_size]; - Memory.copy(flattened, saved_data, saved_size); - + var md5 = new Checksum(ChecksumType.MD5); + md5.update((uchar []) saved_data, saved_size); Exif.Mem.new_default().free(saved_data); + + this.metadata_hash = md5.get_string (); } - - // restore thumbnail (this works in either case) - exif.data = thumbnail; - exif.size = thumbnail_size; - - return flattened; + + return hash; } // Returns raw bytes of EXIF preview, if present - public uint8[]? flatten_exif_preview() { + public string? thumbnail_hash() { + if (this.thumbnail_md5 != null) { + return this.thumbnail_md5; + } + uchar[] buffer; - return exiv2.get_exif_thumbnail(out buffer) ? buffer : null; + if (exiv2.get_exif_thumbnail(out buffer)) { + var md5 = new Checksum(ChecksumType.MD5); + md5.update(buffer, buffer.length); + + this.thumbnail_md5 = md5.get_string(); + + return this.thumbnail_md5; + } + + return null; } public uint get_preview_count() { diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c index 4658dd2..28fa710 100644 --- a/src/photos/PngSupport.c +++ b/src/photos/PngSupport.c @@ -501,10 +501,10 @@ static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFile static gchar* png_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup14 (gchar** self, int length); +static gchar** _vala_array_dup12 (gchar** self, int length); static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup15 (gchar** self, int length); +static gchar** _vala_array_dup13 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void png_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer photo_file_sniffer_ref (gpointer instance); @@ -717,7 +717,7 @@ static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFo } -static gchar** _vala_array_dup14 (gchar** self, int length) { +static gchar** _vala_array_dup12 (gchar** self, int length) { gchar** result; int i; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -754,7 +754,7 @@ static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFo #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0__length1 = png_file_format_properties_KNOWN_EXTENSIONS_length1; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup14 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup12 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1__length1 = _tmp0__length1; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -800,7 +800,7 @@ static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFo } -static gchar** _vala_array_dup15 (gchar** self, int length) { +static gchar** _vala_array_dup13 (gchar** self, int length) { gchar** result; int i; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -837,7 +837,7 @@ static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatPr #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0__length1 = png_file_format_properties_KNOWN_MIME_TYPES_length1; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup15 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup13 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1__length1 = _tmp0__length1; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c index 8b670ea..c22f941 100644 --- a/src/photos/RawSupport.c +++ b/src/photos/RawSupport.c @@ -559,10 +559,10 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup12 (gchar** self, int length); +static gchar** _vala_array_dup10 (gchar** self, int length); static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup13 (gchar** self, int length); +static gchar** _vala_array_dup11 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); @@ -600,9 +600,8 @@ void dimensions_free (Dimensions* self); libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self); void dimensions_init (Dimensions *self, gint width, gint height); PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error); -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); +gchar* photo_metadata_exif_hash (PhotoMetadata* self); +gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); gchar* md5_file (GFile* file, GError** error); enum { RAW_READER_DUMMY_PROPERTY @@ -666,14 +665,14 @@ void raw_file_format_driver_init (void) { raw_file_format_driver_instance = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_init (); -#line 670 "RawSupport.c" +#line 669 "RawSupport.c" } static gpointer _photo_file_format_driver_ref0 (gpointer self) { #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 677 "RawSupport.c" +#line 676 "RawSupport.c" } @@ -689,7 +688,7 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) { result = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 693 "RawSupport.c" +#line 692 "RawSupport.c" } @@ -705,7 +704,7 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 709 "RawSupport.c" +#line 708 "RawSupport.c" } @@ -726,7 +725,7 @@ static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileForm result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 730 "RawSupport.c" +#line 729 "RawSupport.c" } @@ -742,7 +741,7 @@ static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileForm result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 746 "RawSupport.c" +#line 745 "RawSupport.c" } @@ -755,7 +754,7 @@ static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriv result = FALSE; #line 32 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 759 "RawSupport.c" +#line 758 "RawSupport.c" } @@ -768,7 +767,7 @@ static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatD result = FALSE; #line 36 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 772 "RawSupport.c" +#line 771 "RawSupport.c" } @@ -783,7 +782,7 @@ static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileForm result = NULL; #line 40 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 787 "RawSupport.c" +#line 786 "RawSupport.c" } @@ -798,7 +797,7 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ result = NULL; #line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 802 "RawSupport.c" +#line 801 "RawSupport.c" } @@ -822,7 +821,7 @@ static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFo result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 826 "RawSupport.c" +#line 825 "RawSupport.c" } @@ -832,14 +831,14 @@ RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) { self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 836 "RawSupport.c" +#line 835 "RawSupport.c" } RawFileFormatDriver* raw_file_format_driver_new (void) { #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_file_format_driver_construct (TYPE_RAW_FILE_FORMAT_DRIVER); -#line 843 "RawSupport.c" +#line 842 "RawSupport.c" } @@ -864,7 +863,7 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_metadata_writer; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer; -#line 868 "RawSupport.c" +#line 867 "RawSupport.c" } @@ -878,7 +877,7 @@ static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) { self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj); -#line 882 "RawSupport.c" +#line 881 "RawSupport.c" } @@ -902,14 +901,14 @@ void raw_file_format_properties_init (void) { _photo_file_format_properties_unref0 (raw_file_format_properties_instance); #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_instance = _tmp0_; -#line 906 "RawSupport.c" +#line 905 "RawSupport.c" } static gpointer _photo_file_format_properties_ref0 (gpointer self) { #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 913 "RawSupport.c" +#line 912 "RawSupport.c" } @@ -925,7 +924,7 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) { result = _tmp1_; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 929 "RawSupport.c" +#line 928 "RawSupport.c" } @@ -938,7 +937,7 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil result = PHOTO_FILE_FORMAT_RAW; #line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 942 "RawSupport.c" +#line 941 "RawSupport.c" } @@ -954,7 +953,7 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo result = _tmp0_; #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 958 "RawSupport.c" +#line 957 "RawSupport.c" } @@ -967,7 +966,7 @@ static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFile result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 138 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 971 "RawSupport.c" +#line 970 "RawSupport.c" } @@ -983,28 +982,28 @@ static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFo result = _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 987 "RawSupport.c" +#line 986 "RawSupport.c" } -static gchar** _vala_array_dup12 (gchar** self, int length) { +static gchar** _vala_array_dup10 (gchar** self, int length) { gchar** result; int i; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = g_new0 (gchar*, length + 1); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 998 "RawSupport.c" +#line 997 "RawSupport.c" gchar* _tmp0_; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup (self[i]); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result[i] = _tmp0_; -#line 1004 "RawSupport.c" +#line 1003 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1008 "RawSupport.c" +#line 1007 "RawSupport.c" } @@ -1024,7 +1023,7 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0__length1 = raw_file_format_properties_KNOWN_EXTENSIONS_length1; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup12 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup10 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1__length1 = _tmp0__length1; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1035,13 +1034,13 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo if (result_length1) { #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp2__length1; -#line 1039 "RawSupport.c" +#line 1038 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1045 "RawSupport.c" +#line 1044 "RawSupport.c" } @@ -1066,28 +1065,28 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo result = _tmp2_; #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1070 "RawSupport.c" +#line 1069 "RawSupport.c" } -static gchar** _vala_array_dup13 (gchar** self, int length) { +static gchar** _vala_array_dup11 (gchar** self, int length) { gchar** result; int i; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = g_new0 (gchar*, length + 1); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 1081 "RawSupport.c" +#line 1080 "RawSupport.c" gchar* _tmp0_; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup (self[i]); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result[i] = _tmp0_; -#line 1087 "RawSupport.c" +#line 1086 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1091 "RawSupport.c" +#line 1090 "RawSupport.c" } @@ -1107,7 +1106,7 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0__length1 = raw_file_format_properties_KNOWN_MIME_TYPES_length1; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup13 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup11 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1__length1 = _tmp0__length1; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1118,13 +1117,13 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr if (result_length1) { #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp2__length1; -#line 1122 "RawSupport.c" +#line 1121 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1128 "RawSupport.c" +#line 1127 "RawSupport.c" } @@ -1134,14 +1133,14 @@ RawFileFormatProperties* raw_file_format_properties_construct (GType object_type self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1138 "RawSupport.c" +#line 1137 "RawSupport.c" } RawFileFormatProperties* raw_file_format_properties_new (void) { #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_file_format_properties_construct (TYPE_RAW_FILE_FORMAT_PROPERTIES); -#line 1145 "RawSupport.c" +#line 1144 "RawSupport.c" } @@ -1613,7 +1612,7 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass raw_file_format_properties_KNOWN_MIME_TYPES = _tmp88_; #line 59 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_KNOWN_MIME_TYPES_length1 = 51; -#line 1617 "RawSupport.c" +#line 1616 "RawSupport.c" } @@ -1627,7 +1626,7 @@ static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj); -#line 1631 "RawSupport.c" +#line 1630 "RawSupport.c" } @@ -1657,21 +1656,21 @@ RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnif self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_); #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1661 "RawSupport.c" +#line 1660 "RawSupport.c" } RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_sniffer_construct (TYPE_RAW_SNIFFER, file, options); -#line 1668 "RawSupport.c" +#line 1667 "RawSupport.c" } static gpointer _g_error_copy0 (gpointer self) { #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? g_error_copy (self) : NULL; -#line 1675 "RawSupport.c" +#line 1674 "RawSupport.c" } @@ -1704,10 +1703,10 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, RawReader* _tmp28_; DetectedPhotoInformation* _tmp34_; PhotoMetadata* _tmp35_; - gboolean _tmp58_; - DetectedPhotoInformation* _tmp64_; - gchar* _tmp65_; - DetectedPhotoInformation* _tmp66_; + gboolean _tmp44_; + DetectedPhotoInformation* _tmp50_; + gchar* _tmp51_; + DetectedPhotoInformation* _tmp52_; GError * _inner_error_ = NULL; #line 166 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_SNIFFER, RawSniffer); @@ -1729,7 +1728,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp4_ = _tmp3_; #line 173 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" (*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE; -#line 1733 "RawSupport.c" +#line 1732 "RawSupport.c" { GRawProcessor* _tmp5_; GFile* _tmp6_; @@ -1753,8 +1752,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1757 "RawSupport.c" - goto __catch32_graw_exception; +#line 1756 "RawSupport.c" + goto __catch36_graw_exception; } #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); @@ -1766,7 +1765,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1770 "RawSupport.c" +#line 1769 "RawSupport.c" } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -1776,8 +1775,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1780 "RawSupport.c" - goto __catch32_graw_exception; +#line 1779 "RawSupport.c" + goto __catch36_graw_exception; } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); @@ -1789,7 +1788,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1793 "RawSupport.c" +#line 1792 "RawSupport.c" } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = processor; @@ -1799,8 +1798,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1803 "RawSupport.c" - goto __catch32_graw_exception; +#line 1802 "RawSupport.c" + goto __catch36_graw_exception; } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); @@ -1812,11 +1811,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1816 "RawSupport.c" +#line 1815 "RawSupport.c" } } - goto __finally32; - __catch32_graw_exception: + goto __finally36; + __catch36_graw_exception: { GError* exception = NULL; GError* _tmp11_; @@ -1842,11 +1841,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1846 "RawSupport.c" +#line 1845 "RawSupport.c" } #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1850 "RawSupport.c" +#line 1849 "RawSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp12_ = exception; @@ -1856,10 +1855,10 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = _tmp13_; #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (exception); -#line 1860 "RawSupport.c" - goto __finally32; +#line 1859 "RawSupport.c" + goto __finally36; } - __finally32: + __finally36: #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1870,7 +1869,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1874 "RawSupport.c" +#line 1873 "RawSupport.c" } #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp14_ = detected; @@ -1914,7 +1913,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp26_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" reader = _tmp28_; -#line 1918 "RawSupport.c" +#line 1917 "RawSupport.c" { PhotoMetadata* _tmp29_ = NULL; RawReader* _tmp30_; @@ -1929,8 +1928,8 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp29_ = _tmp31_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1933 "RawSupport.c" - goto __catch33_g_error; +#line 1932 "RawSupport.c" + goto __catch37_g_error; } #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp32_ = detected; @@ -1944,10 +1943,10 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp32_->metadata = _tmp33_; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _media_metadata_unref0 (_tmp29_); -#line 1948 "RawSupport.c" +#line 1947 "RawSupport.c" } - goto __finally33; - __catch33_g_error: + goto __finally37; + __catch37_g_error: { GError* err = NULL; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1956,9 +1955,9 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = NULL; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (err); -#line 1960 "RawSupport.c" +#line 1959 "RawSupport.c" } - __finally33: + __finally37: #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1971,7 +1970,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1975 "RawSupport.c" +#line 1974 "RawSupport.c" } #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp34_ = detected; @@ -1979,224 +1978,112 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp35_ = _tmp34_->metadata; #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp35_ != NULL) { -#line 1983 "RawSupport.c" - guint8* flattened_sans_thumbnail = NULL; +#line 1982 "RawSupport.c" DetectedPhotoInformation* _tmp36_; - PhotoMetadata* _tmp37_; - gint _tmp38_; - guint8* _tmp39_; - gint flattened_sans_thumbnail_length1; - gint _flattened_sans_thumbnail_size_; - gboolean _tmp40_ = FALSE; - guint8* _tmp41_; - gint _tmp41__length1; - guint8* flattened_thumbnail = NULL; - DetectedPhotoInformation* _tmp47_; - PhotoMetadata* _tmp48_; - gint _tmp49_; - guint8* _tmp50_; - gint flattened_thumbnail_length1; - gint _flattened_thumbnail_size_; - gboolean _tmp51_ = FALSE; - guint8* _tmp52_; - gint _tmp52__length1; + DetectedPhotoInformation* _tmp37_; + PhotoMetadata* _tmp38_; + gchar* _tmp39_; + DetectedPhotoInformation* _tmp40_; + DetectedPhotoInformation* _tmp41_; + PhotoMetadata* _tmp42_; + gchar* _tmp43_; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp36_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = _tmp36_->metadata; + _tmp37_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = photo_metadata_flatten_exif (_tmp37_, FALSE, &_tmp38_); + _tmp38_ = _tmp37_->metadata; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - flattened_sans_thumbnail = _tmp39_; + _tmp39_ = photo_metadata_exif_hash (_tmp38_); #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - flattened_sans_thumbnail_length1 = _tmp38_; + _g_free0 (_tmp36_->exif_md5); #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _flattened_sans_thumbnail_size_ = flattened_sans_thumbnail_length1; -#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp41_ = flattened_sans_thumbnail; + _tmp36_->exif_md5 = _tmp39_; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp41__length1 = flattened_sans_thumbnail_length1; + _tmp40_ = detected; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp41_ != NULL) { -#line 2022 "RawSupport.c" - guint8* _tmp42_; - gint _tmp42__length1; + _tmp41_ = detected; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp42_ = flattened_sans_thumbnail; + _tmp42_ = _tmp41_->metadata; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp42__length1 = flattened_sans_thumbnail_length1; + _tmp43_ = photo_metadata_thumbnail_hash (_tmp42_); #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_ = _tmp42__length1 > 0; -#line 2031 "RawSupport.c" - } else { -#line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_ = FALSE; -#line 2035 "RawSupport.c" - } + _g_free0 (_tmp40_->thumbnail_md5); #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp40_) { -#line 2039 "RawSupport.c" - DetectedPhotoInformation* _tmp43_; - guint8* _tmp44_; - gint _tmp44__length1; - guint8* _tmp45_; - gint _tmp45__length1; - gchar* _tmp46_; -#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp43_ = detected; -#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp44_ = flattened_sans_thumbnail; -#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp44__length1 = flattened_sans_thumbnail_length1; -#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp45_ = flattened_sans_thumbnail; -#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp45__length1 = flattened_sans_thumbnail_length1; -#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp46_ = md5_binary (_tmp44_, (gsize) _tmp45__length1); -#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp43_->exif_md5); -#line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp43_->exif_md5 = _tmp46_; -#line 2062 "RawSupport.c" - } -#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp47_ = detected; -#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp48_ = _tmp47_->metadata; -#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp50_ = photo_metadata_flatten_exif_preview (_tmp48_, &_tmp49_); -#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - flattened_thumbnail = _tmp50_; + _tmp40_->thumbnail_md5 = _tmp43_; +#line 2015 "RawSupport.c" + } #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - flattened_thumbnail_length1 = _tmp49_; + _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _flattened_thumbnail_size_ = flattened_thumbnail_length1; -#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp52_ = flattened_thumbnail; -#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp52__length1 = flattened_thumbnail_length1; -#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp52_ != NULL) { -#line 2082 "RawSupport.c" - guint8* _tmp53_; - gint _tmp53__length1; -#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp53_ = flattened_thumbnail; + if (_tmp44_) { +#line 2021 "RawSupport.c" + gchar* _tmp45_ = NULL; + GFile* _tmp46_; + gchar* _tmp47_; + DetectedPhotoInformation* _tmp48_; + gchar* _tmp49_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp53__length1 = flattened_thumbnail_length1; + _tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp51_ = _tmp53__length1 > 0; -#line 2091 "RawSupport.c" - } else { + _tmp47_ = md5_file (_tmp46_, &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp51_ = FALSE; -#line 2095 "RawSupport.c" - } + _tmp45_ = _tmp47_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp51_) { -#line 2099 "RawSupport.c" - DetectedPhotoInformation* _tmp54_; - guint8* _tmp55_; - gint _tmp55__length1; - guint8* _tmp56_; - gint _tmp56__length1; - gchar* _tmp57_; -#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp54_ = detected; -#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp55_ = flattened_thumbnail; -#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp55__length1 = flattened_thumbnail_length1; -#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp56_ = flattened_thumbnail; -#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp56__length1 = flattened_thumbnail_length1; -#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp57_ = md5_binary (_tmp55_, (gsize) _tmp56__length1); -#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp54_->thumbnail_md5); -#line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp54_->thumbnail_md5 = _tmp57_; -#line 2122 "RawSupport.c" - } -#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - flattened_thumbnail = (g_free (flattened_thumbnail), NULL); -#line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - flattened_sans_thumbnail = (g_free (flattened_sans_thumbnail), NULL); -#line 2128 "RawSupport.c" - } -#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; -#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp58_) { -#line 2134 "RawSupport.c" - gchar* _tmp59_ = NULL; - GFile* _tmp60_; - gchar* _tmp61_; - DetectedPhotoInformation* _tmp62_; - gchar* _tmp63_; -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp61_ = md5_file (_tmp60_, &_inner_error_); -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp59_ = _tmp61_; -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _photo_file_adapter_unref0 (reader); -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _detected_photo_information_unref0 (detected); -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2158 "RawSupport.c" +#line 2045 "RawSupport.c" } -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp62_ = detected; -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp63_ = _tmp59_; -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp59_ = NULL; -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp62_->md5); -#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp62_->md5 = _tmp63_; -#line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp59_); -#line 2172 "RawSupport.c" +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp48_ = detected; +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp49_ = _tmp45_; +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp45_ = NULL; +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (_tmp48_->md5); +#line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp48_->md5 = _tmp49_; +#line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (_tmp45_); +#line 2059 "RawSupport.c" } -#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp64_ = detected; -#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp65_ = g_strdup ("raw"); -#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp64_->format_name); -#line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp64_->format_name = _tmp65_; -#line 212 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp66_ = detected; -#line 212 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp66_->file_format = PHOTO_FILE_FORMAT_RAW; -#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp50_ = detected; +#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp51_ = g_strdup ("raw"); +#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (_tmp50_->format_name); +#line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp50_->format_name = _tmp51_; +#line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp52_ = detected; +#line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp52_->file_format = PHOTO_FILE_FORMAT_RAW; +#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = detected; -#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _photo_file_adapter_unref0 (reader); -#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (is_corrupted) { -#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 2196 "RawSupport.c" +#line 2083 "RawSupport.c" } -#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2200 "RawSupport.c" +#line 2087 "RawSupport.c" } @@ -2205,7 +2092,7 @@ static void raw_sniffer_class_init (RawSnifferClass * klass) { raw_sniffer_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) raw_sniffer_real_sniff; -#line 2209 "RawSupport.c" +#line 2096 "RawSupport.c" } @@ -2228,22 +2115,22 @@ GType raw_sniffer_get_type (void) { RawReader* raw_reader_construct (GType object_type, const gchar* filepath) { RawReader* self = NULL; const gchar* _tmp0_; -#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); -#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = filepath; -#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW); -#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 2240 "RawSupport.c" +#line 2127 "RawSupport.c" } RawReader* raw_reader_new (const gchar* filepath) { -#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_reader_construct (TYPE_RAW_READER, filepath); -#line 2247 "RawSupport.c" +#line 2134 "RawSupport.c" } @@ -2255,35 +2142,35 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr GFile* _tmp1_; GFile* _tmp2_; GError * _inner_error_ = NULL; -#line 223 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); -#line 224 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = photo_metadata_new (); -#line 224 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" metadata = _tmp0_; -#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = _tmp1_; -#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (metadata, TYPE_MEDIA_METADATA, MediaMetadata), _tmp2_, &_inner_error_); -#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (_tmp2_); -#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _media_metadata_unref0 (metadata); -#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2281 "RawSupport.c" +#line 2168 "RawSupport.c" } -#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = metadata; -#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2287 "RawSupport.c" +#line 2174 "RawSupport.c" } @@ -2306,99 +2193,99 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** GRawProcessedImage* _tmp12_; GdkPixbuf* _tmp13_; GError * _inner_error_ = NULL; -#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); -#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 226 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = graw_processor_new (LIBRAW_OPTIONS_NONE); -#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 226 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" processor = _tmp0_; -#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = processor; -#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_configure_for_rgb_display (_tmp1_, FALSE); -#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = processor; -#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp3_ = graw_processor_get_output_params (_tmp2_); -#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp4_ = _tmp3_; -#line 233 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 228 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" (*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE; -#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp5_ = processor; -#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp6_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp7_ = _tmp6_; -#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_open_file (_tmp5_, _tmp7_, &_inner_error_); -#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp7_); -#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2346 "RawSupport.c" +#line 2233 "RawSupport.c" } -#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = processor; -#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_unpack (_tmp8_, &_inner_error_); -#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2360 "RawSupport.c" +#line 2247 "RawSupport.c" } -#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; -#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_process (_tmp9_, &_inner_error_); -#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2374 "RawSupport.c" +#line 2261 "RawSupport.c" } -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp11_ = processor; -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp12_ = graw_processor_make_mem_image (_tmp11_, &_inner_error_); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = _tmp12_; -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2390 "RawSupport.c" +#line 2277 "RawSupport.c" } -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp13_ = graw_processed_image_get_pixbuf_copy (_tmp10_); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp13_; -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (_tmp10_); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2402 "RawSupport.c" +#line 2289 "RawSupport.c" } @@ -2440,95 +2327,95 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions GdkPixbuf* _tmp38_; GdkPixbuf* _tmp39_; GError * _inner_error_ = NULL; -#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); -#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (full != NULL, NULL); -#line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (scaled != NULL, NULL); -#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = *scaled; -#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = _tmp0_.width; -#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = *full; -#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp3_ = _tmp2_.width; -#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" width_proportion = ((gdouble) _tmp1_) / ((gdouble) _tmp3_); -#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp4_ = *scaled; -#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp5_ = _tmp4_.height; -#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp6_ = *full; -#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp7_ = _tmp6_.height; -#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 240 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" height_proportion = ((gdouble) _tmp5_) / ((gdouble) _tmp7_); -#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = width_proportion; -#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp9_ < 0.5) { -#line 2474 "RawSupport.c" +#line 2361 "RawSupport.c" gdouble _tmp10_; -#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = height_proportion; -#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = _tmp10_ < 0.5; -#line 2480 "RawSupport.c" +#line 2367 "RawSupport.c" } else { -#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = FALSE; -#line 2484 "RawSupport.c" +#line 2371 "RawSupport.c" } -#line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" half_size = _tmp8_; -#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp11_ = graw_processor_new (LIBRAW_OPTIONS_NONE); -#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 243 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" processor = _tmp11_; -#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp12_ = processor; -#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp13_ = half_size; -#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 244 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_configure_for_rgb_display (_tmp12_, _tmp13_); -#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp14_ = processor; -#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp15_ = graw_processor_get_output_params (_tmp14_); -#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp16_ = _tmp15_; -#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 245 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" (*_tmp16_).user_flip = (gint) GRAW_FLIP_NONE; -#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp17_ = processor; -#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp18_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp19_ = _tmp18_; -#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_open_file (_tmp17_, _tmp19_, &_inner_error_); -#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp19_); -#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2524 "RawSupport.c" +#line 2411 "RawSupport.c" } { PhotoFileReaderRole _tmp20_; -#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp20_ = photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader)); -#line 254 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) { -#line 2532 "RawSupport.c" +#line 2419 "RawSupport.c" GRawProcessor* _tmp21_; GRawProcessedImage* image = NULL; GRawProcessor* _tmp22_; @@ -2539,154 +2426,154 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions Dimensions _tmp27_; GdkPixbuf* _tmp28_; GdkPixbuf* _tmp29_; -#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp21_ = processor; -#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_unpack_thumb (_tmp21_, &_inner_error_); -#line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2549 "RawSupport.c" - goto __catch34_g_error; +#line 2436 "RawSupport.c" + goto __catch38_g_error; } -#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp22_ = processor; -#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp23_ = graw_processor_make_thumb_image (_tmp22_, &_inner_error_); -#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" image = _tmp23_; -#line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2560 "RawSupport.c" - goto __catch34_g_error; +#line 2447 "RawSupport.c" + goto __catch38_g_error; } -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp24_ = image; -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_); -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp26_ = _tmp25_; -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp27_ = *scaled; -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR); -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp29_ = _tmp28_; -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (_tmp26_); -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp29_; -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (image); -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2585 "RawSupport.c" +#line 2472 "RawSupport.c" } } - goto __finally34; - __catch34_g_error: + goto __finally38; + __catch38_g_error: { GError* _error_ = NULL; -#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _error_ = _inner_error_; -#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _inner_error_ = NULL; -#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (_error_); -#line 2598 "RawSupport.c" +#line 2485 "RawSupport.c" } - __finally34: -#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + __finally38: +#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2609 "RawSupport.c" +#line 2496 "RawSupport.c" } -#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp30_ = processor; -#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_unpack (_tmp30_, &_inner_error_); -#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2623 "RawSupport.c" +#line 2510 "RawSupport.c" } -#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp31_ = processor; -#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" graw_processor_process (_tmp31_, &_inner_error_); -#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2637 "RawSupport.c" +#line 2524 "RawSupport.c" } -#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp32_ = processor; -#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp33_ = graw_processor_make_mem_image (_tmp32_, &_inner_error_); -#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" image = _tmp33_; -#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2653 "RawSupport.c" +#line 2540 "RawSupport.c" } -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp34_ = image; -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp35_ = graw_processed_image_get_pixbuf_copy (_tmp34_); -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp36_ = _tmp35_; -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp37_ = *scaled; -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp38_ = resize_pixbuf (_tmp36_, &_tmp37_, GDK_INTERP_BILINEAR); -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp39_ = _tmp38_; -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (_tmp36_); -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp39_; -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (image); -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); -#line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2677 "RawSupport.c" +#line 2564 "RawSupport.c" } static void raw_reader_class_init (RawReaderClass * klass) { -#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_reader_parent_class = g_type_class_peek_parent (klass); -#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) raw_reader_real_read_metadata; -#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) raw_reader_real_unscaled_read; -#line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read; -#line 2690 "RawSupport.c" +#line 2577 "RawSupport.c" } @@ -2711,80 +2598,80 @@ RawDeveloper* raw_developer_as_array (int* result_length1) { RawDeveloper* _tmp0_; RawDeveloper* _tmp1_; gint _tmp1__length1; -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_new0 (RawDeveloper, 3); -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_[0] = RAW_DEVELOPER_SHOTWELL; -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_[1] = RAW_DEVELOPER_CAMERA; -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_[2] = RAW_DEVELOPER_EMBEDDED; -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = _tmp0_; -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1__length1 = 3; -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (result_length1) { -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp1__length1; -#line 2731 "RawSupport.c" +#line 2618 "RawSupport.c" } -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; -#line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2737 "RawSupport.c" +#line 2624 "RawSupport.c" } gchar* raw_developer_to_string (RawDeveloper self) { gchar* result = NULL; -#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (self) { -#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2747 "RawSupport.c" +#line 2634 "RawSupport.c" { gchar* _tmp0_; -#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup ("SHOTWELL"); -#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp0_; -#line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2756 "RawSupport.c" +#line 2643 "RawSupport.c" } -#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: -#line 2760 "RawSupport.c" +#line 2647 "RawSupport.c" { gchar* _tmp1_; -#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = g_strdup ("CAMERA"); -#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; -#line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2769 "RawSupport.c" +#line 2656 "RawSupport.c" } -#line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2773 "RawSupport.c" +#line 2660 "RawSupport.c" { gchar* _tmp2_; -#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = g_strdup ("EMBEDDED"); -#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; -#line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2782 "RawSupport.c" +#line 2669 "RawSupport.c" } default: { -#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 288 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2788 "RawSupport.c" +#line 2675 "RawSupport.c" } } } @@ -2795,69 +2682,69 @@ RawDeveloper raw_developer_from_string (const gchar* value) { const gchar* _tmp0_; const gchar* _tmp1_; GQuark _tmp3_ = 0U; -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" static GQuark _tmp2_label0 = 0; -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" static GQuark _tmp2_label1 = 0; -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" static GQuark _tmp2_label2 = 0; -#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 292 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (value != NULL, 0); -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = value; -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = _tmp0_; -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) { -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2817 "RawSupport.c" +#line 2704 "RawSupport.c" default: { -#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_SHOTWELL; -#line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2824 "RawSupport.c" +#line 2711 "RawSupport.c" } } } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) { -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2830 "RawSupport.c" +#line 2717 "RawSupport.c" default: { -#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_CAMERA; -#line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2837 "RawSupport.c" +#line 2724 "RawSupport.c" } } } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) { -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2843 "RawSupport.c" +#line 2730 "RawSupport.c" default: { -#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_EMBEDDED; -#line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2850 "RawSupport.c" +#line 2737 "RawSupport.c" } } } else { -#line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2856 "RawSupport.c" +#line 2743 "RawSupport.c" default: { -#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 301 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2861 "RawSupport.c" +#line 2748 "RawSupport.c" } } } @@ -2866,41 +2753,41 @@ RawDeveloper raw_developer_from_string (const gchar* value) { gchar* raw_developer_get_label (RawDeveloper self) { gchar* result = NULL; -#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (self) { -#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2874 "RawSupport.c" +#line 2761 "RawSupport.c" { gchar* _tmp0_; -#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup (_ ("Shotwell")); -#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp0_; -#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2883 "RawSupport.c" +#line 2770 "RawSupport.c" } -#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: -#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2889 "RawSupport.c" +#line 2776 "RawSupport.c" { gchar* _tmp1_; -#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = g_strdup (_ ("Camera")); -#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; -#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2898 "RawSupport.c" +#line 2785 "RawSupport.c" } default: { -#line 318 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2904 "RawSupport.c" +#line 2791 "RawSupport.c" } } } @@ -2911,68 +2798,68 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { RawDeveloper _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; -#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = d; -#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == _tmp0_) { -#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = TRUE; -#line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2923 "RawSupport.c" +#line 2810 "RawSupport.c" } -#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_CAMERA) { -#line 2927 "RawSupport.c" +#line 2814 "RawSupport.c" RawDeveloper _tmp3_; -#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp3_ = d; -#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 2933 "RawSupport.c" +#line 2820 "RawSupport.c" } else { -#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = FALSE; -#line 2937 "RawSupport.c" +#line 2824 "RawSupport.c" } -#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp2_) { -#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = TRUE; -#line 2943 "RawSupport.c" +#line 2830 "RawSupport.c" } else { gboolean _tmp4_ = FALSE; -#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_EMBEDDED) { -#line 2948 "RawSupport.c" +#line 2835 "RawSupport.c" RawDeveloper _tmp5_; -#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp5_ = d; -#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA; -#line 2954 "RawSupport.c" +#line 2841 "RawSupport.c" } else { -#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp4_ = FALSE; -#line 2958 "RawSupport.c" +#line 2845 "RawSupport.c" } -#line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = _tmp4_; -#line 2962 "RawSupport.c" +#line 2849 "RawSupport.c" } -#line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp1_) { -#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = TRUE; -#line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2970 "RawSupport.c" +#line 2857 "RawSupport.c" } -#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = FALSE; -#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2976 "RawSupport.c" +#line 2863 "RawSupport.c" } @@ -3010,41 +2897,41 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper GFile* _tmp39_; gchar* _tmp40_; GError * _inner_error_ = NULL; -#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (raw_filepath != NULL, NULL); -#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 334 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = backing_photo_row_new (); -#line 339 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 334 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ns = _tmp0_; -#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = raw_filepath; -#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = g_file_new_for_path (_tmp1_); -#line 340 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" master = _tmp2_; -#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp3_ = master; -#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp4_ = g_file_get_basename (_tmp3_); -#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp5_ = _tmp4_; -#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_); -#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" name = _tmp6_; -#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); -#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ext = _tmp7_; -#line 342 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp5_); -#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = camera_development_filename; -#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp8_ == NULL) { -#line 3048 "RawSupport.c" +#line 2935 "RawSupport.c" gchar* _tmp9_ = NULL; const gchar* _tmp16_; gchar* _tmp17_; @@ -3055,188 +2942,188 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper gchar* _tmp22_; gchar* _tmp23_; gchar* _tmp24_; -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self != RAW_DEVELOPER_CAMERA) { -#line 3061 "RawSupport.c" +#line 2948 "RawSupport.c" gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; gchar* _tmp14_; -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = raw_developer_to_string (self); -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp11_ = _tmp10_; -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1); -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp13_ = _tmp12_; -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp14_ = g_strconcat ("_", _tmp13_, NULL); -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp9_); -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = _tmp14_; -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp13_); -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp11_); -#line 3085 "RawSupport.c" +#line 2972 "RawSupport.c" } else { gchar* _tmp15_; -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp15_ = g_strdup (""); -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp9_); -#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = _tmp15_; -#line 3094 "RawSupport.c" +#line 2981 "RawSupport.c" } -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp16_ = name; -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp17_ = g_strconcat (_tmp16_, "_", NULL); -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp18_ = _tmp17_; -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp19_ = ext; -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL); -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp21_ = _tmp20_; -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp22_ = g_strconcat (_tmp21_, _tmp9_, NULL); -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp23_ = _tmp22_; -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp24_ = g_strconcat (_tmp23_, ".jpg", NULL); -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" basename = _tmp24_; -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp23_); -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp21_); -#line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp18_); -#line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp9_); -#line 3126 "RawSupport.c" +#line 3013 "RawSupport.c" } else { const gchar* _tmp25_; gchar* _tmp26_; -#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp25_ = camera_development_filename; -#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp26_ = g_strdup (_tmp25_); -#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); -#line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" basename = _tmp26_; -#line 3138 "RawSupport.c" +#line 3025 "RawSupport.c" } -#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp27_ = basename; -#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp28_ = library_files_convert_basename (_tmp27_); -#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" newbasename = _tmp28_; -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp29_ = master; -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp30_ = g_file_get_parent (_tmp29_); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp31_ = _tmp30_; -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp32_ = newbasename; -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp34_ = generate_unique_file (_tmp31_, _tmp32_, &_tmp33_, &_inner_error_); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" c = _tmp33_; -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp35_ = _tmp34_; -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (_tmp31_); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" new_back = _tmp35_; -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (newbasename); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (master); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _backing_photo_row_unref0 (ns); -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3182 "RawSupport.c" +#line 3069 "RawSupport.c" } -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp36_ = new_back; -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" claim_file (_tmp36_, &_inner_error_); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (new_back); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (newbasename); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (master); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _backing_photo_row_unref0 (ns); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3208 "RawSupport.c" +#line 3095 "RawSupport.c" } -#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp37_ = ns; -#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp37_->file_format = PHOTO_FILE_FORMAT_JFIF; -#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp38_ = ns; -#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp39_ = new_back; -#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp40_ = g_file_get_path (_tmp39_); -#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp38_->filepath); -#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp38_->filepath = _tmp40_; -#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = ns; -#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (new_back); -#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (newbasename); -#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); -#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); -#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (master); -#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 3240 "RawSupport.c" +#line 3127 "RawSupport.c" } diff --git a/src/photos/RawSupport.vala b/src/photos/RawSupport.vala index d11d06e..8c23826 100644 --- a/src/photos/RawSupport.vala +++ b/src/photos/RawSupport.vala @@ -196,13 +196,8 @@ public class RawSniffer : PhotoFileSniffer { } if (detected.metadata != null) { - uint8[]? flattened_sans_thumbnail = detected.metadata.flatten_exif(false); - if (flattened_sans_thumbnail != null && flattened_sans_thumbnail.length > 0) - detected.exif_md5 = md5_binary(flattened_sans_thumbnail, flattened_sans_thumbnail.length); - - uint8[]? flattened_thumbnail = detected.metadata.flatten_exif_preview(); - if (flattened_thumbnail != null && flattened_thumbnail.length > 0) - detected.thumbnail_md5 = md5_binary(flattened_thumbnail, flattened_thumbnail.length); + detected.exif_md5 = detected.metadata.exif_hash(); + detected.thumbnail_md5 = detected.metadata.thumbnail_hash(); } if (calc_md5) diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c index 4962cb8..70e930b 100644 --- a/src/photos/TiffSupport.c +++ b/src/photos/TiffSupport.c @@ -558,10 +558,10 @@ static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (P static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup16 (gchar** self, int length); +static gchar** _vala_array_dup14 (gchar** self, int length); static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup17 (gchar** self, int length); +static gchar** _vala_array_dup15 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); @@ -949,7 +949,7 @@ static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (Pho } -static gchar** _vala_array_dup16 (gchar** self, int length) { +static gchar** _vala_array_dup14 (gchar** self, int length) { gchar** result; int i; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -986,7 +986,7 @@ static gchar** photos_tiff_file_format_properties_real_get_known_extensions (Pho #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0__length1 = photos_tiff_file_format_properties_KNOWN_EXTENSIONS_length1; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup16 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup14 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp1__length1 = _tmp0__length1; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1032,7 +1032,7 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho } -static gchar** _vala_array_dup17 (gchar** self, int length) { +static gchar** _vala_array_dup15 (gchar** self, int length) { gchar** result; int i; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1069,7 +1069,7 @@ static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFile #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0__length1 = photos_tiff_file_format_properties_KNOWN_MIME_TYPES_length1; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup17 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); + _tmp1_ = (_tmp0_ != NULL) ? _vala_array_dup15 (_tmp0_, _tmp0__length1) : ((gpointer) _tmp0_); #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp1__length1 = _tmp0__length1; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" -- cgit v1.2.3