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 From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/photos/BmpSupport.c | 827 +++-- src/photos/GRaw.c | 1346 ++++---- src/photos/GdkSupport.c | 632 ++-- src/photos/JfifSupport.c | 1050 ++++--- src/photos/PhotoFileAdapter.c | 649 ++-- src/photos/PhotoFileFormat.c | 1764 ++++++----- src/photos/PhotoFileSniffer.c | 634 ++-- src/photos/PhotoMetadata.c | 6772 +++++++++++++++++++++-------------------- src/photos/Photos.c | 25 +- src/photos/PngSupport.c | 844 ++--- src/photos/RawSupport.c | 1289 ++++---- src/photos/TiffSupport.c | 795 +++-- 12 files changed, 9151 insertions(+), 7476 deletions(-) (limited to 'src/photos') diff --git a/src/photos/BmpSupport.c b/src/photos/BmpSupport.c index e6f204c..b56b3ed 100644 --- a/src/photos/BmpSupport.c +++ b/src/photos/BmpSupport.c @@ -1,4 +1,4 @@ -/* BmpSupport.c generated by valac 0.36.6, the Vala compiler +/* BmpSupport.c generated by valac 0.40.4, the Vala compiler * generated from BmpSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -482,17 +483,20 @@ static PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_instance = NULL; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; GType photos_bmp_file_format_properties_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; void photos_bmp_file_format_properties_init (void); PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_new (void); PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_construct (GType object_type); @@ -501,44 +505,73 @@ static PhotoFileFormat photos_bmp_file_format_properties_real_get_file_format (P static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); 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_dup8 (gchar** self, int length); +static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +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_dup9 (gchar** self, int length); +static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +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); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType photos_bmp_sniffer_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_SNIFFER_DUMMY_PROPERTY -}; -PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error); -static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, + GError** error); +static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -547,65 +580,90 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; GType gdk_reader_get_type (void) G_GNUC_CONST; GType photos_bmp_reader_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_READER_DUMMY_PROPERTY -}; PhotosBmpReader* photos_bmp_reader_new (const gchar* filepath); -PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* filepath); -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +PhotosBmpReader* photos_bmp_reader_construct (GType object_type, + const gchar* filepath); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); GType scale_constraint_get_type (void) G_GNUC_CONST; -void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleConstraint constraint, Dimensions* result); +void dimensions_get_scaled_by_constraint (Dimensions *self, + gint scale, + ScaleConstraint constraint, + Dimensions* result); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); GType photo_file_writer_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; GType photos_bmp_writer_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_WRITER_DUMMY_PROPERTY -}; PhotosBmpWriter* photos_bmp_writer_new (const gchar* filepath); -PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* filepath); -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, + const gchar* filepath); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void photos_bmp_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType photos_bmp_metadata_writer_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_METADATA_WRITER_DUMMY_PROPERTY -}; PhotosBmpMetadataWriter* photos_bmp_metadata_writer_new (const gchar* filepath); -PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, const gchar* filepath); -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error); +PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, + const gchar* filepath); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error); gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; GType photos_bmp_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_BMP_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void photos_bmp_file_format_driver_init (void); PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_new (void); PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_construct (GType object_type); PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void); static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); -static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); @@ -614,7 +672,9 @@ static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj) static const guint8 PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[2] = {(guint8) 0x42, (guint8) 0x4D}; -void photos_bmp_file_format_properties_init (void) { +void +photos_bmp_file_format_properties_init (void) +{ PhotosBmpFileFormatProperties* _tmp0_; #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = photos_bmp_file_format_properties_new (); @@ -622,18 +682,22 @@ void photos_bmp_file_format_properties_init (void) { _photo_file_format_properties_unref0 (photos_bmp_file_format_properties_instance); #line 16 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_properties_instance = _tmp0_; -#line 626 "BmpSupport.c" +#line 686 "BmpSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +static gpointer +_photo_file_format_properties_ref0 (gpointer self) +{ #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 633 "BmpSupport.c" +#line 695 "BmpSupport.c" } -PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_get_instance (void) { +PhotosBmpFileFormatProperties* +photos_bmp_file_format_properties_get_instance (void) +{ PhotosBmpFileFormatProperties* result = NULL; PhotosBmpFileFormatProperties* _tmp0_; PhotosBmpFileFormatProperties* _tmp1_; @@ -645,11 +709,13 @@ PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_get_instance (v result = _tmp1_; #line 20 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 649 "BmpSupport.c" +#line 713 "BmpSupport.c" } -static PhotoFileFormat photos_bmp_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +photos_bmp_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; PhotoFileFormat result = 0; #line 23 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -658,11 +724,13 @@ static PhotoFileFormat photos_bmp_file_format_properties_real_get_file_format (P result = PHOTO_FILE_FORMAT_BMP; #line 24 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 662 "BmpSupport.c" +#line 728 "BmpSupport.c" } -static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +photos_bmp_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 27 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -671,11 +739,13 @@ static PhotoFileFormatFlags photos_bmp_file_format_properties_real_get_flags (Ph result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 28 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 675 "BmpSupport.c" +#line 743 "BmpSupport.c" } -static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +photos_bmp_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -687,11 +757,13 @@ static gchar* photos_bmp_file_format_properties_real_get_user_visible_name (Phot result = _tmp0_; #line 32 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 691 "BmpSupport.c" +#line 761 "BmpSupport.c" } -static gchar* photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +photos_bmp_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -712,32 +784,38 @@ static gchar* photos_bmp_file_format_properties_real_get_default_extension (Phot result = _tmp2_; #line 36 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 716 "BmpSupport.c" +#line 788 "BmpSupport.c" } -static gchar** _vala_array_dup8 (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" result = g_new0 (gchar*, length + 1); #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" for (i = 0; i < length; i++) { -#line 727 "BmpSupport.c" +#line 802 "BmpSupport.c" gchar* _tmp0_; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = g_strdup (self[i]); #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result[i] = _tmp0_; -#line 733 "BmpSupport.c" +#line 808 "BmpSupport.c" } #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 737 "BmpSupport.c" +#line 812 "BmpSupport.c" } -static gchar** photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +photos_bmp_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ PhotosBmpFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -764,17 +842,19 @@ static gchar** photos_bmp_file_format_properties_real_get_known_extensions (Phot if (result_length1) { #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *result_length1 = _tmp2__length1; -#line 768 "BmpSupport.c" +#line 846 "BmpSupport.c" } #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = _tmp2_; #line 40 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 774 "BmpSupport.c" +#line 852 "BmpSupport.c" } -static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +photos_bmp_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ PhotosBmpFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -795,32 +875,38 @@ static gchar* photos_bmp_file_format_properties_real_get_default_mime_type (Phot result = _tmp2_; #line 44 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 799 "BmpSupport.c" +#line 879 "BmpSupport.c" } -static gchar** _vala_array_dup9 (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" result = g_new0 (gchar*, length + 1); #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" for (i = 0; i < length; i++) { -#line 810 "BmpSupport.c" +#line 893 "BmpSupport.c" gchar* _tmp0_; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = g_strdup (self[i]); #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result[i] = _tmp0_; -#line 816 "BmpSupport.c" +#line 899 "BmpSupport.c" } #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 820 "BmpSupport.c" +#line 903 "BmpSupport.c" } -static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +photos_bmp_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ PhotosBmpFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -847,34 +933,40 @@ static gchar** photos_bmp_file_format_properties_real_get_mime_types (PhotoFileF if (result_length1) { #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *result_length1 = _tmp2__length1; -#line 851 "BmpSupport.c" +#line 937 "BmpSupport.c" } #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = _tmp2_; #line 48 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 857 "BmpSupport.c" +#line 943 "BmpSupport.c" } -PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_construct (GType object_type) { +PhotosBmpFileFormatProperties* +photos_bmp_file_format_properties_construct (GType object_type) +{ PhotosBmpFileFormatProperties* self = NULL; #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = (PhotosBmpFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 867 "BmpSupport.c" +#line 955 "BmpSupport.c" } -PhotosBmpFileFormatProperties* photos_bmp_file_format_properties_new (void) { +PhotosBmpFileFormatProperties* +photos_bmp_file_format_properties_new (void) +{ #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_file_format_properties_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES); -#line 874 "BmpSupport.c" +#line 964 "BmpSupport.c" } -static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPropertiesClass * klass) { +static void +photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar** _tmp2_; @@ -922,25 +1014,31 @@ static void photos_bmp_file_format_properties_class_init (PhotosBmpFileFormatPro photos_bmp_file_format_properties_KNOWN_MIME_TYPES = _tmp4_; #line 11 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 926 "BmpSupport.c" +#line 1018 "BmpSupport.c" } -static void photos_bmp_file_format_properties_instance_init (PhotosBmpFileFormatProperties * self) { +static void +photos_bmp_file_format_properties_instance_init (PhotosBmpFileFormatProperties * self) +{ } -static void photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +photos_bmp_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ PhotosBmpFileFormatProperties * self; #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_PROPERTIES, PhotosBmpFileFormatProperties); #line 9 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_bmp_file_format_properties_parent_class)->finalize (obj); -#line 940 "BmpSupport.c" +#line 1036 "BmpSupport.c" } -GType photos_bmp_file_format_properties_get_type (void) { +GType +photos_bmp_file_format_properties_get_type (void) +{ static volatile gsize photos_bmp_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpFileFormatProperties), 0, (GInstanceInitFunc) photos_bmp_file_format_properties_instance_init, NULL }; @@ -952,82 +1050,83 @@ GType photos_bmp_file_format_properties_get_type (void) { } -PhotosBmpSniffer* photos_bmp_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PhotosBmpSniffer* +photos_bmp_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotosBmpSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = file; -#line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = options; -#line 56 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - self = (PhotosBmpSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (PhotosBmpSniffer*) gdk_sniffer_construct (object_type, file, options); #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 970 "BmpSupport.c" +#line 1066 "BmpSupport.c" } -PhotosBmpSniffer* photos_bmp_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +PhotosBmpSniffer* +photos_bmp_sniffer_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 55 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_sniffer_construct (PHOTOS_TYPE_BMP_SNIFFER, file, options); -#line 977 "BmpSupport.c" +#line 1076 "BmpSupport.c" } -static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { +static gboolean +photos_bmp_sniffer_is_bmp_file (GFile* file, + GError** error) +{ gboolean result = FALSE; GFileInputStream* instream = NULL; - GFile* _tmp0_; - GFileInputStream* _tmp1_; + GFileInputStream* _tmp0_; guint8* file_lead_sequence = NULL; - guint8* _tmp3_; + guint8* _tmp2_; gint file_lead_sequence_length1; gint _file_lead_sequence_size_; - GFileInputStream* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; + GFileInputStream* _tmp3_; + guint8* _tmp4_; + gint _tmp4__length1; GError * _inner_error_ = NULL; #line 59 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = file; + _tmp0_ = g_file_read (file, NULL, &_inner_error_); #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = g_file_read (_tmp0_, NULL, &_inner_error_); -#line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - instream = _tmp1_; + instream = _tmp0_; #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1004 "BmpSupport.c" - gboolean _tmp2_ = FALSE; +#line 1103 "BmpSupport.c" + gboolean _tmp1_ = FALSE; #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 60 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - return _tmp2_; -#line 1010 "BmpSupport.c" + return _tmp1_; +#line 1109 "BmpSupport.c" } #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE)); + _tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE)); #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - file_lead_sequence = _tmp3_; + file_lead_sequence = _tmp2_; #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" file_lead_sequence_length1 = G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE); #line 62 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _file_lead_sequence_size_ = file_lead_sequence_length1; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp4_ = instream; + _tmp3_ = instream; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp5_ = file_lead_sequence; + _tmp4_ = file_lead_sequence; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp5__length1 = file_lead_sequence_length1; + _tmp4__length1 = file_lead_sequence_length1; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_); + g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_); #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1030 "BmpSupport.c" - gboolean _tmp6_ = FALSE; +#line 1129 "BmpSupport.c" + gboolean _tmp5_ = FALSE; #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1035,62 +1134,62 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _g_object_unref0 (instream); #line 64 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - return _tmp6_; -#line 1040 "BmpSupport.c" + return _tmp5_; +#line 1139 "BmpSupport.c" } { gint i = 0; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" i = 0; -#line 1046 "BmpSupport.c" +#line 1145 "BmpSupport.c" { - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp7_ = TRUE; + _tmp6_ = TRUE; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" while (TRUE) { -#line 1053 "BmpSupport.c" - gint _tmp9_; - guint8* _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - guint8 _tmp12_; - gint _tmp13_; - guint8 _tmp14_; +#line 1152 "BmpSupport.c" + gint _tmp8_; + guint8* _tmp9_; + gint _tmp9__length1; + gint _tmp10_; + guint8 _tmp11_; + gint _tmp12_; + guint8 _tmp13_; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (!_tmp7_) { -#line 1063 "BmpSupport.c" - gint _tmp8_; + if (!_tmp6_) { +#line 1162 "BmpSupport.c" + gint _tmp7_; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp8_ = i; + _tmp7_ = i; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - i = _tmp8_ + 1; -#line 1069 "BmpSupport.c" + i = _tmp7_ + 1; +#line 1168 "BmpSupport.c" } #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp7_ = FALSE; + _tmp6_ = FALSE; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp9_ = i; + _tmp8_ = i; #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (!(_tmp9_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) { + if (!(_tmp8_ < G_N_ELEMENTS (PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE))) { #line 66 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" break; -#line 1079 "BmpSupport.c" +#line 1178 "BmpSupport.c" } #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp10_ = file_lead_sequence; + _tmp9_ = file_lead_sequence; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp10__length1 = file_lead_sequence_length1; + _tmp9__length1 = file_lead_sequence_length1; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp11_ = i; + _tmp10_ = i; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp12_ = _tmp10_[_tmp11_]; + _tmp11_ = _tmp9_[_tmp10_]; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp13_ = i; + _tmp12_ = i; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp14_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp13_]; + _tmp13_ = PHOTOS_BMP_SNIFFER_MAGIC_SEQUENCE[_tmp12_]; #line 67 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (_tmp12_ != _tmp14_) { + if (_tmp11_ != _tmp13_) { #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = FALSE; #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1099,7 +1198,7 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 68 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1103 "BmpSupport.c" +#line 1202 "BmpSupport.c" } } } @@ -1112,32 +1211,37 @@ static gboolean photos_bmp_sniffer_is_bmp_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 71 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1116 "BmpSupport.c" +#line 1215 "BmpSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1123 "BmpSupport.c" +#line 1224 "BmpSupport.c" } -static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +photos_bmp_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ PhotosBmpSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; gboolean _tmp0_ = FALSE; GFile* _tmp1_; - gboolean _tmp2_; DetectedPhotoInformation* detected = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; + DetectedPhotoInformation* _tmp3_; DetectedPhotoInformation* _tmp4_; - DetectedPhotoInformation* _tmp5_; - DetectedPhotoInformation* _tmp6_ = NULL; - DetectedPhotoInformation* _tmp7_; - PhotoFileFormat _tmp8_; - DetectedPhotoInformation* _tmp10_; + DetectedPhotoInformation* _tmp5_ = NULL; + DetectedPhotoInformation* _tmp6_; + PhotoFileFormat _tmp7_; + DetectedPhotoInformation* _tmp9_; GError * _inner_error_ = NULL; #line 74 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_SNIFFER, PhotosBmpSniffer); @@ -1146,16 +1250,14 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp2_ = photos_bmp_sniffer_is_bmp_file (_tmp1_, &_inner_error_); -#line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = photos_bmp_sniffer_is_bmp_file (_tmp1_, &_inner_error_); #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return NULL; -#line 1159 "BmpSupport.c" +#line 1261 "BmpSupport.c" } #line 78 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (!_tmp0_) { @@ -1165,30 +1267,30 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer if (is_corrupted) { #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1169 "BmpSupport.c" +#line 1271 "BmpSupport.c" } #line 79 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1173 "BmpSupport.c" +#line 1275 "BmpSupport.c" } #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_bmp_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_); + _tmp3_ = PHOTO_FILE_SNIFFER_CLASS (photos_bmp_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp2_, &_inner_error_); #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _vala_is_corrupted = _tmp3_; + _vala_is_corrupted = _tmp2_; #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - detected = _tmp4_; + detected = _tmp3_; #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 81 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return NULL; -#line 1187 "BmpSupport.c" +#line 1289 "BmpSupport.c" } #line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp5_ = detected; + _tmp4_ = detected; #line 82 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = NULL; #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1197,62 +1299,68 @@ static DetectedPhotoInformation* photos_bmp_sniffer_real_sniff (PhotoFileSniffer if (is_corrupted) { #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1201 "BmpSupport.c" +#line 1303 "BmpSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1205 "BmpSupport.c" +#line 1307 "BmpSupport.c" } #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp7_ = detected; + _tmp6_ = detected; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp8_ = _tmp7_->file_format; + _tmp7_ = _tmp6_->file_format; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_BMP) { -#line 1213 "BmpSupport.c" - DetectedPhotoInformation* _tmp9_; + if (_tmp7_ == PHOTO_FILE_FORMAT_BMP) { +#line 1315 "BmpSupport.c" + DetectedPhotoInformation* _tmp8_; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp9_ = detected; + _tmp8_ = detected; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp6_ = _tmp9_; -#line 1219 "BmpSupport.c" + _tmp5_ = _tmp8_; +#line 1321 "BmpSupport.c" } else { #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp6_ = NULL; -#line 1223 "BmpSupport.c" + _tmp5_ = NULL; +#line 1325 "BmpSupport.c" } #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp10_ = _detected_photo_information_ref0 (_tmp6_); + _tmp9_ = _detected_photo_information_ref0 (_tmp5_); #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = _tmp10_; + result = _tmp9_; #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _detected_photo_information_unref0 (detected); #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (is_corrupted) { #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1235 "BmpSupport.c" +#line 1337 "BmpSupport.c" } #line 85 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1239 "BmpSupport.c" +#line 1341 "BmpSupport.c" } -static void photos_bmp_sniffer_class_init (PhotosBmpSnifferClass * klass) { +static void +photos_bmp_sniffer_class_init (PhotosBmpSnifferClass * klass) +{ #line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_sniffer_parent_class = g_type_class_peek_parent (klass); #line 52 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_bmp_sniffer_real_sniff; -#line 1248 "BmpSupport.c" +#line 1352 "BmpSupport.c" } -static void photos_bmp_sniffer_instance_init (PhotosBmpSniffer * self) { +static void +photos_bmp_sniffer_instance_init (PhotosBmpSniffer * self) +{ } -GType photos_bmp_sniffer_get_type (void) { +GType +photos_bmp_sniffer_get_type (void) +{ static volatile gsize photos_bmp_sniffer_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpSniffer), 0, (GInstanceInitFunc) photos_bmp_sniffer_instance_init, NULL }; @@ -1264,29 +1372,36 @@ GType photos_bmp_sniffer_get_type (void) { } -PhotosBmpReader* photos_bmp_reader_construct (GType object_type, const gchar* filepath) { +PhotosBmpReader* +photos_bmp_reader_construct (GType object_type, + const gchar* filepath) +{ PhotosBmpReader* self = NULL; - const gchar* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 91 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 91 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - self = (PhotosBmpReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP); + self = (PhotosBmpReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_BMP); #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 1279 "BmpSupport.c" +#line 1387 "BmpSupport.c" } -PhotosBmpReader* photos_bmp_reader_new (const gchar* filepath) { +PhotosBmpReader* +photos_bmp_reader_new (const gchar* filepath) +{ #line 90 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_reader_construct (PHOTOS_TYPE_BMP_READER, filepath); -#line 1286 "BmpSupport.c" +#line 1396 "BmpSupport.c" } -static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +photos_bmp_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ PhotosBmpReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _result_ = NULL; @@ -1311,7 +1426,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim if (_tmp3_ > 9999) { #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1_ = TRUE; -#line 1315 "BmpSupport.c" +#line 1430 "BmpSupport.c" } else { Dimensions _tmp4_; gint _tmp5_; @@ -1321,11 +1436,11 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _tmp5_ = _tmp4_.height; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp1_ = _tmp5_ > 9999; -#line 1325 "BmpSupport.c" +#line 1440 "BmpSupport.c" } #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (_tmp1_) { -#line 1329 "BmpSupport.c" +#line 1444 "BmpSupport.c" gboolean _tmp6_ = FALSE; Dimensions _tmp7_; gint _tmp8_; @@ -1337,7 +1452,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim if (_tmp8_ < 100) { #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp6_ = TRUE; -#line 1341 "BmpSupport.c" +#line 1456 "BmpSupport.c" } else { Dimensions _tmp9_; gint _tmp10_; @@ -1347,19 +1462,19 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _tmp10_ = _tmp9_.height; #line 105 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp6_ = _tmp10_ < 100; -#line 1351 "BmpSupport.c" +#line 1466 "BmpSupport.c" } #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = _tmp6_; -#line 1355 "BmpSupport.c" +#line 1470 "BmpSupport.c" } else { #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = FALSE; -#line 1359 "BmpSupport.c" +#line 1474 "BmpSupport.c" } #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (_tmp0_) { -#line 1363 "BmpSupport.c" +#line 1478 "BmpSupport.c" Dimensions prefetch_dimensions = {0}; Dimensions _tmp11_ = {0}; GdkPixbuf* _tmp12_ = NULL; @@ -1410,7 +1525,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _g_object_unref0 (_result_); #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return NULL; -#line 1414 "BmpSupport.c" +#line 1529 "BmpSupport.c" } #line 109 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp21_ = _tmp12_; @@ -1438,7 +1553,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _result_ = _tmp27_; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _g_object_unref0 (_tmp12_); -#line 1442 "BmpSupport.c" +#line 1557 "BmpSupport.c" } else { GdkPixbuf* _tmp28_ = NULL; gchar* _tmp29_; @@ -1478,7 +1593,7 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _g_object_unref0 (_result_); #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return NULL; -#line 1482 "BmpSupport.c" +#line 1597 "BmpSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp37_ = _tmp28_; @@ -1490,30 +1605,36 @@ static GdkPixbuf* photos_bmp_reader_real_scaled_read (PhotoFileReader* base, Dim _result_ = _tmp37_; #line 104 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _g_object_unref0 (_tmp28_); -#line 1494 "BmpSupport.c" +#line 1609 "BmpSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" result = _result_; #line 118 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1500 "BmpSupport.c" +#line 1615 "BmpSupport.c" } -static void photos_bmp_reader_class_init (PhotosBmpReaderClass * klass) { +static void +photos_bmp_reader_class_init (PhotosBmpReaderClass * klass) +{ #line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_reader_parent_class = g_type_class_peek_parent (klass); #line 89 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photos_bmp_reader_real_scaled_read; -#line 1509 "BmpSupport.c" +#line 1626 "BmpSupport.c" } -static void photos_bmp_reader_instance_init (PhotosBmpReader * self) { +static void +photos_bmp_reader_instance_init (PhotosBmpReader * self) +{ } -GType photos_bmp_reader_get_type (void) { +GType +photos_bmp_reader_get_type (void) +{ static volatile gsize photos_bmp_reader_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpReader), 0, (GInstanceInitFunc) photos_bmp_reader_instance_init, NULL }; @@ -1525,73 +1646,83 @@ GType photos_bmp_reader_get_type (void) { } -PhotosBmpWriter* photos_bmp_writer_construct (GType object_type, const gchar* filepath) { +PhotosBmpWriter* +photos_bmp_writer_construct (GType object_type, + const gchar* filepath) +{ PhotosBmpWriter* self = NULL; - const gchar* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 124 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 124 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - self = (PhotosBmpWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP); + self = (PhotosBmpWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_BMP); #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 1540 "BmpSupport.c" +#line 1661 "BmpSupport.c" } -PhotosBmpWriter* photos_bmp_writer_new (const gchar* filepath) { +PhotosBmpWriter* +photos_bmp_writer_new (const gchar* filepath) +{ #line 123 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_writer_construct (PHOTOS_TYPE_BMP_WRITER, filepath); -#line 1547 "BmpSupport.c" +#line 1670 "BmpSupport.c" } -static void photos_bmp_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +photos_bmp_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ PhotosBmpWriter * self; - GdkPixbuf* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; GError * _inner_error_ = NULL; #line 127 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_WRITER, PhotosBmpWriter); #line 127 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = pixbuf; + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp1_ = _tmp0_; #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp2_ = _tmp1_; -#line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - gdk_pixbuf_save (_tmp0_, _tmp2_, "bmp", &_inner_error_, NULL, NULL); + gdk_pixbuf_save (pixbuf, _tmp1_, "bmp", &_inner_error_, NULL, NULL); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_propagate_error (error, _inner_error_); #line 128 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return; -#line 1577 "BmpSupport.c" +#line 1702 "BmpSupport.c" } } -static void photos_bmp_writer_class_init (PhotosBmpWriterClass * klass) { +static void +photos_bmp_writer_class_init (PhotosBmpWriterClass * klass) +{ #line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_writer_parent_class = g_type_class_peek_parent (klass); #line 122 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_bmp_writer_real_write; -#line 1587 "BmpSupport.c" +#line 1714 "BmpSupport.c" } -static void photos_bmp_writer_instance_init (PhotosBmpWriter * self) { +static void +photos_bmp_writer_instance_init (PhotosBmpWriter * self) +{ } -GType photos_bmp_writer_get_type (void) { +GType +photos_bmp_writer_get_type (void) +{ static volatile gsize photos_bmp_writer_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpWriter), 0, (GInstanceInitFunc) photos_bmp_writer_instance_init, NULL }; @@ -1603,52 +1734,64 @@ GType photos_bmp_writer_get_type (void) { } -PhotosBmpMetadataWriter* photos_bmp_metadata_writer_construct (GType object_type, const gchar* filepath) { +PhotosBmpMetadataWriter* +photos_bmp_metadata_writer_construct (GType object_type, + const gchar* filepath) +{ PhotosBmpMetadataWriter* self = NULL; - const gchar* _tmp0_; #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 134 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 134 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - self = (PhotosBmpMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_BMP); + self = (PhotosBmpMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_BMP); #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 1618 "BmpSupport.c" +#line 1749 "BmpSupport.c" } -PhotosBmpMetadataWriter* photos_bmp_metadata_writer_new (const gchar* filepath) { +PhotosBmpMetadataWriter* +photos_bmp_metadata_writer_new (const gchar* filepath) +{ #line 133 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_metadata_writer_construct (PHOTOS_TYPE_BMP_METADATA_WRITER, filepath); -#line 1625 "BmpSupport.c" +#line 1758 "BmpSupport.c" } -static void photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { +static void +photos_bmp_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error) +{ PhotosBmpMetadataWriter * self; #line 137 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_METADATA_WRITER, PhotosBmpMetadataWriter); #line 137 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); -#line 1635 "BmpSupport.c" +#line 1772 "BmpSupport.c" } -static void photos_bmp_metadata_writer_class_init (PhotosBmpMetadataWriterClass * klass) { +static void +photos_bmp_metadata_writer_class_init (PhotosBmpMetadataWriterClass * klass) +{ #line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 132 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_bmp_metadata_writer_real_write_metadata; -#line 1644 "BmpSupport.c" +#line 1783 "BmpSupport.c" } -static void photos_bmp_metadata_writer_instance_init (PhotosBmpMetadataWriter * self) { +static void +photos_bmp_metadata_writer_instance_init (PhotosBmpMetadataWriter * self) +{ } -GType photos_bmp_metadata_writer_get_type (void) { +GType +photos_bmp_metadata_writer_get_type (void) +{ static volatile gsize photos_bmp_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpMetadataWriter), 0, (GInstanceInitFunc) photos_bmp_metadata_writer_instance_init, NULL }; @@ -1660,7 +1803,9 @@ GType photos_bmp_metadata_writer_get_type (void) { } -void photos_bmp_file_format_driver_init (void) { +void +photos_bmp_file_format_driver_init (void) +{ PhotosBmpFileFormatDriver* _tmp0_; #line 146 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" _tmp0_ = photos_bmp_file_format_driver_new (); @@ -1670,18 +1815,22 @@ void photos_bmp_file_format_driver_init (void) { photos_bmp_file_format_driver_instance = _tmp0_; #line 147 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_properties_init (); -#line 1674 "BmpSupport.c" +#line 1819 "BmpSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +static gpointer +_photo_file_format_driver_ref0 (gpointer self) +{ #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 1681 "BmpSupport.c" +#line 1828 "BmpSupport.c" } -PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) { +PhotosBmpFileFormatDriver* +photos_bmp_file_format_driver_get_instance (void) +{ PhotosBmpFileFormatDriver* result = NULL; PhotosBmpFileFormatDriver* _tmp0_; PhotosBmpFileFormatDriver* _tmp1_; @@ -1693,11 +1842,13 @@ PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void) { result = _tmp1_; #line 151 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1697 "BmpSupport.c" +#line 1846 "BmpSupport.c" } -static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +photos_bmp_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ PhotosBmpFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; PhotosBmpFileFormatProperties* _tmp0_; @@ -1709,32 +1860,34 @@ static PhotoFileFormatProperties* photos_bmp_file_format_driver_real_get_propert result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 155 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1713 "BmpSupport.c" +#line 1864 "BmpSupport.c" } -static PhotoFileReader* photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +photos_bmp_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosBmpFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - PhotosBmpReader* _tmp1_; + PhotosBmpReader* _tmp0_; #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 158 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = photos_bmp_reader_new (_tmp0_); + _tmp0_ = photos_bmp_reader_new (filepath); #line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 159 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1734 "BmpSupport.c" +#line 1885 "BmpSupport.c" } -static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +photos_bmp_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ PhotosBmpFileFormatDriver * self; gboolean result = FALSE; #line 162 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1743,11 +1896,13 @@ static gboolean photos_bmp_file_format_driver_real_can_write_image (PhotoFileFor result = TRUE; #line 163 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1747 "BmpSupport.c" +#line 1900 "BmpSupport.c" } -static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +photos_bmp_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ PhotosBmpFileFormatDriver * self; gboolean result = FALSE; #line 166 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1756,77 +1911,77 @@ static gboolean photos_bmp_file_format_driver_real_can_write_metadata (PhotoFile result = FALSE; #line 167 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1760 "BmpSupport.c" +#line 1915 "BmpSupport.c" } -static PhotoFileWriter* photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +photos_bmp_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosBmpFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_; - PhotosBmpWriter* _tmp1_; + PhotosBmpWriter* _tmp0_; #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 170 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; + _tmp0_ = photos_bmp_writer_new (filepath); #line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = photos_bmp_writer_new (_tmp0_); -#line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 171 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1781 "BmpSupport.c" +#line 1936 "BmpSupport.c" } -static PhotoFileMetadataWriter* photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +photos_bmp_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosBmpFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_; - PhotosBmpMetadataWriter* _tmp1_; + PhotosBmpMetadataWriter* _tmp0_; #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 174 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = filepath; -#line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = photos_bmp_metadata_writer_new (_tmp0_); + _tmp0_ = photos_bmp_metadata_writer_new (filepath); #line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 175 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1802 "BmpSupport.c" +#line 1957 "BmpSupport.c" } -static PhotoFileSniffer* photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +photos_bmp_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotosBmpFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - PhotosBmpSniffer* _tmp2_; + PhotosBmpSniffer* _tmp0_; #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 178 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp0_ = file; -#line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp1_ = options; -#line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - _tmp2_ = photos_bmp_sniffer_new (_tmp0_, _tmp1_); + _tmp0_ = photos_bmp_sniffer_new (file, options); #line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 179 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1826 "BmpSupport.c" +#line 1979 "BmpSupport.c" } -static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +photos_bmp_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ PhotosBmpFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -1838,28 +1993,34 @@ static PhotoMetadata* photos_bmp_file_format_driver_real_create_metadata (PhotoF result = _tmp0_; #line 183 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return result; -#line 1842 "BmpSupport.c" +#line 1997 "BmpSupport.c" } -PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_construct (GType object_type) { +PhotosBmpFileFormatDriver* +photos_bmp_file_format_driver_construct (GType object_type) +{ PhotosBmpFileFormatDriver* self = NULL; #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = (PhotosBmpFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return self; -#line 1852 "BmpSupport.c" +#line 2009 "BmpSupport.c" } -PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_new (void) { +PhotosBmpFileFormatDriver* +photos_bmp_file_format_driver_new (void) +{ #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" return photos_bmp_file_format_driver_construct (PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER); -#line 1859 "BmpSupport.c" +#line 2018 "BmpSupport.c" } -static void photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverClass * klass) { +static void +photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverClass * klass) +{ #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" photos_bmp_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" @@ -1880,25 +2041,31 @@ static void photos_bmp_file_format_driver_class_init (PhotosBmpFileFormatDriverC ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photos_bmp_file_format_driver_real_create_sniffer; #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) photos_bmp_file_format_driver_real_create_metadata; -#line 1884 "BmpSupport.c" +#line 2045 "BmpSupport.c" } -static void photos_bmp_file_format_driver_instance_init (PhotosBmpFileFormatDriver * self) { +static void +photos_bmp_file_format_driver_instance_init (PhotosBmpFileFormatDriver * self) +{ } -static void photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +photos_bmp_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ PhotosBmpFileFormatDriver * self; #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_BMP_FILE_FORMAT_DRIVER, PhotosBmpFileFormatDriver); #line 142 "/home/jens/Source/shotwell/src/photos/BmpSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (photos_bmp_file_format_driver_parent_class)->finalize (obj); -#line 1898 "BmpSupport.c" +#line 2063 "BmpSupport.c" } -GType photos_bmp_file_format_driver_get_type (void) { +GType +photos_bmp_file_format_driver_get_type (void) +{ static volatile gsize photos_bmp_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&photos_bmp_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosBmpFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_bmp_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosBmpFileFormatDriver), 0, (GInstanceInitFunc) photos_bmp_file_format_driver_instance_init, NULL }; diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c index 304cc1a..25539cc 100644 --- a/src/photos/GRaw.c +++ b/src/photos/GRaw.c @@ -1,4 +1,4 @@ -/* GRaw.c generated by valac 0.36.6, the Vala compiler +/* GRaw.c generated by valac 0.40.4, the Vala compiler * generated from GRaw.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -179,20 +180,31 @@ GType graw_interpolation_quality_get_type (void) G_GNUC_CONST; GType graw_use_camera_matrix_get_type (void) G_GNUC_CONST; gpointer graw_processed_image_ref (gpointer instance); void graw_processed_image_unref (gpointer instance); -GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processed_image (GValue* value, gpointer v_object); -void graw_value_take_processed_image (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processed_image (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processed_image (GValue* value, + gpointer v_object); +void graw_value_take_processed_image (GValue* value, + gpointer v_object); gpointer graw_value_get_processed_image (const GValue* value); GType graw_processed_image_get_type (void) G_GNUC_CONST; #define GRAW_PROCESSED_IMAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImagePrivate)) -enum { - GRAW_PROCESSED_IMAGE_DUMMY_PROPERTY -}; -GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** error); -GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error); -void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GError** error); -GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GError** error); -GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type, libraw_data_t* proc, GError** error); +GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, + GError** error); +GRawProcessedImage* graw_processed_image_construct (GType object_type, + libraw_data_t* proc, + GError** error); +void graw_throw_exception (const gchar* caller, + enum LibRaw_errors _result_, + GError** error); +GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, + GError** error); +GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type, + libraw_data_t* proc, + GError** error); GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self); gushort graw_processed_image_get_width (GRawProcessedImage* self); gushort graw_processed_image_get_height (GRawProcessedImage* self); @@ -203,38 +215,60 @@ guint graw_processed_image_get_data_size (GRawProcessedImage* self); static void graw_processed_image_finalize (GRawProcessedImage * obj); gpointer graw_processor_ref (gpointer instance); void graw_processor_unref (gpointer instance); -GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processor (GValue* value, gpointer v_object); -void graw_value_take_processor (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processor (GValue* value, + gpointer v_object); +void graw_value_take_processor (GValue* value, + gpointer v_object); gpointer graw_value_get_processor (const GValue* value); GType graw_processor_get_type (void) G_GNUC_CONST; #define GRAW_PROCESSOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GRAW_TYPE_PROCESSOR, GRawProcessorPrivate)) -enum { - GRAW_PROCESSOR_DUMMY_PROPERTY -}; GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options); -GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options); -void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error); +GRawProcessor* graw_processor_construct (GType object_type, + enum LibRaw_constructor_flags options); +void graw_processor_adjust_sizes_info_only (GRawProcessor* self, + GError** error); libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self); libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self); libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self); libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self); -GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error); -GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error); -void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer_length1, GError** error); -void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error); -void graw_processor_process (GRawProcessor* self, GError** error); -void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error); -void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error); +GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, + GError** error); +GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, + GError** error); +void graw_processor_open_buffer (GRawProcessor* self, + guint8* buffer, + int buffer_length1, + GError** error); +void graw_processor_open_file (GRawProcessor* self, + const gchar* filename, + GError** error); +void graw_processor_process (GRawProcessor* self, + GError** error); +void graw_processor_ppm_tiff_writer (GRawProcessor* self, + const gchar* filename, + GError** error); +void graw_processor_thumb_writer (GRawProcessor* self, + const gchar* filename, + GError** error); void graw_processor_recycle (GRawProcessor* self); -void graw_processor_unpack (GRawProcessor* self, GError** error); -void graw_processor_unpack_thumb (GRawProcessor* self, GError** error); -void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size); +void graw_processor_unpack (GRawProcessor* self, + GError** error); +void graw_processor_unpack_thumb (GRawProcessor* self, + GError** error); +void graw_processor_configure_for_rgb_display (GRawProcessor* self, + gboolean half_size); libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self); static void graw_processor_finalize (GRawProcessor * obj); -GType graw_colorspace_get_type (void) { +GType +graw_colorspace_get_type (void) +{ static volatile gsize graw_colorspace_type_id__volatile = 0; if (g_once_init_enter (&graw_colorspace_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_COLORSPACE_RAW, "GRAW_COLORSPACE_RAW", "raw"}, {GRAW_COLORSPACE_SRGB, "GRAW_COLORSPACE_SRGB", "srgb"}, {GRAW_COLORSPACE_ADOBE, "GRAW_COLORSPACE_ADOBE", "adobe"}, {GRAW_COLORSPACE_WIDE, "GRAW_COLORSPACE_WIDE", "wide"}, {GRAW_COLORSPACE_PROPHOTO, "GRAW_COLORSPACE_PROPHOTO", "prophoto"}, {GRAW_COLORSPACE_XYZ, "GRAW_COLORSPACE_XYZ", "xyz"}, {0, NULL, NULL}}; @@ -246,12 +280,16 @@ GType graw_colorspace_get_type (void) { } -GQuark graw_exception_quark (void) { +GQuark +graw_exception_quark (void) +{ return g_quark_from_static_string ("graw_exception-quark"); } -GType graw_flip_get_type (void) { +GType +graw_flip_get_type (void) +{ static volatile gsize graw_flip_type_id__volatile = 0; if (g_once_init_enter (&graw_flip_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_FLIP_FROM_SOURCE, "GRAW_FLIP_FROM_SOURCE", "from-source"}, {GRAW_FLIP_NONE, "GRAW_FLIP_NONE", "none"}, {GRAW_FLIP_UPSIDE_DOWN, "GRAW_FLIP_UPSIDE_DOWN", "upside-down"}, {GRAW_FLIP_COUNTERCLOCKWISE, "GRAW_FLIP_COUNTERCLOCKWISE", "counterclockwise"}, {GRAW_FLIP_CLOCKWISE, "GRAW_FLIP_CLOCKWISE", "clockwise"}, {0, NULL, NULL}}; @@ -263,7 +301,9 @@ GType graw_flip_get_type (void) { } -GType graw_fuji_rotate_get_type (void) { +GType +graw_fuji_rotate_get_type (void) +{ static volatile gsize graw_fuji_rotate_type_id__volatile = 0; if (g_once_init_enter (&graw_fuji_rotate_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_FUJI_ROTATE_USE, "GRAW_FUJI_ROTATE_USE", "use"}, {GRAW_FUJI_ROTATE_DONT_USE, "GRAW_FUJI_ROTATE_DONT_USE", "dont-use"}, {0, NULL, NULL}}; @@ -275,7 +315,9 @@ GType graw_fuji_rotate_get_type (void) { } -GType graw_highlight_mode_get_type (void) { +GType +graw_highlight_mode_get_type (void) +{ static volatile gsize graw_highlight_mode_type_id__volatile = 0; if (g_once_init_enter (&graw_highlight_mode_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_HIGHLIGHT_MODE_CLIP, "GRAW_HIGHLIGHT_MODE_CLIP", "clip"}, {GRAW_HIGHLIGHT_MODE_UNCLIP, "GRAW_HIGHLIGHT_MODE_UNCLIP", "unclip"}, {GRAW_HIGHLIGHT_MODE_BLEND, "GRAW_HIGHLIGHT_MODE_BLEND", "blend"}, {GRAW_HIGHLIGHT_MODE_REBUILD, "GRAW_HIGHLIGHT_MODE_REBUILD", "rebuild"}, {0, NULL, NULL}}; @@ -287,7 +329,9 @@ GType graw_highlight_mode_get_type (void) { } -GType graw_interpolation_quality_get_type (void) { +GType +graw_interpolation_quality_get_type (void) +{ static volatile gsize graw_interpolation_quality_type_id__volatile = 0; if (g_once_init_enter (&graw_interpolation_quality_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_INTERPOLATION_QUALITY_LINEAR, "GRAW_INTERPOLATION_QUALITY_LINEAR", "linear"}, {GRAW_INTERPOLATION_QUALITY_VNG, "GRAW_INTERPOLATION_QUALITY_VNG", "vng"}, {GRAW_INTERPOLATION_QUALITY_PPG, "GRAW_INTERPOLATION_QUALITY_PPG", "ppg"}, {GRAW_INTERPOLATION_QUALITY_AHD, "GRAW_INTERPOLATION_QUALITY_AHD", "ahd"}, {0, NULL, NULL}}; @@ -299,7 +343,9 @@ GType graw_interpolation_quality_get_type (void) { } -GType graw_use_camera_matrix_get_type (void) { +GType +graw_use_camera_matrix_get_type (void) +{ static volatile gsize graw_use_camera_matrix_type_id__volatile = 0; if (g_once_init_enter (&graw_use_camera_matrix_type_id__volatile)) { static const GEnumValue values[] = {{GRAW_USE_CAMERA_MATRIX_IGNORE, "GRAW_USE_CAMERA_MATRIX_IGNORE", "ignore"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE", "embedded-color-profile"}, {GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA, "GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_DATA", "embedded-color-data"}, {0, NULL, NULL}}; @@ -311,27 +357,30 @@ GType graw_use_camera_matrix_get_type (void) { } -GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error) { +GRawProcessedImage* +graw_processed_image_construct (GType object_type, + libraw_data_t* proc, + GError** error) +{ GRawProcessedImage* self = NULL; enum LibRaw_errors _result_ = 0; - libraw_data_t* _tmp0_; - libraw_processed_image_t* _tmp1_; - enum LibRaw_errors _tmp2_; + libraw_processed_image_t* _tmp0_; + enum LibRaw_errors _tmp1_; + libraw_processed_image_t* _tmp2_; libraw_processed_image_t* _tmp3_; - libraw_processed_image_t* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; - libraw_processed_image_t* _tmp6_; - gushort _tmp7_; - libraw_processed_image_t* _tmp8_; - gushort _tmp9_; - libraw_processed_image_t* _tmp10_; - gushort _tmp11_; - libraw_processed_image_t* _tmp12_; - gushort _tmp13_; - libraw_processed_image_t* _tmp14_; - gushort _tmp15_; - GdkPixbuf* _tmp16_; + guint8* _tmp4_; + gint _tmp4__length1; + libraw_processed_image_t* _tmp5_; + gushort _tmp6_; + libraw_processed_image_t* _tmp7_; + gushort _tmp8_; + libraw_processed_image_t* _tmp9_; + gushort _tmp10_; + libraw_processed_image_t* _tmp11_; + gushort _tmp12_; + libraw_processed_image_t* _tmp13_; + gushort _tmp14_; + GdkPixbuf* _tmp15_; GError * _inner_error_ = NULL; #line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (proc != NULL, NULL); @@ -340,17 +389,15 @@ GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_da #line 113 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _result_ = LIBRAW_SUCCESS; #line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp0_ = proc; -#line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_dcraw_make_mem_image (_tmp0_, &_result_); + _tmp0_ = libraw_dcraw_make_mem_image (proc, &_result_); #line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _free0 (self->priv->image); #line 114 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->image = _tmp1_; + self->priv->image = _tmp0_; #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = _result_; + _tmp1_ = _result_; #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("ProcessedImage", _tmp2_, &_inner_error_); + graw_throw_exception ("ProcessedImage", _tmp1_, &_inner_error_); #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -361,7 +408,7 @@ GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_da _graw_processed_image_unref0 (self); #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 365 "GRaw.c" +#line 412 "GRaw.c" } else { #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -369,81 +416,87 @@ GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_da g_clear_error (&_inner_error_); #line 115 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 373 "GRaw.c" +#line 420 "GRaw.c" } } #line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp3_ = self->priv->image; + _tmp2_ = self->priv->image; #line 116 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _vala_assert (_tmp3_ != NULL, "image != null"); + _vala_assert (_tmp2_ != NULL, "image != null"); #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp4_ = self->priv->image; + _tmp3_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5_ = _tmp4_->data; + _tmp4_ = _tmp3_->data; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5__length1 = _tmp4_->data_size; + _tmp4__length1 = _tmp3_->data_size; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp6_ = self->priv->image; + _tmp5_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp7_ = _tmp6_->bits; + _tmp6_ = _tmp5_->bits; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp8_ = self->priv->image; + _tmp7_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp9_ = _tmp8_->width; + _tmp8_ = _tmp7_->width; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp10_ = self->priv->image; + _tmp9_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp11_ = _tmp10_->height; + _tmp10_ = _tmp9_->height; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp12_ = self->priv->image; + _tmp11_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp13_ = _tmp12_->width; + _tmp12_ = _tmp11_->width; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp14_ = self->priv->image; + _tmp13_ = self->priv->image; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp15_ = _tmp14_->colors; + _tmp14_ = _tmp13_->colors; #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp16_ = gdk_pixbuf_new_from_data (_tmp5_, GDK_COLORSPACE_RGB, FALSE, (gint) _tmp7_, (gint) _tmp9_, (gint) _tmp11_, (gint) (_tmp13_ * _tmp15_), (GdkPixbufDestroyNotify) NULL, NULL); + _tmp15_ = gdk_pixbuf_new_from_data (_tmp4_, GDK_COLORSPACE_RGB, FALSE, (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, (gint) (_tmp12_ * _tmp14_), (GdkPixbufDestroyNotify) NULL, NULL); #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_object_unref0 (self->priv->pixbuf); #line 120 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->pixbuf = _tmp16_; + self->priv->pixbuf = _tmp15_; #line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return self; -#line 414 "GRaw.c" +#line 461 "GRaw.c" } -GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** error) { +GRawProcessedImage* +graw_processed_image_new (libraw_data_t* proc, + GError** error) +{ #line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return graw_processed_image_construct (GRAW_TYPE_PROCESSED_IMAGE, proc, error); -#line 421 "GRaw.c" +#line 471 "GRaw.c" } -GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type, libraw_data_t* proc, GError** error) { +GRawProcessedImage* +graw_processed_image_construct_from_thumb (GType object_type, + libraw_data_t* proc, + GError** error) +{ GRawProcessedImage* self = NULL; enum LibRaw_errors _result_ = 0; - libraw_data_t* _tmp0_; - libraw_processed_image_t* _tmp1_; - enum LibRaw_errors _tmp2_; - libraw_processed_image_t* _tmp3_; - libraw_processed_image_t* _tmp17_; - GdkPixbuf* _tmp18_; + libraw_processed_image_t* _tmp0_; + enum LibRaw_errors _tmp1_; + libraw_processed_image_t* _tmp2_; + libraw_processed_image_t* _tmp16_; + GdkPixbuf* _tmp17_; + gint _tmp18_; gint _tmp19_; - gint _tmp20_; - libraw_processed_image_t* _tmp21_; - GdkPixbuf* _tmp22_; + libraw_processed_image_t* _tmp20_; + GdkPixbuf* _tmp21_; + gint _tmp22_; gint _tmp23_; - gint _tmp24_; - libraw_processed_image_t* _tmp25_; - GdkPixbuf* _tmp26_; + libraw_processed_image_t* _tmp24_; + GdkPixbuf* _tmp25_; + gint _tmp26_; gint _tmp27_; - gint _tmp28_; - libraw_processed_image_t* _tmp29_; - GdkPixbuf* _tmp30_; + libraw_processed_image_t* _tmp28_; + GdkPixbuf* _tmp29_; + gint _tmp30_; gint _tmp31_; - gint _tmp32_; GError * _inner_error_ = NULL; #line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (proc != NULL, NULL); @@ -452,17 +505,15 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 125 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _result_ = LIBRAW_SUCCESS; #line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp0_ = proc; -#line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_dcraw_make_mem_thumb (_tmp0_, &_result_); + _tmp0_ = libraw_dcraw_make_mem_thumb (proc, &_result_); #line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _free0 (self->priv->image); #line 126 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->image = _tmp1_; + self->priv->image = _tmp0_; #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = _result_; + _tmp1_ = _result_; #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("ProcessedImage.from_thumb", _tmp2_, &_inner_error_); + graw_throw_exception ("ProcessedImage.from_thumb", _tmp1_, &_inner_error_); #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -473,7 +524,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type _graw_processed_image_unref0 (self); #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 477 "GRaw.c" +#line 528 "GRaw.c" } else { #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -481,94 +532,94 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type g_clear_error (&_inner_error_); #line 127 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 485 "GRaw.c" +#line 536 "GRaw.c" } } #line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp3_ = self->priv->image; + _tmp2_ = self->priv->image; #line 128 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _vala_assert (_tmp3_ != NULL, "image != null"); -#line 492 "GRaw.c" + _vala_assert (_tmp2_ != NULL, "image != null"); +#line 543 "GRaw.c" { GBytes* bytes = NULL; - libraw_processed_image_t* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; - GBytes* _tmp6_; - GdkPixbuf* _tmp7_ = NULL; - GBytes* _tmp8_; + libraw_processed_image_t* _tmp3_; + guint8* _tmp4_; + gint _tmp4__length1; + GBytes* _tmp5_; + GdkPixbuf* _tmp6_ = NULL; + GBytes* _tmp7_; + GMemoryInputStream* _tmp8_; GMemoryInputStream* _tmp9_; - GMemoryInputStream* _tmp10_; + GdkPixbuf* _tmp10_; GdkPixbuf* _tmp11_; GdkPixbuf* _tmp12_; - GdkPixbuf* _tmp13_; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp4_ = self->priv->image; + _tmp3_ = self->priv->image; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5_ = _tmp4_->data; + _tmp4_ = _tmp3_->data; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5__length1 = _tmp4_->data_size; + _tmp4__length1 = _tmp3_->data_size; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp6_ = g_bytes_new_static (_tmp5_, _tmp5__length1); + _tmp5_ = g_bytes_new_static (_tmp4_, _tmp4__length1); #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - bytes = _tmp6_; + bytes = _tmp5_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp8_ = bytes; + _tmp7_ = bytes; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp9_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp8_); + _tmp8_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (_tmp7_); #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp11_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); + _tmp10_ = gdk_pixbuf_new_from_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _g_object_unref0 (_tmp10_); + _g_object_unref0 (_tmp9_); #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp7_ = _tmp12_; + _tmp6_ = _tmp11_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_bytes_unref0 (bytes); -#line 534 "GRaw.c" +#line 585 "GRaw.c" goto __catch33_g_error; } #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp13_ = _tmp7_; + _tmp12_ = _tmp6_; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp7_ = NULL; + _tmp6_ = NULL; #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_object_unref0 (self->priv->pixbuf); #line 135 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->pixbuf = _tmp13_; + self->priv->pixbuf = _tmp12_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _g_object_unref0 (_tmp7_); + _g_object_unref0 (_tmp6_); #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_bytes_unref0 (bytes); -#line 549 "GRaw.c" +#line 600 "GRaw.c" } goto __finally33; __catch33_g_error: { GError* err = NULL; - GError* _tmp14_; - const gchar* _tmp15_; - GError* _tmp16_; + GError* _tmp13_; + const gchar* _tmp14_; + GError* _tmp15_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" err = _inner_error_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _inner_error_ = NULL; #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp14_ = err; + _tmp13_ = err; #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp15_ = _tmp14_->message; + _tmp14_ = _tmp13_->message; #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp16_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp15_); + _tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp14_); #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp16_; + _inner_error_ = _tmp15_; #line 138 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_error_free0 (err); -#line 572 "GRaw.c" +#line 623 "GRaw.c" goto __finally33; } __finally33: @@ -582,7 +633,7 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type _graw_processed_image_unref0 (self); #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 586 "GRaw.c" +#line 637 "GRaw.c" } else { #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -590,63 +641,68 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type g_clear_error (&_inner_error_); #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 594 "GRaw.c" +#line 645 "GRaw.c" } } #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp17_ = self->priv->image; + _tmp16_ = self->priv->image; #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp18_ = self->priv->pixbuf; + _tmp17_ = self->priv->pixbuf; #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp19_ = gdk_pixbuf_get_width (_tmp18_); + _tmp18_ = gdk_pixbuf_get_width (_tmp17_); #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 142 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp17_->width = (gushort) _tmp20_; + _tmp16_->width = (gushort) _tmp19_; #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp21_ = self->priv->image; + _tmp20_ = self->priv->image; #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp22_ = self->priv->pixbuf; + _tmp21_ = self->priv->pixbuf; #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp23_ = gdk_pixbuf_get_height (_tmp22_); + _tmp22_ = gdk_pixbuf_get_height (_tmp21_); #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 143 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp21_->height = (gushort) _tmp24_; + _tmp20_->height = (gushort) _tmp23_; #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp25_ = self->priv->image; + _tmp24_ = self->priv->image; #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp26_ = self->priv->pixbuf; + _tmp25_ = self->priv->pixbuf; #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp27_ = gdk_pixbuf_get_n_channels (_tmp26_); + _tmp26_ = gdk_pixbuf_get_n_channels (_tmp25_); #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 144 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp25_->colors = (gushort) _tmp28_; + _tmp24_->colors = (gushort) _tmp27_; #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp29_ = self->priv->image; + _tmp28_ = self->priv->image; #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp30_ = self->priv->pixbuf; + _tmp29_ = self->priv->pixbuf; #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp31_ = gdk_pixbuf_get_bits_per_sample (_tmp30_); + _tmp30_ = gdk_pixbuf_get_bits_per_sample (_tmp29_); #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp32_ = _tmp31_; + _tmp31_ = _tmp30_; #line 145 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp29_->bits = (gushort) _tmp32_; + _tmp28_->bits = (gushort) _tmp31_; #line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return self; -#line 639 "GRaw.c" +#line 690 "GRaw.c" } -GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GError** error) { +GRawProcessedImage* +graw_processed_image_new_from_thumb (libraw_data_t* proc, + GError** error) +{ #line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return graw_processed_image_construct_from_thumb (GRAW_TYPE_PROCESSED_IMAGE, proc, error); -#line 646 "GRaw.c" +#line 700 "GRaw.c" } -GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) { +GdkPixbuf* +graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; @@ -660,11 +716,13 @@ GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) { result = _tmp1_; #line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 664 "GRaw.c" +#line 720 "GRaw.c" } -gushort graw_processed_image_get_width (GRawProcessedImage* self) { +gushort +graw_processed_image_get_width (GRawProcessedImage* self) +{ gushort result; libraw_processed_image_t* _tmp0_; gushort _tmp1_; @@ -678,11 +736,13 @@ gushort graw_processed_image_get_width (GRawProcessedImage* self) { result = _tmp1_; #line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 682 "GRaw.c" +#line 740 "GRaw.c" } -gushort graw_processed_image_get_height (GRawProcessedImage* self) { +gushort +graw_processed_image_get_height (GRawProcessedImage* self) +{ gushort result; libraw_processed_image_t* _tmp0_; gushort _tmp1_; @@ -696,11 +756,13 @@ gushort graw_processed_image_get_height (GRawProcessedImage* self) { result = _tmp1_; #line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 700 "GRaw.c" +#line 760 "GRaw.c" } -gushort graw_processed_image_get_colors (GRawProcessedImage* self) { +gushort +graw_processed_image_get_colors (GRawProcessedImage* self) +{ gushort result; libraw_processed_image_t* _tmp0_; gushort _tmp1_; @@ -714,11 +776,13 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self) { result = _tmp1_; #line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 718 "GRaw.c" +#line 780 "GRaw.c" } -gushort graw_processed_image_get_bits (GRawProcessedImage* self) { +gushort +graw_processed_image_get_bits (GRawProcessedImage* self) +{ gushort result; libraw_processed_image_t* _tmp0_; gushort _tmp1_; @@ -732,11 +796,13 @@ gushort graw_processed_image_get_bits (GRawProcessedImage* self) { result = _tmp1_; #line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 736 "GRaw.c" +#line 800 "GRaw.c" } -guint8* graw_processed_image_get_data (GRawProcessedImage* self) { +guint8* +graw_processed_image_get_data (GRawProcessedImage* self) +{ guint8* result; libraw_processed_image_t* _tmp0_; guint8* _tmp1_; @@ -753,11 +819,13 @@ guint8* graw_processed_image_get_data (GRawProcessedImage* self) { result = _tmp1_; #line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 757 "GRaw.c" +#line 823 "GRaw.c" } -guint graw_processed_image_get_data_size (GRawProcessedImage* self) { +guint +graw_processed_image_get_data_size (GRawProcessedImage* self) +{ guint result; libraw_processed_image_t* _tmp0_; guint _tmp1_; @@ -771,108 +839,133 @@ guint graw_processed_image_get_data_size (GRawProcessedImage* self) { result = _tmp1_; #line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 775 "GRaw.c" +#line 843 "GRaw.c" } -static void graw_value_processed_image_init (GValue* value) { +static void +graw_value_processed_image_init (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 782 "GRaw.c" +#line 852 "GRaw.c" } -static void graw_value_processed_image_free_value (GValue* value) { +static void +graw_value_processed_image_free_value (GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_unref (value->data[0].v_pointer); -#line 791 "GRaw.c" +#line 863 "GRaw.c" } } -static void graw_value_processed_image_copy_value (const GValue* src_value, GValue* dest_value) { +static void +graw_value_processed_image_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (src_value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" dest_value->data[0].v_pointer = graw_processed_image_ref (src_value->data[0].v_pointer); -#line 801 "GRaw.c" +#line 876 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" dest_value->data[0].v_pointer = NULL; -#line 805 "GRaw.c" +#line 880 "GRaw.c" } } -static gpointer graw_value_processed_image_peek_pointer (const GValue* value) { +static gpointer +graw_value_processed_image_peek_pointer (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return value->data[0].v_pointer; -#line 813 "GRaw.c" +#line 890 "GRaw.c" } -static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +graw_value_processed_image_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (collect_values[0].v_pointer) { -#line 820 "GRaw.c" +#line 902 "GRaw.c" GRawProcessedImage * object; object = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (object->parent_instance.g_class == NULL) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 827 "GRaw.c" +#line 909 "GRaw.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.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 831 "GRaw.c" +#line 913 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = graw_processed_image_ref (object); -#line 835 "GRaw.c" +#line 917 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 839 "GRaw.c" +#line 921 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 843 "GRaw.c" +#line 925 "GRaw.c" } -static gchar* graw_value_processed_image_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +graw_value_processed_image_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ GRawProcessedImage ** object_p; object_p = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!object_p) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 854 "GRaw.c" +#line 941 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!value->data[0].v_pointer) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = NULL; -#line 860 "GRaw.c" +#line 947 "GRaw.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = value->data[0].v_pointer; -#line 864 "GRaw.c" +#line 951 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = graw_processed_image_ref (value->data[0].v_pointer); -#line 868 "GRaw.c" +#line 955 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 872 "GRaw.c" +#line 959 "GRaw.c" } -GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +graw_param_spec_processed_image (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ GRawParamSpecProcessedImage* spec; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSED_IMAGE), NULL); @@ -882,20 +975,25 @@ GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nic G_PARAM_SPEC (spec)->value_type = object_type; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return G_PARAM_SPEC (spec); -#line 886 "GRaw.c" +#line 979 "GRaw.c" } -gpointer graw_value_get_processed_image (const GValue* value) { +gpointer +graw_value_get_processed_image (const GValue* value) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE), NULL); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return value->data[0].v_pointer; -#line 895 "GRaw.c" +#line 990 "GRaw.c" } -void graw_value_set_processed_image (GValue* value, gpointer v_object) { +void +graw_value_set_processed_image (GValue* value, + gpointer v_object) +{ GRawProcessedImage * old; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE)); @@ -911,22 +1009,25 @@ void graw_value_set_processed_image (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_ref (value->data[0].v_pointer); -#line 915 "GRaw.c" +#line 1013 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 919 "GRaw.c" +#line 1017 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_unref (old); -#line 925 "GRaw.c" +#line 1023 "GRaw.c" } } -void graw_value_take_processed_image (GValue* value, gpointer v_object) { +void +graw_value_take_processed_image (GValue* value, + gpointer v_object) +{ GRawProcessedImage * old; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE)); @@ -940,44 +1041,50 @@ void graw_value_take_processed_image (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = v_object; -#line 944 "GRaw.c" +#line 1045 "GRaw.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 948 "GRaw.c" +#line 1049 "GRaw.c" } #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (old) { #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_unref (old); -#line 954 "GRaw.c" +#line 1055 "GRaw.c" } } -static void graw_processed_image_class_init (GRawProcessedImageClass * klass) { +static void +graw_processed_image_class_init (GRawProcessedImageClass * klass) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processed_image_parent_class = g_type_class_peek_parent (klass); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" ((GRawProcessedImageClass *) klass)->finalize = graw_processed_image_finalize; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_type_class_add_private (klass, sizeof (GRawProcessedImagePrivate)); -#line 966 "GRaw.c" +#line 1069 "GRaw.c" } -static void graw_processed_image_instance_init (GRawProcessedImage * self) { +static void +graw_processed_image_instance_init (GRawProcessedImage * self) +{ #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->priv = GRAW_PROCESSED_IMAGE_GET_PRIVATE (self); #line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->priv->pixbuf = NULL; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->ref_count = 1; -#line 977 "GRaw.c" +#line 1082 "GRaw.c" } -static void graw_processed_image_finalize (GRawProcessedImage * obj) { +static void +graw_processed_image_finalize (GRawProcessedImage * obj) +{ GRawProcessedImage * self; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage); @@ -987,11 +1094,13 @@ static void graw_processed_image_finalize (GRawProcessedImage * obj) { _free0 (self->priv->image); #line 74 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_object_unref0 (self->priv->pixbuf); -#line 991 "GRaw.c" +#line 1098 "GRaw.c" } -GType graw_processed_image_get_type (void) { +GType +graw_processed_image_get_type (void) +{ static volatile gsize graw_processed_image_type_id__volatile = 0; if (g_once_init_enter (&graw_processed_image_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { graw_value_processed_image_init, graw_value_processed_image_free_value, graw_value_processed_image_copy_value, graw_value_processed_image_peek_pointer, "p", graw_value_processed_image_collect_value, "p", graw_value_processed_image_lcopy_value }; @@ -1005,18 +1114,22 @@ GType graw_processed_image_get_type (void) { } -gpointer graw_processed_image_ref (gpointer instance) { +gpointer +graw_processed_image_ref (gpointer instance) +{ GRawProcessedImage * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_atomic_int_inc (&self->ref_count); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return instance; -#line 1016 "GRaw.c" +#line 1127 "GRaw.c" } -void graw_processed_image_unref (gpointer instance) { +void +graw_processed_image_unref (gpointer instance) +{ GRawProcessedImage * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1025,50 +1138,52 @@ void graw_processed_image_unref (gpointer instance) { GRAW_PROCESSED_IMAGE_GET_CLASS (self)->finalize (self); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1029 "GRaw.c" +#line 1142 "GRaw.c" } } -GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options) { +GRawProcessor* +graw_processor_construct (GType object_type, + enum LibRaw_constructor_flags options) +{ GRawProcessor* self = NULL; - enum LibRaw_constructor_flags _tmp0_; - libraw_data_t* _tmp1_; + libraw_data_t* _tmp0_; #line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = (GRawProcessor*) g_type_create_instance (object_type); #line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp0_ = options; -#line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_init (_tmp0_); + _tmp0_ = libraw_init (options); #line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _libraw_close0 (self->priv->proc); #line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - self->priv->proc = _tmp1_; + self->priv->proc = _tmp0_; #line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return self; -#line 1050 "GRaw.c" +#line 1163 "GRaw.c" } -GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options) { +GRawProcessor* +graw_processor_new (enum LibRaw_constructor_flags options) +{ #line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return graw_processor_construct (GRAW_TYPE_PROCESSOR, options); -#line 1057 "GRaw.c" +#line 1172 "GRaw.c" } -void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) { +void +graw_processor_adjust_sizes_info_only (GRawProcessor* self, + GError** error) +{ libraw_data_t* _tmp0_; - enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 167 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_adjust_sizes_info_only (_tmp0_); -#line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("adjust_sizes_info_only", _tmp1_, &_inner_error_); + graw_throw_exception ("adjust_sizes_info_only", libraw_adjust_sizes_info_only (_tmp0_), &_inner_error_); #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1077,7 +1192,7 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) g_propagate_error (error, _inner_error_); #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1081 "GRaw.c" +#line 1196 "GRaw.c" } else { #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1085,13 +1200,15 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) g_clear_error (&_inner_error_); #line 168 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1089 "GRaw.c" +#line 1204 "GRaw.c" } } } -static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) { +static libraw_imgother_t +libraw_get_image_other (libraw_data_t* self) +{ libraw_imgother_t result = {0}; libraw_imgother_t _tmp0_; #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1100,27 +1217,28 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) { result = _tmp0_; #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi" return result; -#line 1104 "GRaw.c" +#line 1221 "GRaw.c" } -libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) { +libraw_imgother_t +graw_processor_get_image_other (GRawProcessor* self) +{ libraw_imgother_t result = {0}; libraw_data_t* _tmp0_; - libraw_imgother_t _tmp1_; #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_get_image_other (_tmp0_); -#line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - result = _tmp1_; + result = libraw_get_image_other (_tmp0_); #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1120 "GRaw.c" +#line 1236 "GRaw.c" } -static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) { +static libraw_iparams_t +libraw_get_image_params (libraw_data_t* self) +{ libraw_iparams_t result = {0}; libraw_iparams_t _tmp0_; #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1129,27 +1247,28 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) { result = _tmp0_; #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi" return result; -#line 1133 "GRaw.c" +#line 1251 "GRaw.c" } -libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) { +libraw_iparams_t +graw_processor_get_image_params (GRawProcessor* self) +{ libraw_iparams_t result = {0}; libraw_data_t* _tmp0_; - libraw_iparams_t _tmp1_; #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_get_image_params (_tmp0_); -#line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - result = _tmp1_; + result = libraw_get_image_params (_tmp0_); #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1149 "GRaw.c" +#line 1266 "GRaw.c" } -static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) { +static libraw_image_sizes_t +libraw_get_sizes (libraw_data_t* self) +{ libraw_image_sizes_t result = {0}; libraw_image_sizes_t _tmp0_; #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1158,27 +1277,28 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) { result = _tmp0_; #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi" return result; -#line 1162 "GRaw.c" +#line 1281 "GRaw.c" } -libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) { +libraw_image_sizes_t +graw_processor_get_sizes (GRawProcessor* self) +{ libraw_image_sizes_t result = {0}; libraw_data_t* _tmp0_; - libraw_image_sizes_t _tmp1_; #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_get_sizes (_tmp0_); -#line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - result = _tmp1_; + result = libraw_get_sizes (_tmp0_); #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1178 "GRaw.c" +#line 1296 "GRaw.c" } -static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) { +static libraw_thumbnail_t +libraw_get_thumbnail (libraw_data_t* self) +{ libraw_thumbnail_t result = {0}; libraw_thumbnail_t _tmp0_; #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1187,27 +1307,29 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) { result = _tmp0_; #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi" return result; -#line 1191 "GRaw.c" +#line 1311 "GRaw.c" } -libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) { +libraw_thumbnail_t +graw_processor_get_thumbnail (GRawProcessor* self) +{ libraw_thumbnail_t result = {0}; libraw_data_t* _tmp0_; - libraw_thumbnail_t _tmp1_; #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_get_thumbnail (_tmp0_); -#line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - result = _tmp1_; + result = libraw_get_thumbnail (_tmp0_); #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1207 "GRaw.c" +#line 1326 "GRaw.c" } -GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error) { +GRawProcessedImage* +graw_processor_make_mem_image (GRawProcessor* self, + GError** error) +{ GRawProcessedImage* result = NULL; GRawProcessedImage* _tmp0_ = NULL; libraw_data_t* _tmp1_; @@ -1230,7 +1352,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** g_propagate_error (error, _inner_error_); #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1234 "GRaw.c" +#line 1356 "GRaw.c" } else { #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1238,7 +1360,7 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** g_clear_error (&_inner_error_); #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1242 "GRaw.c" +#line 1364 "GRaw.c" } } #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1251,11 +1373,14 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** _graw_processed_image_unref0 (_tmp0_); #line 188 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1255 "GRaw.c" +#line 1377 "GRaw.c" } -GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error) { +GRawProcessedImage* +graw_processor_make_thumb_image (GRawProcessor* self, + GError** error) +{ GRawProcessedImage* result = NULL; GRawProcessedImage* _tmp0_ = NULL; libraw_data_t* _tmp1_; @@ -1278,7 +1403,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError g_propagate_error (error, _inner_error_); #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1282 "GRaw.c" +#line 1407 "GRaw.c" } else { #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1286,7 +1411,7 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError g_clear_error (&_inner_error_); #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1290 "GRaw.c" +#line 1415 "GRaw.c" } } #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1299,28 +1424,24 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError _graw_processed_image_unref0 (_tmp0_); #line 192 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1303 "GRaw.c" +#line 1428 "GRaw.c" } -void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer_length1, GError** error) { +void +graw_processor_open_buffer (GRawProcessor* self, + guint8* buffer, + int buffer_length1, + GError** error) +{ libraw_data_t* _tmp0_; - guint8* _tmp1_; - gint _tmp1__length1; - enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 195 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = buffer; -#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1__length1 = buffer_length1; -#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = libraw_open_buffer (_tmp0_, _tmp1_, _tmp1__length1); -#line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("open_buffer", _tmp2_, &_inner_error_); + graw_throw_exception ("open_buffer", libraw_open_buffer (_tmp0_, buffer, buffer_length1), &_inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1329,7 +1450,7 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer g_propagate_error (error, _inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1333 "GRaw.c" +#line 1454 "GRaw.c" } else { #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1337,16 +1458,18 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer g_clear_error (&_inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1341 "GRaw.c" +#line 1462 "GRaw.c" } } } -void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error) { +void +graw_processor_open_file (GRawProcessor* self, + const gchar* filename, + GError** error) +{ libraw_data_t* _tmp0_; - const gchar* _tmp1_; - enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1355,11 +1478,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = filename; -#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = libraw_open_file (_tmp0_, _tmp1_); -#line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("open_file", _tmp2_, &_inner_error_); + graw_throw_exception ("open_file", libraw_open_file (_tmp0_, filename), &_inner_error_); #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1368,7 +1487,7 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro g_propagate_error (error, _inner_error_); #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1372 "GRaw.c" +#line 1491 "GRaw.c" } else { #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1376,24 +1495,24 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro g_clear_error (&_inner_error_); #line 200 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1380 "GRaw.c" +#line 1499 "GRaw.c" } } } -void graw_processor_process (GRawProcessor* self, GError** error) { +void +graw_processor_process (GRawProcessor* self, + GError** error) +{ libraw_data_t* _tmp0_; - enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 203 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_dcraw_process (_tmp0_); -#line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("process", _tmp1_, &_inner_error_); + graw_throw_exception ("process", libraw_dcraw_process (_tmp0_), &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1402,7 +1521,7 @@ void graw_processor_process (GRawProcessor* self, GError** error) { g_propagate_error (error, _inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1406 "GRaw.c" +#line 1525 "GRaw.c" } else { #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1410,16 +1529,18 @@ void graw_processor_process (GRawProcessor* self, GError** error) { g_clear_error (&_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1414 "GRaw.c" +#line 1533 "GRaw.c" } } } -void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error) { +void +graw_processor_ppm_tiff_writer (GRawProcessor* self, + const gchar* filename, + GError** error) +{ libraw_data_t* _tmp0_; - const gchar* _tmp1_; - enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1428,11 +1549,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = filename; -#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = libraw_dcraw_ppm_tiff_writer (_tmp0_, _tmp1_); -#line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("ppm_tiff_writer", _tmp2_, &_inner_error_); + graw_throw_exception ("ppm_tiff_writer", libraw_dcraw_ppm_tiff_writer (_tmp0_, filename), &_inner_error_); #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1441,7 +1558,7 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, g_propagate_error (error, _inner_error_); #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1445 "GRaw.c" +#line 1562 "GRaw.c" } else { #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1449,16 +1566,18 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, g_clear_error (&_inner_error_); #line 208 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1453 "GRaw.c" +#line 1570 "GRaw.c" } } } -void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error) { +void +graw_processor_thumb_writer (GRawProcessor* self, + const gchar* filename, + GError** error) +{ libraw_data_t* _tmp0_; - const gchar* _tmp1_; - enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1467,11 +1586,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = filename; -#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = libraw_dcraw_thumb_writer (_tmp0_, _tmp1_); -#line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("thumb_writer", _tmp2_, &_inner_error_); + graw_throw_exception ("thumb_writer", libraw_dcraw_thumb_writer (_tmp0_, filename), &_inner_error_); #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1480,7 +1595,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE g_propagate_error (error, _inner_error_); #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1484 "GRaw.c" +#line 1599 "GRaw.c" } else { #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1488,13 +1603,15 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE g_clear_error (&_inner_error_); #line 212 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1492 "GRaw.c" +#line 1607 "GRaw.c" } } } -void graw_processor_recycle (GRawProcessor* self) { +void +graw_processor_recycle (GRawProcessor* self) +{ libraw_data_t* _tmp0_; #line 215 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1502,22 +1619,22 @@ void graw_processor_recycle (GRawProcessor* self) { _tmp0_ = self->priv->proc; #line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala" libraw_recycle (_tmp0_); -#line 1506 "GRaw.c" +#line 1623 "GRaw.c" } -void graw_processor_unpack (GRawProcessor* self, GError** error) { +void +graw_processor_unpack (GRawProcessor* self, + GError** error) +{ libraw_data_t* _tmp0_; - enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 219 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_unpack (_tmp0_); -#line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("unpack", _tmp1_, &_inner_error_); + graw_throw_exception ("unpack", libraw_unpack (_tmp0_), &_inner_error_); #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1526,7 +1643,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) { g_propagate_error (error, _inner_error_); #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1530 "GRaw.c" +#line 1647 "GRaw.c" } else { #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1534,24 +1651,24 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) { g_clear_error (&_inner_error_); #line 220 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1538 "GRaw.c" +#line 1655 "GRaw.c" } } } -void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { +void +graw_processor_unpack_thumb (GRawProcessor* self, + GError** error) +{ libraw_data_t* _tmp0_; - enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = libraw_unpack_thumb (_tmp0_); -#line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - graw_throw_exception ("unpack_thumb", _tmp1_, &_inner_error_); + graw_throw_exception ("unpack_thumb", libraw_unpack_thumb (_tmp0_), &_inner_error_); #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1560,7 +1677,7 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { g_propagate_error (error, _inner_error_); #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1564 "GRaw.c" +#line 1681 "GRaw.c" } else { #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -1568,67 +1685,54 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { g_clear_error (&_inner_error_); #line 224 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 1572 "GRaw.c" +#line 1689 "GRaw.c" } } } -static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, gdouble red_multiplier, gdouble green_multiplier) { - libraw_output_params_t* _tmp0_; +static void +lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, + gdouble red_multiplier, + gdouble green_multiplier) +{ + gdouble _tmp0_; gdouble _tmp1_; - gdouble _tmp2_; - libraw_output_params_t* _tmp3_; - gdouble _tmp4_; - gdouble _tmp5_; -#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp0_ = params; -#line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp1_ = red_multiplier; #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" - (*_tmp0_).aber[0] = _tmp1_; + (*params).aber[0] = red_multiplier; #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp2_ = (*_tmp0_).aber[0]; -#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp3_ = params; -#line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp4_ = green_multiplier; + _tmp0_ = (*params).aber[0]; #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi" - (*_tmp3_).aber[2] = _tmp4_; + (*params).aber[2] = green_multiplier; #line 149 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp5_ = (*_tmp3_).aber[2]; -#line 1601 "GRaw.c" + _tmp1_ = (*params).aber[2]; +#line 1710 "GRaw.c" } -static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, gdouble power, gdouble slope) { - libraw_output_params_t* _tmp0_; +static void +lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, + gdouble power, + gdouble slope) +{ + gdouble _tmp0_; gdouble _tmp1_; - gdouble _tmp2_; - libraw_output_params_t* _tmp3_; - gdouble _tmp4_; - gdouble _tmp5_; -#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp0_ = params; -#line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp1_ = power; #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" - (*_tmp0_).gamm[0] = 1.0 / _tmp1_; + (*params).gamm[0] = 1.0 / power; #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp2_ = (*_tmp0_).gamm[0]; + _tmp0_ = (*params).gamm[0]; #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp3_ = params; + (*params).gamm[1] = slope; #line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp4_ = slope; -#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi" - (*_tmp3_).gamm[1] = _tmp4_; -#line 154 "/home/jens/Source/shotwell/vapi/libraw.vapi" - _tmp5_ = (*_tmp3_).gamm[1]; -#line 1628 "GRaw.c" + _tmp1_ = (*params).gamm[1]; +#line 1729 "GRaw.c" } -void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size) { +void +graw_processor_configure_for_rgb_display (GRawProcessor* self, + gboolean half_size) +{ libraw_output_params_t* _tmp0_; libraw_output_params_t* _tmp1_; libraw_output_params_t* _tmp2_; @@ -1637,7 +1741,7 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal libraw_output_params_t* _tmp5_; libraw_output_params_t* _tmp6_; libraw_output_params_t* _tmp7_; - gboolean _tmp8_; + libraw_output_params_t* _tmp8_; libraw_output_params_t* _tmp9_; libraw_output_params_t* _tmp10_; libraw_output_params_t* _tmp11_; @@ -1659,7 +1763,6 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal libraw_output_params_t* _tmp27_; libraw_output_params_t* _tmp28_; libraw_output_params_t* _tmp29_; - libraw_output_params_t* _tmp30_; #line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1685,80 +1788,80 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal #line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp7_ = _tmp6_; #line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp8_ = half_size; -#line 242 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp7_).half_size = _tmp8_; + (*_tmp7_).half_size = half_size; #line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp9_ = graw_processor_get_output_params (self); + _tmp8_ = graw_processor_get_output_params (self); #line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp10_ = _tmp9_; + _tmp9_ = _tmp8_; #line 244 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp10_).highlight = (gint) GRAW_HIGHLIGHT_MODE_CLIP; + (*_tmp9_).highlight = (gint) GRAW_HIGHLIGHT_MODE_CLIP; #line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp11_ = graw_processor_get_output_params (self); + _tmp10_ = graw_processor_get_output_params (self); #line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp12_ = _tmp11_; + _tmp11_ = _tmp10_; #line 245 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp12_).use_auto_wb = TRUE; + (*_tmp11_).use_auto_wb = TRUE; #line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp13_ = graw_processor_get_output_params (self); + _tmp12_ = graw_processor_get_output_params (self); #line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 246 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp14_).use_camera_wb = TRUE; + (*_tmp13_).use_camera_wb = TRUE; #line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp15_ = graw_processor_get_output_params (self); + _tmp14_ = graw_processor_get_output_params (self); #line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp16_ = _tmp15_; + _tmp15_ = _tmp14_; #line 247 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp16_).use_camera_matrix = (gint) GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE; + (*_tmp15_).use_camera_matrix = (gint) GRAW_USE_CAMERA_MATRIX_EMBEDDED_COLOR_PROFILE; #line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp17_ = graw_processor_get_output_params (self); + _tmp16_ = graw_processor_get_output_params (self); #line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp18_ = _tmp17_; + _tmp17_ = _tmp16_; #line 248 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp18_).output_color = (gint) GRAW_COLORSPACE_SRGB; + (*_tmp17_).output_color = (gint) GRAW_COLORSPACE_SRGB; #line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp19_ = graw_processor_get_output_params (self); + _tmp18_ = graw_processor_get_output_params (self); #line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_; #line 253 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp20_).output_bps = 8; + (*_tmp19_).output_bps = 8; #line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp21_ = graw_processor_get_output_params (self); + _tmp20_ = graw_processor_get_output_params (self); #line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 255 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp22_).user_flip = (gint) GRAW_FLIP_FROM_SOURCE; + (*_tmp21_).user_flip = (gint) GRAW_FLIP_FROM_SOURCE; #line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp23_ = graw_processor_get_output_params (self); + _tmp22_ = graw_processor_get_output_params (self); #line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp24_ = _tmp23_; + _tmp23_ = _tmp22_; #line 256 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp24_).user_qual = (gint) GRAW_INTERPOLATION_QUALITY_PPG; + (*_tmp23_).user_qual = (gint) GRAW_INTERPOLATION_QUALITY_PPG; #line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp25_ = graw_processor_get_output_params (self); + _tmp24_ = graw_processor_get_output_params (self); #line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 260 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp26_).no_auto_bright = TRUE; + (*_tmp25_).no_auto_bright = TRUE; #line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp27_ = graw_processor_get_output_params (self); + _tmp26_ = graw_processor_get_output_params (self); #line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp28_ = _tmp27_; + _tmp27_ = _tmp26_; #line 261 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp28_).auto_bright_thr = 0.01f; + (*_tmp27_).auto_bright_thr = 0.01f; #line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp29_ = graw_processor_get_output_params (self); + _tmp28_ = graw_processor_get_output_params (self); #line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp30_ = _tmp29_; + _tmp29_ = _tmp28_; #line 262 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - (*_tmp30_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE; -#line 1758 "GRaw.c" + (*_tmp29_).use_fuji_rotate = (gint) GRAW_FUJI_ROTATE_USE; +#line 1859 "GRaw.c" } -libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) { +libraw_output_params_t* +graw_processor_get_output_params (GRawProcessor* self) +{ libraw_output_params_t* result; libraw_data_t* _tmp0_; #line 156 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1769,108 +1872,133 @@ libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) { result = &_tmp0_->params; #line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return result; -#line 1773 "GRaw.c" +#line 1876 "GRaw.c" } -static void graw_value_processor_init (GValue* value) { +static void +graw_value_processor_init (GValue* value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 1780 "GRaw.c" +#line 1885 "GRaw.c" } -static void graw_value_processor_free_value (GValue* value) { +static void +graw_value_processor_free_value (GValue* value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_unref (value->data[0].v_pointer); -#line 1789 "GRaw.c" +#line 1896 "GRaw.c" } } -static void graw_value_processor_copy_value (const GValue* src_value, GValue* dest_value) { +static void +graw_value_processor_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (src_value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" dest_value->data[0].v_pointer = graw_processor_ref (src_value->data[0].v_pointer); -#line 1799 "GRaw.c" +#line 1909 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" dest_value->data[0].v_pointer = NULL; -#line 1803 "GRaw.c" +#line 1913 "GRaw.c" } } -static gpointer graw_value_processor_peek_pointer (const GValue* value) { +static gpointer +graw_value_processor_peek_pointer (const GValue* value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return value->data[0].v_pointer; -#line 1811 "GRaw.c" +#line 1923 "GRaw.c" } -static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +graw_value_processor_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (collect_values[0].v_pointer) { -#line 1818 "GRaw.c" +#line 1935 "GRaw.c" GRawProcessor * object; object = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (object->parent_instance.g_class == NULL) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1825 "GRaw.c" +#line 1942 "GRaw.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.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 1829 "GRaw.c" +#line 1946 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = graw_processor_ref (object); -#line 1833 "GRaw.c" +#line 1950 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 1837 "GRaw.c" +#line 1954 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1841 "GRaw.c" +#line 1958 "GRaw.c" } -static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +graw_value_processor_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ GRawProcessor ** object_p; object_p = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!object_p) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1852 "GRaw.c" +#line 1974 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!value->data[0].v_pointer) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = NULL; -#line 1858 "GRaw.c" +#line 1980 "GRaw.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = value->data[0].v_pointer; -#line 1862 "GRaw.c" +#line 1984 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" *object_p = graw_processor_ref (value->data[0].v_pointer); -#line 1866 "GRaw.c" +#line 1988 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return NULL; -#line 1870 "GRaw.c" +#line 1992 "GRaw.c" } -GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +graw_param_spec_processor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ GRawParamSpecProcessor* spec; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (g_type_is_a (object_type, GRAW_TYPE_PROCESSOR), NULL); @@ -1880,20 +2008,25 @@ GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, con G_PARAM_SPEC (spec)->value_type = object_type; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return G_PARAM_SPEC (spec); -#line 1884 "GRaw.c" +#line 2012 "GRaw.c" } -gpointer graw_value_get_processor (const GValue* value) { +gpointer +graw_value_get_processor (const GValue* value) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR), NULL); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return value->data[0].v_pointer; -#line 1893 "GRaw.c" +#line 2023 "GRaw.c" } -void graw_value_set_processor (GValue* value, gpointer v_object) { +void +graw_value_set_processor (GValue* value, + gpointer v_object) +{ GRawProcessor * old; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR)); @@ -1909,22 +2042,25 @@ void graw_value_set_processor (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_ref (value->data[0].v_pointer); -#line 1913 "GRaw.c" +#line 2046 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 1917 "GRaw.c" +#line 2050 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (old) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_unref (old); -#line 1923 "GRaw.c" +#line 2056 "GRaw.c" } } -void graw_value_take_processor (GValue* value, gpointer v_object) { +void +graw_value_take_processor (GValue* value, + gpointer v_object) +{ GRawProcessor * old; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR)); @@ -1938,42 +2074,48 @@ void graw_value_take_processor (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = v_object; -#line 1942 "GRaw.c" +#line 2078 "GRaw.c" } else { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" value->data[0].v_pointer = NULL; -#line 1946 "GRaw.c" +#line 2082 "GRaw.c" } #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (old) { #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_unref (old); -#line 1952 "GRaw.c" +#line 2088 "GRaw.c" } } -static void graw_processor_class_init (GRawProcessorClass * klass) { +static void +graw_processor_class_init (GRawProcessorClass * klass) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" graw_processor_parent_class = g_type_class_peek_parent (klass); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" ((GRawProcessorClass *) klass)->finalize = graw_processor_finalize; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_type_class_add_private (klass, sizeof (GRawProcessorPrivate)); -#line 1964 "GRaw.c" +#line 2102 "GRaw.c" } -static void graw_processor_instance_init (GRawProcessor * self) { +static void +graw_processor_instance_init (GRawProcessor * self) +{ #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->priv = GRAW_PROCESSOR_GET_PRIVATE (self); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self->ref_count = 1; -#line 1973 "GRaw.c" +#line 2113 "GRaw.c" } -static void graw_processor_finalize (GRawProcessor * obj) { +static void +graw_processor_finalize (GRawProcessor * obj) +{ GRawProcessor * self; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSOR, GRawProcessor); @@ -1981,11 +2123,13 @@ static void graw_processor_finalize (GRawProcessor * obj) { g_signal_handlers_destroy (self); #line 161 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _libraw_close0 (self->priv->proc); -#line 1985 "GRaw.c" +#line 2127 "GRaw.c" } -GType graw_processor_get_type (void) { +GType +graw_processor_get_type (void) +{ static volatile gsize graw_processor_type_id__volatile = 0; if (g_once_init_enter (&graw_processor_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { graw_value_processor_init, graw_value_processor_free_value, graw_value_processor_copy_value, graw_value_processor_peek_pointer, "p", graw_value_processor_collect_value, "p", graw_value_processor_lcopy_value }; @@ -1999,18 +2143,22 @@ GType graw_processor_get_type (void) { } -gpointer graw_processor_ref (gpointer instance) { +gpointer +graw_processor_ref (gpointer instance) +{ GRawProcessor * self; self = instance; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_atomic_int_inc (&self->ref_count); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return instance; -#line 2010 "GRaw.c" +#line 2156 "GRaw.c" } -void graw_processor_unref (gpointer instance) { +void +graw_processor_unref (gpointer instance) +{ GRawProcessor * self; self = instance; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2019,60 +2167,46 @@ void graw_processor_unref (gpointer instance) { GRAW_PROCESSOR_GET_CLASS (self)->finalize (self); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2023 "GRaw.c" +#line 2171 "GRaw.c" } } -void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GError** error) { - enum LibRaw_errors _tmp0_; +void +graw_throw_exception (const gchar* caller, + enum LibRaw_errors _result_, + GError** error) +{ gchar* msg = NULL; - const gchar* _tmp7_; - enum LibRaw_errors _tmp8_; - const gchar* _tmp9_; - gchar* _tmp10_; - enum LibRaw_errors _tmp11_; + const gchar* _tmp2_; + gchar* _tmp3_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (caller != NULL); #line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp0_ = _result_; -#line 267 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - if (_tmp0_ == LIBRAW_SUCCESS) { + if (_result_ == LIBRAW_SUCCESS) { #line 268 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2045 "GRaw.c" +#line 2191 "GRaw.c" } else { - enum LibRaw_errors _tmp1_; -#line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp1_ = _result_; #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - if (_tmp1_ > 0) { -#line 2052 "GRaw.c" - const gchar* _tmp2_; - enum LibRaw_errors _tmp3_; - enum LibRaw_errors _tmp4_; - const gchar* _tmp5_; - GError* _tmp6_; -#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp2_ = caller; -#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp3_ = _result_; + if (_result_ > 0) { +#line 2195 "GRaw.c" + const gchar* _tmp0_; + GError* _tmp1_; #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp4_ = _result_; + _tmp0_ = g_strerror ((gint) _result_); #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp5_ = g_strerror ((gint) _tmp4_); + _tmp1_ = g_error_new (GRAW_EXCEPTION, GRAW_EXCEPTION_SYSTEM_ERROR, "%s: System error %d: %s", caller, (gint) _result_, _tmp0_); #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp6_ = g_error_new (GRAW_EXCEPTION, GRAW_EXCEPTION_SYSTEM_ERROR, "%s: System error %d: %s", _tmp2_, (gint) _tmp3_, _tmp5_); -#line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp6_; + _inner_error_ = _tmp1_; #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_propagate_error (error, _inner_error_); #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2076 "GRaw.c" +#line 2210 "GRaw.c" } else { #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.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); @@ -2080,36 +2214,30 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2084 "GRaw.c" +#line 2218 "GRaw.c" } } } #line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp7_ = caller; -#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp8_ = _result_; -#line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp9_ = libraw_strerror (_tmp8_); + _tmp2_ = libraw_strerror (_result_); #line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp10_ = g_strdup_printf ("%s: %s", _tmp7_, _tmp9_); + _tmp3_ = g_strdup_printf ("%s: %s", caller, _tmp2_); #line 272 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - msg = _tmp10_; + msg = _tmp3_; #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp11_ = _result_; -#line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - switch (_tmp11_) { + switch (_result_) { #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_UNSPECIFIED_ERROR: -#line 2104 "GRaw.c" +#line 2232 "GRaw.c" { - const gchar* _tmp12_; - GError* _tmp13_; + const gchar* _tmp4_; + GError* _tmp5_; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp12_ = msg; + _tmp4_ = msg; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp12_); + _tmp5_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSPECIFIED, _tmp4_); #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp13_; + _inner_error_ = _tmp5_; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2118,7 +2246,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2122 "GRaw.c" +#line 2250 "GRaw.c" } else { #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2128,21 +2256,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2132 "GRaw.c" +#line 2260 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_FILE_UNSUPPORTED: -#line 2137 "GRaw.c" +#line 2265 "GRaw.c" { - const gchar* _tmp14_; - GError* _tmp15_; + const gchar* _tmp6_; + GError* _tmp7_; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp14_ = msg; + _tmp6_ = msg; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp14_); + _tmp7_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_FILE, _tmp6_); #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp15_; + _inner_error_ = _tmp7_; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2151,7 +2279,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2155 "GRaw.c" +#line 2283 "GRaw.c" } else { #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2161,21 +2289,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2165 "GRaw.c" +#line 2293 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE: -#line 2170 "GRaw.c" +#line 2298 "GRaw.c" { - const gchar* _tmp16_; - GError* _tmp17_; + const gchar* _tmp8_; + GError* _tmp9_; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp16_ = msg; + _tmp8_ = msg; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp16_); + _tmp9_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NONEXISTANT_IMAGE, _tmp8_); #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp17_; + _inner_error_ = _tmp9_; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2184,7 +2312,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2188 "GRaw.c" +#line 2316 "GRaw.c" } else { #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2194,21 +2322,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2198 "GRaw.c" +#line 2326 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_OUT_OF_ORDER_CALL: -#line 2203 "GRaw.c" +#line 2331 "GRaw.c" { - const gchar* _tmp18_; - GError* _tmp19_; + const gchar* _tmp10_; + GError* _tmp11_; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp18_ = msg; + _tmp10_ = msg; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp18_); + _tmp11_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_ORDER_CALL, _tmp10_); #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp19_; + _inner_error_ = _tmp11_; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2217,7 +2345,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2221 "GRaw.c" +#line 2349 "GRaw.c" } else { #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2227,21 +2355,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2231 "GRaw.c" +#line 2359 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_NO_THUMBNAIL: -#line 2236 "GRaw.c" +#line 2364 "GRaw.c" { - const gchar* _tmp20_; - GError* _tmp21_; + const gchar* _tmp12_; + GError* _tmp13_; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp20_ = msg; + _tmp12_ = msg; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp20_); + _tmp13_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_NO_THUMBNAIL, _tmp12_); #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp21_; + _inner_error_ = _tmp13_; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2250,7 +2378,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2254 "GRaw.c" +#line 2382 "GRaw.c" } else { #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2260,21 +2388,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2264 "GRaw.c" +#line 2392 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_UNSUPPORTED_THUMBNAIL: -#line 2269 "GRaw.c" +#line 2397 "GRaw.c" { - const gchar* _tmp22_; - GError* _tmp23_; + const gchar* _tmp14_; + GError* _tmp15_; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp22_ = msg; + _tmp14_ = msg; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp22_); + _tmp15_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_UNSUPPORTED_THUMBNAIL, _tmp14_); #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp23_; + _inner_error_ = _tmp15_; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2283,7 +2411,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2287 "GRaw.c" +#line 2415 "GRaw.c" } else { #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2293,21 +2421,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2297 "GRaw.c" +#line 2425 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_UNSUFFICIENT_MEMORY: -#line 2302 "GRaw.c" +#line 2430 "GRaw.c" { - const gchar* _tmp24_; - GError* _tmp25_; + const gchar* _tmp16_; + GError* _tmp17_; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp24_ = msg; + _tmp16_ = msg; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp24_); + _tmp17_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_OUT_OF_MEMORY, _tmp16_); #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp25_; + _inner_error_ = _tmp17_; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2316,7 +2444,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2320 "GRaw.c" +#line 2448 "GRaw.c" } else { #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2326,21 +2454,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2330 "GRaw.c" +#line 2458 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_DATA_ERROR: -#line 2335 "GRaw.c" +#line 2463 "GRaw.c" { - const gchar* _tmp26_; - GError* _tmp27_; + const gchar* _tmp18_; + GError* _tmp19_; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp26_ = msg; + _tmp18_ = msg; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp27_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp26_); + _tmp19_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_DATA_ERROR, _tmp18_); #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp27_; + _inner_error_ = _tmp19_; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2349,7 +2477,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2353 "GRaw.c" +#line 2481 "GRaw.c" } else { #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2359,21 +2487,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2363 "GRaw.c" +#line 2491 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_IO_ERROR: -#line 2368 "GRaw.c" +#line 2496 "GRaw.c" { - const gchar* _tmp28_; - GError* _tmp29_; + const gchar* _tmp20_; + GError* _tmp21_; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp28_ = msg; + _tmp20_ = msg; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp29_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp28_); + _tmp21_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_IO_ERROR, _tmp20_); #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp29_; + _inner_error_ = _tmp21_; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2382,7 +2510,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2386 "GRaw.c" +#line 2514 "GRaw.c" } else { #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2392,21 +2520,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2396 "GRaw.c" +#line 2524 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_CANCELLED_BY_CALLBACK: -#line 2401 "GRaw.c" +#line 2529 "GRaw.c" { - const gchar* _tmp30_; - GError* _tmp31_; + const gchar* _tmp22_; + GError* _tmp23_; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp30_ = msg; + _tmp22_ = msg; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp31_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp30_); + _tmp23_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_CANCELLED_BY_CALLBACK, _tmp22_); #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp31_; + _inner_error_ = _tmp23_; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2415,7 +2543,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2419 "GRaw.c" +#line 2547 "GRaw.c" } else { #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2425,21 +2553,21 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2429 "GRaw.c" +#line 2557 "GRaw.c" } } #line 274 "/home/jens/Source/shotwell/src/photos/GRaw.vala" case LIBRAW_BAD_CROP: -#line 2434 "GRaw.c" +#line 2562 "GRaw.c" { - const gchar* _tmp32_; - GError* _tmp33_; + const gchar* _tmp24_; + GError* _tmp25_; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp32_ = msg; + _tmp24_ = msg; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _tmp33_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp32_); + _tmp25_ = g_error_new_literal (GRAW_EXCEPTION, GRAW_EXCEPTION_BAD_CROP, _tmp24_); #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" - _inner_error_ = _tmp33_; + _inner_error_ = _tmp25_; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2448,7 +2576,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2452 "GRaw.c" +#line 2580 "GRaw.c" } else { #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); @@ -2458,7 +2586,7 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr g_clear_error (&_inner_error_); #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2462 "GRaw.c" +#line 2590 "GRaw.c" } } default: @@ -2467,12 +2595,12 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr _g_free0 (msg); #line 309 "/home/jens/Source/shotwell/src/photos/GRaw.vala" return; -#line 2471 "GRaw.c" +#line 2599 "GRaw.c" } } #line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _g_free0 (msg); -#line 2476 "GRaw.c" +#line 2604 "GRaw.c" } diff --git a/src/photos/GdkSupport.c b/src/photos/GdkSupport.c index 8955711..c0b4e05 100644 --- a/src/photos/GdkSupport.c +++ b/src/photos/GdkSupport.c @@ -1,4 +1,4 @@ -/* GdkSupport.c generated by valac 0.36.6, the Vala compiler +/* GdkSupport.c generated by valac 0.40.4, the Vala compiler * generated from GdkSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -222,17 +223,29 @@ static gpointer gdk_sniffer_parent_class = NULL; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -240,76 +253,111 @@ GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType gdk_reader_get_type (void) G_GNUC_CONST; -enum { - GDK_READER_DUMMY_PROPERTY -}; GType photo_file_format_get_type (void) G_GNUC_CONST; -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GError** error); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +PhotoFileReader* photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, + GError** error); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** error); +static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, + GError** error); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; GType gdk_sniffer_get_type (void) G_GNUC_CONST; #define GDK_SNIFFER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_GDK_SNIFFER, GdkSnifferPrivate)) -enum { - GDK_SNIFFER_DUMMY_PROPERTY -}; -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); DetectedPhotoInformation* detected_photo_information_new (void); DetectedPhotoInformation* detected_photo_information_construct (GType object_type); -static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loader, gint width, gint height); -static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self); -static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader); -static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self); +static void gdk_sniffer_on_size_prepared (GdkSniffer* self, + GdkPixbufLoader* loader, + gint width, + gint height); +static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, + gint width, + gint height, + gpointer self); +static void gdk_sniffer_on_area_prepared (GdkSniffer* self, + GdkPixbufLoader* pixbuf_loader); +static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, + gpointer self); gchar* photo_metadata_exif_hash (PhotoMetadata* self); gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); -static guint8* _vala_array_dup5 (guint8* self, int length); -void dimensions_init (Dimensions *self, gint width, gint height); +static guint8* _vala_array_dup5 (guint8* self, + int length); +void dimensions_init (Dimensions *self, + gint width, + gint height); PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name); static void gdk_sniffer_finalize (PhotoFileSniffer * obj); -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +GdkReader* +gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ GdkReader* self = NULL; - const gchar* _tmp0_; - PhotoFileFormat _tmp1_; #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp0_ = filepath; -#line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = file_format; -#line 9 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - self = (GdkReader*) photo_file_reader_construct (object_type, _tmp0_, _tmp1_); + self = (GdkReader*) photo_file_reader_construct (object_type, filepath, file_format); #line 8 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self; -#line 309 "GdkSupport.c" +#line 354 "GdkSupport.c" } -static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GError** error) { +static PhotoMetadata* +gdk_reader_real_read_metadata (PhotoFileReader* base, + GError** error) +{ GdkReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; @@ -339,17 +387,20 @@ static PhotoMetadata* gdk_reader_real_read_metadata (PhotoFileReader* base, GErr _media_metadata_unref0 (metadata); #line 14 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 343 "GdkSupport.c" +#line 391 "GdkSupport.c" } #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" result = metadata; #line 16 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 349 "GdkSupport.c" +#line 397 "GdkSupport.c" } -static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** error) { +static GdkPixbuf* +gdk_reader_real_unscaled_read (PhotoFileReader* base, + GError** error) +{ GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -379,7 +430,7 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** g_propagate_error (error, _inner_error_); #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 383 "GdkSupport.c" +#line 434 "GdkSupport.c" } #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = _tmp0_; @@ -391,11 +442,16 @@ static GdkPixbuf* gdk_reader_real_unscaled_read (PhotoFileReader* base, GError** _g_object_unref0 (_tmp0_); #line 20 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 395 "GdkSupport.c" +#line 446 "GdkSupport.c" } -static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +gdk_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ GdkReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; @@ -441,7 +497,7 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions g_propagate_error (error, _inner_error_); #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 445 "GdkSupport.c" +#line 501 "GdkSupport.c" } #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp9_ = _tmp0_; @@ -453,11 +509,13 @@ static GdkPixbuf* gdk_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_tmp0_); #line 24 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 457 "GdkSupport.c" +#line 513 "GdkSupport.c" } -static void gdk_reader_class_init (GdkReaderClass * klass) { +static void +gdk_reader_class_init (GdkReaderClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_reader_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -466,15 +524,19 @@ static void gdk_reader_class_init (GdkReaderClass * klass) { ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) gdk_reader_real_unscaled_read; #line 7 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) gdk_reader_real_scaled_read; -#line 470 "GdkSupport.c" +#line 528 "GdkSupport.c" } -static void gdk_reader_instance_init (GdkReader * self) { +static void +gdk_reader_instance_init (GdkReader * self) +{ } -GType gdk_reader_get_type (void) { +GType +gdk_reader_get_type (void) +{ static volatile gsize gdk_reader_type_id__volatile = 0; if (g_once_init_enter (&gdk_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (GdkReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gdk_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GdkReader), 0, (GInstanceInitFunc) gdk_reader_instance_init, NULL }; @@ -486,53 +548,68 @@ GType gdk_reader_get_type (void) { } -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +GdkSniffer* +gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ GdkSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp0_ = file; -#line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = options; -#line 34 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - self = (GdkSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (GdkSniffer*) photo_file_sniffer_construct (object_type, file, options); #line 33 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self; -#line 504 "GdkSupport.c" +#line 564 "GdkSupport.c" } -static void _gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, gint width, gint height, gpointer self) { +static void +_gdk_sniffer_on_size_prepared_gdk_pixbuf_loader_size_prepared (GdkPixbufLoader* _sender, + gint width, + gint height, + gpointer self) +{ #line 41 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_on_size_prepared ((GdkSniffer*) self, _sender, width, height); -#line 511 "GdkSupport.c" +#line 576 "GdkSupport.c" } -static void _gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, gpointer self) { +static void +_gdk_sniffer_on_area_prepared_gdk_pixbuf_loader_area_prepared (GdkPixbufLoader* _sender, + gpointer self) +{ #line 42 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_on_area_prepared ((GdkSniffer*) self, _sender); -#line 518 "GdkSupport.c" +#line 586 "GdkSupport.c" } -static guint8* _vala_array_dup5 (guint8* self, int length) { +static guint8* +_vala_array_dup5 (guint8* self, + int length) +{ #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return g_memdup (self, length * sizeof (guint8)); -#line 525 "GdkSupport.c" +#line 596 "GdkSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 532 "GdkSupport.c" +#line 605 "GdkSupport.c" } -static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +gdk_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ GdkSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; @@ -560,12 +637,12 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, GFileInputStream* fins = NULL; GFile* _tmp29_; GFileInputStream* _tmp30_; - GFileInputStream* _tmp54_; - gboolean _tmp56_; - gboolean _tmp61_ = FALSE; - gboolean _tmp62_; + GFileInputStream* _tmp53_; + gboolean _tmp55_; + gboolean _tmp60_ = FALSE; + gboolean _tmp61_; + DetectedPhotoInformation* _tmp63_; DetectedPhotoInformation* _tmp64_; - DetectedPhotoInformation* _tmp65_; GError * _inner_error_ = NULL; #line 37 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_GDK_SNIFFER, GdkSniffer); @@ -593,7 +670,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 46 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp4_) { -#line 597 "GdkSupport.c" +#line 674 "GdkSupport.c" GChecksum* _tmp5_; #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp5_ = g_checksum_new (G_CHECKSUM_MD5); @@ -601,7 +678,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_checksum_free0 (md5_checksum); #line 47 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" md5_checksum = _tmp5_; -#line 605 "GdkSupport.c" +#line 682 "GdkSupport.c" } #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp6_ = self->priv->detected; @@ -611,7 +688,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _media_metadata_unref0 (_tmp6_->metadata); #line 49 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp6_->metadata = _tmp7_; -#line 615 "GdkSupport.c" +#line 692 "GdkSupport.c" { DetectedPhotoInformation* _tmp8_; PhotoMetadata* _tmp9_; @@ -626,7 +703,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, media_metadata_read_from_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_METADATA, MediaMetadata), _tmp10_, &_inner_error_); #line 51 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 630 "GdkSupport.c" +#line 707 "GdkSupport.c" goto __catch34_g_error; } } @@ -647,7 +724,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp11_->metadata = NULL; #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_error_free0 (err); -#line 651 "GdkSupport.c" +#line 728 "GdkSupport.c" } __finally34: #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -660,13 +737,13 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 50 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 664 "GdkSupport.c" +#line 741 "GdkSupport.c" } #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp13_) { -#line 670 "GdkSupport.c" +#line 747 "GdkSupport.c" DetectedPhotoInformation* _tmp14_; PhotoMetadata* _tmp15_; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -675,15 +752,15 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp15_ = _tmp14_->metadata; #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp12_ = _tmp15_ != NULL; -#line 679 "GdkSupport.c" +#line 756 "GdkSupport.c" } else { #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp12_ = FALSE; -#line 683 "GdkSupport.c" +#line 760 "GdkSupport.c" } #line 57 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp12_) { -#line 687 "GdkSupport.c" +#line 764 "GdkSupport.c" DetectedPhotoInformation* _tmp16_; DetectedPhotoInformation* _tmp17_; PhotoMetadata* _tmp18_; @@ -716,13 +793,13 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp20_->thumbnail_md5); #line 59 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp20_->thumbnail_md5 = _tmp23_; -#line 720 "GdkSupport.c" +#line 797 "GdkSupport.c" } #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (_tmp25_) { -#line 726 "GdkSupport.c" +#line 803 "GdkSupport.c" guint8* _tmp26_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp26_ = g_new0 (guint8, 64 * 1024); @@ -734,7 +811,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp24__length1 = 64 * 1024; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" __tmp24__size_ = _tmp24__length1; -#line 738 "GdkSupport.c" +#line 815 "GdkSupport.c" } else { guint8* _tmp27_; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -747,7 +824,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp24__length1 = 8 * 1024; #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" __tmp24__size_ = _tmp24__length1; -#line 751 "GdkSupport.c" +#line 828 "GdkSupport.c" } #line 64 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp28_ = (_tmp24_ != NULL) ? _vala_array_dup5 (_tmp24_, _tmp24__length1) : ((gpointer) _tmp24_); @@ -781,7 +858,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 68 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 785 "GdkSupport.c" +#line 862 "GdkSupport.c" } { gboolean _tmp31_ = FALSE; @@ -789,24 +866,23 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _tmp31_ = TRUE; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" while (TRUE) { -#line 793 "GdkSupport.c" +#line 870 "GdkSupport.c" gsize bytes_read = 0UL; GFileInputStream* _tmp32_; guint8* _tmp33_; gint _tmp33__length1; - gssize _tmp34_; + gsize _tmp34_; gsize _tmp35_; gsize _tmp36_; - gsize _tmp37_; - gboolean _tmp38_; - gboolean _tmp42_ = FALSE; - gboolean _tmp43_; + gboolean _tmp37_; + gboolean _tmp41_ = FALSE; + gboolean _tmp42_; + gboolean _tmp47_ = FALSE; gboolean _tmp48_ = FALSE; - gboolean _tmp49_ = FALSE; - gboolean _tmp50_; + gboolean _tmp49_; #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (!_tmp31_) { -#line 810 "GdkSupport.c" +#line 886 "GdkSupport.c" } #line 69 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp31_ = FALSE; @@ -817,9 +893,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp33__length1 = buffer_length1; #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp34_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), _tmp33_, (gsize) _tmp33__length1, NULL, &_inner_error_); -#line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - bytes_read = (gsize) _tmp34_; + bytes_read = (gsize) g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, g_input_stream_get_type (), GInputStream), _tmp33_, (gsize) _tmp33__length1, NULL, &_inner_error_); #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -836,75 +910,75 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 70 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 840 "GdkSupport.c" +#line 914 "GdkSupport.c" } #line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp35_ = bytes_read; + _tmp34_ = bytes_read; #line 71 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp35_ <= ((gsize) 0)) { + if (_tmp34_ <= ((gsize) 0)) { #line 72 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" break; -#line 848 "GdkSupport.c" +#line 922 "GdkSupport.c" } #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp36_ = count; + _tmp35_ = count; #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp37_ = bytes_read; + _tmp36_ = bytes_read; #line 74 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - count = _tmp36_ + _tmp37_; + count = _tmp35_ + _tmp36_; #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 76 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp38_) { -#line 860 "GdkSupport.c" - GChecksum* _tmp39_; - guint8* _tmp40_; - gint _tmp40__length1; - gsize _tmp41_; + if (_tmp37_) { +#line 934 "GdkSupport.c" + GChecksum* _tmp38_; + guint8* _tmp39_; + gint _tmp39__length1; + gsize _tmp40_; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp39_ = md5_checksum; + _tmp38_ = md5_checksum; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp40_ = buffer; + _tmp39_ = buffer; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp40__length1 = buffer_length1; + _tmp39__length1 = buffer_length1; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp41_ = bytes_read; + _tmp40_ = bytes_read; #line 77 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - g_checksum_update (_tmp39_, _tmp40_, _tmp41_); -#line 875 "GdkSupport.c" + g_checksum_update (_tmp38_, _tmp39_, _tmp40_); +#line 949 "GdkSupport.c" } #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp43_ = self->priv->size_ready; + _tmp42_ = self->priv->size_ready; #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp43_) { + if (!_tmp42_) { #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp42_ = TRUE; -#line 883 "GdkSupport.c" + _tmp41_ = TRUE; +#line 957 "GdkSupport.c" } else { - gboolean _tmp44_; + gboolean _tmp43_; #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp44_ = self->priv->area_prepared; + _tmp43_ = self->priv->area_prepared; #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp42_ = !_tmp44_; -#line 890 "GdkSupport.c" + _tmp41_ = !_tmp43_; +#line 964 "GdkSupport.c" } #line 80 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp42_) { -#line 894 "GdkSupport.c" - GdkPixbufLoader* _tmp45_; - guint8* _tmp46_; - gint _tmp46__length1; - gsize _tmp47_; + if (_tmp41_) { +#line 968 "GdkSupport.c" + GdkPixbufLoader* _tmp44_; + guint8* _tmp45_; + gint _tmp45__length1; + gsize _tmp46_; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp45_ = pixbuf_loader; + _tmp44_ = pixbuf_loader; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp46_ = buffer; + _tmp45_ = buffer; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp46__length1 = buffer_length1; + _tmp45__length1 = buffer_length1; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp47_ = bytes_read; + _tmp46_ = bytes_read; #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - gdk_pixbuf_loader_write (_tmp45_, _tmp46_ + 0, (gsize) (((gint) _tmp47_) - 0), &_inner_error_); + gdk_pixbuf_loader_write (_tmp44_, _tmp45_ + 0, (gsize) (((gint) _tmp46_) - 0), &_inner_error_); #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -921,56 +995,56 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 81 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 925 "GdkSupport.c" +#line 999 "GdkSupport.c" } } #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp49_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp50_) { -#line 932 "GdkSupport.c" - gboolean _tmp51_; + if (!_tmp49_) { +#line 1006 "GdkSupport.c" + gboolean _tmp50_; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp51_ = self->priv->size_ready; + _tmp50_ = self->priv->size_ready; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp49_ = _tmp51_; -#line 938 "GdkSupport.c" + _tmp48_ = _tmp50_; +#line 1012 "GdkSupport.c" } else { #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp49_ = FALSE; -#line 942 "GdkSupport.c" + _tmp48_ = FALSE; +#line 1016 "GdkSupport.c" } #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp49_) { -#line 946 "GdkSupport.c" - gboolean _tmp52_; + if (_tmp48_) { +#line 1020 "GdkSupport.c" + gboolean _tmp51_; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp52_ = self->priv->area_prepared; + _tmp51_ = self->priv->area_prepared; #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp48_ = _tmp52_; -#line 952 "GdkSupport.c" + _tmp47_ = _tmp51_; +#line 1026 "GdkSupport.c" } else { #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp48_ = FALSE; -#line 956 "GdkSupport.c" + _tmp47_ = FALSE; +#line 1030 "GdkSupport.c" } #line 84 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp48_) { + if (_tmp47_) { #line 85 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" break; -#line 962 "GdkSupport.c" +#line 1036 "GdkSupport.c" } } } { - GdkPixbufLoader* _tmp53_; + GdkPixbufLoader* _tmp52_; #line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp53_ = pixbuf_loader; + _tmp52_ = pixbuf_loader; #line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - gdk_pixbuf_loader_close (_tmp53_, &_inner_error_); + gdk_pixbuf_loader_close (_tmp52_, &_inner_error_); #line 90 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 974 "GdkSupport.c" +#line 1048 "GdkSupport.c" goto __catch35_g_error; } } @@ -984,7 +1058,7 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = NULL; #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_error_free0 (err); -#line 988 "GdkSupport.c" +#line 1062 "GdkSupport.c" } __finally35: #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1003,18 +1077,18 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 89 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 1007 "GdkSupport.c" +#line 1081 "GdkSupport.c" } #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp54_ = fins; + _tmp53_ = fins; #line 94 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp54_ != NULL) { -#line 1013 "GdkSupport.c" - GFileInputStream* _tmp55_; + if (_tmp53_ != NULL) { +#line 1087 "GdkSupport.c" + GFileInputStream* _tmp54_; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp55_ = fins; + _tmp54_ = fins; #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); + g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_); #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1031,55 +1105,55 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, _g_object_unref0 (pixbuf_loader); #line 95 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return NULL; -#line 1035 "GdkSupport.c" +#line 1109 "GdkSupport.c" } } #line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp56_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 97 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp56_) { -#line 1042 "GdkSupport.c" - DetectedPhotoInformation* _tmp57_; - GChecksum* _tmp58_; - const gchar* _tmp59_; - gchar* _tmp60_; + if (_tmp55_) { +#line 1116 "GdkSupport.c" + DetectedPhotoInformation* _tmp56_; + GChecksum* _tmp57_; + const gchar* _tmp58_; + gchar* _tmp59_; #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp57_ = self->priv->detected; + _tmp56_ = self->priv->detected; #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp58_ = md5_checksum; + _tmp57_ = md5_checksum; #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp59_ = g_checksum_get_string (_tmp58_); + _tmp58_ = g_checksum_get_string (_tmp57_); #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp60_ = g_strdup (_tmp59_); + _tmp59_ = g_strdup (_tmp58_); #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _g_free0 (_tmp57_->md5); + _g_free0 (_tmp56_->md5); #line 98 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp57_->md5 = _tmp60_; -#line 1059 "GdkSupport.c" + _tmp56_->md5 = _tmp59_; +#line 1133 "GdkSupport.c" } #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp62_ = self->priv->size_ready; + _tmp61_ = self->priv->size_ready; #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (!_tmp62_) { + if (!_tmp61_) { #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp61_ = TRUE; -#line 1067 "GdkSupport.c" + _tmp60_ = TRUE; +#line 1141 "GdkSupport.c" } else { - gboolean _tmp63_; + gboolean _tmp62_; #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp63_ = self->priv->area_prepared; + _tmp62_ = self->priv->area_prepared; #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp61_ = !_tmp63_; -#line 1074 "GdkSupport.c" + _tmp60_ = !_tmp62_; +#line 1148 "GdkSupport.c" } #line 101 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _vala_is_corrupted = _tmp61_; + _vala_is_corrupted = _tmp60_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp64_ = self->priv->detected; + _tmp63_ = self->priv->detected; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp65_ = _detected_photo_information_ref0 (_tmp64_); + _tmp64_ = _detected_photo_information_ref0 (_tmp63_); #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - result = _tmp65_; + result = _tmp64_; #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (fins); #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1094,18 +1168,21 @@ static DetectedPhotoInformation* gdk_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1098 "GdkSupport.c" +#line 1172 "GdkSupport.c" } #line 103 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return result; -#line 1102 "GdkSupport.c" +#line 1176 "GdkSupport.c" } -static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loader, gint width, gint height) { +static void +gdk_sniffer_on_size_prepared (GdkSniffer* self, + GdkPixbufLoader* loader, + gint width, + gint height) +{ DetectedPhotoInformation* _tmp0_; - gint _tmp1_; - gint _tmp2_; #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (IS_GDK_SNIFFER (self)); #line 106 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1113,130 +1190,115 @@ static void gdk_sniffer_on_size_prepared (GdkSniffer* self, GdkPixbufLoader* loa #line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _tmp0_ = self->priv->detected; #line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = width; -#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp2_ = height; -#line 107 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - dimensions_init (&_tmp0_->image_dim, _tmp1_, _tmp2_); + dimensions_init (&_tmp0_->image_dim, width, height); #line 108 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->size_ready = TRUE; -#line 1124 "GdkSupport.c" +#line 1197 "GdkSupport.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return self ? g_object_ref (self) : NULL; -#line 1131 "GdkSupport.c" +#line 1206 "GdkSupport.c" } -static void gdk_sniffer_on_area_prepared (GdkSniffer* self, GdkPixbufLoader* pixbuf_loader) { +static void +gdk_sniffer_on_area_prepared (GdkSniffer* self, + GdkPixbufLoader* pixbuf_loader) +{ GdkPixbuf* pixbuf = NULL; - GdkPixbufLoader* _tmp0_; + GdkPixbuf* _tmp0_; GdkPixbuf* _tmp1_; GdkPixbuf* _tmp2_; - GdkPixbuf* _tmp3_; - DetectedPhotoInformation* _tmp4_; - GdkPixbuf* _tmp5_; - GdkColorspace _tmp6_; + DetectedPhotoInformation* _tmp3_; + GdkPixbuf* _tmp4_; + DetectedPhotoInformation* _tmp5_; + GdkPixbuf* _tmp6_; DetectedPhotoInformation* _tmp7_; GdkPixbuf* _tmp8_; - gint _tmp9_; - DetectedPhotoInformation* _tmp10_; - GdkPixbuf* _tmp11_; - gint _tmp12_; GdkPixbufFormat* format = NULL; - GdkPixbufLoader* _tmp13_; - GdkPixbufFormat* _tmp14_; - DetectedPhotoInformation* _tmp15_; - GdkPixbufFormat* _tmp16_; - gchar* _tmp17_; - DetectedPhotoInformation* _tmp18_; - DetectedPhotoInformation* _tmp19_; - const gchar* _tmp20_; - PhotoFileFormat _tmp21_; + GdkPixbufFormat* _tmp9_; + DetectedPhotoInformation* _tmp10_; + GdkPixbufFormat* _tmp11_; + gchar* _tmp12_; + DetectedPhotoInformation* _tmp13_; + DetectedPhotoInformation* _tmp14_; + const gchar* _tmp15_; #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (IS_GDK_SNIFFER (self)); #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" g_return_if_fail (GDK_IS_PIXBUF_LOADER (pixbuf_loader)); #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp0_ = pixbuf_loader; + _tmp0_ = gdk_pixbuf_loader_get_pixbuf (pixbuf_loader); #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp1_ = gdk_pixbuf_loader_get_pixbuf (_tmp0_); + _tmp1_ = _g_object_ref0 (_tmp0_); #line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp2_ = _g_object_ref0 (_tmp1_); -#line 112 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - pixbuf = _tmp2_; + pixbuf = _tmp1_; #line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp3_ = pixbuf; + _tmp2_ = pixbuf; #line 113 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - if (_tmp3_ == NULL) { + if (_tmp2_ == NULL) { #line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf); #line 114 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" return; -#line 1180 "GdkSupport.c" +#line 1250 "GdkSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp4_ = self->priv->detected; -#line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp5_ = pixbuf; + _tmp3_ = self->priv->detected; #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp6_ = gdk_pixbuf_get_colorspace (_tmp5_); + _tmp4_ = pixbuf; #line 116 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp4_->colorspace = _tmp6_; + _tmp3_->colorspace = gdk_pixbuf_get_colorspace (_tmp4_); #line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp7_ = self->priv->detected; + _tmp5_ = self->priv->detected; #line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp8_ = pixbuf; + _tmp6_ = pixbuf; #line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp9_ = gdk_pixbuf_get_n_channels (_tmp8_); -#line 117 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp7_->channels = _tmp9_; -#line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp10_ = self->priv->detected; + _tmp5_->channels = gdk_pixbuf_get_n_channels (_tmp6_); #line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp11_ = pixbuf; + _tmp7_ = self->priv->detected; #line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp12_ = gdk_pixbuf_get_bits_per_sample (_tmp11_); + _tmp8_ = pixbuf; #line 118 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp10_->bits_per_channel = _tmp12_; -#line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp13_ = pixbuf_loader; + _tmp7_->bits_per_channel = gdk_pixbuf_get_bits_per_sample (_tmp8_); #line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp14_ = gdk_pixbuf_loader_get_format (_tmp13_); + _tmp9_ = gdk_pixbuf_loader_get_format (pixbuf_loader); #line 120 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - format = _tmp14_; + format = _tmp9_; #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp15_ = self->priv->detected; + _tmp10_ = self->priv->detected; #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp16_ = format; + _tmp11_ = format; #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp17_ = gdk_pixbuf_format_get_name (_tmp16_); + _tmp12_ = gdk_pixbuf_format_get_name (_tmp11_); #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _g_free0 (_tmp15_->format_name); + _g_free0 (_tmp10_->format_name); #line 121 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp15_->format_name = _tmp17_; -#line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp18_ = self->priv->detected; + _tmp10_->format_name = _tmp12_; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp19_ = self->priv->detected; + _tmp13_ = self->priv->detected; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp20_ = _tmp19_->format_name; + _tmp14_ = self->priv->detected; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp21_ = photo_file_format_from_pixbuf_name (_tmp20_); + _tmp15_ = _tmp14_->format_name; #line 122 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" - _tmp18_->file_format = _tmp21_; + _tmp13_->file_format = photo_file_format_from_pixbuf_name (_tmp15_); #line 124 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->area_prepared = TRUE; #line 111 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" _g_object_unref0 (pixbuf); -#line 1236 "GdkSupport.c" +#line 1296 "GdkSupport.c" } -static void gdk_sniffer_class_init (GdkSnifferClass * klass) { +static void +gdk_sniffer_class_init (GdkSnifferClass * klass) +{ #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" gdk_sniffer_parent_class = g_type_class_peek_parent (klass); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1245,11 +1307,13 @@ static void gdk_sniffer_class_init (GdkSnifferClass * klass) { g_type_class_add_private (klass, sizeof (GdkSnifferPrivate)); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) gdk_sniffer_real_sniff; -#line 1249 "GdkSupport.c" +#line 1311 "GdkSupport.c" } -static void gdk_sniffer_instance_init (GdkSniffer * self) { +static void +gdk_sniffer_instance_init (GdkSniffer * self) +{ #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv = GDK_SNIFFER_GET_PRIVATE (self); #line 29 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" @@ -1258,11 +1322,13 @@ static void gdk_sniffer_instance_init (GdkSniffer * self) { self->priv->size_ready = FALSE; #line 31 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self->priv->area_prepared = FALSE; -#line 1262 "GdkSupport.c" +#line 1326 "GdkSupport.c" } -static void gdk_sniffer_finalize (PhotoFileSniffer * obj) { +static void +gdk_sniffer_finalize (PhotoFileSniffer * obj) +{ GdkSniffer * self; #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_GDK_SNIFFER, GdkSniffer); @@ -1270,11 +1336,13 @@ static void gdk_sniffer_finalize (PhotoFileSniffer * obj) { _detected_photo_information_unref0 (self->priv->detected); #line 28 "/home/jens/Source/shotwell/src/photos/GdkSupport.vala" PHOTO_FILE_SNIFFER_CLASS (gdk_sniffer_parent_class)->finalize (obj); -#line 1274 "GdkSupport.c" +#line 1340 "GdkSupport.c" } -GType gdk_sniffer_get_type (void) { +GType +gdk_sniffer_get_type (void) +{ static volatile gsize gdk_sniffer_type_id__volatile = 0; if (g_once_init_enter (&gdk_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (GdkSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) gdk_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (GdkSniffer), 0, (GInstanceInitFunc) gdk_sniffer_instance_init, NULL }; diff --git a/src/photos/JfifSupport.c b/src/photos/JfifSupport.c index 190c4c2..e4e9217 100644 --- a/src/photos/JfifSupport.c +++ b/src/photos/JfifSupport.c @@ -1,4 +1,4 @@ -/* JfifSupport.c generated by valac 0.36.6, the Vala compiler +/* JfifSupport.c generated by valac 0.40.4, the Vala compiler * generated from JfifSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -481,31 +482,55 @@ static gpointer jfif_metadata_writer_parent_class = NULL; gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -514,15 +539,18 @@ GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; GType jfif_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - JFIF_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void jfif_file_format_driver_init (void); JfifFileFormatDriver* jfif_file_format_driver_new (void); JfifFileFormatDriver* jfif_file_format_driver_construct (GType object_type); @@ -531,9 +559,11 @@ JfifFileFormatDriver* jfif_file_format_driver_get_instance (void); static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); GType jfif_file_format_properties_get_type (void) G_GNUC_CONST; JfifFileFormatProperties* jfif_file_format_properties_get_instance (void); -static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); JfifReader* jfif_reader_new (const gchar* filepath); -JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath); +JfifReader* jfif_reader_construct (GType object_type, + const gchar* filepath); GType gdk_reader_get_type (void) G_GNUC_CONST; GType jfif_reader_get_type (void) G_GNUC_CONST; static PhotoMetadata* jfif_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); @@ -541,74 +571,98 @@ PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); static gboolean jfif_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean jfif_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); JfifWriter* jfif_writer_new (const gchar* filepath); -JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath); +JfifWriter* jfif_writer_construct (GType object_type, + const gchar* filepath); GType jfif_writer_get_type (void) G_GNUC_CONST; -static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); JfifMetadataWriter* jfif_metadata_writer_new (const gchar* filepath); -JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gchar* filepath); +JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, + const gchar* filepath); GType jfif_metadata_writer_get_type (void) G_GNUC_CONST; -static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); -JfifSniffer* jfif_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); +JfifSniffer* jfif_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +JfifSniffer* jfif_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType jfif_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; -enum { - JFIF_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; JfifFileFormatProperties* jfif_file_format_properties_new (void); JfifFileFormatProperties* jfif_file_format_properties_construct (GType object_type); static PhotoFileFormat jfif_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base); static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); 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_dup6 (gchar** self, int length); +static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +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_dup7 (gchar** self, int length); +static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +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); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; -enum { - JFIF_SNIFFER_DUMMY_PROPERTY -}; -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); -gboolean jpeg_is_jpeg (GFile* file, GError** error); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); +gboolean jpeg_is_jpeg (GFile* file, + GError** error); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -enum { - JFIF_READER_DUMMY_PROPERTY -}; -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); GType jpeg_quality_get_type (void) G_GNUC_CONST; -enum { - JFIF_WRITER_DUMMY_PROPERTY -}; -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void jfif_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); gchar* jpeg_quality_get_pct_text (JpegQuality self); -enum { - JFIF_METADATA_WRITER_DUMMY_PROPERTY -}; -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error); -void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error); +void photo_metadata_write_to_file (PhotoMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); #define JPEG_MARKER_PREFIX ((guint8) 0xFF) GType jpeg_marker_get_type (void) G_GNUC_CONST; @@ -616,12 +670,18 @@ 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); -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) { +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) +{ JfifFileFormatDriver* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = jfif_file_format_driver_new (); @@ -631,18 +691,22 @@ 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 635 "JfifSupport.c" +#line 695 "JfifSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +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 642 "JfifSupport.c" +#line 704 "JfifSupport.c" } -JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) { +JfifFileFormatDriver* +jfif_file_format_driver_get_instance (void) +{ JfifFileFormatDriver* result = NULL; JfifFileFormatDriver* _tmp0_; JfifFileFormatDriver* _tmp1_; @@ -654,11 +718,13 @@ JfifFileFormatDriver* jfif_file_format_driver_get_instance (void) { result = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 658 "JfifSupport.c" +#line 722 "JfifSupport.c" } -static PhotoFileFormatProperties* jfif_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +jfif_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ JfifFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; JfifFileFormatProperties* _tmp0_; @@ -670,32 +736,34 @@ 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 674 "JfifSupport.c" +#line 740 "JfifSupport.c" } -static PhotoFileReader* jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +jfif_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ JfifFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - JfifReader* _tmp1_; + JfifReader* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 23 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = jfif_reader_new (_tmp0_); + _tmp0_ = jfif_reader_new (filepath); #line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 24 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 695 "JfifSupport.c" +#line 761 "JfifSupport.c" } -static PhotoMetadata* jfif_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +jfif_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ JfifFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -707,11 +775,13 @@ 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 711 "JfifSupport.c" +#line 779 "JfifSupport.c" } -static gboolean jfif_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +jfif_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ JfifFileFormatDriver * self; gboolean result = FALSE; #line 31 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -720,11 +790,13 @@ 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 724 "JfifSupport.c" +#line 794 "JfifSupport.c" } -static gboolean jfif_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +jfif_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ JfifFileFormatDriver * self; gboolean result = FALSE; #line 35 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -733,94 +805,98 @@ 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 737 "JfifSupport.c" +#line 809 "JfifSupport.c" } -static PhotoFileWriter* jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +jfif_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ JfifFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_; - JfifWriter* _tmp1_; + JfifWriter* _tmp0_; #line 39 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 39 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = jfif_writer_new (_tmp0_); + _tmp0_ = jfif_writer_new (filepath); #line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 40 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 758 "JfifSupport.c" +#line 830 "JfifSupport.c" } -static PhotoFileMetadataWriter* jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +jfif_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ JfifFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_; - JfifMetadataWriter* _tmp1_; + JfifMetadataWriter* _tmp0_; #line 43 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 43 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; + _tmp0_ = jfif_metadata_writer_new (filepath); #line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = jfif_metadata_writer_new (_tmp0_); -#line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 44 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 779 "JfifSupport.c" +#line 851 "JfifSupport.c" } -static PhotoFileSniffer* jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +jfif_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ JfifFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - JfifSniffer* _tmp2_; + JfifSniffer* _tmp0_; #line 47 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_FILE_FORMAT_DRIVER, JfifFileFormatDriver); #line 47 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = file; + _tmp0_ = jfif_sniffer_new (file, options); #line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = options; -#line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = jfif_sniffer_new (_tmp0_, _tmp1_); -#line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 48 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 803 "JfifSupport.c" +#line 873 "JfifSupport.c" } -JfifFileFormatDriver* jfif_file_format_driver_construct (GType object_type) { +JfifFileFormatDriver* +jfif_file_format_driver_construct (GType object_type) +{ JfifFileFormatDriver* self = NULL; #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = (JfifFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 813 "JfifSupport.c" +#line 885 "JfifSupport.c" } -JfifFileFormatDriver* jfif_file_format_driver_new (void) { +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 820 "JfifSupport.c" +#line 894 "JfifSupport.c" } -static void jfif_file_format_driver_class_init (JfifFileFormatDriverClass * klass) { +static void +jfif_file_format_driver_class_init (JfifFileFormatDriverClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" jfif_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -841,25 +917,31 @@ 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 845 "JfifSupport.c" +#line 921 "JfifSupport.c" } -static void jfif_file_format_driver_instance_init (JfifFileFormatDriver * self) { +static void +jfif_file_format_driver_instance_init (JfifFileFormatDriver * self) +{ } -static void jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +jfif_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ JfifFileFormatDriver * self; #line 7 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" 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 859 "JfifSupport.c" +#line 939 "JfifSupport.c" } -GType jfif_file_format_driver_get_type (void) { +GType +jfif_file_format_driver_get_type (void) +{ static volatile gsize jfif_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&jfif_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifFileFormatDriver), 0, (GInstanceInitFunc) jfif_file_format_driver_instance_init, NULL }; @@ -871,7 +953,9 @@ GType jfif_file_format_driver_get_type (void) { } -void jfif_file_format_properties_init (void) { +void +jfif_file_format_properties_init (void) +{ JfifFileFormatProperties* _tmp0_; #line 64 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp0_ = jfif_file_format_properties_new (); @@ -879,18 +963,22 @@ 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 883 "JfifSupport.c" +#line 967 "JfifSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +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 890 "JfifSupport.c" +#line 976 "JfifSupport.c" } -JfifFileFormatProperties* jfif_file_format_properties_get_instance (void) { +JfifFileFormatProperties* +jfif_file_format_properties_get_instance (void) +{ JfifFileFormatProperties* result = NULL; JfifFileFormatProperties* _tmp0_; JfifFileFormatProperties* _tmp1_; @@ -902,11 +990,13 @@ JfifFileFormatProperties* jfif_file_format_properties_get_instance (void) { result = _tmp1_; #line 68 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 906 "JfifSupport.c" +#line 994 "JfifSupport.c" } -static PhotoFileFormat jfif_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +jfif_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; PhotoFileFormat result = 0; #line 71 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -915,11 +1005,13 @@ 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 919 "JfifSupport.c" +#line 1009 "JfifSupport.c" } -static PhotoFileFormatFlags jfif_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +jfif_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 75 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -928,11 +1020,13 @@ 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 932 "JfifSupport.c" +#line 1024 "JfifSupport.c" } -static gchar* jfif_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +jfif_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -944,11 +1038,13 @@ 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 948 "JfifSupport.c" +#line 1042 "JfifSupport.c" } -static gchar* jfif_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +jfif_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -960,32 +1056,38 @@ 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 964 "JfifSupport.c" +#line 1060 "JfifSupport.c" } -static gchar** _vala_array_dup6 (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 975 "JfifSupport.c" +#line 1074 "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 981 "JfifSupport.c" +#line 1080 "JfifSupport.c" } #line 88 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 985 "JfifSupport.c" +#line 1084 "JfifSupport.c" } -static gchar** jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +jfif_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ JfifFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1012,17 +1114,19 @@ 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 1016 "JfifSupport.c" +#line 1118 "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 1022 "JfifSupport.c" +#line 1124 "JfifSupport.c" } -static gchar* jfif_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +jfif_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ JfifFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -1043,32 +1147,38 @@ 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 1047 "JfifSupport.c" +#line 1151 "JfifSupport.c" } -static gchar** _vala_array_dup7 (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 1058 "JfifSupport.c" +#line 1165 "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 1064 "JfifSupport.c" +#line 1171 "JfifSupport.c" } #line 96 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1068 "JfifSupport.c" +#line 1175 "JfifSupport.c" } -static gchar** jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +jfif_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ JfifFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1095,34 +1205,40 @@ 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 1099 "JfifSupport.c" +#line 1209 "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 1105 "JfifSupport.c" +#line 1215 "JfifSupport.c" } -JfifFileFormatProperties* jfif_file_format_properties_construct (GType object_type) { +JfifFileFormatProperties* +jfif_file_format_properties_construct (GType object_type) +{ JfifFileFormatProperties* self = NULL; #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = (JfifFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1115 "JfifSupport.c" +#line 1227 "JfifSupport.c" } -JfifFileFormatProperties* jfif_file_format_properties_new (void) { +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 1122 "JfifSupport.c" +#line 1236 "JfifSupport.c" } -static void jfif_file_format_properties_class_init (JfifFileFormatPropertiesClass * klass) { +static void +jfif_file_format_properties_class_init (JfifFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -1180,25 +1296,31 @@ 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 1184 "JfifSupport.c" +#line 1300 "JfifSupport.c" } -static void jfif_file_format_properties_instance_init (JfifFileFormatProperties * self) { +static void +jfif_file_format_properties_instance_init (JfifFileFormatProperties * self) +{ } -static void jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +jfif_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ JfifFileFormatProperties * self; #line 52 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" 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 1198 "JfifSupport.c" +#line 1318 "JfifSupport.c" } -GType jfif_file_format_properties_get_type (void) { +GType +jfif_file_format_properties_get_type (void) +{ static volatile gsize jfif_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&jfif_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifFileFormatProperties), 0, (GInstanceInitFunc) jfif_file_format_properties_instance_init, NULL }; @@ -1210,53 +1332,59 @@ GType jfif_file_format_properties_get_type (void) { } -JfifSniffer* jfif_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +JfifSniffer* +jfif_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ JfifSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 102 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = file; -#line 102 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = options; -#line 102 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - self = (JfifSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (JfifSniffer*) gdk_sniffer_construct (object_type, file, options); #line 101 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1228 "JfifSupport.c" +#line 1348 "JfifSupport.c" } -JfifSniffer* jfif_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +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 1235 "JfifSupport.c" +#line 1358 "JfifSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +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 1242 "JfifSupport.c" +#line 1367 "JfifSupport.c" } -static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +jfif_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ JfifSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; gboolean _tmp0_ = FALSE; GFile* _tmp1_; - gboolean _tmp2_; DetectedPhotoInformation* detected = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; + DetectedPhotoInformation* _tmp3_; DetectedPhotoInformation* _tmp4_; - DetectedPhotoInformation* _tmp5_; - DetectedPhotoInformation* _tmp6_ = NULL; - DetectedPhotoInformation* _tmp7_; - PhotoFileFormat _tmp8_; - DetectedPhotoInformation* _tmp10_; + DetectedPhotoInformation* _tmp5_ = NULL; + DetectedPhotoInformation* _tmp6_; + PhotoFileFormat _tmp7_; + DetectedPhotoInformation* _tmp9_; GError * _inner_error_ = NULL; #line 105 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_SNIFFER, JfifSniffer); @@ -1265,16 +1393,14 @@ static DetectedPhotoInformation* jfif_sniffer_real_sniff (PhotoFileSniffer* base #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = jpeg_is_jpeg (_tmp1_, &_inner_error_); -#line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = jpeg_is_jpeg (_tmp1_, &_inner_error_); #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return NULL; -#line 1278 "JfifSupport.c" +#line 1404 "JfifSupport.c" } #line 109 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (!_tmp0_) { @@ -1284,30 +1410,30 @@ 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 1288 "JfifSupport.c" +#line 1414 "JfifSupport.c" } #line 110 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1292 "JfifSupport.c" +#line 1418 "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_); + _tmp3_ = 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), &_tmp2_, &_inner_error_); #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _vala_is_corrupted = _tmp3_; + _vala_is_corrupted = _tmp2_; #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - detected = _tmp4_; + detected = _tmp3_; #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 112 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return NULL; -#line 1306 "JfifSupport.c" +#line 1432 "JfifSupport.c" } #line 113 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp5_ = detected; + _tmp4_ = detected; #line 113 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = NULL; #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1316,62 +1442,68 @@ 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 1320 "JfifSupport.c" +#line 1446 "JfifSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1324 "JfifSupport.c" +#line 1450 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp7_ = detected; + _tmp6_ = detected; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp8_ = _tmp7_->file_format; + _tmp7_ = _tmp6_->file_format; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_JFIF) { -#line 1332 "JfifSupport.c" - DetectedPhotoInformation* _tmp9_; + if (_tmp7_ == PHOTO_FILE_FORMAT_JFIF) { +#line 1458 "JfifSupport.c" + DetectedPhotoInformation* _tmp8_; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp9_ = detected; + _tmp8_ = detected; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp6_ = _tmp9_; -#line 1338 "JfifSupport.c" + _tmp5_ = _tmp8_; +#line 1464 "JfifSupport.c" } else { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp6_ = NULL; -#line 1342 "JfifSupport.c" + _tmp5_ = NULL; +#line 1468 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp10_ = _detected_photo_information_ref0 (_tmp6_); + _tmp9_ = _detected_photo_information_ref0 (_tmp5_); #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp10_; + result = _tmp9_; #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _detected_photo_information_unref0 (detected); #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (is_corrupted) { #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1354 "JfifSupport.c" +#line 1480 "JfifSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1358 "JfifSupport.c" +#line 1484 "JfifSupport.c" } -static void jfif_sniffer_class_init (JfifSnifferClass * klass) { +static void +jfif_sniffer_class_init (JfifSnifferClass * klass) +{ #line 100 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" 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 1367 "JfifSupport.c" +#line 1495 "JfifSupport.c" } -static void jfif_sniffer_instance_init (JfifSniffer * self) { +static void +jfif_sniffer_instance_init (JfifSniffer * self) +{ } -GType jfif_sniffer_get_type (void) { +GType +jfif_sniffer_get_type (void) +{ static volatile gsize jfif_sniffer_type_id__volatile = 0; if (g_once_init_enter (&jfif_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifSniffer), 0, (GInstanceInitFunc) jfif_sniffer_instance_init, NULL }; @@ -1383,40 +1515,48 @@ GType jfif_sniffer_get_type (void) { } -JfifReader* jfif_reader_construct (GType object_type, const gchar* filepath) { +JfifReader* +jfif_reader_construct (GType object_type, + const gchar* filepath) +{ JfifReader* self = NULL; - const gchar* _tmp0_; #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 122 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - self = (JfifReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); + self = (JfifReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_JFIF); #line 121 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1398 "JfifSupport.c" +#line 1530 "JfifSupport.c" } -JfifReader* jfif_reader_new (const gchar* filepath) { +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 1405 "JfifSupport.c" +#line 1539 "JfifSupport.c" } -static void jfif_reader_class_init (JfifReaderClass * klass) { +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 1412 "JfifSupport.c" +#line 1548 "JfifSupport.c" } -static void jfif_reader_instance_init (JfifReader * self) { +static void +jfif_reader_instance_init (JfifReader * self) +{ } -GType jfif_reader_get_type (void) { +GType +jfif_reader_get_type (void) +{ static volatile gsize jfif_reader_type_id__volatile = 0; if (g_once_init_enter (&jfif_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifReader), 0, (GInstanceInitFunc) jfif_reader_instance_init, NULL }; @@ -1428,84 +1568,91 @@ GType jfif_reader_get_type (void) { } -JfifWriter* jfif_writer_construct (GType object_type, const gchar* filepath) { +JfifWriter* +jfif_writer_construct (GType object_type, + const gchar* filepath) +{ JfifWriter* self = NULL; - const gchar* _tmp0_; #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 128 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 128 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - self = (JfifWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); + self = (JfifWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_JFIF); #line 127 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1443 "JfifSupport.c" +#line 1583 "JfifSupport.c" } -JfifWriter* jfif_writer_new (const gchar* filepath) { +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 1450 "JfifSupport.c" +#line 1592 "JfifSupport.c" } -static void jfif_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +jfif_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ JfifWriter * self; - GdkPixbuf* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; - JpegQuality _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp3_; GError * _inner_error_ = NULL; #line 131 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_WRITER, JfifWriter); #line 131 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = pixbuf; -#line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = _tmp1_; -#line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp3_ = quality; + _tmp1_ = _tmp0_; #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = jpeg_quality_get_pct_text (_tmp3_); + _tmp2_ = jpeg_quality_get_pct_text (quality); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - gdk_pixbuf_save (_tmp0_, _tmp2_, "jpeg", &_inner_error_, "quality", _tmp5_, NULL); + gdk_pixbuf_save (pixbuf, _tmp1_, "jpeg", &_inner_error_, "quality", _tmp3_, NULL); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp3_); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 132 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return; -#line 1491 "JfifSupport.c" +#line 1632 "JfifSupport.c" } } -static void jfif_writer_class_init (JfifWriterClass * klass) { +static void +jfif_writer_class_init (JfifWriterClass * klass) +{ #line 126 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" 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 1501 "JfifSupport.c" +#line 1644 "JfifSupport.c" } -static void jfif_writer_instance_init (JfifWriter * self) { +static void +jfif_writer_instance_init (JfifWriter * self) +{ } -GType jfif_writer_get_type (void) { +GType +jfif_writer_get_type (void) +{ static volatile gsize jfif_writer_type_id__volatile = 0; if (g_once_init_enter (&jfif_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifWriter), 0, (GInstanceInitFunc) jfif_writer_instance_init, NULL }; @@ -1517,73 +1664,82 @@ GType jfif_writer_get_type (void) { } -JfifMetadataWriter* jfif_metadata_writer_construct (GType object_type, const gchar* filepath) { +JfifMetadataWriter* +jfif_metadata_writer_construct (GType object_type, + const gchar* filepath) +{ JfifMetadataWriter* self = NULL; - const gchar* _tmp0_; #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 138 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = filepath; -#line 138 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - self = (JfifMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_JFIF); + self = (JfifMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_JFIF); #line 137 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return self; -#line 1532 "JfifSupport.c" +#line 1679 "JfifSupport.c" } -JfifMetadataWriter* jfif_metadata_writer_new (const gchar* filepath) { +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 1539 "JfifSupport.c" +#line 1688 "JfifSupport.c" } -static void jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { +static void +jfif_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error) +{ JfifMetadataWriter * self; - PhotoMetadata* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; GError * _inner_error_ = NULL; #line 141 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_JFIF_METADATA_WRITER, JfifMetadataWriter); #line 141 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = metadata; -#line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - photo_metadata_write_to_file (_tmp0_, _tmp2_, &_inner_error_); + photo_metadata_write_to_file (metadata, _tmp1_, &_inner_error_); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 142 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return; -#line 1569 "JfifSupport.c" +#line 1719 "JfifSupport.c" } } -static void jfif_metadata_writer_class_init (JfifMetadataWriterClass * klass) { +static void +jfif_metadata_writer_class_init (JfifMetadataWriterClass * klass) +{ #line 136 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" 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 1579 "JfifSupport.c" +#line 1731 "JfifSupport.c" } -static void jfif_metadata_writer_instance_init (JfifMetadataWriter * self) { +static void +jfif_metadata_writer_instance_init (JfifMetadataWriter * self) +{ } -GType jfif_metadata_writer_get_type (void) { +GType +jfif_metadata_writer_get_type (void) +{ static volatile gsize jfif_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&jfif_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (JfifMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) jfif_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (JfifMetadataWriter), 0, (GInstanceInitFunc) jfif_metadata_writer_instance_init, NULL }; @@ -1595,17 +1751,21 @@ GType jfif_metadata_writer_get_type (void) { } -guint8 jpeg_marker_get_byte (JpegMarker self) { +guint8 +jpeg_marker_get_byte (JpegMarker self) +{ guint8 result = 0U; #line 160 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = (guint8) self; #line 160 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1605 "JfifSupport.c" +#line 1763 "JfifSupport.c" } -GType jpeg_marker_get_type (void) { +GType +jpeg_marker_get_type (void) +{ static volatile gsize jpeg_marker_type_id__volatile = 0; if (g_once_init_enter (&jpeg_marker_type_id__volatile)) { static const GEnumValue values[] = {{JPEG_MARKER_INVALID, "JPEG_MARKER_INVALID", "invalid"}, {JPEG_MARKER_SOI, "JPEG_MARKER_SOI", "soi"}, {JPEG_MARKER_EOI, "JPEG_MARKER_EOI", "eoi"}, {JPEG_MARKER_APP0, "JPEG_MARKER_APP0", "app0"}, {JPEG_MARKER_APP1, "JPEG_MARKER_APP1", "app1"}, {0, NULL, NULL}}; @@ -1617,17 +1777,21 @@ GType jpeg_marker_get_type (void) { } -gint jpeg_quality_get_pct (JpegQuality self) { +gint +jpeg_quality_get_pct (JpegQuality self) +{ gint result = 0; #line 171 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = (gint) self; #line 171 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1627 "JfifSupport.c" +#line 1789 "JfifSupport.c" } -gchar* jpeg_quality_get_pct_text (JpegQuality self) { +gchar* +jpeg_quality_get_pct_text (JpegQuality self) +{ gchar* result = NULL; gchar* _tmp0_; #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1636,11 +1800,13 @@ gchar* jpeg_quality_get_pct_text (JpegQuality self) { result = _tmp0_; #line 175 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1640 "JfifSupport.c" +#line 1804 "JfifSupport.c" } -JpegQuality* jpeg_quality_get_all (int* result_length1) { +JpegQuality* +jpeg_quality_get_all (int* result_length1) +{ JpegQuality* result = NULL; JpegQuality* _tmp0_; JpegQuality* _tmp1_; @@ -1663,23 +1829,25 @@ 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 1667 "JfifSupport.c" +#line 1833 "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 1673 "JfifSupport.c" +#line 1839 "JfifSupport.c" } -gchar* jpeg_quality_to_string (JpegQuality self) { +gchar* +jpeg_quality_to_string (JpegQuality self) +{ gchar* result = NULL; #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" switch (self) { #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_LOW: -#line 1683 "JfifSupport.c" +#line 1851 "JfifSupport.c" { gchar* _tmp0_; #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1688,11 +1856,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp0_; #line 185 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1692 "JfifSupport.c" +#line 1860 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_MEDIUM: -#line 1696 "JfifSupport.c" +#line 1864 "JfifSupport.c" { gchar* _tmp1_; #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1701,11 +1869,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp1_; #line 188 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1705 "JfifSupport.c" +#line 1873 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_HIGH: -#line 1709 "JfifSupport.c" +#line 1877 "JfifSupport.c" { gchar* _tmp2_; #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1714,11 +1882,11 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp2_; #line 191 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1718 "JfifSupport.c" +#line 1886 "JfifSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" case JPEG_QUALITY_MAXIMUM: -#line 1722 "JfifSupport.c" +#line 1890 "JfifSupport.c" { gchar* _tmp3_; #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1727,12 +1895,12 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = _tmp3_; #line 194 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1731 "JfifSupport.c" +#line 1899 "JfifSupport.c" } default: #line 183 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" break; -#line 1736 "JfifSupport.c" +#line 1904 "JfifSupport.c" } #line 197 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_warn_if_reached (); @@ -1740,11 +1908,13 @@ gchar* jpeg_quality_to_string (JpegQuality self) { result = NULL; #line 199 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1744 "JfifSupport.c" +#line 1912 "JfifSupport.c" } -GType jpeg_quality_get_type (void) { +GType +jpeg_quality_get_type (void) +{ static volatile gsize jpeg_quality_type_id__volatile = 0; if (g_once_init_enter (&jpeg_quality_type_id__volatile)) { static const GEnumValue values[] = {{JPEG_QUALITY_LOW, "JPEG_QUALITY_LOW", "low"}, {JPEG_QUALITY_MEDIUM, "JPEG_QUALITY_MEDIUM", "medium"}, {JPEG_QUALITY_HIGH, "JPEG_QUALITY_HIGH", "high"}, {JPEG_QUALITY_MAXIMUM, "JPEG_QUALITY_MAXIMUM", "maximum"}, {0, NULL, NULL}}; @@ -1756,206 +1926,196 @@ GType jpeg_quality_get_type (void) { } -gboolean jpeg_is_jpeg (GFile* file, GError** error) { +gboolean +jpeg_is_jpeg (GFile* file, + GError** error) +{ gboolean result = FALSE; GFileInputStream* fins = NULL; - GFile* _tmp0_; - GFileInputStream* _tmp1_; - gboolean _tmp3_ = FALSE; - GFileInputStream* _tmp4_; - gboolean _tmp5_; + GFileInputStream* _tmp0_; + gboolean _tmp2_ = FALSE; + GFileInputStream* _tmp3_; GError * _inner_error_ = NULL; #line 203 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = file; + _tmp0_ = g_file_read (file, NULL, &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp1_ = g_file_read (_tmp0_, NULL, &_inner_error_); -#line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - fins = _tmp1_; + fins = _tmp0_; #line 204 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1779 "JfifSupport.c" - gboolean _tmp2_ = FALSE; +#line 1948 "JfifSupport.c" + gboolean _tmp1_ = 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 1785 "JfifSupport.c" + return _tmp1_; +#line 1954 "JfifSupport.c" } #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_); + _tmp3_ = fins; #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp3_ = _tmp5_; + _tmp2_ = jpeg_is_jpeg_stream (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), &_inner_error_); #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1795 "JfifSupport.c" - gboolean _tmp6_ = FALSE; +#line 1962 "JfifSupport.c" + gboolean _tmp4_ = FALSE; #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #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 _tmp6_; -#line 1803 "JfifSupport.c" + return _tmp4_; +#line 1970 "JfifSupport.c" } #line 205 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp3_; + result = _tmp2_; #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" +#line 1978 "JfifSupport.c" } -gboolean jpeg_is_jpeg_stream (GInputStream* ins, GError** error) { +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; + JpegMarker _tmp0_ = 0; + gint _tmp1_; + gboolean _tmp3_ = 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" - _tmp0_ = ins; -#line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = jpeg_read_marker (_tmp0_, &_tmp1_, &_inner_error_); + _tmp1_ = jpeg_read_marker (ins, &_tmp0_, &_inner_error_); #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - marker = _tmp1_; + marker = _tmp0_; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - segment_length = _tmp2_; + segment_length = _tmp1_; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1836 "JfifSupport.c" - gboolean _tmp3_ = FALSE; +#line 2003 "JfifSupport.c" + gboolean _tmp2_ = FALSE; #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 210 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp3_; -#line 1842 "JfifSupport.c" + return _tmp2_; +#line 2009 "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" + _tmp3_ = segment_length == 0; +#line 2015 "JfifSupport.c" } else { #line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = FALSE; -#line 1852 "JfifSupport.c" + _tmp3_ = FALSE; +#line 2019 "JfifSupport.c" } #line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp4_; + result = _tmp3_; #line 213 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1858 "JfifSupport.c" +#line 2025 "JfifSupport.c" } -gboolean jpeg_is_jpeg_bytes (GBytes* bytes, GError** error) { +gboolean +jpeg_is_jpeg_bytes (GBytes* bytes, + GError** error) +{ gboolean result = FALSE; GMemoryInputStream* mins = NULL; - GBytes* _tmp0_; - GMemoryInputStream* _tmp1_; - gboolean _tmp2_ = FALSE; - gboolean _tmp3_; + GMemoryInputStream* _tmp0_; + gboolean _tmp1_ = FALSE; 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; + _tmp0_ = (GMemoryInputStream*) g_memory_input_stream_new_from_bytes (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_); + mins = _tmp0_; #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = _tmp3_; + _tmp1_ = 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" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1884 "JfifSupport.c" - gboolean _tmp4_ = FALSE; +#line 2048 "JfifSupport.c" + gboolean _tmp2_ = 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" + return _tmp2_; +#line 2056 "JfifSupport.c" } #line 219 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp2_; + result = _tmp1_; #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 1900 "JfifSupport.c" +#line 2064 "JfifSupport.c" } -gint jpeg_read_marker (GInputStream* 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; - GInputStream* _tmp0_; + GDataInputStream* _tmp0_; GDataInputStream* _tmp1_; - GDataInputStream* _tmp2_; - guint8 _tmp3_ = 0U; - GDataInputStream* _tmp4_; - guint8 _tmp5_; - guint8 _tmp7_ = 0U; - GDataInputStream* _tmp8_; - guint8 _tmp9_; - gboolean _tmp11_ = FALSE; - JpegMarker _tmp12_; + guint8 _tmp2_ = 0U; + GDataInputStream* _tmp3_; + guint8 _tmp5_ = 0U; + GDataInputStream* _tmp6_; + gboolean _tmp8_ = FALSE; + JpegMarker _tmp9_; guint16 length = 0U; - GDataInputStream* _tmp14_; - guint16 _tmp15_; - gboolean _tmp17_ = FALSE; - guint16 _tmp18_; - guint16 _tmp23_; + GDataInputStream* _tmp11_; + gboolean _tmp13_ = FALSE; + guint16 _tmp14_; + guint16 _tmp16_; GError * _inner_error_ = NULL; #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 225 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp0_ = fins; + _tmp0_ = g_data_input_stream_new (fins); #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_; + dins = _tmp0_; #line 226 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp2_ = dins; + _tmp1_ = dins; #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 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp4_ = dins; + g_data_input_stream_set_byte_order (_tmp1_, G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN); #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp5_ = g_data_input_stream_read_byte (_tmp4_, NULL, &_inner_error_); + _tmp3_ = dins; #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp3_ = _tmp5_; + _tmp2_ = g_data_input_stream_read_byte (_tmp3_, NULL, &_inner_error_); #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1948 "JfifSupport.c" - gint _tmp6_ = 0; +#line 2108 "JfifSupport.c" + gint _tmp4_ = 0; #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp6_; -#line 1956 "JfifSupport.c" + return _tmp4_; +#line 2116 "JfifSupport.c" } #line 228 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp3_ != JPEG_MARKER_PREFIX) { + if (_tmp2_ != JPEG_MARKER_PREFIX) { #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = -1; #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -1964,49 +2124,47 @@ gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error) { if (marker) { #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 1968 "JfifSupport.c" +#line 2128 "JfifSupport.c" } #line 229 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 1972 "JfifSupport.c" +#line 2132 "JfifSupport.c" } #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp8_ = dins; -#line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp9_ = g_data_input_stream_read_byte (_tmp8_, NULL, &_inner_error_); + _tmp6_ = dins; #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp7_ = _tmp9_; + _tmp5_ = g_data_input_stream_read_byte (_tmp6_, NULL, &_inner_error_); #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1982 "JfifSupport.c" - gint _tmp10_ = 0; +#line 2140 "JfifSupport.c" + gint _tmp7_ = 0; #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp10_; -#line 1990 "JfifSupport.c" + return _tmp7_; +#line 2148 "JfifSupport.c" } #line 231 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _vala_marker = (JpegMarker) _tmp7_; + _vala_marker = (JpegMarker) _tmp5_; #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp12_ = _vala_marker; + _tmp9_ = _vala_marker; #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp12_ == JPEG_MARKER_SOI) { + if (_tmp9_ == JPEG_MARKER_SOI) { #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp11_ = TRUE; -#line 2000 "JfifSupport.c" + _tmp8_ = TRUE; +#line 2158 "JfifSupport.c" } else { - JpegMarker _tmp13_; + JpegMarker _tmp10_; #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp13_ = _vala_marker; + _tmp10_ = _vala_marker; #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp11_ = _tmp13_ == JPEG_MARKER_EOI; -#line 2007 "JfifSupport.c" + _tmp8_ = _tmp10_ == JPEG_MARKER_EOI; +#line 2165 "JfifSupport.c" } #line 232 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - if (_tmp11_) { + if (_tmp8_) { #line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = 0; #line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -2015,60 +2173,48 @@ gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error) { if (marker) { #line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 2019 "JfifSupport.c" +#line 2177 "JfifSupport.c" } #line 234 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2023 "JfifSupport.c" +#line 2181 "JfifSupport.c" } #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp14_ = dins; -#line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp15_ = g_data_input_stream_read_uint16 (_tmp14_, NULL, &_inner_error_); + _tmp11_ = dins; #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - length = _tmp15_; + length = g_data_input_stream_read_uint16 (_tmp11_, NULL, &_inner_error_); #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2033 "JfifSupport.c" - gint _tmp16_ = 0; +#line 2189 "JfifSupport.c" + gint _tmp12_ = 0; #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" g_propagate_error (error, _inner_error_); #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); #line 237 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - return _tmp16_; -#line 2041 "JfifSupport.c" + return _tmp12_; +#line 2197 "JfifSupport.c" } #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_; + _tmp14_ = length; #line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp19_ = fins; + if (((gint) _tmp14_) < 2) { #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" + _tmp13_ = G_TYPE_CHECK_INSTANCE_TYPE (fins, g_seekable_get_type ()); +#line 2205 "JfifSupport.c" } else { #line 238 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp17_ = FALSE; -#line 2057 "JfifSupport.c" + _tmp13_ = FALSE; +#line 2209 "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; + if (_tmp13_) { +#line 2213 "JfifSupport.c" + guint16 _tmp15_; #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); + _tmp15_ = length; #line 239 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp20_, _tmp22_ - 2); + g_debug ("Invalid length %Xh at ofs %" G_GINT64_FORMAT "Xh", _tmp15_, g_seekable_tell (G_TYPE_CHECK_INSTANCE_TYPE (fins, g_seekable_get_type ()) ? ((GSeekable*) fins) : NULL) - 2); #line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" result = -1; #line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" @@ -2077,27 +2223,27 @@ gint jpeg_read_marker (GInputStream* fins, JpegMarker* marker, GError** error) { if (marker) { #line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 2081 "JfifSupport.c" +#line 2227 "JfifSupport.c" } #line 242 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2085 "JfifSupport.c" +#line 2231 "JfifSupport.c" } #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - _tmp23_ = length; + _tmp16_ = length; #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" - result = _tmp23_ - 2; + result = _tmp16_ - 2; #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" _g_object_unref0 (dins); #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" if (marker) { #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" *marker = _vala_marker; -#line 2097 "JfifSupport.c" +#line 2243 "JfifSupport.c" } #line 246 "/home/jens/Source/shotwell/src/photos/JfifSupport.vala" return result; -#line 2101 "JfifSupport.c" +#line 2247 "JfifSupport.c" } diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c index 4f46fdc..72dcc4f 100644 --- a/src/photos/PhotoFileAdapter.c +++ b/src/photos/PhotoFileAdapter.c @@ -1,4 +1,4 @@ -/* PhotoFileAdapter.c generated by valac 0.36.6, the Vala compiler +/* PhotoFileAdapter.c generated by valac 0.40.4, the Vala compiler * generated from PhotoFileAdapter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -19,6 +19,7 @@ /* atomicity on the filesystem.*/ /**/ + #include #include #include @@ -202,17 +203,22 @@ static gpointer photo_file_metadata_writer_parent_class = NULL; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; #define PHOTO_FILE_ADAPTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapterPrivate)) -enum { - PHOTO_FILE_ADAPTER_DUMMY_PROPERTY -}; -PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +PhotoFileAdapter* photo_file_adapter_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); @@ -221,9 +227,15 @@ static void photo_file_adapter_finalize (PhotoFileAdapter * obj); GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -232,91 +244,117 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); GType photo_file_reader_role_get_type (void) G_GNUC_CONST; #define PHOTO_FILE_READER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_READER, PhotoFileReaderPrivate)) -enum { - PHOTO_FILE_READER_DUMMY_PROPERTY -}; -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +PhotoFileReader* photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); GType photo_file_writer_get_type (void) G_GNUC_CONST; GQuark photo_format_error_quark (void); -PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError** error); -PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error); +PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, + GError** error); +PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; -PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error); -PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error); -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error); -static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, GError** error); -GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error); -static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, GError** error); -GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error); -static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); -void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role); +PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, + GError** error); +PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); +PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error); +static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, + GError** error); +GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, + GError** error); +static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, + GError** error); +GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error); +static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); +void photo_file_reader_set_role (PhotoFileReader* self, + PhotoFileReaderRole role); PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self); static void photo_file_reader_finalize (PhotoFileAdapter * obj); GType jpeg_quality_get_type (void) G_GNUC_CONST; -enum { - PHOTO_FILE_WRITER_DUMMY_PROPERTY -}; -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self); -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath); -void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); -static void photo_file_writer_real_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); -enum { - PHOTO_FILE_METADATA_WRITER_DUMMY_PROPERTY -}; -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath); +void photo_file_writer_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); +static void photo_file_writer_real_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self); -void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error); -static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error); - - -PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error); +static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error); + + +PhotoFileAdapter* +photo_file_adapter_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ PhotoFileAdapter* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - PhotoFileFormat _tmp2_; + gchar* _tmp0_; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = (PhotoFileAdapter*) g_type_create_instance (object_type); #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = filepath; -#line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (filepath); #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _g_free0 (self->priv->filepath); #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self->priv->filepath = _tmp1_; -#line 27 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = file_format; + self->priv->filepath = _tmp0_; #line 27 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self->priv->file_format = _tmp2_; + self->priv->file_format = file_format; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self; -#line 298 "PhotoFileAdapter.c" +#line 335 "PhotoFileAdapter.c" } -gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) { +gboolean +photo_file_adapter_file_exists (PhotoFileAdapter* self) +{ gboolean result = FALSE; const gchar* _tmp0_; - gboolean _tmp1_; #line 30 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), FALSE); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = self->priv->filepath; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = g_file_test (_tmp0_, G_FILE_TEST_IS_REGULAR); -#line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp1_; + result = g_file_test (_tmp0_, G_FILE_TEST_IS_REGULAR); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 316 "PhotoFileAdapter.c" +#line 352 "PhotoFileAdapter.c" } -gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) { +gchar* +photo_file_adapter_get_filepath (PhotoFileAdapter* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -330,31 +368,35 @@ gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) { result = _tmp1_; #line 35 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 334 "PhotoFileAdapter.c" +#line 372 "PhotoFileAdapter.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self ? g_object_ref (self) : NULL; -#line 341 "PhotoFileAdapter.c" +#line 381 "PhotoFileAdapter.c" } -GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { +GFile* +photo_file_adapter_get_file (PhotoFileAdapter* self) +{ GFile* result = NULL; GFile* _result_ = NULL; GError * _inner_error_ = NULL; #line 38 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL); -#line 351 "PhotoFileAdapter.c" +#line 393 "PhotoFileAdapter.c" { GFile* _tmp0_; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = self->priv->file; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_rec_mutex_lock (&self->priv->__lock_file); -#line 358 "PhotoFileAdapter.c" +#line 400 "PhotoFileAdapter.c" { GFile* _tmp1_; GFile* _tmp4_; @@ -363,7 +405,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { _tmp1_ = self->priv->file; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (_tmp1_ == NULL) { -#line 367 "PhotoFileAdapter.c" +#line 409 "PhotoFileAdapter.c" const gchar* _tmp2_; GFile* _tmp3_; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -374,7 +416,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { _g_object_unref0 (self->priv->file); #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->priv->file = _tmp3_; -#line 378 "PhotoFileAdapter.c" +#line 420 "PhotoFileAdapter.c" } #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp4_ = self->priv->file; @@ -384,7 +426,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { _g_object_unref0 (_result_); #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _result_ = _tmp5_; -#line 388 "PhotoFileAdapter.c" +#line 430 "PhotoFileAdapter.c" } __finally28: { @@ -393,7 +435,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { _tmp6_ = self->priv->file; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_rec_mutex_unlock (&self->priv->__lock_file); -#line 397 "PhotoFileAdapter.c" +#line 439 "PhotoFileAdapter.c" } #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { @@ -405,18 +447,20 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { g_clear_error (&_inner_error_); #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 409 "PhotoFileAdapter.c" +#line 451 "PhotoFileAdapter.c" } } #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" result = _result_; #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 416 "PhotoFileAdapter.c" +#line 458 "PhotoFileAdapter.c" } -PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) { +PhotoFileFormat +photo_file_adapter_get_file_format (PhotoFileAdapter* self) +{ PhotoFileFormat result = 0; PhotoFileFormat _tmp0_; #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -427,108 +471,133 @@ PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) { result = _tmp0_; #line 51 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 431 "PhotoFileAdapter.c" +#line 475 "PhotoFileAdapter.c" } -static void value_photo_file_adapter_init (GValue* value) { +static void +value_photo_file_adapter_init (GValue* value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = NULL; -#line 438 "PhotoFileAdapter.c" +#line 484 "PhotoFileAdapter.c" } -static void value_photo_file_adapter_free_value (GValue* value) { +static void +value_photo_file_adapter_free_value (GValue* value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (value->data[0].v_pointer) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_unref (value->data[0].v_pointer); -#line 447 "PhotoFileAdapter.c" +#line 495 "PhotoFileAdapter.c" } } -static void value_photo_file_adapter_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_adapter_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (src_value->data[0].v_pointer) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" dest_value->data[0].v_pointer = photo_file_adapter_ref (src_value->data[0].v_pointer); -#line 457 "PhotoFileAdapter.c" +#line 508 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" dest_value->data[0].v_pointer = NULL; -#line 461 "PhotoFileAdapter.c" +#line 512 "PhotoFileAdapter.c" } } -static gpointer value_photo_file_adapter_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_adapter_peek_pointer (const GValue* value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return value->data[0].v_pointer; -#line 469 "PhotoFileAdapter.c" +#line 522 "PhotoFileAdapter.c" } -static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_adapter_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (collect_values[0].v_pointer) { -#line 476 "PhotoFileAdapter.c" +#line 534 "PhotoFileAdapter.c" PhotoFileAdapter * object; object = collect_values[0].v_pointer; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (object->parent_instance.g_class == NULL) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 483 "PhotoFileAdapter.c" +#line 541 "PhotoFileAdapter.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.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 487 "PhotoFileAdapter.c" +#line 545 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = photo_file_adapter_ref (object); -#line 491 "PhotoFileAdapter.c" +#line 549 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = NULL; -#line 495 "PhotoFileAdapter.c" +#line 553 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 499 "PhotoFileAdapter.c" +#line 557 "PhotoFileAdapter.c" } -static gchar* value_photo_file_adapter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_adapter_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileAdapter ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (!object_p) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 510 "PhotoFileAdapter.c" +#line 573 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (!value->data[0].v_pointer) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" *object_p = NULL; -#line 516 "PhotoFileAdapter.c" +#line 579 "PhotoFileAdapter.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" *object_p = value->data[0].v_pointer; -#line 520 "PhotoFileAdapter.c" +#line 583 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" *object_p = photo_file_adapter_ref (value->data[0].v_pointer); -#line 524 "PhotoFileAdapter.c" +#line 587 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 528 "PhotoFileAdapter.c" +#line 591 "PhotoFileAdapter.c" } -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileAdapter* spec; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_ADAPTER), NULL); @@ -538,20 +607,25 @@ GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return G_PARAM_SPEC (spec); -#line 542 "PhotoFileAdapter.c" +#line 611 "PhotoFileAdapter.c" } -gpointer value_get_photo_file_adapter (const GValue* value) { +gpointer +value_get_photo_file_adapter (const GValue* value) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER), NULL); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return value->data[0].v_pointer; -#line 551 "PhotoFileAdapter.c" +#line 622 "PhotoFileAdapter.c" } -void value_set_photo_file_adapter (GValue* value, gpointer v_object) { +void +value_set_photo_file_adapter (GValue* value, + gpointer v_object) +{ PhotoFileAdapter * old; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER)); @@ -567,22 +641,25 @@ void value_set_photo_file_adapter (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_ref (value->data[0].v_pointer); -#line 571 "PhotoFileAdapter.c" +#line 645 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = NULL; -#line 575 "PhotoFileAdapter.c" +#line 649 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (old) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_unref (old); -#line 581 "PhotoFileAdapter.c" +#line 655 "PhotoFileAdapter.c" } } -void value_take_photo_file_adapter (GValue* value, gpointer v_object) { +void +value_take_photo_file_adapter (GValue* value, + gpointer v_object) +{ PhotoFileAdapter * old; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER)); @@ -596,33 +673,37 @@ void value_take_photo_file_adapter (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = v_object; -#line 600 "PhotoFileAdapter.c" +#line 677 "PhotoFileAdapter.c" } else { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" value->data[0].v_pointer = NULL; -#line 604 "PhotoFileAdapter.c" +#line 681 "PhotoFileAdapter.c" } #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (old) { #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_unref (old); -#line 610 "PhotoFileAdapter.c" +#line 687 "PhotoFileAdapter.c" } } -static void photo_file_adapter_class_init (PhotoFileAdapterClass * klass) { +static void +photo_file_adapter_class_init (PhotoFileAdapterClass * klass) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_adapter_parent_class = g_type_class_peek_parent (klass); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" ((PhotoFileAdapterClass *) klass)->finalize = photo_file_adapter_finalize; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_type_class_add_private (klass, sizeof (PhotoFileAdapterPrivate)); -#line 622 "PhotoFileAdapter.c" +#line 701 "PhotoFileAdapter.c" } -static void photo_file_adapter_instance_init (PhotoFileAdapter * self) { +static void +photo_file_adapter_instance_init (PhotoFileAdapter * self) +{ #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->priv = PHOTO_FILE_ADAPTER_GET_PRIVATE (self); #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -631,11 +712,13 @@ static void photo_file_adapter_instance_init (PhotoFileAdapter * self) { self->priv->file = NULL; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->ref_count = 1; -#line 635 "PhotoFileAdapter.c" +#line 716 "PhotoFileAdapter.c" } -static void photo_file_adapter_finalize (PhotoFileAdapter * obj) { +static void +photo_file_adapter_finalize (PhotoFileAdapter * obj) +{ PhotoFileAdapter * self; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter); @@ -647,11 +730,13 @@ static void photo_file_adapter_finalize (PhotoFileAdapter * obj) { g_rec_mutex_clear (&self->priv->__lock_file); #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _g_object_unref0 (self->priv->file); -#line 651 "PhotoFileAdapter.c" +#line 734 "PhotoFileAdapter.c" } -GType photo_file_adapter_get_type (void) { +GType +photo_file_adapter_get_type (void) +{ static volatile gsize photo_file_adapter_type_id__volatile = 0; if (g_once_init_enter (&photo_file_adapter_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_adapter_init, value_photo_file_adapter_free_value, value_photo_file_adapter_copy_value, value_photo_file_adapter_peek_pointer, "p", value_photo_file_adapter_collect_value, "p", value_photo_file_adapter_lcopy_value }; @@ -665,18 +750,22 @@ GType photo_file_adapter_get_type (void) { } -gpointer photo_file_adapter_ref (gpointer instance) { +gpointer +photo_file_adapter_ref (gpointer instance) +{ PhotoFileAdapter * self; self = instance; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_atomic_int_inc (&self->ref_count); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return instance; -#line 676 "PhotoFileAdapter.c" +#line 763 "PhotoFileAdapter.c" } -void photo_file_adapter_unref (gpointer instance) { +void +photo_file_adapter_unref (gpointer instance) +{ PhotoFileAdapter * self; self = instance; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -685,12 +774,14 @@ void photo_file_adapter_unref (gpointer instance) { PHOTO_FILE_ADAPTER_GET_CLASS (self)->finalize (self); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_type_free_instance ((GTypeInstance *) self); -#line 689 "PhotoFileAdapter.c" +#line 778 "PhotoFileAdapter.c" } } -GType photo_file_reader_role_get_type (void) { +GType +photo_file_reader_role_get_type (void) +{ static volatile gsize photo_file_reader_role_type_id__volatile = 0; if (g_once_init_enter (&photo_file_reader_role_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_FILE_READER_ROLE_DEFAULT, "PHOTO_FILE_READER_ROLE_DEFAULT", "default"}, {PHOTO_FILE_READER_ROLE_THUMBNAIL, "PHOTO_FILE_READER_ROLE_THUMBNAIL", "thumbnail"}, {0, NULL, NULL}}; @@ -702,50 +793,48 @@ GType photo_file_reader_role_get_type (void) { } -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +PhotoFileReader* +photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ PhotoFileReader* self = NULL; - const gchar* _tmp0_; - PhotoFileFormat _tmp1_; #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = filepath; -#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = file_format; -#line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self = (PhotoFileReader*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_); + self = (PhotoFileReader*) photo_file_adapter_construct (object_type, filepath, file_format); #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self; -#line 720 "PhotoFileAdapter.c" +#line 809 "PhotoFileAdapter.c" } -PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError** error) { +PhotoFileWriter* +photo_file_reader_create_writer (PhotoFileReader* self, + GError** error) +{ PhotoFileWriter* result = NULL; PhotoFileWriter* _tmp0_ = NULL; - PhotoFileFormat _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; + PhotoFileWriter* _tmp3_; PhotoFileWriter* _tmp4_; PhotoFileWriter* _tmp5_; - PhotoFileWriter* _tmp6_; GError * _inner_error_ = NULL; #line 71 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp4_ = photo_file_format_create_writer (_tmp1_, _tmp3_, &_inner_error_); + _tmp3_ = photo_file_format_create_writer (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp2_, &_inner_error_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = _tmp5_; + _tmp0_ = _tmp4_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -754,7 +843,7 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError* g_propagate_error (error, _inner_error_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 758 "PhotoFileAdapter.c" +#line 847 "PhotoFileAdapter.c" } else { #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.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); @@ -762,49 +851,49 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError* g_clear_error (&_inner_error_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 766 "PhotoFileAdapter.c" +#line 855 "PhotoFileAdapter.c" } } #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp6_ = _tmp0_; + _tmp5_ = _tmp0_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = NULL; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp6_; + result = _tmp5_; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _photo_file_adapter_unref0 (_tmp0_); #line 72 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 779 "PhotoFileAdapter.c" +#line 868 "PhotoFileAdapter.c" } -PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error) { +PhotoFileMetadataWriter* +photo_file_reader_create_metadata_writer (PhotoFileReader* self, + GError** error) +{ PhotoFileMetadataWriter* result = NULL; PhotoFileMetadataWriter* _tmp0_ = NULL; - PhotoFileFormat _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; + PhotoFileMetadataWriter* _tmp3_; PhotoFileMetadataWriter* _tmp4_; PhotoFileMetadataWriter* _tmp5_; - PhotoFileMetadataWriter* _tmp6_; GError * _inner_error_ = NULL; #line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp4_ = photo_file_format_create_metadata_writer (_tmp1_, _tmp3_, &_inner_error_); + _tmp3_ = photo_file_format_create_metadata_writer (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp2_, &_inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = _tmp5_; + _tmp0_ = _tmp4_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -813,7 +902,7 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead g_propagate_error (error, _inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 817 "PhotoFileAdapter.c" +#line 906 "PhotoFileAdapter.c" } else { #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.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); @@ -821,60 +910,77 @@ PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileRead g_clear_error (&_inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 825 "PhotoFileAdapter.c" +#line 914 "PhotoFileAdapter.c" } } #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp6_ = _tmp0_; + _tmp5_ = _tmp0_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = NULL; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp6_; + result = _tmp5_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _photo_file_adapter_unref0 (_tmp0_); #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 838 "PhotoFileAdapter.c" +#line 927 "PhotoFileAdapter.c" } -static PhotoMetadata* photo_file_reader_real_read_metadata (PhotoFileReader* self, GError** error) { +static PhotoMetadata* +photo_file_reader_real_read_metadata (PhotoFileReader* self, + GError** error) +{ #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_reader_read_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 847 "PhotoFileAdapter.c" +#line 939 "PhotoFileAdapter.c" } -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error) { +PhotoMetadata* +photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error) +{ #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 79 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return PHOTO_FILE_READER_GET_CLASS (self)->read_metadata (self, error); -#line 856 "PhotoFileAdapter.c" +#line 951 "PhotoFileAdapter.c" } -static GdkPixbuf* photo_file_reader_real_unscaled_read (PhotoFileReader* self, GError** error) { +static GdkPixbuf* +photo_file_reader_real_unscaled_read (PhotoFileReader* self, + GError** error) +{ #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_reader_unscaled_read'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 865 "PhotoFileAdapter.c" +#line 963 "PhotoFileAdapter.c" } -GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** error) { +GdkPixbuf* +photo_file_reader_unscaled_read (PhotoFileReader* self, + GError** error) +{ #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return PHOTO_FILE_READER_GET_CLASS (self)->unscaled_read (self, error); -#line 874 "PhotoFileAdapter.c" +#line 975 "PhotoFileAdapter.c" } -static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +photo_file_reader_real_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; GdkPixbuf* _tmp1_; @@ -895,7 +1001,7 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim g_propagate_error (error, _inner_error_); #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return NULL; -#line 899 "PhotoFileAdapter.c" +#line 1005 "PhotoFileAdapter.c" } #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp2_ = *scaled; @@ -907,32 +1013,39 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim _g_object_unref0 (_tmp0_); #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 911 "PhotoFileAdapter.c" +#line 1017 "PhotoFileAdapter.c" } -GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) { +GdkPixbuf* +photo_file_reader_scaled_read (PhotoFileReader* self, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ #line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); #line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return PHOTO_FILE_READER_GET_CLASS (self)->scaled_read (self, full, scaled, error); -#line 920 "PhotoFileAdapter.c" +#line 1031 "PhotoFileAdapter.c" } -void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role) { - PhotoFileReaderRole _tmp0_; +void +photo_file_reader_set_role (PhotoFileReader* self, + PhotoFileReaderRole role) +{ #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (IS_PHOTO_FILE_READER (self)); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = role; -#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self->priv->role = _tmp0_; -#line 932 "PhotoFileAdapter.c" + self->priv->role = role; +#line 1043 "PhotoFileAdapter.c" } -PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) { +PhotoFileReaderRole +photo_file_reader_get_role (PhotoFileReader* self) +{ PhotoFileReaderRole result = 0; PhotoFileReaderRole _tmp0_; #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -943,11 +1056,13 @@ PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) { result = _tmp0_; #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 947 "PhotoFileAdapter.c" +#line 1060 "PhotoFileAdapter.c" } -static void photo_file_reader_class_init (PhotoFileReaderClass * klass) { +static void +photo_file_reader_class_init (PhotoFileReaderClass * klass) +{ #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_reader_parent_class = g_type_class_peek_parent (klass); #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -960,30 +1075,36 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) { ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) photo_file_reader_real_unscaled_read; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read; -#line 964 "PhotoFileAdapter.c" +#line 1079 "PhotoFileAdapter.c" } -static void photo_file_reader_instance_init (PhotoFileReader * self) { +static void +photo_file_reader_instance_init (PhotoFileReader * self) +{ #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->priv = PHOTO_FILE_READER_GET_PRIVATE (self); #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self->priv->role = PHOTO_FILE_READER_ROLE_DEFAULT; -#line 973 "PhotoFileAdapter.c" +#line 1090 "PhotoFileAdapter.c" } -static void photo_file_reader_finalize (PhotoFileAdapter * obj) { +static void +photo_file_reader_finalize (PhotoFileAdapter * obj) +{ PhotoFileReader * self; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" PHOTO_FILE_ADAPTER_CLASS (photo_file_reader_parent_class)->finalize (obj); -#line 983 "PhotoFileAdapter.c" +#line 1102 "PhotoFileAdapter.c" } -GType photo_file_reader_get_type (void) { +GType +photo_file_reader_get_type (void) +{ static volatile gsize photo_file_reader_type_id__volatile = 0; if (g_once_init_enter (&photo_file_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoFileReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_file_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoFileReader), 0, (GInstanceInitFunc) photo_file_reader_instance_init, NULL }; @@ -995,85 +1116,98 @@ GType photo_file_reader_get_type (void) { } -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +PhotoFileWriter* +photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ PhotoFileWriter* self = NULL; - const gchar* _tmp0_; - PhotoFileFormat _tmp1_; #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = filepath; -#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = file_format; -#line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self = (PhotoFileWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_); + self = (PhotoFileWriter*) photo_file_adapter_construct (object_type, filepath, file_format); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self; -#line 1013 "PhotoFileAdapter.c" +#line 1132 "PhotoFileAdapter.c" } -PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self) { +PhotoFileReader* +photo_file_writer_create_reader (PhotoFileWriter* self) +{ PhotoFileReader* result = NULL; - PhotoFileFormat _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + PhotoFileReader* _tmp2_; PhotoFileReader* _tmp3_; - PhotoFileReader* _tmp4_; #line 105 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_WRITER (self), NULL); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_); + _tmp2_ = photo_file_format_create_reader (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp1_); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp4_; + result = _tmp3_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 1042 "PhotoFileAdapter.c" +#line 1160 "PhotoFileAdapter.c" } -static void photo_file_writer_real_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +photo_file_writer_real_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_writer_write'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return; -#line 1051 "PhotoFileAdapter.c" +#line 1174 "PhotoFileAdapter.c" } -void photo_file_writer_write (PhotoFileWriter* self, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +void +photo_file_writer_write (PhotoFileWriter* self, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (IS_PHOTO_FILE_WRITER (self)); #line 109 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" PHOTO_FILE_WRITER_GET_CLASS (self)->write (self, pixbuf, quality, error); -#line 1060 "PhotoFileAdapter.c" +#line 1188 "PhotoFileAdapter.c" } -static void photo_file_writer_class_init (PhotoFileWriterClass * klass) { +static void +photo_file_writer_class_init (PhotoFileWriterClass * klass) +{ #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_writer_parent_class = g_type_class_peek_parent (klass); #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write; -#line 1069 "PhotoFileAdapter.c" +#line 1199 "PhotoFileAdapter.c" } -static void photo_file_writer_instance_init (PhotoFileWriter * self) { +static void +photo_file_writer_instance_init (PhotoFileWriter * self) +{ } -GType photo_file_writer_get_type (void) { +GType +photo_file_writer_get_type (void) +{ static volatile gsize photo_file_writer_type_id__volatile = 0; if (g_once_init_enter (&photo_file_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoFileWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_file_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoFileWriter), 0, (GInstanceInitFunc) photo_file_writer_instance_init, NULL }; @@ -1085,85 +1219,96 @@ GType photo_file_writer_get_type (void) { } -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { +PhotoFileMetadataWriter* +photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format) +{ PhotoFileMetadataWriter* self = NULL; - const gchar* _tmp0_; - PhotoFileFormat _tmp1_; #line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = filepath; -#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = file_format; -#line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - self = (PhotoFileMetadataWriter*) photo_file_adapter_construct (object_type, _tmp0_, _tmp1_); + self = (PhotoFileMetadataWriter*) photo_file_adapter_construct (object_type, filepath, file_format); #line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return self; -#line 1103 "PhotoFileAdapter.c" +#line 1235 "PhotoFileAdapter.c" } -PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self) { +PhotoFileReader* +photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self) +{ PhotoFileReader* result = NULL; - PhotoFileFormat _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + PhotoFileReader* _tmp2_; PhotoFileReader* _tmp3_; - PhotoFileReader* _tmp4_; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self), NULL); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp0_ = photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); -#line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp3_ = photo_file_format_create_reader (_tmp0_, _tmp2_); + _tmp2_ = photo_file_format_create_reader (photo_file_adapter_get_file_format (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)), _tmp1_); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - result = _tmp4_; + result = _tmp3_; #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return result; -#line 1132 "PhotoFileAdapter.c" +#line 1263 "PhotoFileAdapter.c" } -static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) { +static void +photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error) +{ #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_metadata_writer_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" return; -#line 1141 "PhotoFileAdapter.c" +#line 1276 "PhotoFileAdapter.c" } -void photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, PhotoMetadata* metadata, GError** error) { +void +photo_file_metadata_writer_write_metadata (PhotoFileMetadataWriter* self, + PhotoMetadata* metadata, + GError** error) +{ #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self)); #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" PHOTO_FILE_METADATA_WRITER_GET_CLASS (self)->write_metadata (self, metadata, error); -#line 1150 "PhotoFileAdapter.c" +#line 1289 "PhotoFileAdapter.c" } -static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass * klass) { +static void +photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass * klass) +{ #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata; -#line 1159 "PhotoFileAdapter.c" +#line 1300 "PhotoFileAdapter.c" } -static void photo_file_metadata_writer_instance_init (PhotoFileMetadataWriter * self) { +static void +photo_file_metadata_writer_instance_init (PhotoFileMetadataWriter * self) +{ } -GType photo_file_metadata_writer_get_type (void) { +GType +photo_file_metadata_writer_get_type (void) +{ static volatile gsize photo_file_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&photo_file_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoFileMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_file_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoFileMetadataWriter), 0, (GInstanceInitFunc) photo_file_metadata_writer_instance_init, NULL }; diff --git a/src/photos/PhotoFileFormat.c b/src/photos/PhotoFileFormat.c index 604499f..3b3520c 100644 --- a/src/photos/PhotoFileFormat.c +++ b/src/photos/PhotoFileFormat.c @@ -1,4 +1,4 @@ -/* PhotoFileFormat.c generated by valac 0.36.6, the Vala compiler +/* PhotoFileFormat.c generated by valac 0.40.4, the Vala compiler * generated from PhotoFileFormat.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -261,47 +262,73 @@ static gpointer photo_file_format_properties_parent_class = NULL; 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_data_find_applicable (PhotoFileFormatDataApplicableTest test, + void* test_target, + int* result_length1); PhotoFileFormat* photo_file_format_get_supported (int* result_length1); -static void _vala_array_add46 (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_dup2 (PhotoFileFormat* self, int length); +static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, + gpointer self); +static PhotoFileFormat* _vala_array_dup2 (PhotoFileFormat* self, + int length); PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1); static gboolean ___lambda26_ (PhotoFileFormat format); gboolean photo_file_format_can_write_image (PhotoFileFormat self); -static gboolean ____lambda26__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); -static PhotoFileFormat* _vala_array_dup3 (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 ___lambda27_ (PhotoFileFormat format); gboolean photo_file_format_can_write_metadata (PhotoFileFormat self); -static gboolean ____lambda27__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self); -static PhotoFileFormat* _vala_array_dup4 (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); PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); gboolean is_string_empty (const gchar* s); gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self); gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; PhotoFileFormatProperties* photo_file_format_driver_get_properties (PhotoFileFormatDriver* self); -gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext); +gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext); gboolean photo_file_format_is_file_supported (GFile* file); gboolean photo_file_format_is_basename_supported (const gchar* basename); PhotoFileFormat photo_file_format_get_system_default_format (void); @@ -328,41 +355,72 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void); GType photos_bmp_file_format_driver_get_type (void) G_GNUC_CONST; PhotosBmpFileFormatDriver* photos_bmp_file_format_driver_get_instance (void); PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self); -gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar* name); +gchar* photo_file_format_get_default_basename (PhotoFileFormat self, + const gchar* name); gchar* photo_file_format_properties_get_default_extension (PhotoFileFormatProperties* self); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath); -PhotoFileReader* photo_file_format_driver_create_reader (PhotoFileFormatDriver* self, const gchar* filepath); +PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath); +PhotoFileReader* photo_file_format_driver_create_reader (PhotoFileFormatDriver* self, + const gchar* filepath); gboolean photo_file_format_driver_can_write_image (PhotoFileFormatDriver* self); gboolean photo_file_format_driver_can_write_metadata (PhotoFileFormatDriver* self); GType photo_file_writer_get_type (void) G_GNUC_CONST; -PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error); -PhotoFileWriter* photo_file_format_driver_create_writer (PhotoFileFormatDriver* self, const gchar* filepath); +PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); +PhotoFileWriter* photo_file_format_driver_create_writer (PhotoFileFormatDriver* self, + const gchar* filepath); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; -PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error); -PhotoFileMetadataWriter* photo_file_format_driver_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath); +PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error); +PhotoFileMetadataWriter* photo_file_format_driver_create_metadata_writer (PhotoFileFormatDriver* self, + const gchar* filepath); GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; -PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options); -PhotoFileSniffer* photo_file_format_driver_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options); +PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, + GFile* file, + PhotoFileSnifferOptions options); +PhotoFileSniffer* photo_file_format_driver_create_sniffer (PhotoFileFormatDriver* self, + GFile* file, + PhotoFileSnifferOptions options); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -370,68 +428,94 @@ PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self); PhotoMetadata* photo_file_format_driver_create_metadata (PhotoFileFormatDriver* self); gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self); gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProperties* self); -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_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_add47 (gchar** * array, int* length, int* size, gchar* value); -enum { - PHOTO_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; +static void _vala_array_add47 (gchar** * array, + int* length, + int* size, + gchar* value); static PhotoFileFormatProperties* photo_file_format_driver_real_get_properties (PhotoFileFormatDriver* self); -static PhotoFileReader* photo_file_format_driver_real_create_reader (PhotoFileFormatDriver* self, const gchar* filepath); +static PhotoFileReader* photo_file_format_driver_real_create_reader (PhotoFileFormatDriver* self, + const gchar* filepath); static PhotoMetadata* photo_file_format_driver_real_create_metadata (PhotoFileFormatDriver* self); static gboolean photo_file_format_driver_real_can_write_image (PhotoFileFormatDriver* self); static gboolean photo_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* self); -static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFormatDriver* self, const gchar* filepath); -static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath); -static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFormatDriver* self, + const gchar* filepath); +static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, + const gchar* filepath); +static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, + GFile* file, + PhotoFileSnifferOptions options); PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_flags_get_type (void) G_GNUC_CONST; -enum { - PHOTO_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; PhotoFileFormat photo_file_format_properties_get_file_format (PhotoFileFormatProperties* self); static PhotoFileFormat photo_file_format_properties_real_get_file_format (PhotoFileFormatProperties* self); PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProperties* self); static PhotoFileFormatFlags photo_file_format_properties_real_get_flags (PhotoFileFormatProperties* self); -static gboolean photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext); -gboolean is_in_ci_array (const gchar* str, gchar** strings, int strings_length1); -gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1); +static gboolean photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext); +gboolean is_in_ci_array (const gchar* str, + gchar** strings, + int strings_length1); +gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, + int* result_length1); static gchar* photo_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* self); -static gchar** photo_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1); +static gchar** photo_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* self, + int* result_length1); static gchar* photo_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* self); -static gchar** photo_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* self, int* result_length1); +static gchar** photo_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* self, + int* result_length1); gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProperties* self); static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* self); -GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, GFile* file); +GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, + GFile* file); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void photo_file_format_properties_finalize (PhotoFileFormatProperties * obj); -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); -GQuark photo_format_error_quark (void) { +GQuark +photo_format_error_quark (void) +{ return g_quark_from_static_string ("photo_format_error-quark"); } -static void _vala_array_add46 (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" *size = (*size) ? (2 * (*size)) : 4; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *array = g_renew (PhotoFileFormat, *array, *size); -#line 427 "PhotoFileFormat.c" +#line 507 "PhotoFileFormat.c" } #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" (*array)[(*length)++] = value; -#line 431 "PhotoFileFormat.c" +#line 511 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, void* test_target, int* result_length1) { +PhotoFileFormat* +photo_file_format_data_find_applicable (PhotoFileFormatDataApplicableTest test, + void* test_target, + int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* applicable = NULL; PhotoFileFormat* _tmp0_; @@ -439,8 +523,8 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl gint _applicable_size_; gint _tmp1_; PhotoFileFormat* _tmp2_; - PhotoFileFormat* _tmp8_; - gint _tmp8__length1; + PhotoFileFormat* _tmp6_; + gint _tmp6__length1; #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = g_new0 (PhotoFileFormat, 0); #line 23 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -451,7 +535,7 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl _applicable_size_ = applicable_length1; #line 24 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_get_supported (&_tmp1_); -#line 455 "PhotoFileFormat.c" +#line 539 "PhotoFileFormat.c" { PhotoFileFormat* format_collection = NULL; gint format_collection_length1 = 0; @@ -463,97 +547,92 @@ PhotoFileFormat* photo_file_format_data_find_applicable (PhotoFileFormatDataAppl format_collection_length1 = _tmp1_; #line 24 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" for (format_it = 0; format_it < _tmp1_; format_it = format_it + 1) { -#line 467 "PhotoFileFormat.c" +#line 551 "PhotoFileFormat.c" PhotoFileFormat format = 0; #line 24 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" format = format_collection[format_it]; -#line 471 "PhotoFileFormat.c" +#line 555 "PhotoFileFormat.c" { - PhotoFileFormatDataApplicableTest _tmp3_; - void* _tmp3__target; - PhotoFileFormat _tmp4_; - gboolean _tmp5_; -#line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = test; -#line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3__target = test_target; -#line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = format; + PhotoFileFormat _tmp3_; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = _tmp3_ (_tmp4_, _tmp3__target); + _tmp3_ = format; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp5_) { -#line 487 "PhotoFileFormat.c" - PhotoFileFormat* _tmp6_; - gint _tmp6__length1; - PhotoFileFormat _tmp7_; + if (test (_tmp3_, test_target)) { +#line 562 "PhotoFileFormat.c" + PhotoFileFormat* _tmp4_; + gint _tmp4__length1; + PhotoFileFormat _tmp5_; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = applicable; + _tmp4_ = applicable; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6__length1 = applicable_length1; + _tmp4__length1 = applicable_length1; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = format; + _tmp5_ = format; #line 26 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _vala_array_add46 (&applicable, &applicable_length1, &_applicable_size_, _tmp7_); -#line 499 "PhotoFileFormat.c" + _vala_array_add46 (&applicable, &applicable_length1, &_applicable_size_, _tmp5_); +#line 574 "PhotoFileFormat.c" } } } #line 24 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" format_collection = (g_free (format_collection), NULL); -#line 505 "PhotoFileFormat.c" +#line 580 "PhotoFileFormat.c" } #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8_ = applicable; + _tmp6_ = applicable; #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8__length1 = applicable_length1; + _tmp6__length1 = applicable_length1; #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (result_length1) { #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - *result_length1 = _tmp8__length1; -#line 515 "PhotoFileFormat.c" + *result_length1 = _tmp6__length1; +#line 590 "PhotoFileFormat.c" } #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp8_; + result = _tmp6_; #line 29 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 521 "PhotoFileFormat.c" +#line 596 "PhotoFileFormat.c" } -static gboolean ___lambda4_ (PhotoFileFormat format) { +static gboolean +___lambda4_ (PhotoFileFormat format) +{ gboolean result = FALSE; - PhotoFileFormat _tmp0_; - gboolean _tmp1_; -#line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = format; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_can_write (_tmp0_); -#line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp1_; + result = photo_file_format_can_write (format); #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 537 "PhotoFileFormat.c" +#line 608 "PhotoFileFormat.c" } -static gboolean ____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, gpointer self) { +static gboolean +____lambda4__photo_file_format_data_applicable_test (PhotoFileFormat format, + gpointer self) +{ gboolean result; result = ___lambda4_ (format); #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 546 "PhotoFileFormat.c" +#line 620 "PhotoFileFormat.c" } -static PhotoFileFormat* _vala_array_dup2 (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" +#line 630 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_data_get_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* _tmp0_; gint _tmp0__length1; @@ -569,7 +648,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { _tmp0__length1 = photo_file_format_data_writeable_length1; #line 33 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp0_ == NULL) { -#line 573 "PhotoFileFormat.c" +#line 652 "PhotoFileFormat.c" gint _tmp1_; PhotoFileFormat* _tmp2_; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -582,7 +661,7 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { photo_file_format_data_writeable_length1 = _tmp1_; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_data_writeable_size_ = photo_file_format_data_writeable_length1; -#line 586 "PhotoFileFormat.c" +#line 665 "PhotoFileFormat.c" } #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3_ = photo_file_format_data_writeable; @@ -600,49 +679,53 @@ PhotoFileFormat* photo_file_format_data_get_writeable (int* result_length1) { if (result_length1) { #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp5__length1; -#line 604 "PhotoFileFormat.c" +#line 683 "PhotoFileFormat.c" } #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp5_; #line 36 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 610 "PhotoFileFormat.c" +#line 689 "PhotoFileFormat.c" } -static gboolean ___lambda26_ (PhotoFileFormat format) { +static gboolean +___lambda26_ (PhotoFileFormat format) +{ gboolean result = FALSE; - PhotoFileFormat _tmp0_; - gboolean _tmp1_; -#line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = format; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_can_write_image (_tmp0_); -#line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp1_; + result = photo_file_format_can_write_image (format); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 626 "PhotoFileFormat.c" +#line 701 "PhotoFileFormat.c" } -static gboolean ____lambda26__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 = ___lambda26_ (format); #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 635 "PhotoFileFormat.c" +#line 713 "PhotoFileFormat.c" } -static PhotoFileFormat* _vala_array_dup3 (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" +#line 723 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_data_get_image_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* _tmp0_; gint _tmp0__length1; @@ -658,7 +741,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 _tmp0__length1 = photo_file_format_data_image_writeable_length1; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp0_ == NULL) { -#line 662 "PhotoFileFormat.c" +#line 745 "PhotoFileFormat.c" gint _tmp1_; PhotoFileFormat* _tmp2_; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -671,7 +754,7 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 photo_file_format_data_image_writeable_length1 = _tmp1_; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_data_image_writeable_size_ = photo_file_format_data_image_writeable_length1; -#line 675 "PhotoFileFormat.c" +#line 758 "PhotoFileFormat.c" } #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3_ = photo_file_format_data_image_writeable; @@ -689,49 +772,53 @@ PhotoFileFormat* photo_file_format_data_get_image_writeable (int* result_length1 if (result_length1) { #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp5__length1; -#line 693 "PhotoFileFormat.c" +#line 776 "PhotoFileFormat.c" } #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp5_; #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 699 "PhotoFileFormat.c" +#line 782 "PhotoFileFormat.c" } -static gboolean ___lambda27_ (PhotoFileFormat format) { +static gboolean +___lambda27_ (PhotoFileFormat format) +{ gboolean result = FALSE; - PhotoFileFormat _tmp0_; - gboolean _tmp1_; -#line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = format; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_can_write_metadata (_tmp0_); -#line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp1_; + result = photo_file_format_can_write_metadata (format); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 715 "PhotoFileFormat.c" +#line 794 "PhotoFileFormat.c" } -static gboolean ____lambda27__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 = ___lambda27_ (format); #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 724 "PhotoFileFormat.c" +#line 806 "PhotoFileFormat.c" } -static PhotoFileFormat* _vala_array_dup4 (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" +#line 816 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_data_get_metadata_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* _tmp0_; gint _tmp0__length1; @@ -747,7 +834,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng _tmp0__length1 = photo_file_format_data_metadata_writeable_length1; #line 47 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_tmp0_ == NULL) { -#line 751 "PhotoFileFormat.c" +#line 838 "PhotoFileFormat.c" gint _tmp1_; PhotoFileFormat* _tmp2_; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -760,7 +847,7 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng photo_file_format_data_metadata_writeable_length1 = _tmp1_; #line 48 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_data_metadata_writeable_size_ = photo_file_format_data_metadata_writeable_length1; -#line 764 "PhotoFileFormat.c" +#line 851 "PhotoFileFormat.c" } #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp3_ = photo_file_format_data_metadata_writeable; @@ -778,17 +865,19 @@ PhotoFileFormat* photo_file_format_data_get_metadata_writeable (int* result_leng if (result_length1) { #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp5__length1; -#line 782 "PhotoFileFormat.c" +#line 869 "PhotoFileFormat.c" } #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp5_; #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 788 "PhotoFileFormat.c" +#line 875 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_get_supported (int* result_length1) { +PhotoFileFormat* +photo_file_format_get_supported (int* result_length1) +{ PhotoFileFormat* result = NULL; PhotoFileFormat* _tmp0_; PhotoFileFormat* _tmp1_; @@ -813,17 +902,19 @@ PhotoFileFormat* photo_file_format_get_supported (int* result_length1) { if (result_length1) { #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp1__length1; -#line 817 "PhotoFileFormat.c" +#line 906 "PhotoFileFormat.c" } #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp1_; #line 65 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 823 "PhotoFileFormat.c" +#line 912 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_get_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; gint _tmp0_; PhotoFileFormat* _tmp1_; @@ -839,17 +930,19 @@ PhotoFileFormat* photo_file_format_get_writeable (int* result_length1) { if (result_length1) { #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp2__length1; -#line 843 "PhotoFileFormat.c" +#line 934 "PhotoFileFormat.c" } #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp2_; #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 849 "PhotoFileFormat.c" +#line 940 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_get_image_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; gint _tmp0_; PhotoFileFormat* _tmp1_; @@ -865,17 +958,19 @@ PhotoFileFormat* photo_file_format_get_image_writeable (int* result_length1) { if (result_length1) { #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp2__length1; -#line 869 "PhotoFileFormat.c" +#line 962 "PhotoFileFormat.c" } #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp2_; #line 73 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 875 "PhotoFileFormat.c" +#line 968 "PhotoFileFormat.c" } -PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1) { +PhotoFileFormat* +photo_file_format_get_metadata_writeable (int* result_length1) +{ PhotoFileFormat* result = NULL; gint _tmp0_; PhotoFileFormat* _tmp1_; @@ -891,47 +986,43 @@ PhotoFileFormat* photo_file_format_get_metadata_writeable (int* result_length1) if (result_length1) { #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp2__length1; -#line 895 "PhotoFileFormat.c" +#line 990 "PhotoFileFormat.c" } #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp2_; #line 77 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 901 "PhotoFileFormat.c" +#line 996 "PhotoFileFormat.c" } -PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basename) { +PhotoFileFormat +photo_file_format_get_by_basename_extension (const gchar* basename) +{ PhotoFileFormat result = 0; gchar* name = NULL; gchar* ext = NULL; - const gchar* _tmp0_; + gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_; - gboolean _tmp4_; - gint _tmp5_; - PhotoFileFormat* _tmp6_; + const gchar* _tmp2_; + gint _tmp3_; + PhotoFileFormat* _tmp4_; #line 80 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (basename != NULL, 0); #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = basename; -#line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_); + disassemble_filename (basename, &_tmp0_, &_tmp1_); #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - name = _tmp1_; + name = _tmp0_; #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 82 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ext = _tmp2_; + ext = _tmp1_; #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = ext; + _tmp2_ = ext; #line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = is_string_empty (_tmp3_); -#line 84 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp4_) { + if (is_string_empty (_tmp2_)) { #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_UNKNOWN; #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -940,58 +1031,55 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena _g_free0 (name); #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 944 "PhotoFileFormat.c" +#line 1035 "PhotoFileFormat.c" } #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = photo_file_format_get_supported (&_tmp5_); -#line 948 "PhotoFileFormat.c" + _tmp4_ = photo_file_format_get_supported (&_tmp3_); +#line 1039 "PhotoFileFormat.c" { PhotoFileFormat* file_format_collection = NULL; gint file_format_collection_length1 = 0; gint _file_format_collection_size_ = 0; gint file_format_it = 0; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - file_format_collection = _tmp6_; + file_format_collection = _tmp4_; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - file_format_collection_length1 = _tmp5_; + file_format_collection_length1 = _tmp3_; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - for (file_format_it = 0; file_format_it < _tmp5_; file_format_it = file_format_it + 1) { -#line 960 "PhotoFileFormat.c" + for (file_format_it = 0; file_format_it < _tmp3_; file_format_it = file_format_it + 1) { +#line 1051 "PhotoFileFormat.c" PhotoFileFormat file_format = 0; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" file_format = file_format_collection[file_format_it]; -#line 964 "PhotoFileFormat.c" +#line 1055 "PhotoFileFormat.c" { - PhotoFileFormat _tmp7_; - PhotoFileFormatDriver* _tmp8_; - PhotoFileFormatDriver* _tmp9_; - PhotoFileFormatProperties* _tmp10_; - PhotoFileFormatProperties* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; + PhotoFileFormat _tmp5_; + PhotoFileFormatDriver* _tmp6_; + PhotoFileFormatDriver* _tmp7_; + PhotoFileFormatProperties* _tmp8_; + PhotoFileFormatProperties* _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = file_format; + _tmp5_ = file_format; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8_ = photo_file_format_get_driver (_tmp7_); -#line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_file_format_get_driver (_tmp5_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp10_ = photo_file_format_driver_get_properties (_tmp9_); + _tmp7_ = _tmp6_; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp11_ = _tmp10_; + _tmp8_ = photo_file_format_driver_get_properties (_tmp7_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp12_ = ext; + _tmp9_ = _tmp8_; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp13_ = photo_file_format_properties_is_recognized_extension (_tmp11_, _tmp12_); + _tmp10_ = ext; #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp14_ = _tmp13_; + _tmp11_ = photo_file_format_properties_is_recognized_extension (_tmp9_, _tmp10_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_properties_unref0 (_tmp11_); + _photo_file_format_properties_unref0 (_tmp9_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_driver_unref0 (_tmp9_); + _photo_file_format_driver_unref0 (_tmp7_); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp14_) { + if (_tmp11_) { #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = file_format; #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1002,13 +1090,13 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena _g_free0 (name); #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1006 "PhotoFileFormat.c" +#line 1094 "PhotoFileFormat.c" } } } #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" file_format_collection = (g_free (file_format_collection), NULL); -#line 1012 "PhotoFileFormat.c" +#line 1100 "PhotoFileFormat.c" } #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_UNKNOWN; @@ -1018,70 +1106,62 @@ PhotoFileFormat photo_file_format_get_by_basename_extension (const gchar* basena _g_free0 (name); #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1022 "PhotoFileFormat.c" +#line 1110 "PhotoFileFormat.c" } -gboolean photo_file_format_is_file_supported (GFile* file) { +gboolean +photo_file_format_is_file_supported (GFile* file) +{ gboolean result = FALSE; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - gboolean _tmp3_; - gboolean _tmp4_; + gboolean _tmp2_; #line 95 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = file; -#line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = g_file_get_basename (_tmp0_); -#line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = _tmp1_; + _tmp0_ = g_file_get_basename (file); #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_is_basename_supported (_tmp2_); + _tmp1_ = _tmp0_; #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp2_ = photo_file_format_is_basename_supported (_tmp1_); #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp4_; + result = _tmp2_; #line 96 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1051 "PhotoFileFormat.c" +#line 1135 "PhotoFileFormat.c" } -gboolean photo_file_format_is_basename_supported (const gchar* basename) { +gboolean +photo_file_format_is_basename_supported (const gchar* basename) +{ gboolean result = FALSE; gchar* name = NULL; gchar* ext = NULL; - const gchar* _tmp0_; + gchar* _tmp0_ = NULL; gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - const gchar* _tmp3_; - gboolean _tmp4_; - gint _tmp5_; - PhotoFileFormat* _tmp6_; + const gchar* _tmp2_; + gint _tmp3_; + PhotoFileFormat* _tmp4_; #line 99 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (basename != NULL, FALSE); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = basename; -#line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - disassemble_filename (_tmp0_, &_tmp1_, &_tmp2_); + disassemble_filename (basename, &_tmp0_, &_tmp1_); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - name = _tmp1_; + name = _tmp0_; #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ext = _tmp2_; -#line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = ext; + ext = _tmp1_; #line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = is_string_empty (_tmp3_); + _tmp2_ = ext; #line 103 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp4_) { + if (is_string_empty (_tmp2_)) { #line 104 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = FALSE; #line 104 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1090,58 +1170,55 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) { _g_free0 (name); #line 104 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1094 "PhotoFileFormat.c" +#line 1174 "PhotoFileFormat.c" } #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = photo_file_format_get_supported (&_tmp5_); -#line 1098 "PhotoFileFormat.c" + _tmp4_ = photo_file_format_get_supported (&_tmp3_); +#line 1178 "PhotoFileFormat.c" { PhotoFileFormat* format_collection = NULL; gint format_collection_length1 = 0; gint _format_collection_size_ = 0; gint format_it = 0; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - format_collection = _tmp6_; + format_collection = _tmp4_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - format_collection_length1 = _tmp5_; + format_collection_length1 = _tmp3_; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - for (format_it = 0; format_it < _tmp5_; format_it = format_it + 1) { -#line 1110 "PhotoFileFormat.c" + for (format_it = 0; format_it < _tmp3_; format_it = format_it + 1) { +#line 1190 "PhotoFileFormat.c" PhotoFileFormat format = 0; #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" format = format_collection[format_it]; -#line 1114 "PhotoFileFormat.c" +#line 1194 "PhotoFileFormat.c" { - PhotoFileFormat _tmp7_; - PhotoFileFormatDriver* _tmp8_; - PhotoFileFormatDriver* _tmp9_; - PhotoFileFormatProperties* _tmp10_; - PhotoFileFormatProperties* _tmp11_; - const gchar* _tmp12_; - gboolean _tmp13_; - gboolean _tmp14_; -#line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = format; + PhotoFileFormat _tmp5_; + PhotoFileFormatDriver* _tmp6_; + PhotoFileFormatDriver* _tmp7_; + PhotoFileFormatProperties* _tmp8_; + PhotoFileFormatProperties* _tmp9_; + const gchar* _tmp10_; + gboolean _tmp11_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8_ = photo_file_format_get_driver (_tmp7_); + _tmp5_ = format; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp9_ = _tmp8_; + _tmp6_ = photo_file_format_get_driver (_tmp5_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp10_ = photo_file_format_driver_get_properties (_tmp9_); + _tmp7_ = _tmp6_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp11_ = _tmp10_; + _tmp8_ = photo_file_format_driver_get_properties (_tmp7_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp12_ = ext; + _tmp9_ = _tmp8_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp13_ = photo_file_format_properties_is_recognized_extension (_tmp11_, _tmp12_); + _tmp10_ = ext; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp14_ = _tmp13_; + _tmp11_ = photo_file_format_properties_is_recognized_extension (_tmp9_, _tmp10_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_properties_unref0 (_tmp11_); + _photo_file_format_properties_unref0 (_tmp9_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_driver_unref0 (_tmp9_); + _photo_file_format_driver_unref0 (_tmp7_); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp14_) { + if (_tmp11_) { #line 108 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = TRUE; #line 108 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1152,13 +1229,13 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) { _g_free0 (name); #line 108 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1156 "PhotoFileFormat.c" +#line 1233 "PhotoFileFormat.c" } } } #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" format_collection = (g_free (format_collection), NULL); -#line 1162 "PhotoFileFormat.c" +#line 1239 "PhotoFileFormat.c" } #line 111 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = FALSE; @@ -1168,174 +1245,173 @@ gboolean photo_file_format_is_basename_supported (const gchar* basename) { _g_free0 (name); #line 111 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1172 "PhotoFileFormat.c" +#line 1249 "PhotoFileFormat.c" } -PhotoFileFormat photo_file_format_get_system_default_format (void) { +PhotoFileFormat +photo_file_format_get_system_default_format (void) +{ PhotoFileFormat result = 0; #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_JFIF; #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1182 "PhotoFileFormat.c" +#line 1261 "PhotoFileFormat.c" } -PhotoFileFormat photo_file_format_get_by_file_extension (GFile* file) { +PhotoFileFormat +photo_file_format_get_by_file_extension (GFile* file) +{ PhotoFileFormat result = 0; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; - PhotoFileFormat _tmp3_; - PhotoFileFormat _tmp4_; + PhotoFileFormat _tmp2_; #line 119 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), 0); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = file; -#line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = g_file_get_basename (_tmp0_); + _tmp0_ = g_file_get_basename (file); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = _tmp1_; -#line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_get_by_basename_extension (_tmp2_); + _tmp1_ = _tmp0_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp2_ = photo_file_format_get_by_basename_extension (_tmp1_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp4_; + result = _tmp2_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1211 "PhotoFileFormat.c" +#line 1286 "PhotoFileFormat.c" } -gint photo_file_format_serialize (PhotoFileFormat self) { +gint +photo_file_format_serialize (PhotoFileFormat self) +{ gint result = 0; #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (self) { #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_JFIF: -#line 1221 "PhotoFileFormat.c" +#line 1298 "PhotoFileFormat.c" { #line 127 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 0; #line 127 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1227 "PhotoFileFormat.c" +#line 1304 "PhotoFileFormat.c" } #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_RAW: -#line 1231 "PhotoFileFormat.c" +#line 1308 "PhotoFileFormat.c" { #line 130 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 1; #line 130 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1237 "PhotoFileFormat.c" +#line 1314 "PhotoFileFormat.c" } #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_PNG: -#line 1241 "PhotoFileFormat.c" +#line 1318 "PhotoFileFormat.c" { #line 133 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 2; #line 133 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1247 "PhotoFileFormat.c" +#line 1324 "PhotoFileFormat.c" } #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_TIFF: -#line 1251 "PhotoFileFormat.c" +#line 1328 "PhotoFileFormat.c" { #line 136 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 3; #line 136 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1257 "PhotoFileFormat.c" +#line 1334 "PhotoFileFormat.c" } #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_BMP: -#line 1261 "PhotoFileFormat.c" +#line 1338 "PhotoFileFormat.c" { #line 139 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = 4; #line 139 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1267 "PhotoFileFormat.c" +#line 1344 "PhotoFileFormat.c" } default: #line 125 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_UNKNOWN: -#line 1272 "PhotoFileFormat.c" +#line 1349 "PhotoFileFormat.c" { #line 143 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = -1; #line 143 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1278 "PhotoFileFormat.c" +#line 1355 "PhotoFileFormat.c" } } } -PhotoFileFormat photo_file_format_unserialize (gint value) { +PhotoFileFormat +photo_file_format_unserialize (gint value) +{ PhotoFileFormat result = 0; - gint _tmp0_; #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = value; -#line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - switch (_tmp0_) { + switch (value) { #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 0: -#line 1293 "PhotoFileFormat.c" +#line 1369 "PhotoFileFormat.c" { #line 151 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_JFIF; #line 151 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1299 "PhotoFileFormat.c" +#line 1375 "PhotoFileFormat.c" } #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 1: -#line 1303 "PhotoFileFormat.c" +#line 1379 "PhotoFileFormat.c" { #line 154 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_RAW; #line 154 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1309 "PhotoFileFormat.c" +#line 1385 "PhotoFileFormat.c" } #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 2: -#line 1313 "PhotoFileFormat.c" +#line 1389 "PhotoFileFormat.c" { #line 157 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_PNG; #line 157 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1319 "PhotoFileFormat.c" +#line 1395 "PhotoFileFormat.c" } #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 3: -#line 1323 "PhotoFileFormat.c" +#line 1399 "PhotoFileFormat.c" { #line 160 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_TIFF; #line 160 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1329 "PhotoFileFormat.c" +#line 1405 "PhotoFileFormat.c" } #line 149 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case 4: -#line 1333 "PhotoFileFormat.c" +#line 1409 "PhotoFileFormat.c" { #line 163 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_BMP; #line 163 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1339 "PhotoFileFormat.c" +#line 1415 "PhotoFileFormat.c" } default: { @@ -1343,251 +1419,251 @@ PhotoFileFormat photo_file_format_unserialize (gint value) { result = PHOTO_FILE_FORMAT_UNKNOWN; #line 166 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1347 "PhotoFileFormat.c" +#line 1423 "PhotoFileFormat.c" } } } -PhotoFileFormat photo_file_format_from_gphoto_type (const gchar* type) { +PhotoFileFormat +photo_file_format_from_gphoto_type (const gchar* type) +{ PhotoFileFormat result = 0; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; + GQuark _tmp2_ = 0U; #line 170 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (type != NULL, 0); #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = type; #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = _tmp0_; -#line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp3_ == g_quark_from_string (GP_MIME_JPEG)) { + if (_tmp2_ == g_quark_from_string (GP_MIME_JPEG)) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1370 "PhotoFileFormat.c" +#line 1445 "PhotoFileFormat.c" default: { #line 173 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_JFIF; #line 173 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1377 "PhotoFileFormat.c" +#line 1452 "PhotoFileFormat.c" } } - } else if ((_tmp3_ == g_quark_from_string (GP_MIME_RAW)) || (_tmp3_ == g_quark_from_string (GP_MIME_CRW))) { + } else if ((_tmp2_ == g_quark_from_string (GP_MIME_RAW)) || (_tmp2_ == g_quark_from_string (GP_MIME_CRW))) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1383 "PhotoFileFormat.c" +#line 1458 "PhotoFileFormat.c" default: { #line 177 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_RAW; #line 177 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1390 "PhotoFileFormat.c" +#line 1465 "PhotoFileFormat.c" } } - } else if (_tmp3_ == g_quark_from_string (GP_MIME_PNG)) { + } else if (_tmp2_ == g_quark_from_string (GP_MIME_PNG)) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1396 "PhotoFileFormat.c" +#line 1471 "PhotoFileFormat.c" default: { #line 180 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_PNG; #line 180 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1403 "PhotoFileFormat.c" +#line 1478 "PhotoFileFormat.c" } } - } else if (_tmp3_ == g_quark_from_string (GP_MIME_TIFF)) { + } else if (_tmp2_ == g_quark_from_string (GP_MIME_TIFF)) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1409 "PhotoFileFormat.c" +#line 1484 "PhotoFileFormat.c" default: { #line 183 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_TIFF; #line 183 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1416 "PhotoFileFormat.c" +#line 1491 "PhotoFileFormat.c" } } - } else if (_tmp3_ == g_quark_from_string (GP_MIME_BMP)) { + } else if (_tmp2_ == g_quark_from_string (GP_MIME_BMP)) { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1422 "PhotoFileFormat.c" +#line 1497 "PhotoFileFormat.c" default: { #line 186 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_BMP; #line 186 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1429 "PhotoFileFormat.c" +#line 1504 "PhotoFileFormat.c" } } } else { #line 171 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1435 "PhotoFileFormat.c" +#line 1510 "PhotoFileFormat.c" default: { #line 190 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_UNKNOWN; #line 190 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1442 "PhotoFileFormat.c" +#line 1517 "PhotoFileFormat.c" } } } } -PhotoFileFormat photo_file_format_from_pixbuf_name (const gchar* name) { +PhotoFileFormat +photo_file_format_from_pixbuf_name (const gchar* name) +{ PhotoFileFormat result = 0; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; + GQuark _tmp2_ = 0U; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - static GQuark _tmp2_label0 = 0; + static GQuark _tmp1_label0 = 0; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - static GQuark _tmp2_label1 = 0; + static GQuark _tmp1_label1 = 0; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - static GQuark _tmp2_label2 = 0; + static GQuark _tmp1_label2 = 0; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - static GQuark _tmp2_label3 = 0; + static GQuark _tmp1_label3 = 0; #line 195 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (name != NULL, 0); #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = name; #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = _tmp0_; -#line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("jpeg")))) { + if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("jpeg")))) { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1474 "PhotoFileFormat.c" +#line 1548 "PhotoFileFormat.c" default: { #line 198 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_JFIF; #line 198 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1481 "PhotoFileFormat.c" +#line 1555 "PhotoFileFormat.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("png")))) { + } else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("png")))) { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1487 "PhotoFileFormat.c" +#line 1561 "PhotoFileFormat.c" default: { #line 201 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_PNG; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1494 "PhotoFileFormat.c" +#line 1568 "PhotoFileFormat.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("tiff")))) { + } else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("tiff")))) { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1500 "PhotoFileFormat.c" +#line 1574 "PhotoFileFormat.c" default: { #line 204 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_TIFF; #line 204 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1507 "PhotoFileFormat.c" +#line 1581 "PhotoFileFormat.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label3) ? _tmp2_label3 : (_tmp2_label3 = g_quark_from_static_string ("bmp")))) { + } else if (_tmp2_ == ((0 != _tmp1_label3) ? _tmp1_label3 : (_tmp1_label3 = g_quark_from_static_string ("bmp")))) { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1513 "PhotoFileFormat.c" +#line 1587 "PhotoFileFormat.c" default: { #line 207 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_BMP; #line 207 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1520 "PhotoFileFormat.c" +#line 1594 "PhotoFileFormat.c" } } } else { #line 196 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (0) { -#line 1526 "PhotoFileFormat.c" +#line 1600 "PhotoFileFormat.c" default: { #line 210 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = PHOTO_FILE_FORMAT_UNKNOWN; #line 210 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1533 "PhotoFileFormat.c" +#line 1607 "PhotoFileFormat.c" } } } } -void photo_file_format_init (PhotoFileFormat self) { +void +photo_file_format_init (PhotoFileFormat self) +{ #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (self) { #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_JFIF: -#line 1545 "PhotoFileFormat.c" +#line 1621 "PhotoFileFormat.c" { #line 217 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" jfif_file_format_driver_init (); #line 218 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1551 "PhotoFileFormat.c" +#line 1627 "PhotoFileFormat.c" } #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_RAW: -#line 1555 "PhotoFileFormat.c" +#line 1631 "PhotoFileFormat.c" { #line 221 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" raw_file_format_driver_init (); #line 222 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1561 "PhotoFileFormat.c" +#line 1637 "PhotoFileFormat.c" } #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_PNG: -#line 1565 "PhotoFileFormat.c" +#line 1641 "PhotoFileFormat.c" { #line 225 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" png_file_format_driver_init (); #line 226 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1571 "PhotoFileFormat.c" +#line 1647 "PhotoFileFormat.c" } #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_TIFF: -#line 1575 "PhotoFileFormat.c" +#line 1651 "PhotoFileFormat.c" { #line 229 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photos_tiff_file_format_driver_init (); #line 230 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1581 "PhotoFileFormat.c" +#line 1657 "PhotoFileFormat.c" } #line 215 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_BMP: -#line 1585 "PhotoFileFormat.c" +#line 1661 "PhotoFileFormat.c" { #line 233 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photos_bmp_file_format_driver_init (); #line 234 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" break; -#line 1591 "PhotoFileFormat.c" +#line 1667 "PhotoFileFormat.c" } default: { @@ -1596,19 +1672,21 @@ void photo_file_format_init (PhotoFileFormat self) { _tmp0_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 237 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_error ("PhotoFileFormat.vala:237: Unsupported file format %s", (_tmp0_ != NULL) ? _tmp0_->value_name : NULL); -#line 1600 "PhotoFileFormat.c" +#line 1676 "PhotoFileFormat.c" } } } -static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self) { +static PhotoFileFormatDriver* +photo_file_format_get_driver (PhotoFileFormat self) +{ PhotoFileFormatDriver* result = NULL; #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" switch (self) { #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_JFIF: -#line 1612 "PhotoFileFormat.c" +#line 1690 "PhotoFileFormat.c" { JfifFileFormatDriver* _tmp0_; #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1617,11 +1695,11 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 244 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1621 "PhotoFileFormat.c" +#line 1699 "PhotoFileFormat.c" } #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_RAW: -#line 1625 "PhotoFileFormat.c" +#line 1703 "PhotoFileFormat.c" { RawFileFormatDriver* _tmp1_; #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1630,11 +1708,11 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 247 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1634 "PhotoFileFormat.c" +#line 1712 "PhotoFileFormat.c" } #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_PNG: -#line 1638 "PhotoFileFormat.c" +#line 1716 "PhotoFileFormat.c" { PngFileFormatDriver* _tmp2_; #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1643,11 +1721,11 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 250 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1647 "PhotoFileFormat.c" +#line 1725 "PhotoFileFormat.c" } #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_TIFF: -#line 1651 "PhotoFileFormat.c" +#line 1729 "PhotoFileFormat.c" { PhotosTiffFileFormatDriver* _tmp3_; #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1656,11 +1734,11 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 253 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1660 "PhotoFileFormat.c" +#line 1738 "PhotoFileFormat.c" } #line 242 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" case PHOTO_FILE_FORMAT_BMP: -#line 1664 "PhotoFileFormat.c" +#line 1742 "PhotoFileFormat.c" { PhotosBmpFileFormatDriver* _tmp4_; #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1669,7 +1747,7 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self result = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 256 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1673 "PhotoFileFormat.c" +#line 1751 "PhotoFileFormat.c" } default: { @@ -1678,13 +1756,15 @@ static PhotoFileFormatDriver* photo_file_format_get_driver (PhotoFileFormat self _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 259 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_error ("PhotoFileFormat.vala:259: Unsupported file format %s", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); -#line 1682 "PhotoFileFormat.c" +#line 1760 "PhotoFileFormat.c" } } } -PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat self) { +PhotoFileFormatProperties* +photo_file_format_get_properties (PhotoFileFormat self) +{ PhotoFileFormatProperties* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; @@ -1704,54 +1784,56 @@ PhotoFileFormatProperties* photo_file_format_get_properties (PhotoFileFormat sel result = _tmp3_; #line 264 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1708 "PhotoFileFormat.c" +#line 1788 "PhotoFileFormat.c" } -gchar* photo_file_format_get_default_basename (PhotoFileFormat self, const gchar* name) { +gchar* +photo_file_format_get_default_basename (PhotoFileFormat self, + const gchar* name) +{ gchar* result = NULL; - const gchar* _tmp0_; + PhotoFileFormatProperties* _tmp0_; PhotoFileFormatProperties* _tmp1_; - PhotoFileFormatProperties* _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; gchar* _tmp5_; - gchar* _tmp6_; #line 268 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (name != NULL, NULL); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = name; -#line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_get_properties (self); + _tmp0_ = photo_file_format_get_properties (self); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_properties_get_default_extension (_tmp2_); + _tmp2_ = photo_file_format_properties_get_default_extension (_tmp1_); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = g_strdup_printf ("%s.%s", _tmp0_, _tmp4_); + _tmp4_ = g_strdup_printf ("%s.%s", name, _tmp3_); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = _tmp5_; + _tmp5_ = _tmp4_; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _photo_file_format_properties_unref0 (_tmp2_); + _photo_file_format_properties_unref0 (_tmp1_); #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp6_; + result = _tmp5_; #line 269 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1745 "PhotoFileFormat.c" +#line 1825 "PhotoFileFormat.c" } -PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gchar* filepath) { +PhotoFileReader* +photo_file_format_create_reader (PhotoFileFormat self, + const gchar* filepath) +{ PhotoFileReader* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; - const gchar* _tmp2_; + PhotoFileReader* _tmp2_; PhotoFileReader* _tmp3_; - PhotoFileReader* _tmp4_; #line 272 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1759,106 +1841,100 @@ PhotoFileReader* photo_file_format_create_reader (PhotoFileFormat self, const gc #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = filepath; -#line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_driver_create_reader (_tmp1_, _tmp2_); + _tmp2_ = photo_file_format_driver_create_reader (_tmp1_, filepath); #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp4_; + result = _tmp3_; #line 273 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1774 "PhotoFileFormat.c" +#line 1854 "PhotoFileFormat.c" } -gboolean photo_file_format_can_write (PhotoFileFormat self) { +gboolean +photo_file_format_can_write (PhotoFileFormat self) +{ gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gboolean _tmp1_; -#line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = photo_file_format_can_write_image (self); #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp1_) { -#line 1786 "PhotoFileFormat.c" - gboolean _tmp2_; + if (photo_file_format_can_write_image (self)) { #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_can_write_metadata (self); -#line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = _tmp2_; -#line 1792 "PhotoFileFormat.c" + _tmp0_ = photo_file_format_can_write_metadata (self); +#line 1867 "PhotoFileFormat.c" } else { #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = FALSE; -#line 1796 "PhotoFileFormat.c" +#line 1871 "PhotoFileFormat.c" } #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp0_; #line 278 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1802 "PhotoFileFormat.c" +#line 1877 "PhotoFileFormat.c" } -gboolean photo_file_format_can_write_image (PhotoFileFormat self) { +gboolean +photo_file_format_can_write_image (PhotoFileFormat self) +{ gboolean result = FALSE; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_driver_can_write_image (_tmp1_); -#line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = _tmp2_; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp3_; + result = _tmp2_; #line 282 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1826 "PhotoFileFormat.c" +#line 1900 "PhotoFileFormat.c" } -gboolean photo_file_format_can_write_metadata (PhotoFileFormat self) { +gboolean +photo_file_format_can_write_metadata (PhotoFileFormat self) +{ gboolean result = FALSE; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; gboolean _tmp2_; - gboolean _tmp3_; #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp0_ = photo_file_format_get_driver (self); #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_driver_can_write_metadata (_tmp1_); -#line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp3_; + result = _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1850 "PhotoFileFormat.c" +#line 1923 "PhotoFileFormat.c" } -PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gchar* filepath, GError** error) { +PhotoFileWriter* +photo_file_format_create_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error) +{ PhotoFileWriter* result = NULL; PhotoFileWriter* writer = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; - const gchar* _tmp2_; + PhotoFileWriter* _tmp2_; PhotoFileWriter* _tmp3_; PhotoFileWriter* _tmp4_; - PhotoFileWriter* _tmp5_; GError * _inner_error_ = NULL; #line 289 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (filepath != NULL, NULL); @@ -1867,28 +1943,26 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = filepath; -#line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_driver_create_writer (_tmp1_, _tmp2_); + _tmp2_ = photo_file_format_driver_create_writer (_tmp1_, filepath); #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 290 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - writer = _tmp4_; + writer = _tmp3_; #line 291 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = writer; + _tmp4_ = writer; #line 291 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp5_ == NULL) { -#line 1884 "PhotoFileFormat.c" - GEnumValue* _tmp6_; - GError* _tmp7_; + if (_tmp4_ == NULL) { +#line 1958 "PhotoFileFormat.c" + GEnumValue* _tmp5_; + GError* _tmp6_; #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); + _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = g_error_new (PHOTO_FORMAT_ERROR, PHOTO_FORMAT_ERROR_READ_ONLY, "File format %s is read-only", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL); + _tmp6_ = g_error_new (PHOTO_FORMAT_ERROR, PHOTO_FORMAT_ERROR_READ_ONLY, "File format %s is read-only", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _inner_error_ = _tmp7_; + _inner_error_ = _tmp6_; #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_inner_error_->domain == PHOTO_FORMAT_ERROR) { #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1897,7 +1971,7 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc _photo_file_adapter_unref0 (writer); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 1901 "PhotoFileFormat.c" +#line 1975 "PhotoFileFormat.c" } else { #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_adapter_unref0 (writer); @@ -1907,26 +1981,29 @@ PhotoFileWriter* photo_file_format_create_writer (PhotoFileFormat self, const gc g_clear_error (&_inner_error_); #line 292 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 1911 "PhotoFileFormat.c" +#line 1985 "PhotoFileFormat.c" } } #line 294 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = writer; #line 294 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1918 "PhotoFileFormat.c" +#line 1992 "PhotoFileFormat.c" } -PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileFormat self, const gchar* filepath, GError** error) { +PhotoFileMetadataWriter* +photo_file_format_create_metadata_writer (PhotoFileFormat self, + const gchar* filepath, + GError** error) +{ PhotoFileMetadataWriter* result = NULL; PhotoFileMetadataWriter* writer = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; - const gchar* _tmp2_; + PhotoFileMetadataWriter* _tmp2_; PhotoFileMetadataWriter* _tmp3_; PhotoFileMetadataWriter* _tmp4_; - PhotoFileMetadataWriter* _tmp5_; GError * _inner_error_ = NULL; #line 297 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (filepath != NULL, NULL); @@ -1935,28 +2012,26 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = filepath; + _tmp2_ = photo_file_format_driver_create_metadata_writer (_tmp1_, filepath); #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = photo_file_format_driver_create_metadata_writer (_tmp1_, _tmp2_); -#line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 298 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - writer = _tmp4_; + writer = _tmp3_; #line 299 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = writer; + _tmp4_ = writer; #line 299 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp5_ == NULL) { -#line 1952 "PhotoFileFormat.c" - GEnumValue* _tmp6_; - GError* _tmp7_; + if (_tmp4_ == NULL) { +#line 2027 "PhotoFileFormat.c" + GEnumValue* _tmp5_; + GError* _tmp6_; #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); + _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_PHOTO_FILE_FORMAT), self); #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = g_error_new (PHOTO_FORMAT_ERROR, PHOTO_FORMAT_ERROR_READ_ONLY, "File format %s metadata is read-only", (_tmp6_ != NULL) ? _tmp6_->value_name : NULL); + _tmp6_ = g_error_new (PHOTO_FORMAT_ERROR, PHOTO_FORMAT_ERROR_READ_ONLY, "File format %s metadata is read-only", (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _inner_error_ = _tmp7_; + _inner_error_ = _tmp6_; #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (_inner_error_->domain == PHOTO_FORMAT_ERROR) { #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -1965,7 +2040,7 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm _photo_file_adapter_unref0 (writer); #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 1969 "PhotoFileFormat.c" +#line 2044 "PhotoFileFormat.c" } else { #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_adapter_unref0 (writer); @@ -1975,25 +2050,27 @@ PhotoFileMetadataWriter* photo_file_format_create_metadata_writer (PhotoFileForm g_clear_error (&_inner_error_); #line 300 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 1979 "PhotoFileFormat.c" +#line 2054 "PhotoFileFormat.c" } } #line 302 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = writer; #line 302 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 1986 "PhotoFileFormat.c" +#line 2061 "PhotoFileFormat.c" } -PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options) { +PhotoFileSniffer* +photo_file_format_create_sniffer (PhotoFileFormat self, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotoFileSniffer* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; - GFile* _tmp2_; - PhotoFileSnifferOptions _tmp3_; - PhotoFileSniffer* _tmp4_; - PhotoFileSniffer* _tmp5_; + PhotoFileSniffer* _tmp2_; + PhotoFileSniffer* _tmp3_; #line 305 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2001,24 +2078,22 @@ PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp1_ = _tmp0_; #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = file; -#line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = options; + _tmp2_ = photo_file_format_driver_create_sniffer (_tmp1_, file, options); #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = photo_file_format_driver_create_sniffer (_tmp1_, _tmp2_, _tmp3_); -#line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _photo_file_format_driver_unref0 (_tmp1_); #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp5_; + result = _tmp3_; #line 306 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2018 "PhotoFileFormat.c" +#line 2091 "PhotoFileFormat.c" } -PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) { +PhotoMetadata* +photo_file_format_create_metadata (PhotoFileFormat self) +{ PhotoMetadata* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; @@ -2038,11 +2113,13 @@ PhotoMetadata* photo_file_format_create_metadata (PhotoFileFormat self) { result = _tmp3_; #line 310 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2042 "PhotoFileFormat.c" +#line 2117 "PhotoFileFormat.c" } -gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) { +gchar* +photo_file_format_get_default_mime_type (PhotoFileFormat self) +{ gchar* result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; @@ -2070,11 +2147,14 @@ gchar* photo_file_format_get_default_mime_type (PhotoFileFormat self) { result = _tmp5_; #line 314 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2074 "PhotoFileFormat.c" +#line 2151 "PhotoFileFormat.c" } -gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_length1) { +gchar** +photo_file_format_get_mime_types (PhotoFileFormat self, + int* result_length1) +{ gchar** result = NULL; PhotoFileFormatDriver* _tmp0_; PhotoFileFormatDriver* _tmp1_; @@ -2112,34 +2192,41 @@ gchar** photo_file_format_get_mime_types (PhotoFileFormat self, int* result_leng if (result_length1) { #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp7__length1; -#line 2116 "PhotoFileFormat.c" +#line 2196 "PhotoFileFormat.c" } #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp7_; #line 318 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2122 "PhotoFileFormat.c" +#line 2202 "PhotoFileFormat.c" } -static void _vala_array_add47 (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" *size = (*size) ? (2 * (*size)) : 4; #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 2133 "PhotoFileFormat.c" +#line 2218 "PhotoFileFormat.c" } #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" (*array)[(*length)++] = value; #line 326 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" (*array)[*length] = NULL; -#line 2139 "PhotoFileFormat.c" +#line 2224 "PhotoFileFormat.c" } -gchar** photo_file_format_get_editable_mime_types (int* result_length1) { +gchar** +photo_file_format_get_editable_mime_types (int* result_length1) +{ gchar** result = NULL; gchar** mime_types = NULL; gchar** _tmp0_; @@ -2159,7 +2246,7 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { _mime_types_size_ = mime_types_length1; #line 324 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp2_ = photo_file_format_get_supported (&_tmp1_); -#line 2163 "PhotoFileFormat.c" +#line 2250 "PhotoFileFormat.c" { PhotoFileFormat* file_format_collection = NULL; gint file_format_collection_length1 = 0; @@ -2171,11 +2258,11 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { file_format_collection_length1 = _tmp1_; #line 324 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" for (file_format_it = 0; file_format_it < _tmp1_; file_format_it = file_format_it + 1) { -#line 2175 "PhotoFileFormat.c" +#line 2262 "PhotoFileFormat.c" PhotoFileFormat file_format = 0; #line 324 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" file_format = file_format_collection[file_format_it]; -#line 2179 "PhotoFileFormat.c" +#line 2266 "PhotoFileFormat.c" { PhotoFileFormat _tmp3_; gint _tmp4_; @@ -2184,7 +2271,7 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { _tmp3_ = file_format; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp5_ = photo_file_format_get_mime_types (_tmp3_, &_tmp4_); -#line 2188 "PhotoFileFormat.c" +#line 2275 "PhotoFileFormat.c" { gchar** mime_type_collection = NULL; gint mime_type_collection_length1 = 0; @@ -2196,14 +2283,14 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { mime_type_collection_length1 = _tmp4_; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" for (mime_type_it = 0; mime_type_it < _tmp4_; mime_type_it = mime_type_it + 1) { -#line 2200 "PhotoFileFormat.c" +#line 2287 "PhotoFileFormat.c" gchar* _tmp6_; gchar* mime_type = NULL; #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp6_ = g_strdup (mime_type_collection[mime_type_it]); #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" mime_type = _tmp6_; -#line 2207 "PhotoFileFormat.c" +#line 2294 "PhotoFileFormat.c" { gchar** _tmp7_; gint _tmp7__length1; @@ -2221,18 +2308,18 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { _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" +#line 2312 "PhotoFileFormat.c" } } #line 325 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" mime_type_collection = (_vala_array_free (mime_type_collection, mime_type_collection_length1, (GDestroyNotify) g_free), NULL); -#line 2230 "PhotoFileFormat.c" +#line 2317 "PhotoFileFormat.c" } } } #line 324 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" file_format_collection = (g_free (file_format_collection), NULL); -#line 2236 "PhotoFileFormat.c" +#line 2323 "PhotoFileFormat.c" } #line 329 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _tmp10_ = mime_types; @@ -2242,17 +2329,19 @@ gchar** photo_file_format_get_editable_mime_types (int* result_length1) { if (result_length1) { #line 329 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *result_length1 = _tmp10__length1; -#line 2246 "PhotoFileFormat.c" +#line 2333 "PhotoFileFormat.c" } #line 329 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" result = _tmp10_; #line 329 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2252 "PhotoFileFormat.c" +#line 2339 "PhotoFileFormat.c" } -GType photo_file_format_get_type (void) { +GType +photo_file_format_get_type (void) +{ static volatile gsize photo_file_format_type_id__volatile = 0; if (g_once_init_enter (&photo_file_format_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_FILE_FORMAT_JFIF, "PHOTO_FILE_FORMAT_JFIF", "jfif"}, {PHOTO_FILE_FORMAT_RAW, "PHOTO_FILE_FORMAT_RAW", "raw"}, {PHOTO_FILE_FORMAT_PNG, "PHOTO_FILE_FORMAT_PNG", "png"}, {PHOTO_FILE_FORMAT_TIFF, "PHOTO_FILE_FORMAT_TIFF", "tiff"}, {PHOTO_FILE_FORMAT_BMP, "PHOTO_FILE_FORMAT_BMP", "bmp"}, {PHOTO_FILE_FORMAT_UNKNOWN, "PHOTO_FILE_FORMAT_UNKNOWN", "unknown"}, {0, NULL, NULL}}; @@ -2264,260 +2353,329 @@ GType photo_file_format_get_type (void) { } -static PhotoFileFormatProperties* photo_file_format_driver_real_get_properties (PhotoFileFormatDriver* self) { +static PhotoFileFormatProperties* +photo_file_format_driver_real_get_properties (PhotoFileFormatDriver* self) +{ #line 345 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_get_properties'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 345 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2273 "PhotoFileFormat.c" +#line 2364 "PhotoFileFormat.c" } -PhotoFileFormatProperties* photo_file_format_driver_get_properties (PhotoFileFormatDriver* self) { +PhotoFileFormatProperties* +photo_file_format_driver_get_properties (PhotoFileFormatDriver* self) +{ #line 345 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 345 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->get_properties (self); -#line 2282 "PhotoFileFormat.c" +#line 2375 "PhotoFileFormat.c" } -static PhotoFileReader* photo_file_format_driver_real_create_reader (PhotoFileFormatDriver* self, const gchar* filepath) { +static PhotoFileReader* +photo_file_format_driver_real_create_reader (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 347 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_reader'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 347 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2291 "PhotoFileFormat.c" +#line 2387 "PhotoFileFormat.c" } -PhotoFileReader* photo_file_format_driver_create_reader (PhotoFileFormatDriver* self, const gchar* filepath) { +PhotoFileReader* +photo_file_format_driver_create_reader (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 347 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 347 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_reader (self, filepath); -#line 2300 "PhotoFileFormat.c" +#line 2399 "PhotoFileFormat.c" } -static PhotoMetadata* photo_file_format_driver_real_create_metadata (PhotoFileFormatDriver* self) { +static PhotoMetadata* +photo_file_format_driver_real_create_metadata (PhotoFileFormatDriver* self) +{ #line 349 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 349 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2309 "PhotoFileFormat.c" +#line 2410 "PhotoFileFormat.c" } -PhotoMetadata* photo_file_format_driver_create_metadata (PhotoFileFormatDriver* self) { +PhotoMetadata* +photo_file_format_driver_create_metadata (PhotoFileFormatDriver* self) +{ #line 349 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 349 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_metadata (self); -#line 2318 "PhotoFileFormat.c" +#line 2421 "PhotoFileFormat.c" } -static gboolean photo_file_format_driver_real_can_write_image (PhotoFileFormatDriver* self) { +static gboolean +photo_file_format_driver_real_can_write_image (PhotoFileFormatDriver* self) +{ gboolean _tmp0_ = FALSE; #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_image'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return _tmp0_; -#line 2328 "PhotoFileFormat.c" +#line 2433 "PhotoFileFormat.c" } -gboolean photo_file_format_driver_can_write_image (PhotoFileFormatDriver* self) { +gboolean +photo_file_format_driver_can_write_image (PhotoFileFormatDriver* self) +{ #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE); #line 351 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_image (self); -#line 2337 "PhotoFileFormat.c" +#line 2444 "PhotoFileFormat.c" } -static gboolean photo_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* self) { +static gboolean +photo_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* self) +{ gboolean _tmp0_ = FALSE; #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_can_write_metadata'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return _tmp0_; -#line 2347 "PhotoFileFormat.c" +#line 2456 "PhotoFileFormat.c" } -gboolean photo_file_format_driver_can_write_metadata (PhotoFileFormatDriver* self) { +gboolean +photo_file_format_driver_can_write_metadata (PhotoFileFormatDriver* self) +{ #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), FALSE); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->can_write_metadata (self); -#line 2356 "PhotoFileFormat.c" +#line 2467 "PhotoFileFormat.c" } -static PhotoFileWriter* photo_file_format_driver_real_create_writer (PhotoFileFormatDriver* self, const gchar* filepath) { +static PhotoFileWriter* +photo_file_format_driver_real_create_writer (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2365 "PhotoFileFormat.c" +#line 2479 "PhotoFileFormat.c" } -PhotoFileWriter* photo_file_format_driver_create_writer (PhotoFileFormatDriver* self, const gchar* filepath) { +PhotoFileWriter* +photo_file_format_driver_create_writer (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 355 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_writer (self, filepath); -#line 2374 "PhotoFileFormat.c" +#line 2491 "PhotoFileFormat.c" } -static PhotoFileMetadataWriter* photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath) { +static PhotoFileMetadataWriter* +photo_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_metadata_writer'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2383 "PhotoFileFormat.c" +#line 2503 "PhotoFileFormat.c" } -PhotoFileMetadataWriter* photo_file_format_driver_create_metadata_writer (PhotoFileFormatDriver* self, const gchar* filepath) { +PhotoFileMetadataWriter* +photo_file_format_driver_create_metadata_writer (PhotoFileFormatDriver* self, + const gchar* filepath) +{ #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_metadata_writer (self, filepath); -#line 2392 "PhotoFileFormat.c" +#line 2515 "PhotoFileFormat.c" } -static PhotoFileSniffer* photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +photo_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* self, + GFile* file, + PhotoFileSnifferOptions options) +{ #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_driver_create_sniffer'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2401 "PhotoFileFormat.c" +#line 2528 "PhotoFileFormat.c" } -PhotoFileSniffer* photo_file_format_driver_create_sniffer (PhotoFileFormatDriver* self, GFile* file, PhotoFileSnifferOptions options) { +PhotoFileSniffer* +photo_file_format_driver_create_sniffer (PhotoFileFormatDriver* self, + GFile* file, + PhotoFileSnifferOptions options) +{ #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_DRIVER (self), NULL); #line 359 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->create_sniffer (self, file, options); -#line 2410 "PhotoFileFormat.c" +#line 2541 "PhotoFileFormat.c" } -PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type) { +PhotoFileFormatDriver* +photo_file_format_driver_construct (GType object_type) +{ PhotoFileFormatDriver* self = NULL; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = (PhotoFileFormatDriver*) g_type_create_instance (object_type); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return self; -#line 2420 "PhotoFileFormat.c" +#line 2553 "PhotoFileFormat.c" } -static void value_photo_file_format_driver_init (GValue* value) { +static void +value_photo_file_format_driver_init (GValue* value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2427 "PhotoFileFormat.c" +#line 2562 "PhotoFileFormat.c" } -static void value_photo_file_format_driver_free_value (GValue* value) { +static void +value_photo_file_format_driver_free_value (GValue* value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (value->data[0].v_pointer) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_unref (value->data[0].v_pointer); -#line 2436 "PhotoFileFormat.c" +#line 2573 "PhotoFileFormat.c" } } -static void value_photo_file_format_driver_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_format_driver_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (src_value->data[0].v_pointer) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = photo_file_format_driver_ref (src_value->data[0].v_pointer); -#line 2446 "PhotoFileFormat.c" +#line 2586 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = NULL; -#line 2450 "PhotoFileFormat.c" +#line 2590 "PhotoFileFormat.c" } } -static gpointer value_photo_file_format_driver_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_format_driver_peek_pointer (const GValue* value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 2458 "PhotoFileFormat.c" +#line 2600 "PhotoFileFormat.c" } -static gchar* value_photo_file_format_driver_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_format_driver_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (collect_values[0].v_pointer) { -#line 2465 "PhotoFileFormat.c" +#line 2612 "PhotoFileFormat.c" PhotoFileFormatDriver * object; object = collect_values[0].v_pointer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (object->parent_instance.g_class == NULL) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 2472 "PhotoFileFormat.c" +#line 2619 "PhotoFileFormat.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.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 2476 "PhotoFileFormat.c" +#line 2623 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = photo_file_format_driver_ref (object); -#line 2480 "PhotoFileFormat.c" +#line 2627 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2484 "PhotoFileFormat.c" +#line 2631 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2488 "PhotoFileFormat.c" +#line 2635 "PhotoFileFormat.c" } -static gchar* value_photo_file_format_driver_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_format_driver_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileFormatDriver ** object_p; object_p = collect_values[0].v_pointer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!object_p) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 2499 "PhotoFileFormat.c" +#line 2651 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!value->data[0].v_pointer) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = NULL; -#line 2505 "PhotoFileFormat.c" +#line 2657 "PhotoFileFormat.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = value->data[0].v_pointer; -#line 2509 "PhotoFileFormat.c" +#line 2661 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = photo_file_format_driver_ref (value->data[0].v_pointer); -#line 2513 "PhotoFileFormat.c" +#line 2665 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2517 "PhotoFileFormat.c" +#line 2669 "PhotoFileFormat.c" } -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileFormatDriver* spec; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_FORMAT_DRIVER), NULL); @@ -2527,20 +2685,25 @@ GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return G_PARAM_SPEC (spec); -#line 2531 "PhotoFileFormat.c" +#line 2689 "PhotoFileFormat.c" } -gpointer value_get_photo_file_format_driver (const GValue* value) { +gpointer +value_get_photo_file_format_driver (const GValue* value) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER), NULL); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 2540 "PhotoFileFormat.c" +#line 2700 "PhotoFileFormat.c" } -void value_set_photo_file_format_driver (GValue* value, gpointer v_object) { +void +value_set_photo_file_format_driver (GValue* value, + gpointer v_object) +{ PhotoFileFormatDriver * old; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER)); @@ -2556,22 +2719,25 @@ void value_set_photo_file_format_driver (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_ref (value->data[0].v_pointer); -#line 2560 "PhotoFileFormat.c" +#line 2723 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2564 "PhotoFileFormat.c" +#line 2727 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_unref (old); -#line 2570 "PhotoFileFormat.c" +#line 2733 "PhotoFileFormat.c" } } -void value_take_photo_file_format_driver (GValue* value, gpointer v_object) { +void +value_take_photo_file_format_driver (GValue* value, + gpointer v_object) +{ PhotoFileFormatDriver * old; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_DRIVER)); @@ -2585,22 +2751,24 @@ void value_take_photo_file_format_driver (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = v_object; -#line 2589 "PhotoFileFormat.c" +#line 2755 "PhotoFileFormat.c" } else { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 2593 "PhotoFileFormat.c" +#line 2759 "PhotoFileFormat.c" } #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_unref (old); -#line 2599 "PhotoFileFormat.c" +#line 2765 "PhotoFileFormat.c" } } -static void photo_file_format_driver_class_init (PhotoFileFormatDriverClass * klass) { +static void +photo_file_format_driver_class_init (PhotoFileFormatDriverClass * klass) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2621,28 +2789,34 @@ static void photo_file_format_driver_class_init (PhotoFileFormatDriverClass * kl ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photo_file_format_driver_real_create_metadata_writer; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photo_file_format_driver_real_create_sniffer; -#line 2625 "PhotoFileFormat.c" +#line 2793 "PhotoFileFormat.c" } -static void photo_file_format_driver_instance_init (PhotoFileFormatDriver * self) { +static void +photo_file_format_driver_instance_init (PhotoFileFormatDriver * self) +{ #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self->ref_count = 1; -#line 2632 "PhotoFileFormat.c" +#line 2802 "PhotoFileFormat.c" } -static void photo_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +photo_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ PhotoFileFormatDriver * self; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_DRIVER, PhotoFileFormatDriver); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_signal_handlers_destroy (self); -#line 2642 "PhotoFileFormat.c" +#line 2814 "PhotoFileFormat.c" } -GType photo_file_format_driver_get_type (void) { +GType +photo_file_format_driver_get_type (void) +{ static volatile gsize photo_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&photo_file_format_driver_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_format_driver_init, value_photo_file_format_driver_free_value, value_photo_file_format_driver_copy_value, value_photo_file_format_driver_peek_pointer, "p", value_photo_file_format_driver_collect_value, "p", value_photo_file_format_driver_lcopy_value }; @@ -2656,18 +2830,22 @@ GType photo_file_format_driver_get_type (void) { } -gpointer photo_file_format_driver_ref (gpointer instance) { +gpointer +photo_file_format_driver_ref (gpointer instance) +{ PhotoFileFormatDriver * self; self = instance; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_atomic_int_inc (&self->ref_count); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return instance; -#line 2667 "PhotoFileFormat.c" +#line 2843 "PhotoFileFormat.c" } -void photo_file_format_driver_unref (gpointer instance) { +void +photo_file_format_driver_unref (gpointer instance) +{ PhotoFileFormatDriver * self; self = instance; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -2676,12 +2854,14 @@ void photo_file_format_driver_unref (gpointer instance) { PHOTO_FILE_FORMAT_DRIVER_GET_CLASS (self)->finalize (self); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_type_free_instance ((GTypeInstance *) self); -#line 2680 "PhotoFileFormat.c" +#line 2858 "PhotoFileFormat.c" } } -GType photo_file_format_flags_get_type (void) { +GType +photo_file_format_flags_get_type (void) +{ static volatile gsize photo_file_format_flags_type_id__volatile = 0; if (g_once_init_enter (&photo_file_format_flags_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_FILE_FORMAT_FLAGS_NONE, "PHOTO_FILE_FORMAT_FLAGS_NONE", "none"}, {0, NULL, NULL}}; @@ -2693,408 +2873,460 @@ GType photo_file_format_flags_get_type (void) { } -static PhotoFileFormat photo_file_format_properties_real_get_file_format (PhotoFileFormatProperties* self) { +static PhotoFileFormat +photo_file_format_properties_real_get_file_format (PhotoFileFormatProperties* self) +{ #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_file_format'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return 0; -#line 2702 "PhotoFileFormat.c" +#line 2884 "PhotoFileFormat.c" } -PhotoFileFormat photo_file_format_properties_get_file_format (PhotoFileFormatProperties* self) { +PhotoFileFormat +photo_file_format_properties_get_file_format (PhotoFileFormatProperties* self) +{ #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0); #line 374 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_file_format (self); -#line 2711 "PhotoFileFormat.c" +#line 2895 "PhotoFileFormat.c" } -static PhotoFileFormatFlags photo_file_format_properties_real_get_flags (PhotoFileFormatProperties* self) { +static PhotoFileFormatFlags +photo_file_format_properties_real_get_flags (PhotoFileFormatProperties* self) +{ #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_flags'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return 0; -#line 2720 "PhotoFileFormat.c" +#line 2906 "PhotoFileFormat.c" } -PhotoFileFormatFlags photo_file_format_properties_get_flags (PhotoFileFormatProperties* self) { +PhotoFileFormatFlags +photo_file_format_properties_get_flags (PhotoFileFormatProperties* self) +{ #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), 0); #line 376 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_flags (self); -#line 2729 "PhotoFileFormat.c" +#line 2917 "PhotoFileFormat.c" } -static gboolean photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext) { +static gboolean +photo_file_format_properties_real_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gint _tmp1_; + gint _tmp0_; + gchar** _tmp1_; gchar** _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - gboolean _tmp4_; - gboolean _tmp5_; + gint _tmp2__length1; + gboolean _tmp3_; #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (ext != NULL, FALSE); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = ext; -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = photo_file_format_properties_get_known_extensions (self, &_tmp1_); + _tmp1_ = photo_file_format_properties_get_known_extensions (self, &_tmp0_); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = _tmp2_; -#line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3__length1 = _tmp1_; + _tmp2_ = _tmp1_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp4_ = is_in_ci_array (_tmp0_, _tmp3_, _tmp1_); + _tmp2__length1 = _tmp0_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = _tmp4_; + _tmp3_ = is_in_ci_array (ext, _tmp2_, _tmp0_); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp3_ = (_vala_array_free (_tmp3_, _tmp3__length1, (GDestroyNotify) g_free), NULL); + _tmp2_ = (_vala_array_free (_tmp2_, _tmp2__length1, (GDestroyNotify) g_free), NULL); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp5_; + result = _tmp3_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2762 "PhotoFileFormat.c" +#line 2947 "PhotoFileFormat.c" } -gboolean photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, const gchar* ext) { +gboolean +photo_file_format_properties_is_recognized_extension (PhotoFileFormatProperties* self, + const gchar* ext) +{ #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), FALSE); #line 380 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->is_recognized_extension (self, ext); -#line 2771 "PhotoFileFormat.c" +#line 2959 "PhotoFileFormat.c" } -static gchar* photo_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* self) { +static gchar* +photo_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* self) +{ #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_extension'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2780 "PhotoFileFormat.c" +#line 2970 "PhotoFileFormat.c" } -gchar* photo_file_format_properties_get_default_extension (PhotoFileFormatProperties* self) { +gchar* +photo_file_format_properties_get_default_extension (PhotoFileFormatProperties* self) +{ #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 384 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_extension (self); -#line 2789 "PhotoFileFormat.c" +#line 2981 "PhotoFileFormat.c" } -static gchar** photo_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1) { +static gchar** +photo_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* self, + int* result_length1) +{ #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_known_extensions'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2798 "PhotoFileFormat.c" +#line 2993 "PhotoFileFormat.c" } -gchar** photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, int* result_length1) { +gchar** +photo_file_format_properties_get_known_extensions (PhotoFileFormatProperties* self, + int* result_length1) +{ #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 386 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_known_extensions (self, result_length1); -#line 2807 "PhotoFileFormat.c" +#line 3005 "PhotoFileFormat.c" } -static gchar* photo_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* self) { +static gchar* +photo_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* self) +{ #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_default_mime_type'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2816 "PhotoFileFormat.c" +#line 3016 "PhotoFileFormat.c" } -gchar* photo_file_format_properties_get_default_mime_type (PhotoFileFormatProperties* self) { +gchar* +photo_file_format_properties_get_default_mime_type (PhotoFileFormatProperties* self) +{ #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 388 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_default_mime_type (self); -#line 2825 "PhotoFileFormat.c" +#line 3027 "PhotoFileFormat.c" } -static gchar** photo_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* self, int* result_length1) { +static gchar** +photo_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* self, + int* result_length1) +{ #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_mime_types'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2834 "PhotoFileFormat.c" +#line 3039 "PhotoFileFormat.c" } -gchar** photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, int* result_length1) { +gchar** +photo_file_format_properties_get_mime_types (PhotoFileFormatProperties* self, + int* result_length1) +{ #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 390 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_mime_types (self, result_length1); -#line 2843 "PhotoFileFormat.c" +#line 3051 "PhotoFileFormat.c" } -static gchar* photo_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* self) { +static gchar* +photo_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* self) +{ #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_format_properties_get_user_visible_name'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 2852 "PhotoFileFormat.c" +#line 3062 "PhotoFileFormat.c" } -gchar* photo_file_format_properties_get_user_visible_name (PhotoFileFormatProperties* self) { +gchar* +photo_file_format_properties_get_user_visible_name (PhotoFileFormatProperties* self) +{ #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->get_user_visible_name (self); -#line 2861 "PhotoFileFormat.c" +#line 3073 "PhotoFileFormat.c" } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return self ? g_object_ref (self) : NULL; -#line 2868 "PhotoFileFormat.c" +#line 3082 "PhotoFileFormat.c" } -GFile* photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, GFile* file) { +GFile* +photo_file_format_properties_convert_file_extension (PhotoFileFormatProperties* self, + GFile* file) +{ GFile* result = NULL; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp2_ = NULL; gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gboolean _tmp5_ = FALSE; - const gchar* _tmp6_; - GFile* _tmp11_; - GFile* _tmp12_; - GFile* _tmp13_; - const gchar* _tmp14_; - gchar* _tmp15_; - gchar* _tmp16_; - gchar* _tmp17_; - gchar* _tmp18_; - GFile* _tmp19_; - GFile* _tmp20_; + gboolean _tmp4_ = FALSE; + const gchar* _tmp5_; + GFile* _tmp8_; + GFile* _tmp9_; + const gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + GFile* _tmp15_; + GFile* _tmp16_; #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (IS_PHOTO_FILE_FORMAT_PROPERTIES (self), NULL); #line 401 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp0_ = file; -#line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp1_ = g_file_get_basename (_tmp0_); + _tmp0_ = g_file_get_basename (file); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - disassemble_filename (_tmp2_, &_tmp3_, &_tmp4_); + disassemble_filename (_tmp1_, &_tmp2_, &_tmp3_); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - name = _tmp3_; + name = _tmp2_; #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - ext = _tmp4_; + ext = _tmp3_; #line 403 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp2_); -#line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp6_ = ext; + _g_free0 (_tmp1_); #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp6_ != NULL) { -#line 2919 "PhotoFileFormat.c" - const gchar* _tmp7_; - gboolean _tmp8_; + _tmp5_ = ext; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp7_ = ext; + if (_tmp5_ != NULL) { +#line 3132 "PhotoFileFormat.c" + const gchar* _tmp6_; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp8_ = photo_file_format_properties_is_recognized_extension (self, _tmp7_); + _tmp6_ = ext; #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = _tmp8_; -#line 2928 "PhotoFileFormat.c" + _tmp4_ = photo_file_format_properties_is_recognized_extension (self, _tmp6_); +#line 3138 "PhotoFileFormat.c" } else { #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp5_ = FALSE; -#line 2932 "PhotoFileFormat.c" + _tmp4_ = FALSE; +#line 3142 "PhotoFileFormat.c" } #line 404 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - if (_tmp5_) { -#line 2936 "PhotoFileFormat.c" - GFile* _tmp9_; - GFile* _tmp10_; -#line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp9_ = file; + if (_tmp4_) { +#line 3146 "PhotoFileFormat.c" + GFile* _tmp7_; #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp10_ = _g_object_ref0 (_tmp9_); + _tmp7_ = _g_object_ref0 (file); #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp10_; + result = _tmp7_; #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 405 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2951 "PhotoFileFormat.c" +#line 3158 "PhotoFileFormat.c" } #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp11_ = file; + _tmp8_ = g_file_get_parent (file); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp12_ = g_file_get_parent (_tmp11_); + _tmp9_ = _tmp8_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp13_ = _tmp12_; + _tmp10_ = name; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp14_ = name; + _tmp11_ = photo_file_format_properties_get_default_extension (self); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp15_ = photo_file_format_properties_get_default_extension (self); + _tmp12_ = _tmp11_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp16_ = _tmp15_; -#line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp17_ = g_strdup_printf ("%s.%s", _tmp14_, _tmp16_); + _tmp13_ = g_strdup_printf ("%s.%s", _tmp10_, _tmp12_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp18_ = _tmp17_; + _tmp14_ = _tmp13_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp19_ = g_file_get_child (_tmp13_, _tmp18_); + _tmp15_ = g_file_get_child (_tmp9_, _tmp14_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _tmp20_ = _tmp19_; + _tmp16_ = _tmp15_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp14_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_free0 (_tmp16_); + _g_free0 (_tmp12_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - _g_object_unref0 (_tmp13_); + _g_object_unref0 (_tmp9_); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" - result = _tmp20_; + result = _tmp16_; #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (ext); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" _g_free0 (name); #line 407 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return result; -#line 2987 "PhotoFileFormat.c" +#line 3192 "PhotoFileFormat.c" } -PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type) { +PhotoFileFormatProperties* +photo_file_format_properties_construct (GType object_type) +{ PhotoFileFormatProperties* self = NULL; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = (PhotoFileFormatProperties*) g_type_create_instance (object_type); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return self; -#line 2997 "PhotoFileFormat.c" +#line 3204 "PhotoFileFormat.c" } -static void value_photo_file_format_properties_init (GValue* value) { +static void +value_photo_file_format_properties_init (GValue* value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3004 "PhotoFileFormat.c" +#line 3213 "PhotoFileFormat.c" } -static void value_photo_file_format_properties_free_value (GValue* value) { +static void +value_photo_file_format_properties_free_value (GValue* value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (value->data[0].v_pointer) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_unref (value->data[0].v_pointer); -#line 3013 "PhotoFileFormat.c" +#line 3224 "PhotoFileFormat.c" } } -static void value_photo_file_format_properties_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_format_properties_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (src_value->data[0].v_pointer) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = photo_file_format_properties_ref (src_value->data[0].v_pointer); -#line 3023 "PhotoFileFormat.c" +#line 3237 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" dest_value->data[0].v_pointer = NULL; -#line 3027 "PhotoFileFormat.c" +#line 3241 "PhotoFileFormat.c" } } -static gpointer value_photo_file_format_properties_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_format_properties_peek_pointer (const GValue* value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 3035 "PhotoFileFormat.c" +#line 3251 "PhotoFileFormat.c" } -static gchar* value_photo_file_format_properties_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_format_properties_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (collect_values[0].v_pointer) { -#line 3042 "PhotoFileFormat.c" +#line 3263 "PhotoFileFormat.c" PhotoFileFormatProperties * object; object = collect_values[0].v_pointer; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (object->parent_instance.g_class == NULL) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3049 "PhotoFileFormat.c" +#line 3270 "PhotoFileFormat.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.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 3053 "PhotoFileFormat.c" +#line 3274 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = photo_file_format_properties_ref (object); -#line 3057 "PhotoFileFormat.c" +#line 3278 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3061 "PhotoFileFormat.c" +#line 3282 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 3065 "PhotoFileFormat.c" +#line 3286 "PhotoFileFormat.c" } -static gchar* value_photo_file_format_properties_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_format_properties_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileFormatProperties ** object_p; object_p = collect_values[0].v_pointer; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!object_p) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3076 "PhotoFileFormat.c" +#line 3302 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (!value->data[0].v_pointer) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = NULL; -#line 3082 "PhotoFileFormat.c" +#line 3308 "PhotoFileFormat.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = value->data[0].v_pointer; -#line 3086 "PhotoFileFormat.c" +#line 3312 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" *object_p = photo_file_format_properties_ref (value->data[0].v_pointer); -#line 3090 "PhotoFileFormat.c" +#line 3316 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return NULL; -#line 3094 "PhotoFileFormat.c" +#line 3320 "PhotoFileFormat.c" } -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileFormatProperties* spec; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_FORMAT_PROPERTIES), NULL); @@ -3104,20 +3336,25 @@ GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gc G_PARAM_SPEC (spec)->value_type = object_type; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return G_PARAM_SPEC (spec); -#line 3108 "PhotoFileFormat.c" +#line 3340 "PhotoFileFormat.c" } -gpointer value_get_photo_file_format_properties (const GValue* value) { +gpointer +value_get_photo_file_format_properties (const GValue* value) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES), NULL); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return value->data[0].v_pointer; -#line 3117 "PhotoFileFormat.c" +#line 3351 "PhotoFileFormat.c" } -void value_set_photo_file_format_properties (GValue* value, gpointer v_object) { +void +value_set_photo_file_format_properties (GValue* value, + gpointer v_object) +{ PhotoFileFormatProperties * old; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES)); @@ -3133,22 +3370,25 @@ void value_set_photo_file_format_properties (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_ref (value->data[0].v_pointer); -#line 3137 "PhotoFileFormat.c" +#line 3374 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3141 "PhotoFileFormat.c" +#line 3378 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_unref (old); -#line 3147 "PhotoFileFormat.c" +#line 3384 "PhotoFileFormat.c" } } -void value_take_photo_file_format_properties (GValue* value, gpointer v_object) { +void +value_take_photo_file_format_properties (GValue* value, + gpointer v_object) +{ PhotoFileFormatProperties * old; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_FORMAT_PROPERTIES)); @@ -3162,22 +3402,24 @@ void value_take_photo_file_format_properties (GValue* value, gpointer v_object) g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = v_object; -#line 3166 "PhotoFileFormat.c" +#line 3406 "PhotoFileFormat.c" } else { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" value->data[0].v_pointer = NULL; -#line 3170 "PhotoFileFormat.c" +#line 3410 "PhotoFileFormat.c" } #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" if (old) { #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_unref (old); -#line 3176 "PhotoFileFormat.c" +#line 3416 "PhotoFileFormat.c" } } -static void photo_file_format_properties_class_init (PhotoFileFormatPropertiesClass * klass) { +static void +photo_file_format_properties_class_init (PhotoFileFormatPropertiesClass * klass) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" photo_file_format_properties_parent_class = g_type_class_peek_parent (klass); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -3198,28 +3440,34 @@ static void photo_file_format_properties_class_init (PhotoFileFormatPropertiesCl ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) photo_file_format_properties_real_get_mime_types; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) photo_file_format_properties_real_get_user_visible_name; -#line 3202 "PhotoFileFormat.c" +#line 3444 "PhotoFileFormat.c" } -static void photo_file_format_properties_instance_init (PhotoFileFormatProperties * self) { +static void +photo_file_format_properties_instance_init (PhotoFileFormatProperties * self) +{ #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self->ref_count = 1; -#line 3209 "PhotoFileFormat.c" +#line 3453 "PhotoFileFormat.c" } -static void photo_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +photo_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ PhotoFileFormatProperties * self; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_signal_handlers_destroy (self); -#line 3219 "PhotoFileFormat.c" +#line 3465 "PhotoFileFormat.c" } -GType photo_file_format_properties_get_type (void) { +GType +photo_file_format_properties_get_type (void) +{ static volatile gsize photo_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&photo_file_format_properties_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_format_properties_init, value_photo_file_format_properties_free_value, value_photo_file_format_properties_copy_value, value_photo_file_format_properties_peek_pointer, "p", value_photo_file_format_properties_collect_value, "p", value_photo_file_format_properties_lcopy_value }; @@ -3233,18 +3481,22 @@ GType photo_file_format_properties_get_type (void) { } -gpointer photo_file_format_properties_ref (gpointer instance) { +gpointer +photo_file_format_properties_ref (gpointer instance) +{ PhotoFileFormatProperties * self; self = instance; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_atomic_int_inc (&self->ref_count); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" return instance; -#line 3244 "PhotoFileFormat.c" +#line 3494 "PhotoFileFormat.c" } -void photo_file_format_properties_unref (gpointer instance) { +void +photo_file_format_properties_unref (gpointer instance) +{ PhotoFileFormatProperties * self; self = instance; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" @@ -3253,12 +3505,16 @@ void photo_file_format_properties_unref (gpointer instance) { PHOTO_FILE_FORMAT_PROPERTIES_GET_CLASS (self)->finalize (self); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoFileFormat.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3257 "PhotoFileFormat.c" +#line 3509 "PhotoFileFormat.c" } } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -3270,7 +3526,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } diff --git a/src/photos/PhotoFileSniffer.c b/src/photos/PhotoFileSniffer.c index e632525..04d5d07 100644 --- a/src/photos/PhotoFileSniffer.c +++ b/src/photos/PhotoFileSniffer.c @@ -1,4 +1,4 @@ -/* PhotoFileSniffer.c generated by valac 0.36.6, the Vala compiler +/* PhotoFileSniffer.c generated by valac 0.40.4, the Vala compiler * generated from PhotoFileSniffer.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -180,181 +181,239 @@ static gpointer photo_file_interrogator_parent_class = NULL; gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -enum { - DETECTED_PHOTO_INFORMATION_DUMMY_PROPERTY -}; -void dimensions_init (Dimensions *self, gint width, gint height); +void dimensions_init (Dimensions *self, + gint width, + gint height); DetectedPhotoInformation* detected_photo_information_new (void); DetectedPhotoInformation* detected_photo_information_construct (GType object_type); static void detected_photo_information_finalize (DetectedPhotoInformation * obj); gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; -enum { - PHOTO_FILE_SNIFFER_DUMMY_PROPERTY -}; -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); -static DetectedPhotoInformation* photo_file_sniffer_real_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); +static DetectedPhotoInformation* photo_file_sniffer_real_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); static void photo_file_sniffer_finalize (PhotoFileSniffer * obj); gpointer photo_file_interrogator_ref (gpointer instance); void photo_file_interrogator_unref (gpointer instance); -GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_interrogator (GValue* value, gpointer v_object); -void value_take_photo_file_interrogator (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_interrogator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_interrogator (GValue* value, + gpointer v_object); +void value_take_photo_file_interrogator (GValue* value, + gpointer v_object); gpointer value_get_photo_file_interrogator (const GValue* value); GType photo_file_interrogator_get_type (void) G_GNUC_CONST; #define PHOTO_FILE_INTERROGATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_FILE_INTERROGATOR, PhotoFileInterrogatorPrivate)) -enum { - PHOTO_FILE_INTERROGATOR_DUMMY_PROPERTY -}; -PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, PhotoFileSnifferOptions options); -PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); +PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, + PhotoFileSnifferOptions options); +PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self); gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self); -void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error); +void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, + GError** error); PhotoFileFormat* photo_file_format_get_supported (int* result_length1); -PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, GFile* file, PhotoFileSnifferOptions options); +PhotoFileSniffer* photo_file_format_create_sniffer (PhotoFileFormat self, + GFile* file, + PhotoFileSnifferOptions options); static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj); -DetectedPhotoInformation* detected_photo_information_construct (GType object_type) { +DetectedPhotoInformation* +detected_photo_information_construct (GType object_type) +{ DetectedPhotoInformation* self = NULL; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = (DetectedPhotoInformation*) g_type_create_instance (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self; -#line 250 "PhotoFileSniffer.c" +#line 282 "PhotoFileSniffer.c" } -DetectedPhotoInformation* detected_photo_information_new (void) { +DetectedPhotoInformation* +detected_photo_information_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return detected_photo_information_construct (TYPE_DETECTED_PHOTO_INFORMATION); -#line 257 "PhotoFileSniffer.c" +#line 291 "PhotoFileSniffer.c" } -static void value_detected_photo_information_init (GValue* value) { +static void +value_detected_photo_information_init (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 264 "PhotoFileSniffer.c" +#line 300 "PhotoFileSniffer.c" } -static void value_detected_photo_information_free_value (GValue* value) { +static void +value_detected_photo_information_free_value (GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_unref (value->data[0].v_pointer); -#line 273 "PhotoFileSniffer.c" +#line 311 "PhotoFileSniffer.c" } } -static void value_detected_photo_information_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_detected_photo_information_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (src_value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = detected_photo_information_ref (src_value->data[0].v_pointer); -#line 283 "PhotoFileSniffer.c" +#line 324 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = NULL; -#line 287 "PhotoFileSniffer.c" +#line 328 "PhotoFileSniffer.c" } } -static gpointer value_detected_photo_information_peek_pointer (const GValue* value) { +static gpointer +value_detected_photo_information_peek_pointer (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 295 "PhotoFileSniffer.c" +#line 338 "PhotoFileSniffer.c" } -static gchar* value_detected_photo_information_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_detected_photo_information_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (collect_values[0].v_pointer) { -#line 302 "PhotoFileSniffer.c" +#line 350 "PhotoFileSniffer.c" DetectedPhotoInformation * object; object = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (object->parent_instance.g_class == NULL) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 309 "PhotoFileSniffer.c" +#line 357 "PhotoFileSniffer.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.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 313 "PhotoFileSniffer.c" +#line 361 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = detected_photo_information_ref (object); -#line 317 "PhotoFileSniffer.c" +#line 365 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 321 "PhotoFileSniffer.c" +#line 369 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 325 "PhotoFileSniffer.c" +#line 373 "PhotoFileSniffer.c" } -static gchar* value_detected_photo_information_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_detected_photo_information_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ DetectedPhotoInformation ** object_p; object_p = collect_values[0].v_pointer; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!object_p) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 336 "PhotoFileSniffer.c" +#line 389 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!value->data[0].v_pointer) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = NULL; -#line 342 "PhotoFileSniffer.c" +#line 395 "PhotoFileSniffer.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = value->data[0].v_pointer; -#line 346 "PhotoFileSniffer.c" +#line 399 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = detected_photo_information_ref (value->data[0].v_pointer); -#line 350 "PhotoFileSniffer.c" +#line 403 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 354 "PhotoFileSniffer.c" +#line 407 "PhotoFileSniffer.c" } -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecDetectedPhotoInformation* spec; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_DETECTED_PHOTO_INFORMATION), NULL); @@ -364,20 +423,25 @@ GParamSpec* param_spec_detected_photo_information (const gchar* name, const gcha G_PARAM_SPEC (spec)->value_type = object_type; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return G_PARAM_SPEC (spec); -#line 368 "PhotoFileSniffer.c" +#line 427 "PhotoFileSniffer.c" } -gpointer value_get_detected_photo_information (const GValue* value) { +gpointer +value_get_detected_photo_information (const GValue* value) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION), NULL); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 377 "PhotoFileSniffer.c" +#line 438 "PhotoFileSniffer.c" } -void value_set_detected_photo_information (GValue* value, gpointer v_object) { +void +value_set_detected_photo_information (GValue* value, + gpointer v_object) +{ DetectedPhotoInformation * old; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION)); @@ -393,22 +457,25 @@ void value_set_detected_photo_information (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_ref (value->data[0].v_pointer); -#line 397 "PhotoFileSniffer.c" +#line 461 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 401 "PhotoFileSniffer.c" +#line 465 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_unref (old); -#line 407 "PhotoFileSniffer.c" +#line 471 "PhotoFileSniffer.c" } } -void value_take_detected_photo_information (GValue* value, gpointer v_object) { +void +value_take_detected_photo_information (GValue* value, + gpointer v_object) +{ DetectedPhotoInformation * old; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_DETECTED_PHOTO_INFORMATION)); @@ -422,31 +489,35 @@ void value_take_detected_photo_information (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = v_object; -#line 426 "PhotoFileSniffer.c" +#line 493 "PhotoFileSniffer.c" } else { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 430 "PhotoFileSniffer.c" +#line 497 "PhotoFileSniffer.c" } #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_unref (old); -#line 436 "PhotoFileSniffer.c" +#line 503 "PhotoFileSniffer.c" } } -static void detected_photo_information_class_init (DetectedPhotoInformationClass * klass) { +static void +detected_photo_information_class_init (DetectedPhotoInformationClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" detected_photo_information_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" ((DetectedPhotoInformationClass *) klass)->finalize = detected_photo_information_finalize; -#line 446 "PhotoFileSniffer.c" +#line 515 "PhotoFileSniffer.c" } -static void detected_photo_information_instance_init (DetectedPhotoInformation * self) { +static void +detected_photo_information_instance_init (DetectedPhotoInformation * self) +{ #line 8 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->file_format = PHOTO_FILE_FORMAT_UNKNOWN; #line 9 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -469,11 +540,13 @@ static void detected_photo_information_instance_init (DetectedPhotoInformation * self->bits_per_channel = 0; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->ref_count = 1; -#line 473 "PhotoFileSniffer.c" +#line 544 "PhotoFileSniffer.c" } -static void detected_photo_information_finalize (DetectedPhotoInformation * obj) { +static void +detected_photo_information_finalize (DetectedPhotoInformation * obj) +{ DetectedPhotoInformation * self; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_DETECTED_PHOTO_INFORMATION, DetectedPhotoInformation); @@ -489,11 +562,13 @@ static void detected_photo_information_finalize (DetectedPhotoInformation * obj) _g_free0 (self->thumbnail_md5); #line 13 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _g_free0 (self->format_name); -#line 493 "PhotoFileSniffer.c" +#line 566 "PhotoFileSniffer.c" } -GType detected_photo_information_get_type (void) { +GType +detected_photo_information_get_type (void) +{ static volatile gsize detected_photo_information_type_id__volatile = 0; if (g_once_init_enter (&detected_photo_information_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_detected_photo_information_init, value_detected_photo_information_free_value, value_detected_photo_information_copy_value, value_detected_photo_information_peek_pointer, "p", value_detected_photo_information_collect_value, "p", value_detected_photo_information_lcopy_value }; @@ -507,18 +582,22 @@ GType detected_photo_information_get_type (void) { } -gpointer detected_photo_information_ref (gpointer instance) { +gpointer +detected_photo_information_ref (gpointer instance) +{ DetectedPhotoInformation * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_atomic_int_inc (&self->ref_count); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return instance; -#line 518 "PhotoFileSniffer.c" +#line 595 "PhotoFileSniffer.c" } -void detected_photo_information_unref (gpointer instance) { +void +detected_photo_information_unref (gpointer instance) +{ DetectedPhotoInformation * self; self = instance; #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -527,12 +606,14 @@ void detected_photo_information_unref (gpointer instance) { DETECTED_PHOTO_INFORMATION_GET_CLASS (self)->finalize (self); #line 7 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_type_free_instance ((GTypeInstance *) self); -#line 531 "PhotoFileSniffer.c" +#line 610 "PhotoFileSniffer.c" } } -GType photo_file_sniffer_options_get_type (void) { +GType +photo_file_sniffer_options_get_type (void) +{ static volatile gsize photo_file_sniffer_options_type_id__volatile = 0; if (g_once_init_enter (&photo_file_sniffer_options_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL, "PHOTO_FILE_SNIFFER_OPTIONS_GET_ALL", "get-all"}, {PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5, "PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5", "no-md5"}, {0, NULL, NULL}}; @@ -544,161 +625,191 @@ GType photo_file_sniffer_options_get_type (void) { } -static gpointer _g_object_ref0 (gpointer self) { +static gpointer +_g_object_ref0 (gpointer self) +{ #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self ? g_object_ref (self) : NULL; -#line 551 "PhotoFileSniffer.c" +#line 634 "PhotoFileSniffer.c" } -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PhotoFileSniffer* +photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotoFileSniffer* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - PhotoFileSnifferOptions _tmp2_; - PhotoFileSnifferOptions _tmp3_; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = (PhotoFileSniffer*) g_type_create_instance (object_type); #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp0_ = file; -#line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _g_object_unref0 (self->file); #line 43 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->file = _tmp1_; -#line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp2_ = options; + self->file = _tmp0_; #line 44 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->options = _tmp2_; -#line 46 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp3_ = options; + self->options = options; #line 46 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->calc_md5 = (_tmp3_ & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) == 0; + self->calc_md5 = (options & PHOTO_FILE_SNIFFER_OPTIONS_NO_MD5) == 0; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self; -#line 583 "PhotoFileSniffer.c" +#line 661 "PhotoFileSniffer.c" } -static DetectedPhotoInformation* photo_file_sniffer_real_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +photo_file_sniffer_real_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error) +{ #line 49 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_critical ("Type `%s' does not implement abstract method `photo_file_sniffer_sniff'", g_type_name (G_TYPE_FROM_INSTANCE (self))); #line 49 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 592 "PhotoFileSniffer.c" +#line 674 "PhotoFileSniffer.c" } -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error) { +DetectedPhotoInformation* +photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error) +{ #line 49 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (IS_PHOTO_FILE_SNIFFER (self), NULL); #line 49 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return PHOTO_FILE_SNIFFER_GET_CLASS (self)->sniff (self, is_corrupted, error); -#line 601 "PhotoFileSniffer.c" +#line 687 "PhotoFileSniffer.c" } -static void value_photo_file_sniffer_init (GValue* value) { +static void +value_photo_file_sniffer_init (GValue* value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 608 "PhotoFileSniffer.c" +#line 696 "PhotoFileSniffer.c" } -static void value_photo_file_sniffer_free_value (GValue* value) { +static void +value_photo_file_sniffer_free_value (GValue* value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (value->data[0].v_pointer) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_unref (value->data[0].v_pointer); -#line 617 "PhotoFileSniffer.c" +#line 707 "PhotoFileSniffer.c" } } -static void value_photo_file_sniffer_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_sniffer_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (src_value->data[0].v_pointer) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = photo_file_sniffer_ref (src_value->data[0].v_pointer); -#line 627 "PhotoFileSniffer.c" +#line 720 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = NULL; -#line 631 "PhotoFileSniffer.c" +#line 724 "PhotoFileSniffer.c" } } -static gpointer value_photo_file_sniffer_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_sniffer_peek_pointer (const GValue* value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 639 "PhotoFileSniffer.c" +#line 734 "PhotoFileSniffer.c" } -static gchar* value_photo_file_sniffer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_sniffer_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (collect_values[0].v_pointer) { -#line 646 "PhotoFileSniffer.c" +#line 746 "PhotoFileSniffer.c" PhotoFileSniffer * object; object = collect_values[0].v_pointer; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (object->parent_instance.g_class == NULL) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 653 "PhotoFileSniffer.c" +#line 753 "PhotoFileSniffer.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.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 657 "PhotoFileSniffer.c" +#line 757 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = photo_file_sniffer_ref (object); -#line 661 "PhotoFileSniffer.c" +#line 761 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 665 "PhotoFileSniffer.c" +#line 765 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 669 "PhotoFileSniffer.c" +#line 769 "PhotoFileSniffer.c" } -static gchar* value_photo_file_sniffer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_sniffer_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileSniffer ** object_p; object_p = collect_values[0].v_pointer; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!object_p) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 680 "PhotoFileSniffer.c" +#line 785 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!value->data[0].v_pointer) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = NULL; -#line 686 "PhotoFileSniffer.c" +#line 791 "PhotoFileSniffer.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = value->data[0].v_pointer; -#line 690 "PhotoFileSniffer.c" +#line 795 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = photo_file_sniffer_ref (value->data[0].v_pointer); -#line 694 "PhotoFileSniffer.c" +#line 799 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 698 "PhotoFileSniffer.c" +#line 803 "PhotoFileSniffer.c" } -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileSniffer* spec; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_SNIFFER), NULL); @@ -708,20 +819,25 @@ GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, G_PARAM_SPEC (spec)->value_type = object_type; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return G_PARAM_SPEC (spec); -#line 712 "PhotoFileSniffer.c" +#line 823 "PhotoFileSniffer.c" } -gpointer value_get_photo_file_sniffer (const GValue* value) { +gpointer +value_get_photo_file_sniffer (const GValue* value) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER), NULL); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 721 "PhotoFileSniffer.c" +#line 834 "PhotoFileSniffer.c" } -void value_set_photo_file_sniffer (GValue* value, gpointer v_object) { +void +value_set_photo_file_sniffer (GValue* value, + gpointer v_object) +{ PhotoFileSniffer * old; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER)); @@ -737,22 +853,25 @@ void value_set_photo_file_sniffer (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_ref (value->data[0].v_pointer); -#line 741 "PhotoFileSniffer.c" +#line 857 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 745 "PhotoFileSniffer.c" +#line 861 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_unref (old); -#line 751 "PhotoFileSniffer.c" +#line 867 "PhotoFileSniffer.c" } } -void value_take_photo_file_sniffer (GValue* value, gpointer v_object) { +void +value_take_photo_file_sniffer (GValue* value, + gpointer v_object) +{ PhotoFileSniffer * old; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_SNIFFER)); @@ -766,40 +885,46 @@ void value_take_photo_file_sniffer (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = v_object; -#line 770 "PhotoFileSniffer.c" +#line 889 "PhotoFileSniffer.c" } else { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 774 "PhotoFileSniffer.c" +#line 893 "PhotoFileSniffer.c" } #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_unref (old); -#line 780 "PhotoFileSniffer.c" +#line 899 "PhotoFileSniffer.c" } } -static void photo_file_sniffer_class_init (PhotoFileSnifferClass * klass) { +static void +photo_file_sniffer_class_init (PhotoFileSnifferClass * klass) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_sniffer_parent_class = g_type_class_peek_parent (klass); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" ((PhotoFileSnifferClass *) klass)->finalize = photo_file_sniffer_finalize; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photo_file_sniffer_real_sniff; -#line 792 "PhotoFileSniffer.c" +#line 913 "PhotoFileSniffer.c" } -static void photo_file_sniffer_instance_init (PhotoFileSniffer * self) { +static void +photo_file_sniffer_instance_init (PhotoFileSniffer * self) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->ref_count = 1; -#line 799 "PhotoFileSniffer.c" +#line 922 "PhotoFileSniffer.c" } -static void photo_file_sniffer_finalize (PhotoFileSniffer * obj) { +static void +photo_file_sniffer_finalize (PhotoFileSniffer * obj) +{ PhotoFileSniffer * self; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); @@ -807,11 +932,13 @@ static void photo_file_sniffer_finalize (PhotoFileSniffer * obj) { g_signal_handlers_destroy (self); #line 38 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _g_object_unref0 (self->file); -#line 811 "PhotoFileSniffer.c" +#line 936 "PhotoFileSniffer.c" } -GType photo_file_sniffer_get_type (void) { +GType +photo_file_sniffer_get_type (void) +{ static volatile gsize photo_file_sniffer_type_id__volatile = 0; if (g_once_init_enter (&photo_file_sniffer_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_sniffer_init, value_photo_file_sniffer_free_value, value_photo_file_sniffer_copy_value, value_photo_file_sniffer_peek_pointer, "p", value_photo_file_sniffer_collect_value, "p", value_photo_file_sniffer_lcopy_value }; @@ -825,18 +952,22 @@ GType photo_file_sniffer_get_type (void) { } -gpointer photo_file_sniffer_ref (gpointer instance) { +gpointer +photo_file_sniffer_ref (gpointer instance) +{ PhotoFileSniffer * self; self = instance; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_atomic_int_inc (&self->ref_count); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return instance; -#line 836 "PhotoFileSniffer.c" +#line 965 "PhotoFileSniffer.c" } -void photo_file_sniffer_unref (gpointer instance) { +void +photo_file_sniffer_unref (gpointer instance) +{ PhotoFileSniffer * self; self = instance; #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -845,53 +976,58 @@ void photo_file_sniffer_unref (gpointer instance) { PHOTO_FILE_SNIFFER_GET_CLASS (self)->finalize (self); #line 32 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_type_free_instance ((GTypeInstance *) self); -#line 849 "PhotoFileSniffer.c" +#line 980 "PhotoFileSniffer.c" } } -PhotoFileInterrogator* photo_file_interrogator_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PhotoFileInterrogator* +photo_file_interrogator_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotoFileInterrogator* self = NULL; GFile* _tmp0_; - GFile* _tmp1_; - PhotoFileSnifferOptions _tmp2_; #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = (PhotoFileInterrogator*) g_type_create_instance (object_type); #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp0_ = file; -#line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (file); #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _g_object_unref0 (self->priv->file); #line 69 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->priv->file = _tmp1_; + self->priv->file = _tmp0_; #line 70 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - _tmp2_ = options; -#line 70 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" - self->priv->options = _tmp2_; + self->priv->options = options; #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self; -#line 877 "PhotoFileSniffer.c" +#line 1006 "PhotoFileSniffer.c" } -PhotoFileInterrogator* photo_file_interrogator_new (GFile* file, PhotoFileSnifferOptions options) { +PhotoFileInterrogator* +photo_file_interrogator_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return photo_file_interrogator_construct (TYPE_PHOTO_FILE_INTERROGATOR, file, options); -#line 884 "PhotoFileSniffer.c" +#line 1016 "PhotoFileSniffer.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 891 "PhotoFileSniffer.c" +#line 1025 "PhotoFileSniffer.c" } -DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self) { +DetectedPhotoInformation* +photo_file_interrogator_get_detected_photo_information (PhotoFileInterrogator* self) +{ DetectedPhotoInformation* result = NULL; DetectedPhotoInformation* _tmp0_; DetectedPhotoInformation* _tmp1_; @@ -905,11 +1041,13 @@ DetectedPhotoInformation* photo_file_interrogator_get_detected_photo_information result = _tmp1_; #line 76 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return result; -#line 909 "PhotoFileSniffer.c" +#line 1045 "PhotoFileSniffer.c" } -gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self) { +gboolean +photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* self) +{ gboolean result = FALSE; gboolean _tmp0_; #line 80 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -920,11 +1058,14 @@ gboolean photo_file_interrogator_get_is_photo_corrupted (PhotoFileInterrogator* result = _tmp0_; #line 81 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return result; -#line 924 "PhotoFileSniffer.c" +#line 1062 "PhotoFileSniffer.c" } -void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** error) { +void +photo_file_interrogator_interrogate (PhotoFileInterrogator* self, + GError** error) +{ gint _tmp0_; PhotoFileFormat* _tmp1_; GError * _inner_error_ = NULL; @@ -932,7 +1073,7 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** g_return_if_fail (IS_PHOTO_FILE_INTERROGATOR (self)); #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp1_ = photo_file_format_get_supported (&_tmp0_); -#line 936 "PhotoFileSniffer.c" +#line 1077 "PhotoFileSniffer.c" { PhotoFileFormat* file_format_collection = NULL; gint file_format_collection_length1 = 0; @@ -944,11 +1085,11 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** file_format_collection_length1 = _tmp0_; #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" for (file_format_it = 0; file_format_it < _tmp0_; file_format_it = file_format_it + 1) { -#line 948 "PhotoFileSniffer.c" +#line 1089 "PhotoFileSniffer.c" PhotoFileFormat file_format = 0; #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" file_format = file_format_collection[file_format_it]; -#line 952 "PhotoFileSniffer.c" +#line 1093 "PhotoFileSniffer.c" { PhotoFileSniffer* sniffer = NULL; PhotoFileFormat _tmp2_; @@ -991,7 +1132,7 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** file_format_collection = (g_free (file_format_collection), NULL); #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return; -#line 995 "PhotoFileSniffer.c" +#line 1136 "PhotoFileSniffer.c" } #line 89 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp10_ = _tmp6_; @@ -1005,21 +1146,21 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** _tmp12_ = self->priv->detected; #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (_tmp12_ != NULL) { -#line 1009 "PhotoFileSniffer.c" +#line 1150 "PhotoFileSniffer.c" gboolean _tmp13_; #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp13_ = is_corrupted; #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp11_ = !_tmp13_; -#line 1015 "PhotoFileSniffer.c" +#line 1156 "PhotoFileSniffer.c" } else { #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp11_ = FALSE; -#line 1019 "PhotoFileSniffer.c" +#line 1160 "PhotoFileSniffer.c" } #line 90 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (_tmp11_) { -#line 1023 "PhotoFileSniffer.c" +#line 1164 "PhotoFileSniffer.c" DetectedPhotoInformation* _tmp14_; PhotoFileFormat _tmp15_; PhotoFileFormat _tmp16_; @@ -1037,14 +1178,14 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** _photo_file_sniffer_unref0 (sniffer); #line 93 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" break; -#line 1041 "PhotoFileSniffer.c" +#line 1182 "PhotoFileSniffer.c" } else { gboolean _tmp17_; #line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _tmp17_ = is_corrupted; #line 94 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (_tmp17_) { -#line 1048 "PhotoFileSniffer.c" +#line 1189 "PhotoFileSniffer.c" GFile* _tmp18_; gchar* _tmp19_; gchar* _tmp20_; @@ -1071,121 +1212,146 @@ void photo_file_interrogator_interrogate (PhotoFileInterrogator* self, GError** _photo_file_sniffer_unref0 (sniffer); #line 99 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" break; -#line 1074 "PhotoFileSniffer.c" +#line 1215 "PhotoFileSniffer.c" } } #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _detected_photo_information_unref0 (_tmp6_); #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _photo_file_sniffer_unref0 (sniffer); -#line 1081 "PhotoFileSniffer.c" +#line 1222 "PhotoFileSniffer.c" } } #line 85 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" file_format_collection = (g_free (file_format_collection), NULL); -#line 1086 "PhotoFileSniffer.c" +#line 1227 "PhotoFileSniffer.c" } } -static void value_photo_file_interrogator_init (GValue* value) { +static void +value_photo_file_interrogator_init (GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 1094 "PhotoFileSniffer.c" +#line 1237 "PhotoFileSniffer.c" } -static void value_photo_file_interrogator_free_value (GValue* value) { +static void +value_photo_file_interrogator_free_value (GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_unref (value->data[0].v_pointer); -#line 1103 "PhotoFileSniffer.c" +#line 1248 "PhotoFileSniffer.c" } } -static void value_photo_file_interrogator_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_file_interrogator_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (src_value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = photo_file_interrogator_ref (src_value->data[0].v_pointer); -#line 1113 "PhotoFileSniffer.c" +#line 1261 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" dest_value->data[0].v_pointer = NULL; -#line 1117 "PhotoFileSniffer.c" +#line 1265 "PhotoFileSniffer.c" } } -static gpointer value_photo_file_interrogator_peek_pointer (const GValue* value) { +static gpointer +value_photo_file_interrogator_peek_pointer (const GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 1125 "PhotoFileSniffer.c" +#line 1275 "PhotoFileSniffer.c" } -static gchar* value_photo_file_interrogator_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_interrogator_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (collect_values[0].v_pointer) { -#line 1132 "PhotoFileSniffer.c" +#line 1287 "PhotoFileSniffer.c" PhotoFileInterrogator * object; object = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (object->parent_instance.g_class == NULL) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 1139 "PhotoFileSniffer.c" +#line 1294 "PhotoFileSniffer.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.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 1143 "PhotoFileSniffer.c" +#line 1298 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = photo_file_interrogator_ref (object); -#line 1147 "PhotoFileSniffer.c" +#line 1302 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 1151 "PhotoFileSniffer.c" +#line 1306 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 1155 "PhotoFileSniffer.c" +#line 1310 "PhotoFileSniffer.c" } -static gchar* value_photo_file_interrogator_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_file_interrogator_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoFileInterrogator ** object_p; object_p = collect_values[0].v_pointer; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!object_p) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 1166 "PhotoFileSniffer.c" +#line 1326 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (!value->data[0].v_pointer) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = NULL; -#line 1172 "PhotoFileSniffer.c" +#line 1332 "PhotoFileSniffer.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = value->data[0].v_pointer; -#line 1176 "PhotoFileSniffer.c" +#line 1336 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" *object_p = photo_file_interrogator_ref (value->data[0].v_pointer); -#line 1180 "PhotoFileSniffer.c" +#line 1340 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return NULL; -#line 1184 "PhotoFileSniffer.c" +#line 1344 "PhotoFileSniffer.c" } -GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_file_interrogator (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoFileInterrogator* spec; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_FILE_INTERROGATOR), NULL); @@ -1195,20 +1361,25 @@ GParamSpec* param_spec_photo_file_interrogator (const gchar* name, const gchar* G_PARAM_SPEC (spec)->value_type = object_type; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return G_PARAM_SPEC (spec); -#line 1198 "PhotoFileSniffer.c" +#line 1364 "PhotoFileSniffer.c" } -gpointer value_get_photo_file_interrogator (const GValue* value) { +gpointer +value_get_photo_file_interrogator (const GValue* value) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR), NULL); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return value->data[0].v_pointer; -#line 1207 "PhotoFileSniffer.c" +#line 1375 "PhotoFileSniffer.c" } -void value_set_photo_file_interrogator (GValue* value, gpointer v_object) { +void +value_set_photo_file_interrogator (GValue* value, + gpointer v_object) +{ PhotoFileInterrogator * old; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR)); @@ -1224,22 +1395,25 @@ void value_set_photo_file_interrogator (GValue* value, gpointer v_object) { value->data[0].v_pointer = v_object; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_ref (value->data[0].v_pointer); -#line 1227 "PhotoFileSniffer.c" +#line 1398 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 1231 "PhotoFileSniffer.c" +#line 1402 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_unref (old); -#line 1237 "PhotoFileSniffer.c" +#line 1408 "PhotoFileSniffer.c" } } -void value_take_photo_file_interrogator (GValue* value, gpointer v_object) { +void +value_take_photo_file_interrogator (GValue* value, + gpointer v_object) +{ PhotoFileInterrogator * old; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_INTERROGATOR)); @@ -1253,33 +1427,37 @@ void value_take_photo_file_interrogator (GValue* value, gpointer v_object) { g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = v_object; -#line 1256 "PhotoFileSniffer.c" +#line 1430 "PhotoFileSniffer.c" } else { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" value->data[0].v_pointer = NULL; -#line 1260 "PhotoFileSniffer.c" +#line 1434 "PhotoFileSniffer.c" } #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" if (old) { #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_unref (old); -#line 1266 "PhotoFileSniffer.c" +#line 1440 "PhotoFileSniffer.c" } } -static void photo_file_interrogator_class_init (PhotoFileInterrogatorClass * klass) { +static void +photo_file_interrogator_class_init (PhotoFileInterrogatorClass * klass) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" photo_file_interrogator_parent_class = g_type_class_peek_parent (klass); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" ((PhotoFileInterrogatorClass *) klass)->finalize = photo_file_interrogator_finalize; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_type_class_add_private (klass, sizeof (PhotoFileInterrogatorPrivate)); -#line 1278 "PhotoFileSniffer.c" +#line 1454 "PhotoFileSniffer.c" } -static void photo_file_interrogator_instance_init (PhotoFileInterrogator * self) { +static void +photo_file_interrogator_instance_init (PhotoFileInterrogator * self) +{ #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->priv = PHOTO_FILE_INTERROGATOR_GET_PRIVATE (self); #line 64 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1288,11 +1466,13 @@ static void photo_file_interrogator_instance_init (PhotoFileInterrogator * self) self->priv->is_photo_corrupted = FALSE; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self->ref_count = 1; -#line 1291 "PhotoFileSniffer.c" +#line 1469 "PhotoFileSniffer.c" } -static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj) { +static void +photo_file_interrogator_finalize (PhotoFileInterrogator * obj) +{ PhotoFileInterrogator * self; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_INTERROGATOR, PhotoFileInterrogator); @@ -1302,11 +1482,13 @@ static void photo_file_interrogator_finalize (PhotoFileInterrogator * obj) { _g_object_unref0 (self->priv->file); #line 64 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" _detected_photo_information_unref0 (self->priv->detected); -#line 1305 "PhotoFileSniffer.c" +#line 1485 "PhotoFileSniffer.c" } -GType photo_file_interrogator_get_type (void) { +GType +photo_file_interrogator_get_type (void) +{ static volatile gsize photo_file_interrogator_type_id__volatile = 0; if (g_once_init_enter (&photo_file_interrogator_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_file_interrogator_init, value_photo_file_interrogator_free_value, value_photo_file_interrogator_copy_value, value_photo_file_interrogator_peek_pointer, "p", value_photo_file_interrogator_collect_value, "p", value_photo_file_interrogator_lcopy_value }; @@ -1320,18 +1502,22 @@ GType photo_file_interrogator_get_type (void) { } -gpointer photo_file_interrogator_ref (gpointer instance) { +gpointer +photo_file_interrogator_ref (gpointer instance) +{ PhotoFileInterrogator * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_atomic_int_inc (&self->ref_count); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" return instance; -#line 1330 "PhotoFileSniffer.c" +#line 1514 "PhotoFileSniffer.c" } -void photo_file_interrogator_unref (gpointer instance) { +void +photo_file_interrogator_unref (gpointer instance) +{ PhotoFileInterrogator * self; self = instance; #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" @@ -1340,7 +1526,7 @@ void photo_file_interrogator_unref (gpointer instance) { PHOTO_FILE_INTERROGATOR_GET_CLASS (self)->finalize (self); #line 61 "/home/jens/Source/shotwell/src/photos/PhotoFileSniffer.vala" g_type_free_instance ((GTypeInstance *) self); -#line 1343 "PhotoFileSniffer.c" +#line 1529 "PhotoFileSniffer.c" } } diff --git a/src/photos/PhotoMetadata.c b/src/photos/PhotoMetadata.c index 144f24a..a04ad12 100644 --- a/src/photos/PhotoMetadata.c +++ b/src/photos/PhotoMetadata.c @@ -1,4 +1,4 @@ -/* PhotoMetadata.c generated by valac 0.36.6, the Vala compiler +/* PhotoMetadata.c generated by valac 0.40.4, the Vala compiler * generated from PhotoMetadata.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -23,6 +23,7 @@ /* http://www.exiv2.org/metadata.html*/ /**/ + #include #include #include @@ -484,99 +485,165 @@ static gpointer photo_metadata_internal_photo_preview_parent_class = NULL; GType metadata_domain_get_type (void) G_GNUC_CONST; gpointer keyword_transformer_ref (gpointer instance); void keyword_transformer_unref (gpointer instance); -GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_keyword_transformer (GValue* value, gpointer v_object); -void value_take_keyword_transformer (GValue* value, gpointer v_object); +GParamSpec* param_spec_keyword_transformer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_keyword_transformer (GValue* value, + gpointer v_object); +void value_take_keyword_transformer (GValue* value, + gpointer v_object); gpointer value_get_keyword_transformer (const GValue* value); GType keyword_transformer_get_type (void) G_GNUC_CONST; -enum { - KEYWORD_TRANSFORMER_DUMMY_PROPERTY -}; -GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* input, GError** error); -static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, const gchar* input, GError** error); +GeeList* keyword_transformer_transform (KeywordTransformer* self, + const gchar* input, + GError** error); +static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, + const gchar* input, + GError** error); KeywordTransformer* keyword_transformer_construct (GType object_type); static void keyword_transformer_finalize (KeywordTransformer * obj); GType null_keyword_transformer_get_type (void) G_GNUC_CONST; -enum { - NULL_KEYWORD_TRANSFORMER_DUMMY_PROPERTY -}; -static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error); +static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* base, + const gchar* input, + GError** error); NullKeywordTransformer* null_keyword_transformer_new (void); NullKeywordTransformer* null_keyword_transformer_construct (GType object_type); GType acd_see_keyword_transformer_get_type (void) G_GNUC_CONST; #define ACD_SEE_KEYWORD_TRANSFORMER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformerPrivate)) -enum { - ACD_SEE_KEYWORD_TRANSFORMER_DUMMY_PROPERTY -}; ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void); ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_type); -static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, gchar** attribute_names, gchar** attribute_values, GError** error); -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); -static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, GError** error); -static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, const gchar* element_name, gpointer self, GError** error); -static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* text, GError** error); -static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, const gchar* text, gsize text_len, gpointer self, GError** error); -static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_); -static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self); -static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error); +static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* name, + gchar** attribute_names, + gchar** attribute_values, + GError** error); +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); +static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* name, + GError** error); +static void _acd_see_keyword_transformer_on_end_gmarkup_parser_end_element_func (GMarkupParseContext* context, + const gchar* element_name, + gpointer self, + GError** error); +static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* text, + GError** error); +static void _acd_see_keyword_transformer_on_text_gmarkup_parser_text_func (GMarkupParseContext* context, + const gchar* text, + gsize text_len, + gpointer self, + GError** error); +static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + GError* _error_); +static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, + GError* _error_, + gpointer self); +static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, + const gchar* input, + GError** error); static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj); gpointer hierarchical_keyword_field_ref (gpointer instance); void hierarchical_keyword_field_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object); -void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_keyword_field (GValue* value, + gpointer v_object); +void value_take_hierarchical_keyword_field (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_keyword_field (const GValue* value); GType hierarchical_keyword_field_get_type (void) G_GNUC_CONST; -enum { - HIERARCHICAL_KEYWORD_FIELD_DUMMY_PROPERTY -}; -HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer); -HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer); +HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, + const gchar* path_separator, + gboolean wants_leading_separator, + gboolean is_writeable, + KeywordTransformer* transformer); +HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, + const gchar* field_name, + const gchar* path_separator, + gboolean wants_leading_separator, + gboolean is_writeable, + KeywordTransformer* transformer); static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj); gpointer photo_preview_ref (gpointer instance); void photo_preview_unref (gpointer instance); -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_preview (GValue* value, gpointer v_object); -void value_take_photo_preview (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_preview (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_preview (GValue* value, + gpointer v_object); +void value_take_photo_preview (GValue* value, + gpointer v_object); gpointer value_get_photo_preview (const GValue* value); GType photo_preview_get_type (void) G_GNUC_CONST; GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); #define PHOTO_PREVIEW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_PREVIEW, PhotoPreviewPrivate)) -enum { - PHOTO_PREVIEW_DUMMY_PROPERTY -}; -PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dimensions* dimensions, guint32 size, const gchar* mime_type, const gchar* extension); +PhotoPreview* photo_preview_construct (GType object_type, + const gchar* name, + Dimensions* dimensions, + guint32 size, + const gchar* mime_type, + const gchar* extension); gchar* photo_preview_get_name (PhotoPreview* self); -void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result); +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); -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); +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 void photo_preview_finalize (PhotoPreview * obj); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; gpointer metadata_date_time_ref (gpointer instance); void metadata_date_time_unref (gpointer instance); -GParamSpec* param_spec_metadata_date_time (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_metadata_date_time (GValue* value, gpointer v_object); -void value_take_metadata_date_time (GValue* value, gpointer v_object); +GParamSpec* param_spec_metadata_date_time (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_metadata_date_time (GValue* value, + gpointer v_object); +void value_take_metadata_date_time (GValue* value, + gpointer v_object); gpointer value_get_metadata_date_time (const GValue* value); GType metadata_date_time_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; #define PHOTO_METADATA_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_PHOTO_METADATA, PhotoMetadataPrivate)) -enum { - PHOTO_METADATA_DUMMY_PROPERTY -}; GType photo_metadata_set_option_get_type (void) G_GNUC_CONST; GType prepare_input_text_options_get_type (void) G_GNUC_CONST; #define PHOTO_METADATA_PREPARE_STRING_OPTIONS (((((PREPARE_INPUT_TEXT_OPTIONS_INVALID_IS_NULL | PREPARE_INPUT_TEXT_OPTIONS_EMPTY_IS_NULL) | PREPARE_INPUT_TEXT_OPTIONS_STRIP) | PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF) | PREPARE_INPUT_TEXT_OPTIONS_NORMALIZE) | PREPARE_INPUT_TEXT_OPTIONS_VALIDATE) @@ -584,179 +651,352 @@ GType prepare_input_text_options_get_type (void) G_GNUC_CONST; PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); 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, GBytes* buffer, GError** error); +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, + 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_domain (PhotoMetadata* self, + MetadataDomain domain); gboolean photo_metadata_has_exif (PhotoMetadata* self); gboolean photo_metadata_has_xmp (PhotoMetadata* self); gboolean photo_metadata_has_iptc (PhotoMetadata* self); -gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain domain); +gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, + MetadataDomain domain); gboolean photo_metadata_can_write_exif (PhotoMetadata* self); gboolean photo_metadata_can_write_xmp (PhotoMetadata* self); gboolean photo_metadata_can_write_iptc (PhotoMetadata* self); -gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag); -static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); -GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain domain, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); -GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); -gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag); -gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag); -gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options); -gchar* prepare_input_text (const gchar* text, PrepareInputTextOptions options, gint dest_length); +gboolean photo_metadata_has_tag (PhotoMetadata* self, + const gchar* tag); +static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); +GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, + MetadataDomain domain, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); +GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); +gchar* photo_metadata_get_tag_label (PhotoMetadata* self, + const gchar* tag); +gchar* photo_metadata_get_tag_description (PhotoMetadata* self, + const gchar* tag); +gchar* photo_metadata_get_string (PhotoMetadata* self, + const gchar* tag, + PrepareInputTextOptions options); +gchar* prepare_input_text (const gchar* text, + PrepareInputTextOptions options, + gint dest_length); #define DEFAULT_USER_TEXT_INPUT_LENGTH 1024 -gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options); -gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int tags_length1); -gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** tags, int tags_length1); -GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* tag); -GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1); -void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gchar* value, PrepareInputTextOptions options); -static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, int tags_length1, PhotoMetadataSetOption option, PhotoMetadataSetGenericValue setter, void* setter_target); -void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_length1, const gchar* value, PhotoMetadataSetOption option); +gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, + const gchar* tag, + PrepareInputTextOptions options); +gchar* photo_metadata_get_first_string (PhotoMetadata* self, + gchar** tags, + int tags_length1); +gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, + gchar** tags, + int tags_length1); +GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, + const gchar* tag); +GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, + gchar** tags, + int tags_length1); +void photo_metadata_set_string (PhotoMetadata* self, + const gchar* tag, + const gchar* value, + PrepareInputTextOptions options); +static void photo_metadata_set_all_generic (PhotoMetadata* self, + gchar** tags, + int tags_length1, + PhotoMetadataSetOption option, + PhotoMetadataSetGenericValue setter, + void* setter_target); +void photo_metadata_set_all_string (PhotoMetadata* self, + gchar** tags, + int tags_length1, + const gchar* value, + PhotoMetadataSetOption option); static Block1Data* block1_data_ref (Block1Data* _data1_); 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_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 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_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_); -static void __lambda6_ (Block2Data* _data2_, const gchar* tag); -static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self); -gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* value); -gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong* value); -void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value); -void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong value, PhotoMetadataSetOption option); +static void __lambda6_ (Block2Data* _data2_, + const gchar* tag); +static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); +gboolean photo_metadata_get_long (PhotoMetadata* self, + const gchar* tag, + glong* value); +gboolean photo_metadata_get_first_long (PhotoMetadata* self, + gchar** tags, + int tags_length1, + glong* value); +void photo_metadata_set_long (PhotoMetadata* self, + const gchar* tag, + glong value); +void photo_metadata_set_all_long (PhotoMetadata* self, + gchar** tags, + int tags_length1, + glong value, + PhotoMetadataSetOption option); static Block3Data* block3_data_ref (Block3Data* _data3_); static void block3_data_unref (void * _userdata_); -static void __lambda7_ (Block3Data* _data3_, const gchar* tag); -static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self); +static void __lambda7_ (Block3Data* _data3_, + const gchar* tag); +static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); GType metadata_rational_get_type (void) G_GNUC_CONST; MetadataRational* metadata_rational_dup (const MetadataRational* self); void metadata_rational_free (MetadataRational* self); -gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational); -void metadata_rational_init (MetadataRational *self, gint numerator, gint denominator); -gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational); -void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational); +gboolean photo_metadata_get_rational (PhotoMetadata* self, + const gchar* tag, + MetadataRational* rational); +void metadata_rational_init (MetadataRational *self, + gint numerator, + gint denominator); +gboolean photo_metadata_get_first_rational (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataRational* rational); +void photo_metadata_set_rational (PhotoMetadata* self, + const gchar* tag, + MetadataRational* rational); gchar* metadata_rational_to_string (MetadataRational *self); -void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational, PhotoMetadataSetOption option); +void photo_metadata_set_all_rational (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataRational* rational, + PhotoMetadataSetOption option); static Block4Data* block4_data_ref (Block4Data* _data4_); static void block4_data_unref (void * _userdata_); -static void __lambda8_ (Block4Data* _data4_, const gchar* tag); -static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self); -MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar* tag); +static void __lambda8_ (Block4Data* _data4_, + const gchar* tag); +static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); +MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, + const gchar* tag); GQuark metadata_date_time_error_quark (void); -MetadataDateTime* metadata_date_time_new_from_xmp (const gchar* label, GError** error); -MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, const gchar* label, GError** error); -MetadataDateTime* metadata_date_time_new_from_exif (const gchar* label, GError** error); -MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, const gchar* label, GError** error); -MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar** tags, int tags_length1); -void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, MetadataDateTime* date_time); +MetadataDateTime* metadata_date_time_new_from_xmp (const gchar* label, + GError** error); +MetadataDateTime* metadata_date_time_construct_from_xmp (GType object_type, + const gchar* label, + GError** error); +MetadataDateTime* metadata_date_time_new_from_exif (const gchar* label, + GError** error); +MetadataDateTime* metadata_date_time_construct_from_exif (GType object_type, + const gchar* label, + GError** error); +MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, + gchar** tags, + int tags_length1); +void photo_metadata_set_date_time (PhotoMetadata* self, + const gchar* tag, + MetadataDateTime* date_time); gchar* metadata_date_time_get_exif_label (MetadataDateTime* self); gchar* metadata_date_time_get_xmp_label (MetadataDateTime* self); const gchar* metadata_domain_to_string (MetadataDomain self); -void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_metadata_set_all_date_time (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); 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); +static void __lambda9_ (Block5Data* _data5_, + const gchar* tag); +static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); 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); -static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_construct (GType object_type, PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props); +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); +static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_construct (GType object_type, + PhotoMetadata* owner, + const gchar* name, + guint number, + GExiv2PreviewProperties* props); static GType photo_metadata_internal_photo_preview_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self); -void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag); -void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_length1); -void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain); +void photo_metadata_remove_tag (PhotoMetadata* self, + const gchar* tag); +void photo_metadata_remove_tags (PhotoMetadata* self, + gchar** tags, + int tags_length1); +void photo_metadata_clear_domain (PhotoMetadata* self, + MetadataDomain domain); void photo_metadata_clear (PhotoMetadata* self); MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self); -void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_metadata_set_modification_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self); -void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_metadata_set_exposure_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self); -void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option); +void photo_metadata_set_digitized_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option); static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetadata* base); Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self); -void dimensions_init (Dimensions *self, gint width, gint height); -void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option); +void dimensions_init (Dimensions *self, + gint width, + gint height); +void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, + Dimensions* dim, + PhotoMetadataSetOption option); static gchar* photo_metadata_real_get_title (MediaMetadata* base); gboolean is_string_empty (const gchar* s); -void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option); +void photo_metadata_set_title (PhotoMetadata* self, + const gchar* title, + PhotoMetadataSetOption option); static gchar* photo_metadata_real_get_comment (MediaMetadata* base); -void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option); +void photo_metadata_set_comment (PhotoMetadata* self, + const gchar* comment, + PhotoMetadataSetOption option); static Block6Data* block6_data_ref (Block6Data* _data6_); static void block6_data_unref (void * _userdata_); -static void ___lambda10_ (Block6Data* _data6_, const gchar* tag); -static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self); -GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify); +static void ___lambda10_ (Block6Data* _data6_, + const gchar* tag); +static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, + gpointer self); +GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify); gchar* hierarchical_tag_utilities_make_flat_tag_safe (const gchar* in_tag); gpointer hierarchical_tag_index_ref (gpointer instance); void hierarchical_tag_index_unref (gpointer instance); -GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_hierarchical_tag_index (GValue* value, gpointer v_object); -void value_take_hierarchical_tag_index (GValue* value, gpointer v_object); +GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_hierarchical_tag_index (GValue* value, + gpointer v_object); +void value_take_hierarchical_tag_index (GValue* value, + gpointer v_object); gpointer value_get_hierarchical_tag_index (const GValue* value); GType hierarchical_tag_index_get_type (void) G_GNUC_CONST; -static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, HierarchicalTagIndex* index); +static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, + HierarchicalTagIndex* index); GeeCollection* hierarchical_tag_index_get_all_paths (HierarchicalTagIndex* self); #define TAG_PATH_SEPARATOR_STRING "/" -void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, PhotoMetadataSetOption option); +void photo_metadata_set_keywords (PhotoMetadata* self, + GeeCollection* keywords, + PhotoMetadataSetOption option); HierarchicalTagIndex* hierarchical_tag_index_new (void); HierarchicalTagIndex* hierarchical_tag_index_construct (GType object_type); GeeList* hierarchical_tag_utilities_enumerate_path_components (const gchar* in_path); -void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, const gchar* tag, const gchar* path); +void hierarchical_tag_index_add_path (HierarchicalTagIndex* self, + const gchar* tag, + const gchar* path); GeeCollection* hierarchical_tag_index_get_all_tags (HierarchicalTagIndex* self); gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self); GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self); -gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, const gchar* foreign_separator); +gchar* hierarchical_tag_utilities_canonicalize (const gchar* in_tag, + const gchar* foreign_separator); gboolean photo_metadata_has_orientation (PhotoMetadata* self); GType orientation_get_type (void) G_GNUC_CONST; Orientation photo_metadata_get_orientation (PhotoMetadata* self); -void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation); -gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude); -gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exposure); +void photo_metadata_set_orientation (PhotoMetadata* self, + Orientation orientation); +gboolean photo_metadata_get_gps (PhotoMetadata* self, + gdouble* longitude, + gchar* * long_ref, + gdouble* latitude, + gchar* * lat_ref, + gdouble* altitude); +gboolean photo_metadata_get_exposure (PhotoMetadata* self, + MetadataRational* exposure); gchar* photo_metadata_get_exposure_string (PhotoMetadata* self); gboolean metadata_rational_is_valid (MetadataRational *self); -gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso); +gboolean photo_metadata_get_iso (PhotoMetadata* self, + glong* iso); gchar* photo_metadata_get_iso_string (PhotoMetadata* self); -gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* aperture); -gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_formatted); +gboolean photo_metadata_get_aperture (PhotoMetadata* self, + MetadataRational* aperture); +gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, + gboolean pango_formatted); gchar* photo_metadata_get_camera_make (PhotoMetadata* self); gchar* photo_metadata_get_camera_model (PhotoMetadata* self); -gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash); +gboolean photo_metadata_get_flash (PhotoMetadata* self, + glong* flash); gchar* photo_metadata_get_flash_string (PhotoMetadata* self); -gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* focal_length); +gboolean photo_metadata_get_focal_length (PhotoMetadata* self, + MetadataRational* focal_length); gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self); gchar* photo_metadata_get_artist (PhotoMetadata* self); gchar* photo_metadata_get_copyright (PhotoMetadata* self); gchar* photo_metadata_get_software (PhotoMetadata* self); -void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version); +void photo_metadata_set_software (PhotoMetadata* self, + const gchar* software, + const gchar* version); void photo_metadata_remove_software (PhotoMetadata* self); gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self); GType rating_get_type (void) G_GNUC_CONST; Rating photo_metadata_get_rating (PhotoMetadata* self); Rating rating_unserialize (gint value); -void photo_metadata_set_rating (PhotoMetadata* self, Rating rating); +void photo_metadata_set_rating (PhotoMetadata* self, + Rating rating); gint rating_serialize (Rating self); -enum { - PHOTO_METADATA_INTERNAL_PHOTO_PREVIEW_DUMMY_PROPERTY -}; -static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, GError** error); +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); -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func); +static void _vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func); +static void _vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func); static gint _vala_array_length (gpointer array); extern const gint RESOURCES_rating_thresholds[6]; -GType metadata_domain_get_type (void) { +GType +metadata_domain_get_type (void) +{ static volatile gsize metadata_domain_type_id__volatile = 0; if (g_once_init_enter (&metadata_domain_type_id__volatile)) { static const GEnumValue values[] = {{METADATA_DOMAIN_UNKNOWN, "METADATA_DOMAIN_UNKNOWN", "unknown"}, {METADATA_DOMAIN_EXIF, "METADATA_DOMAIN_EXIF", "exif"}, {METADATA_DOMAIN_XMP, "METADATA_DOMAIN_XMP", "xmp"}, {METADATA_DOMAIN_IPTC, "METADATA_DOMAIN_IPTC", "iptc"}, {0, NULL, NULL}}; @@ -768,132 +1008,167 @@ GType metadata_domain_get_type (void) { } -static GeeList* keyword_transformer_real_transform (KeywordTransformer* self, const gchar* input, GError** error) { +static GeeList* +keyword_transformer_real_transform (KeywordTransformer* self, + const gchar* input, + GError** error) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 777 "PhotoMetadata.c" +#line 1021 "PhotoMetadata.c" } -GeeList* keyword_transformer_transform (KeywordTransformer* self, const gchar* input, GError** error) { +GeeList* +keyword_transformer_transform (KeywordTransformer* self, + const gchar* input, + GError** error) +{ #line 32 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 786 "PhotoMetadata.c" +#line 1034 "PhotoMetadata.c" } -KeywordTransformer* keyword_transformer_construct (GType object_type) { +KeywordTransformer* +keyword_transformer_construct (GType object_type) +{ KeywordTransformer* self = NULL; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (KeywordTransformer*) g_type_create_instance (object_type); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 796 "PhotoMetadata.c" +#line 1046 "PhotoMetadata.c" } -static void value_keyword_transformer_init (GValue* value) { +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 803 "PhotoMetadata.c" +#line 1055 "PhotoMetadata.c" } -static void value_keyword_transformer_free_value (GValue* value) { +static void +value_keyword_transformer_free_value (GValue* value) +{ #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" keyword_transformer_unref (value->data[0].v_pointer); -#line 812 "PhotoMetadata.c" +#line 1066 "PhotoMetadata.c" } } -static void value_keyword_transformer_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_keyword_transformer_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 822 "PhotoMetadata.c" +#line 1079 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 826 "PhotoMetadata.c" +#line 1083 "PhotoMetadata.c" } } -static gpointer value_keyword_transformer_peek_pointer (const GValue* value) { +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 834 "PhotoMetadata.c" +#line 1093 "PhotoMetadata.c" } -static gchar* value_keyword_transformer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 841 "PhotoMetadata.c" +#line 1105 "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 848 "PhotoMetadata.c" +#line 1112 "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 852 "PhotoMetadata.c" +#line 1116 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = keyword_transformer_ref (object); -#line 856 "PhotoMetadata.c" +#line 1120 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 860 "PhotoMetadata.c" +#line 1124 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 864 "PhotoMetadata.c" +#line 1128 "PhotoMetadata.c" } -static gchar* value_keyword_transformer_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_keyword_transformer_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ KeywordTransformer ** object_p; object_p = collect_values[0].v_pointer; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 875 "PhotoMetadata.c" +#line 1144 "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 881 "PhotoMetadata.c" +#line 1150 "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 885 "PhotoMetadata.c" +#line 1154 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = keyword_transformer_ref (value->data[0].v_pointer); -#line 889 "PhotoMetadata.c" +#line 1158 "PhotoMetadata.c" } #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 893 "PhotoMetadata.c" +#line 1162 "PhotoMetadata.c" } -GParamSpec* param_spec_keyword_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_keyword_transformer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecKeywordTransformer* spec; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_KEYWORD_TRANSFORMER), NULL); @@ -903,20 +1178,25 @@ 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 907 "PhotoMetadata.c" +#line 1182 "PhotoMetadata.c" } -gpointer value_get_keyword_transformer (const GValue* value) { +gpointer +value_get_keyword_transformer (const GValue* value) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 916 "PhotoMetadata.c" +#line 1193 "PhotoMetadata.c" } -void value_set_keyword_transformer (GValue* value, gpointer v_object) { +void +value_set_keyword_transformer (GValue* value, + gpointer v_object) +{ KeywordTransformer * old; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER)); @@ -932,22 +1212,25 @@ 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 936 "PhotoMetadata.c" +#line 1216 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 940 "PhotoMetadata.c" +#line 1220 "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 946 "PhotoMetadata.c" +#line 1226 "PhotoMetadata.c" } } -void value_take_keyword_transformer (GValue* value, gpointer v_object) { +void +value_take_keyword_transformer (GValue* value, + gpointer v_object) +{ KeywordTransformer * old; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_KEYWORD_TRANSFORMER)); @@ -961,50 +1244,58 @@ 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 965 "PhotoMetadata.c" +#line 1248 "PhotoMetadata.c" } else { #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 969 "PhotoMetadata.c" +#line 1252 "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 975 "PhotoMetadata.c" +#line 1258 "PhotoMetadata.c" } } -static void keyword_transformer_class_init (KeywordTransformerClass * klass) { +static void +keyword_transformer_class_init (KeywordTransformerClass * klass) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keyword_transformer_parent_class = g_type_class_peek_parent (klass); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ((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 987 "PhotoMetadata.c" +#line 1272 "PhotoMetadata.c" } -static void keyword_transformer_instance_init (KeywordTransformer * self) { +static void +keyword_transformer_instance_init (KeywordTransformer * self) +{ #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 994 "PhotoMetadata.c" +#line 1281 "PhotoMetadata.c" } -static void keyword_transformer_finalize (KeywordTransformer * obj) { +static void +keyword_transformer_finalize (KeywordTransformer * obj) +{ KeywordTransformer * self; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 1004 "PhotoMetadata.c" +#line 1293 "PhotoMetadata.c" } -GType keyword_transformer_get_type (void) { +GType +keyword_transformer_get_type (void) +{ static volatile gsize keyword_transformer_type_id__volatile = 0; if (g_once_init_enter (&keyword_transformer_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_keyword_transformer_init, value_keyword_transformer_free_value, value_keyword_transformer_copy_value, value_keyword_transformer_peek_pointer, "p", value_keyword_transformer_collect_value, "p", value_keyword_transformer_lcopy_value }; @@ -1018,18 +1309,22 @@ GType keyword_transformer_get_type (void) { } -gpointer keyword_transformer_ref (gpointer instance) { +gpointer +keyword_transformer_ref (gpointer instance) +{ KeywordTransformer * self; self = instance; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 1029 "PhotoMetadata.c" +#line 1322 "PhotoMetadata.c" } -void keyword_transformer_unref (gpointer instance) { +void +keyword_transformer_unref (gpointer instance) +{ KeywordTransformer * self; self = instance; #line 31 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1038,17 +1333,20 @@ 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 1042 "PhotoMetadata.c" +#line 1337 "PhotoMetadata.c" } } -static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error) { +static GeeList* +null_keyword_transformer_real_transform (KeywordTransformer* base, + const gchar* input, + GError** error) +{ NullKeywordTransformer * self; GeeList* result = NULL; GeeArrayList* _result_ = NULL; GeeArrayList* _tmp0_; - const gchar* _tmp1_; #line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_NULL_KEYWORD_TRANSFORMER, NullKeywordTransformer); #line 36 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1058,48 +1356,56 @@ static GeeList* null_keyword_transformer_real_transform (KeywordTransformer* bas #line 37 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _result_ = _tmp0_; #line 38 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = input; -#line 38 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp1_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), input); #line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = G_TYPE_CHECK_INSTANCE_CAST (_result_, GEE_TYPE_LIST, GeeList); #line 40 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1069 "PhotoMetadata.c" +#line 1365 "PhotoMetadata.c" } -NullKeywordTransformer* null_keyword_transformer_construct (GType object_type) { +NullKeywordTransformer* +null_keyword_transformer_construct (GType object_type) +{ NullKeywordTransformer* self = NULL; #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (NullKeywordTransformer*) keyword_transformer_construct (object_type); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1079 "PhotoMetadata.c" +#line 1377 "PhotoMetadata.c" } -NullKeywordTransformer* null_keyword_transformer_new (void) { +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 1086 "PhotoMetadata.c" +#line 1386 "PhotoMetadata.c" } -static void null_keyword_transformer_class_init (NullKeywordTransformerClass * klass) { +static void +null_keyword_transformer_class_init (NullKeywordTransformerClass * klass) +{ #line 35 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 1095 "PhotoMetadata.c" +#line 1397 "PhotoMetadata.c" } -static void null_keyword_transformer_instance_init (NullKeywordTransformer * self) { +static void +null_keyword_transformer_instance_init (NullKeywordTransformer * self) +{ } -GType null_keyword_transformer_get_type (void) { +GType +null_keyword_transformer_get_type (void) +{ static volatile gsize null_keyword_transformer_type_id__volatile = 0; if (g_once_init_enter (&null_keyword_transformer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (NullKeywordTransformerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) null_keyword_transformer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (NullKeywordTransformer), 0, (GInstanceInitFunc) null_keyword_transformer_instance_init, NULL }; @@ -1111,35 +1417,59 @@ 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) { +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 1118 "PhotoMetadata.c" +#line 1431 "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) { +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 1125 "PhotoMetadata.c" +#line 1443 "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) { +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 1132 "PhotoMetadata.c" +#line 1456 "PhotoMetadata.c" } -static void _acd_see_keyword_transformer_on_error_gmarkup_parser_error_func (GMarkupParseContext* context, GError* _error_, gpointer self) { +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 1139 "PhotoMetadata.c" +#line 1467 "PhotoMetadata.c" } -ACDSeeKeywordTransformer* acd_see_keyword_transformer_construct (GType object_type) { +ACDSeeKeywordTransformer* +acd_see_keyword_transformer_construct (GType object_type) +{ ACDSeeKeywordTransformer* self = NULL; GeeArrayList* _tmp0_; GeeArrayQueue* _tmp1_; @@ -1169,36 +1499,42 @@ 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 1173 "PhotoMetadata.c" +#line 1503 "PhotoMetadata.c" } -ACDSeeKeywordTransformer* acd_see_keyword_transformer_new (void) { +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 1180 "PhotoMetadata.c" +#line 1512 "PhotoMetadata.c" } -static gpointer _g_object_ref0 (gpointer self) { +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 1187 "PhotoMetadata.c" +#line 1521 "PhotoMetadata.c" } -static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* base, const gchar* input, GError** error) { +static GeeList* +acd_see_keyword_transformer_real_transform (KeywordTransformer* base, + const gchar* input, + GError** error) +{ ACDSeeKeywordTransformer * self; GeeList* result = NULL; GMarkupParseContext* ctx = NULL; GMarkupParser _tmp0_; GMarkupParseContext* _tmp1_; - const gchar* _tmp2_; - const gchar* _tmp3_; - gint _tmp4_; - gint _tmp5_; - GeeArrayList* _tmp6_; - GeeList* _tmp7_; + gint _tmp2_; + gint _tmp3_; + GeeArrayList* _tmp4_; + GeeList* _tmp5_; GError * _inner_error_ = NULL; #line 72 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer); @@ -1211,15 +1547,11 @@ static GeeList* acd_see_keyword_transformer_real_transform (KeywordTransformer* #line 73 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctx = _tmp1_; #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = input; -#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = input; + _tmp2_ = strlen (input); #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = strlen (_tmp3_); -#line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp4_; + _tmp3_ = _tmp2_; #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_markup_parse_context_parse (ctx, _tmp2_, (gssize) _tmp5_, &_inner_error_); + g_markup_parse_context_parse (ctx, input, (gssize) _tmp3_, &_inner_error_); #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 75 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1228,30 +1560,30 @@ 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 1232 "PhotoMetadata.c" +#line 1564 "PhotoMetadata.c" } #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = self->priv->result; + _tmp4_ = self->priv->result; #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList)); + _tmp5_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_LIST, GeeList)); #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp7_; + result = _tmp5_; #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_markup_parse_context_unref0 (ctx); #line 77 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1244 "PhotoMetadata.c" +#line 1576 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, gchar** attribute_names, gchar** attribute_values, GError** error) { - const gchar* _tmp0_; - const gchar* _tmp1_; - const gchar* _tmp2_; - gchar** _tmp3_; - gint _tmp3__length1; - gchar** _tmp4_; - gint _tmp4__length1; +static void +acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* name, + gchar** attribute_names, + gchar** attribute_values, + GError** error) +{ GError * _inner_error_ = NULL; #line 80 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); @@ -1262,33 +1594,19 @@ static void acd_see_keyword_transformer_on_start (ACDSeeKeywordTransformer* self #line 88 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->assigned = FALSE; #line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = name; -#line 89 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (g_strcmp0 (_tmp0_, "Categories") == 0) { + if (g_strcmp0 (name, "Categories") == 0) { #line 90 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1271 "PhotoMetadata.c" +#line 1601 "PhotoMetadata.c" } #line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = name; -#line 93 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (g_strcmp0 (_tmp1_, "Category") != 0) { + if (g_strcmp0 (name, "Category") != 0) { #line 94 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1279 "PhotoMetadata.c" +#line 1607 "PhotoMetadata.c" } #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = name; -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = attribute_names; -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3__length1 = _vala_array_length (attribute_names); -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = attribute_values; -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = _vala_array_length (attribute_values); -#line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_markup_collect_attributes (_tmp2_, _tmp3_, _tmp4_, &_inner_error_, G_MARKUP_COLLECT_BOOLEAN, "Assigned", &self->priv->assigned, G_MARKUP_COLLECT_INVALID); + g_markup_collect_attributes (name, attribute_names, attribute_values, &_inner_error_, G_MARKUP_COLLECT_BOOLEAN, "Assigned", &self->priv->assigned, G_MARKUP_COLLECT_INVALID); #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 97 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1297,7 +1615,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 1301 "PhotoMetadata.c" +#line 1619 "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); @@ -1305,14 +1623,18 @@ 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 1309 "PhotoMetadata.c" +#line 1627 "PhotoMetadata.c" } } } -static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* name, GError** error) { - const gchar* _tmp0_; +static void +acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* name, + GError** error) +{ #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1320,31 +1642,32 @@ static void acd_see_keyword_transformer_on_end (ACDSeeKeywordTransformer* self, #line 104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (name != NULL); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = name; -#line 106 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (g_strcmp0 (_tmp0_, "Category") == 0) { -#line 1327 "PhotoMetadata.c" - GeeArrayQueue* _tmp1_; - gpointer _tmp2_; - gchar* _tmp3_; + if (g_strcmp0 (name, "Category") == 0) { +#line 1647 "PhotoMetadata.c" + GeeArrayQueue* _tmp0_; + gpointer _tmp1_; + gchar* _tmp2_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->stack; + _tmp0_ = self->priv->stack; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_DEQUE, GeeDeque)); + _tmp1_ = gee_deque_poll_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_DEQUE, GeeDeque)); #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = (gchar*) _tmp2_; + _tmp2_ = (gchar*) _tmp1_; #line 107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); -#line 1339 "PhotoMetadata.c" + _g_free0 (_tmp2_); +#line 1659 "PhotoMetadata.c" } } -static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, const gchar* text, GError** error) { - const gchar* _tmp0_; - GeeArrayQueue* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; +static void +acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + const gchar* text, + GError** error) +{ + GeeArrayQueue* _tmp0_; + gboolean _tmp1_; #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1352,148 +1675,146 @@ static void acd_see_keyword_transformer_on_text (ACDSeeKeywordTransformer* self, #line 111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (text != NULL); #line 113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = text; -#line 113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (g_strcmp0 (_tmp0_, "") == 0) { + if (g_strcmp0 (text, "") == 0) { #line 114 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1361 "PhotoMetadata.c" +#line 1682 "PhotoMetadata.c" } #line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->stack; -#line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = text; + _tmp0_ = self->priv->stack; #line 117 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_deque_offer_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_DEQUE, GeeDeque), _tmp2_); + gee_deque_offer_tail (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_DEQUE, GeeDeque), text); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = self->priv->assigned; + _tmp1_ = self->priv->assigned; #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_) { -#line 1373 "PhotoMetadata.c" + if (_tmp1_) { +#line 1692 "PhotoMetadata.c" GString* builder = NULL; - GString* _tmp4_; - GString* _tmp13_; - gssize _tmp14_; - GeeArrayList* _tmp18_; - GString* _tmp19_; - const gchar* _tmp20_; + GString* _tmp2_; + GString* _tmp10_; + gssize _tmp11_; + GeeArrayList* _tmp15_; + GString* _tmp16_; + const gchar* _tmp17_; #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = g_string_new (""); + _tmp2_ = g_string_new (""); #line 119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - builder = _tmp4_; -#line 1385 "PhotoMetadata.c" + builder = _tmp2_; +#line 1704 "PhotoMetadata.c" { GeeIterator* _f_it = NULL; - GeeArrayQueue* _tmp5_; - GeeIterator* _tmp6_; + GeeArrayQueue* _tmp3_; + GeeIterator* _tmp4_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = self->priv->stack; + _tmp3_ = self->priv->stack; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); + _tmp4_ = gee_abstract_collection_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _f_it = _tmp6_; + _f_it = _tmp4_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 1398 "PhotoMetadata.c" - GeeIterator* _tmp7_; - gboolean _tmp8_; +#line 1717 "PhotoMetadata.c" + GeeIterator* _tmp5_; gchar* f = NULL; - GeeIterator* _tmp9_; - gpointer _tmp10_; - GString* _tmp11_; - const gchar* _tmp12_; -#line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _f_it; + GeeIterator* _tmp6_; + gpointer _tmp7_; + GString* _tmp8_; + const gchar* _tmp9_; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = gee_iterator_next (_tmp7_); + _tmp5_ = _f_it; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp8_) { + if (!gee_iterator_next (_tmp5_)) { #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 1414 "PhotoMetadata.c" +#line 1730 "PhotoMetadata.c" } #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _f_it; + _tmp6_ = _f_it; #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = gee_iterator_get (_tmp9_); + _tmp7_ = gee_iterator_get (_tmp6_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - f = (gchar*) _tmp10_; + f = (gchar*) _tmp7_; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = builder; + _tmp8_ = builder; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = f; + _tmp9_ = f; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_string_append_printf (_tmp11_, "%s|", _tmp12_); + g_string_append_printf (_tmp8_, "%s|", _tmp9_); #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (f); -#line 1430 "PhotoMetadata.c" +#line 1746 "PhotoMetadata.c" } #line 120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_f_it); -#line 1434 "PhotoMetadata.c" +#line 1750 "PhotoMetadata.c" } #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = builder; + _tmp10_ = builder; #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = _tmp13_->len; + _tmp11_ = _tmp10_->len; #line 123 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp14_ > ((gssize) 0)) { -#line 1442 "PhotoMetadata.c" - GString* _tmp15_; - GString* _tmp16_; - gssize _tmp17_; + if (_tmp11_ > ((gssize) 0)) { +#line 1758 "PhotoMetadata.c" + GString* _tmp12_; + GString* _tmp13_; + gssize _tmp14_; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = builder; + _tmp12_ = builder; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = builder; + _tmp13_ = builder; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = _tmp16_->len; + _tmp14_ = _tmp13_->len; #line 124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_string_truncate (_tmp15_, (gsize) (_tmp17_ - 1)); -#line 1454 "PhotoMetadata.c" + g_string_truncate (_tmp12_, (gsize) (_tmp14_ - 1)); +#line 1770 "PhotoMetadata.c" } #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = self->priv->result; + _tmp15_ = self->priv->result; #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = builder; + _tmp16_ = builder; #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = _tmp19_->str; + _tmp17_ = _tmp16_->str; #line 126 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_); + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp17_); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_string_free0 (builder); -#line 1466 "PhotoMetadata.c" +#line 1782 "PhotoMetadata.c" } } -static gpointer _g_error_copy0 (gpointer 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 1474 "PhotoMetadata.c" +#line 1792 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, GMarkupParseContext* ctx, GError* _error_) { +static void +acd_see_keyword_transformer_on_error (ACDSeeKeywordTransformer* self, + GMarkupParseContext* ctx, + GError* _error_) +{ GError* _tmp0_; - GError* _tmp1_; #line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_ACD_SEE_KEYWORD_TRANSFORMER (self)); #line 130 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (ctx != NULL); #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = _error_; -#line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _g_error_copy0 (_tmp0_); + _tmp0_ = _g_error_copy0 (_error_); #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_error_free0 (self->priv->error); #line 131 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->error = _tmp1_; -#line 1493 "PhotoMetadata.c" + self->priv->error = _tmp0_; +#line 1812 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClass * klass) { +static void +acd_see_keyword_transformer_class_init (ACDSeeKeywordTransformerClass * klass) +{ #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" acd_see_keyword_transformer_parent_class = g_type_class_peek_parent (klass); #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1502,18 +1823,22 @@ 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 1506 "PhotoMetadata.c" +#line 1827 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_instance_init (ACDSeeKeywordTransformer * self) { +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 1513 "PhotoMetadata.c" +#line 1836 "PhotoMetadata.c" } -static void acd_see_keyword_transformer_finalize (KeywordTransformer * obj) { +static void +acd_see_keyword_transformer_finalize (KeywordTransformer * obj) +{ ACDSeeKeywordTransformer * self; #line 55 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ACD_SEE_KEYWORD_TRANSFORMER, ACDSeeKeywordTransformer); @@ -1525,11 +1850,13 @@ 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 1529 "PhotoMetadata.c" +#line 1854 "PhotoMetadata.c" } -GType acd_see_keyword_transformer_get_type (void) { +GType +acd_see_keyword_transformer_get_type (void) +{ static volatile gsize acd_see_keyword_transformer_type_id__volatile = 0; if (g_once_init_enter (&acd_see_keyword_transformer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (ACDSeeKeywordTransformerClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) acd_see_keyword_transformer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ACDSeeKeywordTransformer), 0, (GInstanceInitFunc) acd_see_keyword_transformer_instance_init, NULL }; @@ -1541,23 +1868,27 @@ GType acd_see_keyword_transformer_get_type (void) { } -static gpointer _keyword_transformer_ref0 (gpointer self) { +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 1548 "PhotoMetadata.c" +#line 1877 "PhotoMetadata.c" } -HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_type, const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) { +HierarchicalKeywordField* +hierarchical_keyword_field_construct (GType object_type, + const gchar* field_name, + const gchar* path_separator, + gboolean wants_leading_separator, + gboolean is_writeable, + KeywordTransformer* transformer) +{ HierarchicalKeywordField* self = NULL; - const gchar* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - const gchar* _tmp2_; - gchar* _tmp3_; - gboolean _tmp4_; - gboolean _tmp5_; - KeywordTransformer* _tmp6_; - KeywordTransformer* _tmp7_; + KeywordTransformer* _tmp2_; #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (field_name != NULL, NULL); #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1567,148 +1898,169 @@ HierarchicalKeywordField* hierarchical_keyword_field_construct (GType object_typ #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (HierarchicalKeywordField*) g_type_create_instance (object_type); #line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = field_name; -#line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (field_name); #line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->field_name); #line 150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->field_name = _tmp1_; -#line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = path_separator; + self->field_name = _tmp0_; #line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (path_separator); #line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->path_separator); #line 151 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->path_separator = _tmp3_; + self->path_separator = _tmp1_; #line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = wants_leading_separator; -#line 152 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->wants_leading_separator = _tmp4_; -#line 153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = is_writeable; + self->wants_leading_separator = wants_leading_separator; #line 153 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->is_writeable = _tmp5_; + self->is_writeable = is_writeable; #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = transformer; -#line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _keyword_transformer_ref0 (_tmp6_); + _tmp2_ = _keyword_transformer_ref0 (transformer); #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _keyword_transformer_unref0 (self->transformer); #line 154 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->transformer = _tmp7_; + self->transformer = _tmp2_; #line 144 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1604 "PhotoMetadata.c" +#line 1925 "PhotoMetadata.c" } -HierarchicalKeywordField* hierarchical_keyword_field_new (const gchar* field_name, const gchar* path_separator, gboolean wants_leading_separator, gboolean is_writeable, KeywordTransformer* transformer) { +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 1611 "PhotoMetadata.c" +#line 1938 "PhotoMetadata.c" } -static void value_hierarchical_keyword_field_init (GValue* value) { +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 1618 "PhotoMetadata.c" +#line 1947 "PhotoMetadata.c" } -static void value_hierarchical_keyword_field_free_value (GValue* value) { +static void +value_hierarchical_keyword_field_free_value (GValue* value) +{ #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" hierarchical_keyword_field_unref (value->data[0].v_pointer); -#line 1627 "PhotoMetadata.c" +#line 1958 "PhotoMetadata.c" } } -static void value_hierarchical_keyword_field_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_hierarchical_keyword_field_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 1637 "PhotoMetadata.c" +#line 1971 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 1641 "PhotoMetadata.c" +#line 1975 "PhotoMetadata.c" } } -static gpointer value_hierarchical_keyword_field_peek_pointer (const GValue* 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 1649 "PhotoMetadata.c" +#line 1985 "PhotoMetadata.c" } -static gchar* value_hierarchical_keyword_field_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 1656 "PhotoMetadata.c" +#line 1997 "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 1663 "PhotoMetadata.c" +#line 2004 "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 1667 "PhotoMetadata.c" +#line 2008 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = hierarchical_keyword_field_ref (object); -#line 1671 "PhotoMetadata.c" +#line 2012 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1675 "PhotoMetadata.c" +#line 2016 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1679 "PhotoMetadata.c" +#line 2020 "PhotoMetadata.c" } -static gchar* value_hierarchical_keyword_field_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_hierarchical_keyword_field_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ HierarchicalKeywordField ** object_p; object_p = collect_values[0].v_pointer; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 1690 "PhotoMetadata.c" +#line 2036 "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 1696 "PhotoMetadata.c" +#line 2042 "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 1700 "PhotoMetadata.c" +#line 2046 "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 1704 "PhotoMetadata.c" +#line 2050 "PhotoMetadata.c" } #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 1708 "PhotoMetadata.c" +#line 2054 "PhotoMetadata.c" } -GParamSpec* param_spec_hierarchical_keyword_field (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_hierarchical_keyword_field (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecHierarchicalKeywordField* spec; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_HIERARCHICAL_KEYWORD_FIELD), NULL); @@ -1718,20 +2070,25 @@ 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 1722 "PhotoMetadata.c" +#line 2074 "PhotoMetadata.c" } -gpointer value_get_hierarchical_keyword_field (const GValue* value) { +gpointer +value_get_hierarchical_keyword_field (const GValue* value) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 1731 "PhotoMetadata.c" +#line 2085 "PhotoMetadata.c" } -void value_set_hierarchical_keyword_field (GValue* value, gpointer v_object) { +void +value_set_hierarchical_keyword_field (GValue* value, + gpointer v_object) +{ HierarchicalKeywordField * old; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD)); @@ -1747,22 +2104,25 @@ 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 1751 "PhotoMetadata.c" +#line 2108 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1755 "PhotoMetadata.c" +#line 2112 "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 1761 "PhotoMetadata.c" +#line 2118 "PhotoMetadata.c" } } -void value_take_hierarchical_keyword_field (GValue* value, gpointer v_object) { +void +value_take_hierarchical_keyword_field (GValue* value, + gpointer v_object) +{ HierarchicalKeywordField * old; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_HIERARCHICAL_KEYWORD_FIELD)); @@ -1776,38 +2136,44 @@ 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 1780 "PhotoMetadata.c" +#line 2140 "PhotoMetadata.c" } else { #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 1784 "PhotoMetadata.c" +#line 2144 "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 1790 "PhotoMetadata.c" +#line 2150 "PhotoMetadata.c" } } -static void hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass * klass) { +static void +hierarchical_keyword_field_class_init (HierarchicalKeywordFieldClass * klass) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 1800 "PhotoMetadata.c" +#line 2162 "PhotoMetadata.c" } -static void hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) { +static void +hierarchical_keyword_field_instance_init (HierarchicalKeywordField * self) +{ #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 1807 "PhotoMetadata.c" +#line 2171 "PhotoMetadata.c" } -static void hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj) { +static void +hierarchical_keyword_field_finalize (HierarchicalKeywordField * obj) +{ HierarchicalKeywordField * self; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_HIERARCHICAL_KEYWORD_FIELD, HierarchicalKeywordField); @@ -1819,11 +2185,13 @@ 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 1823 "PhotoMetadata.c" +#line 2189 "PhotoMetadata.c" } -GType hierarchical_keyword_field_get_type (void) { +GType +hierarchical_keyword_field_get_type (void) +{ static volatile gsize hierarchical_keyword_field_type_id__volatile = 0; if (g_once_init_enter (&hierarchical_keyword_field_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_hierarchical_keyword_field_init, value_hierarchical_keyword_field_free_value, value_hierarchical_keyword_field_copy_value, value_hierarchical_keyword_field_peek_pointer, "p", value_hierarchical_keyword_field_collect_value, "p", value_hierarchical_keyword_field_lcopy_value }; @@ -1837,18 +2205,22 @@ GType hierarchical_keyword_field_get_type (void) { } -gpointer hierarchical_keyword_field_ref (gpointer instance) { +gpointer +hierarchical_keyword_field_ref (gpointer instance) +{ HierarchicalKeywordField * self; self = instance; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 1848 "PhotoMetadata.c" +#line 2218 "PhotoMetadata.c" } -void hierarchical_keyword_field_unref (gpointer instance) { +void +hierarchical_keyword_field_unref (gpointer instance) +{ HierarchicalKeywordField * self; self = instance; #line 137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1857,21 +2229,24 @@ 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 1861 "PhotoMetadata.c" +#line 2233 "PhotoMetadata.c" } } -PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dimensions* dimensions, guint32 size, const gchar* mime_type, const gchar* extension) { +PhotoPreview* +photo_preview_construct (GType object_type, + const gchar* name, + Dimensions* dimensions, + guint32 size, + const gchar* mime_type, + const gchar* extension) +{ PhotoPreview* self = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - Dimensions _tmp2_; - guint32 _tmp3_; - const gchar* _tmp4_; - gchar* _tmp5_; - const gchar* _tmp6_; - gchar* _tmp7_; + gchar* _tmp0_; + Dimensions _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (name != NULL, NULL); #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1883,44 +2258,38 @@ PhotoPreview* photo_preview_construct (GType object_type, const gchar* name, Dim #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (PhotoPreview*) g_type_create_instance (object_type); #line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = name; -#line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (name); #line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->name); #line 166 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->name = _tmp1_; + self->priv->name = _tmp0_; #line 167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = *dimensions; + _tmp1_ = *dimensions; #line 167 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->dimensions = _tmp2_; + self->priv->dimensions = _tmp1_; #line 168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = size; -#line 168 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->size = _tmp3_; -#line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = mime_type; + self->priv->size = size; #line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = g_strdup (_tmp4_); + _tmp2_ = g_strdup (mime_type); #line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->mime_type); #line 169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->mime_type = _tmp5_; + self->priv->mime_type = _tmp2_; #line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = extension; -#line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (extension); #line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->extension); #line 170 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->extension = _tmp7_; + self->priv->extension = _tmp3_; #line 165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 1920 "PhotoMetadata.c" +#line 2287 "PhotoMetadata.c" } -gchar* photo_preview_get_name (PhotoPreview* self) { +gchar* +photo_preview_get_name (PhotoPreview* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -1934,11 +2303,14 @@ gchar* photo_preview_get_name (PhotoPreview* self) { result = _tmp1_; #line 174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1938 "PhotoMetadata.c" +#line 2307 "PhotoMetadata.c" } -void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) { +void +photo_preview_get_pixel_dimensions (PhotoPreview* self, + Dimensions* result) +{ Dimensions _tmp0_; #line 177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_PREVIEW (self)); @@ -1948,11 +2320,13 @@ void photo_preview_get_pixel_dimensions (PhotoPreview* self, Dimensions* result) *result = _tmp0_; #line 178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 1952 "PhotoMetadata.c" +#line 2324 "PhotoMetadata.c" } -guint32 photo_preview_get_size (PhotoPreview* self) { +guint32 +photo_preview_get_size (PhotoPreview* self) +{ guint32 result = 0U; guint32 _tmp0_; #line 181 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -1963,11 +2337,13 @@ guint32 photo_preview_get_size (PhotoPreview* self) { result = _tmp0_; #line 182 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1967 "PhotoMetadata.c" +#line 2341 "PhotoMetadata.c" } -gchar* photo_preview_get_mime_type (PhotoPreview* self) { +gchar* +photo_preview_get_mime_type (PhotoPreview* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -1981,11 +2357,13 @@ gchar* photo_preview_get_mime_type (PhotoPreview* self) { result = _tmp1_; #line 186 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 1985 "PhotoMetadata.c" +#line 2361 "PhotoMetadata.c" } -gchar* photo_preview_get_extension (PhotoPreview* self) { +gchar* +photo_preview_get_extension (PhotoPreview* self) +{ gchar* result = NULL; const gchar* _tmp0_; gchar* _tmp1_; @@ -1999,29 +2377,38 @@ gchar* photo_preview_get_extension (PhotoPreview* self) { result = _tmp1_; #line 190 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2003 "PhotoMetadata.c" +#line 2381 "PhotoMetadata.c" } -static GBytes* photo_preview_real_flatten (PhotoPreview* self, 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 2012 "PhotoMetadata.c" +#line 2393 "PhotoMetadata.c" } -GBytes* photo_preview_flatten (PhotoPreview* self, 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, error); -#line 2021 "PhotoMetadata.c" +#line 2405 "PhotoMetadata.c" } -static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** error) { +static GdkPixbuf* +photo_preview_real_get_pixbuf (PhotoPreview* self, + GError** error) +{ GdkPixbuf* result = NULL; GBytes* flattened = NULL; GBytes* _tmp0_; @@ -2036,7 +2423,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er g_propagate_error (error, _inner_error_); #line 196 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2040 "PhotoMetadata.c" +#line 2427 "PhotoMetadata.c" } { GdkPixbuf* _tmp1_ = NULL; @@ -2059,7 +2446,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er _tmp1_ = _tmp5_; #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2063 "PhotoMetadata.c" +#line 2450 "PhotoMetadata.c" goto __catch29_g_error; } #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2074,7 +2461,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er _g_bytes_unref0 (flattened); #line 201 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2078 "PhotoMetadata.c" +#line 2465 "PhotoMetadata.c" } goto __finally29; __catch29_g_error: @@ -2103,7 +2490,7 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er _g_bytes_unref0 (flattened); #line 206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2107 "PhotoMetadata.c" +#line 2494 "PhotoMetadata.c" } __finally29: #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2112,117 +2499,145 @@ static GdkPixbuf* photo_preview_real_get_pixbuf (PhotoPreview* self, GError** er _g_bytes_unref0 (flattened); #line 200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2116 "PhotoMetadata.c" +#line 2503 "PhotoMetadata.c" } -GdkPixbuf* photo_preview_get_pixbuf (PhotoPreview* self, GError** error) { +GdkPixbuf* +photo_preview_get_pixbuf (PhotoPreview* self, + GError** error) +{ #line 195 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 2125 "PhotoMetadata.c" +#line 2515 "PhotoMetadata.c" } -static void value_photo_preview_init (GValue* value) { +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 2132 "PhotoMetadata.c" +#line 2524 "PhotoMetadata.c" } -static void value_photo_preview_free_value (GValue* value) { +static void +value_photo_preview_free_value (GValue* value) +{ #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" photo_preview_unref (value->data[0].v_pointer); -#line 2141 "PhotoMetadata.c" +#line 2535 "PhotoMetadata.c" } } -static void value_photo_preview_copy_value (const GValue* src_value, GValue* dest_value) { +static void +value_photo_preview_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 2151 "PhotoMetadata.c" +#line 2548 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" dest_value->data[0].v_pointer = NULL; -#line 2155 "PhotoMetadata.c" +#line 2552 "PhotoMetadata.c" } } -static gpointer value_photo_preview_peek_pointer (const GValue* value) { +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 2163 "PhotoMetadata.c" +#line 2562 "PhotoMetadata.c" } -static gchar* value_photo_preview_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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 2170 "PhotoMetadata.c" +#line 2574 "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 2177 "PhotoMetadata.c" +#line 2581 "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 2181 "PhotoMetadata.c" +#line 2585 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = photo_preview_ref (object); -#line 2185 "PhotoMetadata.c" +#line 2589 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2189 "PhotoMetadata.c" +#line 2593 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2193 "PhotoMetadata.c" +#line 2597 "PhotoMetadata.c" } -static gchar* value_photo_preview_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +value_photo_preview_lcopy_value (const GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ PhotoPreview ** object_p; object_p = collect_values[0].v_pointer; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 2204 "PhotoMetadata.c" +#line 2613 "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 2210 "PhotoMetadata.c" +#line 2619 "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 2214 "PhotoMetadata.c" +#line 2623 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *object_p = photo_preview_ref (value->data[0].v_pointer); -#line 2218 "PhotoMetadata.c" +#line 2627 "PhotoMetadata.c" } #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 2222 "PhotoMetadata.c" +#line 2631 "PhotoMetadata.c" } -GParamSpec* param_spec_photo_preview (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +GParamSpec* +param_spec_photo_preview (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ ParamSpecPhotoPreview* spec; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (g_type_is_a (object_type, TYPE_PHOTO_PREVIEW), NULL); @@ -2232,20 +2647,25 @@ 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 2236 "PhotoMetadata.c" +#line 2651 "PhotoMetadata.c" } -gpointer value_get_photo_preview (const GValue* value) { +gpointer +value_get_photo_preview (const GValue* value) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" 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 2245 "PhotoMetadata.c" +#line 2662 "PhotoMetadata.c" } -void value_set_photo_preview (GValue* value, gpointer v_object) { +void +value_set_photo_preview (GValue* value, + gpointer v_object) +{ PhotoPreview * old; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW)); @@ -2261,22 +2681,25 @@ 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 2265 "PhotoMetadata.c" +#line 2685 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2269 "PhotoMetadata.c" +#line 2689 "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 2275 "PhotoMetadata.c" +#line 2695 "PhotoMetadata.c" } } -void value_take_photo_preview (GValue* value, gpointer v_object) { +void +value_take_photo_preview (GValue* value, + gpointer v_object) +{ PhotoPreview * old; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_PREVIEW)); @@ -2290,22 +2713,24 @@ 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 2294 "PhotoMetadata.c" +#line 2717 "PhotoMetadata.c" } else { #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" value->data[0].v_pointer = NULL; -#line 2298 "PhotoMetadata.c" +#line 2721 "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 2304 "PhotoMetadata.c" +#line 2727 "PhotoMetadata.c" } } -static void photo_preview_class_init (PhotoPreviewClass * klass) { +static void +photo_preview_class_init (PhotoPreviewClass * klass) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_preview_parent_class = g_type_class_peek_parent (klass); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2316,20 +2741,24 @@ static void photo_preview_class_init (PhotoPreviewClass * klass) { ((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 2320 "PhotoMetadata.c" +#line 2745 "PhotoMetadata.c" } -static void photo_preview_instance_init (PhotoPreview * self) { +static void +photo_preview_instance_init (PhotoPreview * self) +{ #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv = PHOTO_PREVIEW_GET_PRIVATE (self); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->ref_count = 1; -#line 2329 "PhotoMetadata.c" +#line 2756 "PhotoMetadata.c" } -static void photo_preview_finalize (PhotoPreview * obj) { +static void +photo_preview_finalize (PhotoPreview * obj) +{ PhotoPreview * self; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_PREVIEW, PhotoPreview); @@ -2341,11 +2770,13 @@ 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 2345 "PhotoMetadata.c" +#line 2774 "PhotoMetadata.c" } -GType photo_preview_get_type (void) { +GType +photo_preview_get_type (void) +{ static volatile gsize photo_preview_type_id__volatile = 0; if (g_once_init_enter (&photo_preview_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { value_photo_preview_init, value_photo_preview_free_value, value_photo_preview_copy_value, value_photo_preview_peek_pointer, "p", value_photo_preview_collect_value, "p", value_photo_preview_lcopy_value }; @@ -2359,18 +2790,22 @@ GType photo_preview_get_type (void) { } -gpointer photo_preview_ref (gpointer instance) { +gpointer +photo_preview_ref (gpointer instance) +{ PhotoPreview * self; self = instance; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&self->ref_count); #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return instance; -#line 2370 "PhotoMetadata.c" +#line 2803 "PhotoMetadata.c" } -void photo_preview_unref (gpointer instance) { +void +photo_preview_unref (gpointer instance) +{ PhotoPreview * self; self = instance; #line 158 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2379,12 +2814,14 @@ 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 2383 "PhotoMetadata.c" +#line 2818 "PhotoMetadata.c" } } -GType photo_metadata_set_option_get_type (void) { +GType +photo_metadata_set_option_get_type (void) +{ static volatile gsize photo_metadata_set_option_type_id__volatile = 0; if (g_once_init_enter (&photo_metadata_set_option_type_id__volatile)) { static const GEnumValue values[] = {{PHOTO_METADATA_SET_OPTION_ALL_DOMAINS, "PHOTO_METADATA_SET_OPTION_ALL_DOMAINS", "all-domains"}, {PHOTO_METADATA_SET_OPTION_ONLY_IF_DOMAIN_PRESENT, "PHOTO_METADATA_SET_OPTION_ONLY_IF_DOMAIN_PRESENT", "only-if-domain-present"}, {PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN, "PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN", "at-least-default-domain"}, {0, NULL, NULL}}; @@ -2396,36 +2833,41 @@ GType photo_metadata_set_option_get_type (void) { } -PhotoMetadata* photo_metadata_construct (GType object_type) { +PhotoMetadata* +photo_metadata_construct (GType object_type) +{ PhotoMetadata* self = NULL; #line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = (PhotoMetadata*) media_metadata_construct (object_type); #line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 2406 "PhotoMetadata.c" +#line 2845 "PhotoMetadata.c" } -PhotoMetadata* photo_metadata_new (void) { +PhotoMetadata* +photo_metadata_new (void) +{ #line 254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return photo_metadata_construct (TYPE_PHOTO_METADATA); -#line 2413 "PhotoMetadata.c" +#line 2854 "PhotoMetadata.c" } -static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file, GError** error) { +static void +photo_metadata_real_read_from_file (MediaMetadata* base, + GFile* file, + GError** error) +{ PhotoMetadata * self; GExiv2Metadata* _tmp0_; GExiv2Metadata* _tmp1_; - GFile* _tmp2_; + gchar* _tmp2_; gchar* _tmp3_; gchar* _tmp4_; - GFile* _tmp5_; - gchar* _tmp6_; + gchar* _tmp5_; + ExifData* _tmp6_; gchar* _tmp7_; - ExifData* _tmp8_; - GFile* _tmp9_; - gchar* _tmp10_; GError * _inner_error_ = NULL; #line 257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); @@ -2444,54 +2886,51 @@ static void photo_metadata_real_read_from_file (MediaMetadata* base, GFile* file #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->exiv2; #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = file; -#line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = g_file_get_path (_tmp2_); + _tmp2_ = g_file_get_path (file); #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = _tmp3_; + _tmp3_ = _tmp2_; #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_open_path (_tmp1_, _tmp4_, &_inner_error_); + gexiv2_metadata_open_path (_tmp1_, _tmp3_, &_inner_error_); #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp3_); #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2463 "PhotoMetadata.c" +#line 2903 "PhotoMetadata.c" } #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = file; -#line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = g_file_get_path (_tmp5_); + _tmp4_ = g_file_get_path (file); #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = exif_data_new_from_file (_tmp7_); + _tmp6_ = exif_data_new_from_file (_tmp5_); #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exif = _tmp8_; + self->priv->exif = _tmp6_; #line 262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp7_); -#line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = file; + _g_free0 (_tmp5_); #line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = g_file_get_basename (_tmp9_); + _tmp7_ = g_file_get_basename (file); #line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); #line 263 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->source_name = _tmp10_; -#line 2487 "PhotoMetadata.c" + self->priv->source_name = _tmp7_; +#line 2923 "PhotoMetadata.c" } -void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error) { +void +photo_metadata_write_to_file (PhotoMetadata* self, + GFile* file, + GError** error) +{ GExiv2Metadata* _tmp0_; - GFile* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; - gchar* _tmp3_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); @@ -2500,137 +2939,97 @@ void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** er #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = file; + _tmp1_ = g_file_get_path (file); #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = g_file_get_path (_tmp1_); -#line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_; + _tmp2_ = _tmp1_; #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_save_file (_tmp0_, _tmp3_, &_inner_error_); + gexiv2_metadata_save_file (_tmp0_, _tmp2_, &_inner_error_); #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2519 "PhotoMetadata.c" +#line 2956 "PhotoMetadata.c" } } -void photo_metadata_read_from_buffer (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_buffer (PhotoMetadata* self, + guint8* buffer, + int buffer_length1, + gint length, + GError** error) +{ + GExiv2Metadata* _tmp0_; + GExiv2Metadata* _tmp1_; + ExifData* _tmp2_; + gchar* _tmp3_; GError * _inner_error_ = NULL; #line 270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = length; -#line 271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ <= 0) { -#line 2547 "PhotoMetadata.c" - guint8* _tmp1_; - gint _tmp1__length1; -#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = buffer; + if (length <= 0) { #line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = buffer_length1; -#line 272 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - length = _tmp1__length1; -#line 2556 "PhotoMetadata.c" + length = buffer_length1; +#line 2979 "PhotoMetadata.c" } #line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = buffer; -#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = buffer_length1; -#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = length; -#line 274 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_assert (_tmp2__length1 >= _tmp3_, "buffer.length >= length"); + _vala_assert (buffer_length1 >= length, "buffer.length >= length"); #line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_new (); + _tmp0_ = gexiv2_metadata_new (); #line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (self->priv->exiv2); #line 276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exiv2 = _tmp4_; + self->priv->exiv2 = _tmp0_; #line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); #line 277 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->exif = NULL; #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = self->priv->exiv2; -#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = buffer; -#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6__length1 = buffer_length1; -#line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = length; + _tmp1_ = self->priv->exiv2; #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_open_buf (_tmp5_, _tmp6_, (glong) _tmp7_, &_inner_error_); + gexiv2_metadata_open_buf (_tmp1_, buffer, (glong) length, &_inner_error_); #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 279 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2592 "PhotoMetadata.c" +#line 3003 "PhotoMetadata.c" } #line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = buffer; -#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8__length1 = buffer_length1; -#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = length; -#line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = exif_data_new_from_data (_tmp8_, (gsize) _tmp9_); + _tmp2_ = exif_data_new_from_data (buffer, (gsize) length); #line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); #line 280 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->exif = _tmp10_; -#line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = length; + self->priv->exif = _tmp2_; #line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = g_strdup_printf ("", _tmp11_); + _tmp3_ = g_strdup_printf ("", length); #line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); #line 281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->source_name = _tmp12_; -#line 2614 "PhotoMetadata.c" + self->priv->source_name = _tmp3_; +#line 3017 "PhotoMetadata.c" } -void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, GError** error) { +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_; + gsize _tmp2_; + guint8* _tmp3_; + gsize _tmp4_; + guint8* _tmp5_; + ExifData* _tmp6_; + gchar* _tmp7_; GError * _inner_error_ = NULL; #line 284 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); @@ -2649,344 +3048,289 @@ void photo_metadata_read_from_app1_segment (PhotoMetadata* self, GBytes* buffer, #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_); + _tmp3_ = g_bytes_get_data (buffer, &_tmp2_); #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_from_app1_segment (_tmp1_, _tmp4_, (glong) _tmp6_, &_inner_error_); + gexiv2_metadata_from_app1_segment (_tmp1_, _tmp3_, (glong) g_bytes_get_size (buffer), &_inner_error_); #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_propagate_error (error, _inner_error_); #line 288 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 2668 "PhotoMetadata.c" +#line 3061 "PhotoMetadata.c" } #line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = buffer; + _tmp5_ = g_bytes_get_data (buffer, &_tmp4_); #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_); + _tmp6_ = exif_data_new_from_data (_tmp5_, g_bytes_get_size (buffer)); #line 289 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _exif_data_unref0 (self->priv->exif); #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; + self->priv->exif = _tmp6_; #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_); + _tmp7_ = g_strdup_printf ("", g_bytes_get_size (buffer)); #line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (self->priv->source_name); #line 290 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->priv->source_name = _tmp15_; -#line 2694 "PhotoMetadata.c" + self->priv->source_name = _tmp7_; +#line 3077 "PhotoMetadata.c" } -MetadataDomain photo_metadata_get_tag_domain (const gchar* tag) { +MetadataDomain +photo_metadata_get_tag_domain (const gchar* tag) +{ MetadataDomain result = 0; - const gchar* _tmp0_; - gboolean _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; - const gchar* _tmp4_; - gboolean _tmp5_; #line 293 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, 0); #line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_is_exif_tag (_tmp0_); -#line 294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp1_) { + if (gexiv2_metadata_is_exif_tag (tag)) { #line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_EXIF; #line 295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2718 "PhotoMetadata.c" +#line 3093 "PhotoMetadata.c" } #line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; -#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = gexiv2_metadata_is_xmp_tag (_tmp2_); -#line 297 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_) { + if (gexiv2_metadata_is_xmp_tag (tag)) { #line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_XMP; #line 298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2730 "PhotoMetadata.c" +#line 3101 "PhotoMetadata.c" } #line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = tag; -#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = gexiv2_metadata_is_iptc_tag (_tmp4_); -#line 300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp5_) { + if (gexiv2_metadata_is_iptc_tag (tag)) { #line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_IPTC; #line 301 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2742 "PhotoMetadata.c" +#line 3109 "PhotoMetadata.c" } #line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = METADATA_DOMAIN_UNKNOWN; #line 303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2748 "PhotoMetadata.c" +#line 3115 "PhotoMetadata.c" } -gboolean photo_metadata_has_domain (PhotoMetadata* self, MetadataDomain domain) { +gboolean +photo_metadata_has_domain (PhotoMetadata* self, + MetadataDomain domain) +{ gboolean result = FALSE; - MetadataDomain _tmp0_; #line 306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = domain; -#line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp0_) { + switch (domain) { #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 2763 "PhotoMetadata.c" +#line 3130 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_; - gboolean _tmp2_; + GExiv2Metadata* _tmp0_; #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->exiv2; -#line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_has_exif (_tmp1_); + _tmp0_ = self->priv->exiv2; #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = gexiv2_metadata_has_exif (_tmp0_); #line 309 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2775 "PhotoMetadata.c" +#line 3139 "PhotoMetadata.c" } #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 2779 "PhotoMetadata.c" +#line 3143 "PhotoMetadata.c" { - GExiv2Metadata* _tmp3_; - gboolean _tmp4_; -#line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = self->priv->exiv2; + GExiv2Metadata* _tmp1_; #line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_has_xmp (_tmp3_); + _tmp1_ = self->priv->exiv2; #line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp4_; + result = gexiv2_metadata_has_xmp (_tmp1_); #line 312 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2791 "PhotoMetadata.c" +#line 3152 "PhotoMetadata.c" } #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 2795 "PhotoMetadata.c" +#line 3156 "PhotoMetadata.c" { - GExiv2Metadata* _tmp5_; - gboolean _tmp6_; -#line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = self->priv->exiv2; + GExiv2Metadata* _tmp2_; #line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gexiv2_metadata_has_iptc (_tmp5_); + _tmp2_ = self->priv->exiv2; #line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp6_; + result = gexiv2_metadata_has_iptc (_tmp2_); #line 315 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2807 "PhotoMetadata.c" +#line 3165 "PhotoMetadata.c" } default: #line 307 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_UNKNOWN: -#line 2812 "PhotoMetadata.c" +#line 3170 "PhotoMetadata.c" { #line 319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; #line 319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2818 "PhotoMetadata.c" +#line 3176 "PhotoMetadata.c" } } } -gboolean photo_metadata_has_exif (PhotoMetadata* self) { +gboolean +photo_metadata_has_exif (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 323 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_EXIF); -#line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_has_domain (self, METADATA_DOMAIN_EXIF); #line 324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2835 "PhotoMetadata.c" +#line 3192 "PhotoMetadata.c" } -gboolean photo_metadata_has_xmp (PhotoMetadata* self) { +gboolean +photo_metadata_has_xmp (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 327 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_XMP); -#line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_has_domain (self, METADATA_DOMAIN_XMP); #line 328 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2850 "PhotoMetadata.c" +#line 3206 "PhotoMetadata.c" } -gboolean photo_metadata_has_iptc (PhotoMetadata* self) { +gboolean +photo_metadata_has_iptc (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 331 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_has_domain (self, METADATA_DOMAIN_IPTC); -#line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_has_domain (self, METADATA_DOMAIN_IPTC); #line 332 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2865 "PhotoMetadata.c" +#line 3220 "PhotoMetadata.c" } -gboolean photo_metadata_can_write_to_domain (PhotoMetadata* self, MetadataDomain domain) { +gboolean +photo_metadata_can_write_to_domain (PhotoMetadata* self, + MetadataDomain domain) +{ gboolean result = FALSE; - MetadataDomain _tmp0_; #line 335 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = domain; -#line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp0_) { + switch (domain) { #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 2880 "PhotoMetadata.c" +#line 3235 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_; - gboolean _tmp2_; -#line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->exiv2; + GExiv2Metadata* _tmp0_; #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_get_supports_exif (_tmp1_); + _tmp0_ = self->priv->exiv2; #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = gexiv2_metadata_get_supports_exif (_tmp0_); #line 338 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2892 "PhotoMetadata.c" +#line 3244 "PhotoMetadata.c" } #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 2896 "PhotoMetadata.c" +#line 3248 "PhotoMetadata.c" { - GExiv2Metadata* _tmp3_; - gboolean _tmp4_; -#line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = self->priv->exiv2; + GExiv2Metadata* _tmp1_; #line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_get_supports_xmp (_tmp3_); + _tmp1_ = self->priv->exiv2; #line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp4_; + result = gexiv2_metadata_get_supports_xmp (_tmp1_); #line 341 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2908 "PhotoMetadata.c" +#line 3257 "PhotoMetadata.c" } #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 2912 "PhotoMetadata.c" +#line 3261 "PhotoMetadata.c" { - GExiv2Metadata* _tmp5_; - gboolean _tmp6_; -#line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = self->priv->exiv2; + GExiv2Metadata* _tmp2_; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gexiv2_metadata_get_supports_iptc (_tmp5_); + _tmp2_ = self->priv->exiv2; #line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp6_; + result = gexiv2_metadata_get_supports_iptc (_tmp2_); #line 344 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2924 "PhotoMetadata.c" +#line 3270 "PhotoMetadata.c" } default: #line 336 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_UNKNOWN: -#line 2929 "PhotoMetadata.c" +#line 3275 "PhotoMetadata.c" { #line 348 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = FALSE; #line 348 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2935 "PhotoMetadata.c" +#line 3281 "PhotoMetadata.c" } } } -gboolean photo_metadata_can_write_exif (PhotoMetadata* self) { +gboolean +photo_metadata_can_write_exif (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 352 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_EXIF); -#line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_EXIF); #line 353 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2952 "PhotoMetadata.c" +#line 3297 "PhotoMetadata.c" } -gboolean photo_metadata_can_write_xmp (PhotoMetadata* self) { +gboolean +photo_metadata_can_write_xmp (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 356 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_XMP); -#line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_XMP); #line 357 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2967 "PhotoMetadata.c" +#line 3311 "PhotoMetadata.c" } -gboolean photo_metadata_can_write_iptc (PhotoMetadata* self) { +gboolean +photo_metadata_can_write_iptc (PhotoMetadata* self) +{ gboolean result = FALSE; - gboolean _tmp0_; #line 360 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_IPTC); -#line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp0_; + result = photo_metadata_can_write_to_domain (self, METADATA_DOMAIN_IPTC); #line 361 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 2982 "PhotoMetadata.c" +#line 3325 "PhotoMetadata.c" } -gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) { +gboolean +photo_metadata_has_tag (PhotoMetadata* self, + const gchar* tag) +{ gboolean result = FALSE; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; - gboolean _tmp2_; #line 364 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 364 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -2994,35 +3338,30 @@ gboolean photo_metadata_has_tag (PhotoMetadata* self, const gchar* tag) { #line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_has_tag (_tmp0_, _tmp1_); -#line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = gexiv2_metadata_has_tag (_tmp0_, tag); #line 365 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3005 "PhotoMetadata.c" +#line 3345 "PhotoMetadata.c" } -static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { +static GeeSet* +photo_metadata_create_string_set (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify) +{ GeeSet* result = NULL; - GCompareDataFunc _tmp0_; - void* _tmp0__target; #line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = compare_func; -#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__target = compare_func_target; -#line 370 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ == NULL) { -#line 3021 "PhotoMetadata.c" - GeeHashSet* _tmp1_; + if (compare_func == NULL) { +#line 3360 "PhotoMetadata.c" + GeeHashSet* _tmp0_; #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); + _tmp0_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet); #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 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3033,18 +3372,18 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa compare_func_target_destroy_notify = NULL; #line 371 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3037 "PhotoMetadata.c" +#line 3376 "PhotoMetadata.c" } else { - GCompareDataFunc _tmp2_; - void* _tmp2__target; - GDestroyNotify _tmp2__target_destroy_notify; - GeeTreeSet* _tmp3_; + GCompareDataFunc _tmp1_; + void* _tmp1__target; + GDestroyNotify _tmp1__target_destroy_notify; + GeeTreeSet* _tmp2_; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = compare_func; + _tmp1_ = compare_func; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__target = compare_func_target; + _tmp1__target = compare_func_target; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__target_destroy_notify = compare_func_target_destroy_notify; + _tmp1__target_destroy_notify = compare_func_target_destroy_notify; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3052,9 +3391,9 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; #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); + _tmp2_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, _tmp1_, _tmp1__target, _tmp1__target_destroy_notify); #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SET, GeeSet); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet); #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 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3065,7 +3404,7 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa compare_func_target_destroy_notify = NULL; #line 373 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3069 "PhotoMetadata.c" +#line 3408 "PhotoMetadata.c" } #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); @@ -3075,26 +3414,31 @@ static GeeSet* photo_metadata_create_string_set (PhotoMetadata* self, GCompareDa compare_func_target = NULL; #line 368 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; -#line 3079 "PhotoMetadata.c" +#line 3418 "PhotoMetadata.c" } -GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain domain, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { +GeeCollection* +photo_metadata_get_tags (PhotoMetadata* self, + MetadataDomain domain, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify) +{ GeeCollection* result = NULL; gchar** tags = NULL; gint tags_length1; gint _tags_size_; - MetadataDomain _tmp0_; - gboolean _tmp10_ = FALSE; - gchar** _tmp11_; - gint _tmp11__length1; + gboolean _tmp9_ = FALSE; + gchar** _tmp10_; + gint _tmp10__length1; GeeCollection* collection = NULL; - GCompareDataFunc _tmp13_; - void* _tmp13__target; - GDestroyNotify _tmp13__target_destroy_notify; - GeeSet* _tmp14_; - gchar** _tmp15_; - gint _tmp15__length1; + GCompareDataFunc _tmp12_; + void* _tmp12__target; + GDestroyNotify _tmp12__target_destroy_notify; + GeeSet* _tmp13_; + gchar** _tmp14_; + gint _tmp14__length1; #line 376 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3104,105 +3448,103 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma #line 378 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = domain; -#line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp0_) { + switch (domain) { #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 3113 "PhotoMetadata.c" +#line 3455 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_; + GExiv2Metadata* _tmp0_; + gchar** _tmp1_; gchar** _tmp2_; - gchar** _tmp3_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->exiv2; + _tmp0_ = self->priv->exiv2; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_ = gexiv2_metadata_get_exif_tags (_tmp1_); + _tmp2_ = _tmp1_ = gexiv2_metadata_get_exif_tags (_tmp0_); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags = _tmp3_; + tags = _tmp2_; #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags_length1 = _vala_array_length (_tmp2_); + tags_length1 = _vala_array_length (_tmp1_); #line 381 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; #line 382 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3132 "PhotoMetadata.c" +#line 3474 "PhotoMetadata.c" } #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 3136 "PhotoMetadata.c" +#line 3478 "PhotoMetadata.c" { - GExiv2Metadata* _tmp4_; + GExiv2Metadata* _tmp3_; + gchar** _tmp4_; gchar** _tmp5_; - gchar** _tmp6_; #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = self->priv->exiv2; + _tmp3_ = self->priv->exiv2; #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = _tmp5_ = gexiv2_metadata_get_xmp_tags (_tmp4_); + _tmp5_ = _tmp4_ = gexiv2_metadata_get_xmp_tags (_tmp3_); #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags = _tmp6_; + tags = _tmp5_; #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags_length1 = _vala_array_length (_tmp5_); + tags_length1 = _vala_array_length (_tmp4_); #line 385 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; #line 386 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3155 "PhotoMetadata.c" +#line 3497 "PhotoMetadata.c" } #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 3159 "PhotoMetadata.c" +#line 3501 "PhotoMetadata.c" { - GExiv2Metadata* _tmp7_; + GExiv2Metadata* _tmp6_; + gchar** _tmp7_; gchar** _tmp8_; - gchar** _tmp9_; #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = self->priv->exiv2; + _tmp6_ = self->priv->exiv2; #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp8_ = gexiv2_metadata_get_iptc_tags (_tmp7_); + _tmp8_ = _tmp7_ = gexiv2_metadata_get_iptc_tags (_tmp6_); #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_free), NULL); #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags = _tmp9_; + tags = _tmp8_; #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tags_length1 = _vala_array_length (_tmp8_); + tags_length1 = _vala_array_length (_tmp7_); #line 389 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tags_size_ = tags_length1; #line 390 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3178 "PhotoMetadata.c" +#line 3520 "PhotoMetadata.c" } default: #line 379 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 3183 "PhotoMetadata.c" +#line 3525 "PhotoMetadata.c" } #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = tags; + _tmp10_ = tags; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11__length1 = tags_length1; + _tmp10__length1 = tags_length1; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp11_ == NULL) { + if (_tmp10_ == NULL) { #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = TRUE; -#line 3193 "PhotoMetadata.c" + _tmp9_ = TRUE; +#line 3535 "PhotoMetadata.c" } else { - gchar** _tmp12_; - gint _tmp12__length1; + gchar** _tmp11_; + gint _tmp11__length1; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = tags; + _tmp11_ = tags; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12__length1 = tags_length1; + _tmp11__length1 = tags_length1; #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = _tmp12__length1 == 0; -#line 3203 "PhotoMetadata.c" + _tmp9_ = _tmp11__length1 == 0; +#line 3545 "PhotoMetadata.c" } #line 393 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp10_) { + if (_tmp9_) { #line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3217,14 +3559,14 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma compare_func_target_destroy_notify = NULL; #line 394 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3221 "PhotoMetadata.c" +#line 3563 "PhotoMetadata.c" } #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = compare_func; + _tmp12_ = compare_func; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13__target = compare_func_target; + _tmp12__target = compare_func_target; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13__target_destroy_notify = compare_func_target_destroy_notify; + _tmp12__target_destroy_notify = compare_func_target_destroy_notify; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func = NULL; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3232,45 +3574,45 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" compare_func_target_destroy_notify = NULL; #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = photo_metadata_create_string_set (self, _tmp13_, _tmp13__target, _tmp13__target_destroy_notify); + _tmp13_ = photo_metadata_create_string_set (self, _tmp12_, _tmp12__target, _tmp12__target_destroy_notify); #line 396 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - collection = G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_COLLECTION, GeeCollection); + collection = G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = tags; + _tmp14_ = tags; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15__length1 = tags_length1; -#line 3243 "PhotoMetadata.c" + _tmp14__length1 = tags_length1; +#line 3585 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp15_; + tag_collection = _tmp14_; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp15__length1; + tag_collection_length1 = _tmp14__length1; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp15__length1; tag_it = tag_it + 1) { -#line 3255 "PhotoMetadata.c" - gchar* _tmp16_; + for (tag_it = 0; tag_it < _tmp14__length1; tag_it = tag_it + 1) { +#line 3597 "PhotoMetadata.c" + gchar* _tmp15_; gchar* tag = NULL; #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = g_strdup (tag_collection[tag_it]); + _tmp15_ = g_strdup (tag_collection[tag_it]); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp16_; -#line 3262 "PhotoMetadata.c" + tag = _tmp15_; +#line 3604 "PhotoMetadata.c" { - GeeCollection* _tmp17_; - const gchar* _tmp18_; + GeeCollection* _tmp16_; + const gchar* _tmp17_; #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = collection; + _tmp16_ = collection; #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = tag; + _tmp17_ = tag; #line 398 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (_tmp17_, _tmp18_); + gee_collection_add (_tmp16_, _tmp17_); #line 397 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3274 "PhotoMetadata.c" +#line 3616 "PhotoMetadata.c" } } } @@ -3288,11 +3630,16 @@ GeeCollection* photo_metadata_get_tags (PhotoMetadata* self, MetadataDomain doma compare_func_target_destroy_notify = NULL; #line 400 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3292 "PhotoMetadata.c" +#line 3634 "PhotoMetadata.c" } -GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { +GeeCollection* +photo_metadata_get_all_tags (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify) +{ GeeCollection* result = NULL; GeeCollection* all_tags = NULL; GCompareDataFunc _tmp0_; @@ -3342,7 +3689,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp4_ = exif_tags; #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 3346 "PhotoMetadata.c" +#line 3693 "PhotoMetadata.c" GeeCollection* _tmp5_; gint _tmp6_; gint _tmp7_; @@ -3354,15 +3701,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp7_ = _tmp6_; #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp7_ > 0; -#line 3358 "PhotoMetadata.c" +#line 3705 "PhotoMetadata.c" } else { #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = FALSE; -#line 3362 "PhotoMetadata.c" +#line 3709 "PhotoMetadata.c" } #line 408 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { -#line 3366 "PhotoMetadata.c" +#line 3713 "PhotoMetadata.c" GeeCollection* _tmp8_; GeeCollection* _tmp9_; #line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3371,7 +3718,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp9_ = exif_tags; #line 409 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp8_, _tmp9_); -#line 3375 "PhotoMetadata.c" +#line 3722 "PhotoMetadata.c" } #line 411 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp10_ = photo_metadata_get_tags (self, METADATA_DOMAIN_XMP, NULL, NULL, NULL); @@ -3381,7 +3728,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp12_ = xmp_tags; #line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp12_ != NULL) { -#line 3385 "PhotoMetadata.c" +#line 3732 "PhotoMetadata.c" GeeCollection* _tmp13_; gint _tmp14_; gint _tmp15_; @@ -3393,15 +3740,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp15_ = _tmp14_; #line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = _tmp15_ > 0; -#line 3397 "PhotoMetadata.c" +#line 3744 "PhotoMetadata.c" } else { #line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = FALSE; -#line 3401 "PhotoMetadata.c" +#line 3748 "PhotoMetadata.c" } #line 412 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp11_) { -#line 3405 "PhotoMetadata.c" +#line 3752 "PhotoMetadata.c" GeeCollection* _tmp16_; GeeCollection* _tmp17_; #line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3410,7 +3757,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp17_ = xmp_tags; #line 413 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp16_, _tmp17_); -#line 3414 "PhotoMetadata.c" +#line 3761 "PhotoMetadata.c" } #line 415 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp18_ = photo_metadata_get_tags (self, METADATA_DOMAIN_IPTC, NULL, NULL, NULL); @@ -3420,7 +3767,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp20_ = iptc_tags; #line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp20_ != NULL) { -#line 3424 "PhotoMetadata.c" +#line 3771 "PhotoMetadata.c" GeeCollection* _tmp21_; gint _tmp22_; gint _tmp23_; @@ -3432,15 +3779,15 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp23_ = _tmp22_; #line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = _tmp23_ > 0; -#line 3436 "PhotoMetadata.c" +#line 3783 "PhotoMetadata.c" } else { #line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp19_ = FALSE; -#line 3440 "PhotoMetadata.c" +#line 3787 "PhotoMetadata.c" } #line 416 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp19_) { -#line 3444 "PhotoMetadata.c" +#line 3791 "PhotoMetadata.c" GeeCollection* _tmp24_; GeeCollection* _tmp25_; #line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3449,7 +3796,7 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp25_ = iptc_tags; #line 417 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gee_collection_add_all (_tmp24_, _tmp25_); -#line 3453 "PhotoMetadata.c" +#line 3800 "PhotoMetadata.c" } #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp27_ = all_tags; @@ -3459,17 +3806,17 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun _tmp29_ = _tmp28_; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp29_ > 0) { -#line 3463 "PhotoMetadata.c" +#line 3810 "PhotoMetadata.c" GeeCollection* _tmp30_; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp30_ = all_tags; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = _tmp30_; -#line 3469 "PhotoMetadata.c" +#line 3816 "PhotoMetadata.c" } else { #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp26_ = NULL; -#line 3473 "PhotoMetadata.c" +#line 3820 "PhotoMetadata.c" } #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp31_ = _g_object_ref0 (_tmp26_); @@ -3493,65 +3840,67 @@ GeeCollection* photo_metadata_get_all_tags (PhotoMetadata* self, GCompareDataFun compare_func_target_destroy_notify = NULL; #line 419 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3497 "PhotoMetadata.c" +#line 3844 "PhotoMetadata.c" } -gchar* photo_metadata_get_tag_label (PhotoMetadata* self, const gchar* tag) { +gchar* +photo_metadata_get_tag_label (PhotoMetadata* self, + const gchar* tag) +{ gchar* result = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; #line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 422 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); #line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_get_tag_label (_tmp0_); + _tmp0_ = gexiv2_metadata_get_tag_label (tag); #line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_tmp0_); #line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = _tmp1_; #line 423 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3520 "PhotoMetadata.c" +#line 3867 "PhotoMetadata.c" } -gchar* photo_metadata_get_tag_description (PhotoMetadata* self, const gchar* tag) { +gchar* +photo_metadata_get_tag_description (PhotoMetadata* self, + const gchar* tag) +{ gchar* result = NULL; const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; + gchar* _tmp1_; #line 426 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 426 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); #line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_get_tag_description (_tmp0_); + _tmp0_ = gexiv2_metadata_get_tag_description (tag); #line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = g_strdup (_tmp1_); + _tmp1_ = g_strdup (_tmp0_); #line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp2_; + result = _tmp1_; #line 427 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3543 "PhotoMetadata.c" +#line 3890 "PhotoMetadata.c" } -gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options) { +gchar* +photo_metadata_get_string (PhotoMetadata* self, + const gchar* tag, + PrepareInputTextOptions options) +{ gchar* result = NULL; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - PrepareInputTextOptions _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + gchar* _tmp4_; #line 430 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 430 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3559,36 +3908,34 @@ gchar* photo_metadata_get_string (PhotoMetadata* self, const gchar* tag, Prepare #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; + _tmp1_ = gexiv2_metadata_get_tag_string (_tmp0_, tag); #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_get_tag_string (_tmp0_, _tmp1_); + _tmp2_ = _tmp1_; #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_; -#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = options; + _tmp3_ = prepare_input_text (_tmp2_, options, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH); -#line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp6_; + result = _tmp4_; #line 431 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3580 "PhotoMetadata.c" +#line 3925 "PhotoMetadata.c" } -gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* tag, PrepareInputTextOptions options) { +gchar* +photo_metadata_get_string_interpreted (PhotoMetadata* self, + const gchar* tag, + PrepareInputTextOptions options) +{ gchar* result = NULL; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; + gchar* _tmp1_; gchar* _tmp2_; gchar* _tmp3_; - PrepareInputTextOptions _tmp4_; - gchar* _tmp5_; - gchar* _tmp6_; + gchar* _tmp4_; #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 434 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3596,85 +3943,79 @@ gchar* photo_metadata_get_string_interpreted (PhotoMetadata* self, const gchar* #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_metadata_get_tag_interpreted_string (_tmp0_, _tmp1_); -#line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_; + _tmp1_ = gexiv2_metadata_get_tag_interpreted_string (_tmp0_, tag); #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = options; + _tmp2_ = _tmp1_; #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = prepare_input_text (_tmp3_, _tmp4_, DEFAULT_USER_TEXT_INPUT_LENGTH); + _tmp3_ = prepare_input_text (_tmp2_, options, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = _tmp5_; + _tmp4_ = _tmp3_; #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); + _g_free0 (_tmp2_); #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp6_; + result = _tmp4_; #line 435 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3617 "PhotoMetadata.c" +#line 3960 "PhotoMetadata.c" } -gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int tags_length1) { +gchar* +photo_metadata_get_first_string (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ gchar* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; #line 438 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 3631 "PhotoMetadata.c" +#line 3972 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3643 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 3984 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 3650 "PhotoMetadata.c" + tag = _tmp0_; +#line 3991 "PhotoMetadata.c" { gchar* value = NULL; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; #line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_get_string (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + _tmp2_ = photo_metadata_get_string (self, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 440 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = _tmp3_; + value = _tmp2_; #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = value; + _tmp3_ = value; #line 441 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ != NULL) { + if (_tmp3_ != NULL) { #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = value; #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); #line 442 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3672 "PhotoMetadata.c" +#line 4013 "PhotoMetadata.c" } #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 439 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3678 "PhotoMetadata.c" +#line 4019 "PhotoMetadata.c" } } } @@ -3682,68 +4023,66 @@ gchar* photo_metadata_get_first_string (PhotoMetadata* self, gchar** tags, int t result = NULL; #line 445 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3686 "PhotoMetadata.c" +#line 4027 "PhotoMetadata.c" } -gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** tags, int tags_length1) { +gchar* +photo_metadata_get_first_string_interpreted (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ gchar* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; #line 448 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 3700 "PhotoMetadata.c" +#line 4039 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3712 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 4051 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 3719 "PhotoMetadata.c" + tag = _tmp0_; +#line 4058 "PhotoMetadata.c" { gchar* value = NULL; - const gchar* _tmp2_; - gchar* _tmp3_; - const gchar* _tmp4_; + const gchar* _tmp1_; + gchar* _tmp2_; + const gchar* _tmp3_; #line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_get_string_interpreted (self, _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + _tmp2_ = photo_metadata_get_string_interpreted (self, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 450 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = _tmp3_; + value = _tmp2_; #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = value; + _tmp3_ = value; #line 451 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ != NULL) { + if (_tmp3_ != NULL) { #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = value; #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); #line 452 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3741 "PhotoMetadata.c" +#line 4080 "PhotoMetadata.c" } #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 449 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 3747 "PhotoMetadata.c" +#line 4086 "PhotoMetadata.c" } } } @@ -3751,33 +4090,35 @@ gchar* photo_metadata_get_first_string_interpreted (PhotoMetadata* self, gchar** result = NULL; #line 455 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3755 "PhotoMetadata.c" +#line 4094 "PhotoMetadata.c" } -GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* tag) { +GeeList* +photo_metadata_get_string_multiple (PhotoMetadata* self, + const gchar* tag) +{ GeeList* result = NULL; gchar** values = NULL; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; + gchar** _tmp1_; gchar** _tmp2_; - gchar** _tmp3_; gint values_length1; gint _values_size_; - gboolean _tmp4_ = FALSE; - gchar** _tmp5_; - gint _tmp5__length1; + gboolean _tmp3_ = FALSE; + gchar** _tmp4_; + gint _tmp4__length1; GeeList* list = NULL; - GeeArrayList* _tmp7_; + GeeArrayList* _tmp6_; GeeHashSet* collection = NULL; - GeeHashSet* _tmp8_; - gchar** _tmp9_; - gint _tmp9__length1; - GeeList* _tmp22_ = NULL; - GeeList* _tmp23_; - gint _tmp24_; - gint _tmp25_; - GeeList* _tmp27_; + GeeHashSet* _tmp7_; + gchar** _tmp8_; + gint _tmp8__length1; + GeeList* _tmp20_ = NULL; + GeeList* _tmp21_; + gint _tmp22_; + gint _tmp23_; + GeeList* _tmp25_; #line 464 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 464 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3785,164 +4126,159 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_ = gexiv2_metadata_get_tag_multiple (_tmp0_, _tmp1_); + _tmp2_ = _tmp1_ = gexiv2_metadata_get_tag_multiple (_tmp0_, tag); #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - values = _tmp3_; + values = _tmp2_; #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - values_length1 = _vala_array_length (_tmp2_); + values_length1 = _vala_array_length (_tmp1_); #line 465 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _values_size_ = values_length1; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = values; + _tmp4_ = values; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5__length1 = values_length1; + _tmp4__length1 = values_length1; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = TRUE; -#line 3806 "PhotoMetadata.c" + _tmp3_ = TRUE; +#line 4145 "PhotoMetadata.c" } else { - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp5_; + gint _tmp5__length1; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = values; + _tmp5_ = values; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6__length1 = values_length1; + _tmp5__length1 = values_length1; #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = _tmp6__length1 == 0; -#line 3816 "PhotoMetadata.c" + _tmp3_ = _tmp5__length1 == 0; +#line 4155 "PhotoMetadata.c" } #line 466 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { + if (_tmp3_) { #line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 467 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3826 "PhotoMetadata.c" +#line 4165 "PhotoMetadata.c" } #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); + _tmp6_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 469 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - list = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_LIST, GeeList); + list = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_LIST, GeeList); #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); + _tmp7_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL, NULL, NULL, NULL); #line 471 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - collection = _tmp8_; + collection = _tmp7_; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = values; + _tmp8_ = values; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9__length1 = values_length1; -#line 3840 "PhotoMetadata.c" + _tmp8__length1 = values_length1; +#line 4179 "PhotoMetadata.c" { gchar** value_collection = NULL; gint value_collection_length1 = 0; gint _value_collection_size_ = 0; gint value_it = 0; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value_collection = _tmp9_; + value_collection = _tmp8_; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value_collection_length1 = _tmp9__length1; + value_collection_length1 = _tmp8__length1; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (value_it = 0; value_it < _tmp9__length1; value_it = value_it + 1) { -#line 3852 "PhotoMetadata.c" - gchar* _tmp10_; + for (value_it = 0; value_it < _tmp8__length1; value_it = value_it + 1) { +#line 4191 "PhotoMetadata.c" + gchar* _tmp9_; gchar* value = NULL; #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = g_strdup (value_collection[value_it]); + _tmp9_ = g_strdup (value_collection[value_it]); #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = _tmp10_; -#line 3859 "PhotoMetadata.c" + value = _tmp9_; +#line 4198 "PhotoMetadata.c" { gchar* prepped = NULL; - const gchar* _tmp11_; - gchar* _tmp12_; - gboolean _tmp13_ = FALSE; - const gchar* _tmp14_; + const gchar* _tmp10_; + gchar* _tmp11_; + gboolean _tmp12_ = FALSE; + const gchar* _tmp13_; #line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = value; + _tmp10_ = value; #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); + _tmp11_ = prepare_input_text (_tmp10_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 473 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - prepped = _tmp12_; + prepped = _tmp11_; #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = prepped; + _tmp13_ = prepped; #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp14_ != NULL) { -#line 3876 "PhotoMetadata.c" - GeeHashSet* _tmp15_; - const gchar* _tmp16_; - gboolean _tmp17_; -#line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = collection; + if (_tmp13_ != NULL) { +#line 4215 "PhotoMetadata.c" + GeeHashSet* _tmp14_; + const gchar* _tmp15_; #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = prepped; + _tmp14_ = collection; #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_); + _tmp15_ = prepped; #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = !_tmp17_; -#line 3888 "PhotoMetadata.c" + _tmp12_ = !gee_abstract_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp15_); +#line 4224 "PhotoMetadata.c" } else { #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = FALSE; -#line 3892 "PhotoMetadata.c" + _tmp12_ = FALSE; +#line 4228 "PhotoMetadata.c" } #line 476 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp13_) { -#line 3896 "PhotoMetadata.c" - GeeList* _tmp18_; + if (_tmp12_) { +#line 4232 "PhotoMetadata.c" + GeeList* _tmp16_; + const gchar* _tmp17_; + GeeHashSet* _tmp18_; const gchar* _tmp19_; - GeeHashSet* _tmp20_; - const gchar* _tmp21_; #line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = list; + _tmp16_ = list; #line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = prepped; + _tmp17_ = prepped; #line 477 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp19_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp17_); #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = collection; + _tmp18_ = collection; #line 478 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = prepped; + _tmp19_ = prepped; #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 3913 "PhotoMetadata.c" + gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp19_); +#line 4249 "PhotoMetadata.c" } #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); #line 472 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 3919 "PhotoMetadata.c" +#line 4255 "PhotoMetadata.c" } } } #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = list; + _tmp21_ = list; #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)); + _tmp22_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GEE_TYPE_COLLECTION, GeeCollection)); #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = _tmp24_; + _tmp23_ = _tmp22_; #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp25_ > 0) { -#line 3931 "PhotoMetadata.c" - GeeList* _tmp26_; + if (_tmp23_ > 0) { +#line 4267 "PhotoMetadata.c" + GeeList* _tmp24_; #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = list; + _tmp24_ = list; #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = _tmp26_; -#line 3937 "PhotoMetadata.c" + _tmp20_ = _tmp24_; +#line 4273 "PhotoMetadata.c" } else { #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = NULL; -#line 3941 "PhotoMetadata.c" + _tmp20_ = NULL; +#line 4277 "PhotoMetadata.c" } #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = _g_object_ref0 (_tmp22_); + _tmp25_ = _g_object_ref0 (_tmp20_); #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp27_; + result = _tmp25_; #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (collection); #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -3951,89 +4287,87 @@ GeeList* photo_metadata_get_string_multiple (PhotoMetadata* self, const gchar* t values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 482 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 3955 "PhotoMetadata.c" +#line 4291 "PhotoMetadata.c" } -GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1) { +GeeList* +photo_metadata_get_first_string_multiple (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ GeeList* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; #line 491 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 3969 "PhotoMetadata.c" +#line 4303 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 3981 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 4315 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 3988 "PhotoMetadata.c" + tag = _tmp0_; +#line 4322 "PhotoMetadata.c" { GeeList* values = NULL; - const gchar* _tmp2_; - GeeList* _tmp3_; - gboolean _tmp4_ = FALSE; - GeeList* _tmp5_; + const gchar* _tmp1_; + GeeList* _tmp2_; + gboolean _tmp3_ = FALSE; + GeeList* _tmp4_; #line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_get_string_multiple (self, _tmp2_); + _tmp2_ = photo_metadata_get_string_multiple (self, _tmp1_); #line 493 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - values = _tmp3_; + values = _tmp2_; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = values; + _tmp4_ = values; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp5_ != NULL) { -#line 4005 "PhotoMetadata.c" - GeeList* _tmp6_; + if (_tmp4_ != NULL) { +#line 4339 "PhotoMetadata.c" + GeeList* _tmp5_; + gint _tmp6_; gint _tmp7_; - gint _tmp8_; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = values; + _tmp5_ = values; #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)); + _tmp6_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection)); #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = _tmp7_; + _tmp7_ = _tmp6_; #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = _tmp8_ > 0; -#line 4017 "PhotoMetadata.c" + _tmp3_ = _tmp7_ > 0; +#line 4351 "PhotoMetadata.c" } else { #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = FALSE; -#line 4021 "PhotoMetadata.c" + _tmp3_ = FALSE; +#line 4355 "PhotoMetadata.c" } #line 494 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { + if (_tmp3_) { #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = values; #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); #line 495 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4031 "PhotoMetadata.c" +#line 4365 "PhotoMetadata.c" } #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 492 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4037 "PhotoMetadata.c" +#line 4371 "PhotoMetadata.c" } } } @@ -4041,20 +4375,21 @@ GeeList* photo_metadata_get_first_string_multiple (PhotoMetadata* self, gchar** result = NULL; #line 498 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4045 "PhotoMetadata.c" +#line 4379 "PhotoMetadata.c" } -void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gchar* value, PrepareInputTextOptions options) { +void +photo_metadata_set_string (PhotoMetadata* self, + const gchar* tag, + const gchar* value, + PrepareInputTextOptions options) +{ gchar* prepped = NULL; - const gchar* _tmp0_; - PrepareInputTextOptions _tmp1_; - gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; + GExiv2Metadata* _tmp2_; const gchar* _tmp3_; - GExiv2Metadata* _tmp6_; - const gchar* _tmp7_; - const gchar* _tmp8_; - gboolean _tmp9_; #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4062,296 +4397,203 @@ void photo_metadata_set_string (PhotoMetadata* self, const gchar* tag, const gch #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (value != NULL); #line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = value; -#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = options; + _tmp0_ = prepare_input_text (value, options, DEFAULT_USER_TEXT_INPUT_LENGTH); #line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = prepare_input_text (_tmp0_, _tmp1_, DEFAULT_USER_TEXT_INPUT_LENGTH); -#line 502 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - prepped = _tmp2_; + prepped = _tmp0_; #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = prepped; + _tmp1_ = prepped; #line 503 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_ == NULL) { -#line 4077 "PhotoMetadata.c" - const gchar* _tmp4_; - const gchar* _tmp5_; -#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = tag; -#line 504 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = value; + if (_tmp1_ == NULL) { #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_); + g_warning ("PhotoMetadata.vala:504: Not setting tag %s to string %s: invalid UTF-8", tag, value); #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); #line 506 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 4090 "PhotoMetadata.c" +#line 4414 "PhotoMetadata.c" } #line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = self->priv->exiv2; -#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = tag; -#line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = prepped; + _tmp2_ = self->priv->exiv2; #line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = gexiv2_metadata_set_tag_string (_tmp6_, _tmp7_, _tmp8_); + _tmp3_ = prepped; #line 509 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp9_) { -#line 4102 "PhotoMetadata.c" - const gchar* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; -#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = tag; -#line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = value; + if (!gexiv2_metadata_set_tag_string (_tmp2_, tag, _tmp3_)) { +#line 4422 "PhotoMetadata.c" + const gchar* _tmp4_; #line 510 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = self->priv->source_name; + _tmp4_ = self->priv->source_name; #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 4114 "PhotoMetadata.c" +"%s", tag, value, _tmp4_); +#line 4428 "PhotoMetadata.c" } #line 501 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); -#line 4118 "PhotoMetadata.c" +#line 4432 "PhotoMetadata.c" } -static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, int tags_length1, PhotoMetadataSetOption option, PhotoMetadataSetGenericValue setter, void* setter_target) { +static void +photo_metadata_set_all_generic (PhotoMetadata* self, + gchar** tags, + int tags_length1, + PhotoMetadataSetOption option, + PhotoMetadataSetGenericValue setter, + void* setter_target) +{ gboolean written = FALSE; - gchar** _tmp0_; - gint _tmp0__length1; - gboolean _tmp9_ = FALSE; - gboolean _tmp10_ = FALSE; - PhotoMetadataSetOption _tmp11_; + gboolean _tmp4_ = FALSE; + gboolean _tmp5_ = FALSE; #line 515 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 516 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" written = FALSE; -#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 4137 "PhotoMetadata.c" +#line 4451 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4149 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 4463 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 4156 "PhotoMetadata.c" + tag = _tmp0_; +#line 4470 "PhotoMetadata.c" { - gboolean _tmp2_ = FALSE; - PhotoMetadataSetOption _tmp3_; + gboolean _tmp1_ = FALSE; #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + if (option == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) { #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_ == PHOTO_METADATA_SET_OPTION_ALL_DOMAINS) { -#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = TRUE; -#line 4166 "PhotoMetadata.c" + _tmp1_ = TRUE; +#line 4477 "PhotoMetadata.c" } else { - const gchar* _tmp4_; - MetadataDomain _tmp5_; - gboolean _tmp6_; -#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = tag; + const gchar* _tmp2_; #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = photo_metadata_get_tag_domain (_tmp4_); + _tmp2_ = tag; #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = photo_metadata_has_domain (self, _tmp5_); -#line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = _tmp6_; -#line 4179 "PhotoMetadata.c" + _tmp1_ = photo_metadata_has_domain (self, photo_metadata_get_tag_domain (_tmp2_)); +#line 4484 "PhotoMetadata.c" } #line 518 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_) { -#line 4183 "PhotoMetadata.c" - PhotoMetadataSetGenericValue _tmp7_; - void* _tmp7__target; - const gchar* _tmp8_; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = setter; -#line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7__target = setter_target; + if (_tmp1_) { +#line 4488 "PhotoMetadata.c" + const gchar* _tmp3_; #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = tag; + _tmp3_ = tag; #line 519 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ (_tmp8_, _tmp7__target); + setter (_tmp3_, setter_target); #line 520 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" written = TRUE; -#line 4197 "PhotoMetadata.c" +#line 4496 "PhotoMetadata.c" } #line 517 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4201 "PhotoMetadata.c" +#line 4500 "PhotoMetadata.c" } } } #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = option; -#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp11_ == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) { -#line 4209 "PhotoMetadata.c" - gboolean _tmp12_; + if (option == PHOTO_METADATA_SET_OPTION_AT_LEAST_DEFAULT_DOMAIN) { +#line 4506 "PhotoMetadata.c" + gboolean _tmp6_; #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = written; + _tmp6_ = written; #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = !_tmp12_; -#line 4215 "PhotoMetadata.c" + _tmp5_ = !_tmp6_; +#line 4512 "PhotoMetadata.c" } else { #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = FALSE; -#line 4219 "PhotoMetadata.c" + _tmp5_ = FALSE; +#line 4516 "PhotoMetadata.c" } #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp10_) { -#line 4223 "PhotoMetadata.c" - gchar** _tmp13_; - gint _tmp13__length1; -#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = tags; -#line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13__length1 = tags_length1; + if (_tmp5_) { #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp13__length1 > 0; -#line 4232 "PhotoMetadata.c" + _tmp4_ = tags_length1 > 0; +#line 4522 "PhotoMetadata.c" } else { #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = FALSE; -#line 4236 "PhotoMetadata.c" + _tmp4_ = FALSE; +#line 4526 "PhotoMetadata.c" } #line 524 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp9_) { -#line 4240 "PhotoMetadata.c" + if (_tmp4_) { +#line 4530 "PhotoMetadata.c" MetadataDomain default_domain = 0; - gchar** _tmp14_; - gint _tmp14__length1; - const gchar* _tmp15_; - MetadataDomain _tmp16_; - PhotoMetadataSetGenericValue _tmp17_; - void* _tmp17__target; - gchar** _tmp18_; - gint _tmp18__length1; - const gchar* _tmp19_; -#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = tags; -#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14__length1 = tags_length1; -#line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _tmp14_[0]; + const gchar* _tmp7_; + const gchar* _tmp8_; #line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = photo_metadata_get_tag_domain (_tmp15_); + _tmp7_ = tags[0]; #line 525 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - default_domain = _tmp16_; -#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = setter; -#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17__target = setter_target; -#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = tags; + default_domain = photo_metadata_get_tag_domain (_tmp7_); #line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18__length1 = tags_length1; + _tmp8_ = tags[0]; #line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = _tmp18_[0]; -#line 528 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ (_tmp19_, _tmp17__target); -#line 4273 "PhotoMetadata.c" + setter (_tmp8_, setter_target); +#line 4542 "PhotoMetadata.c" { gint ctr = 0; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = 1; -#line 4278 "PhotoMetadata.c" +#line 4547 "PhotoMetadata.c" { - gboolean _tmp20_ = FALSE; + gboolean _tmp9_ = FALSE; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = TRUE; + _tmp9_ = TRUE; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 4285 "PhotoMetadata.c" - gint _tmp22_; - gchar** _tmp23_; - gint _tmp23__length1; - gchar** _tmp24_; - gint _tmp24__length1; - gint _tmp25_; - const gchar* _tmp26_; - MetadataDomain _tmp27_; - MetadataDomain _tmp28_; +#line 4554 "PhotoMetadata.c" + gint _tmp11_; + gint _tmp12_; + const gchar* _tmp13_; + MetadataDomain _tmp14_; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp20_) { -#line 4297 "PhotoMetadata.c" - gint _tmp21_; + if (!_tmp9_) { +#line 4561 "PhotoMetadata.c" + gint _tmp10_; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = ctr; + _tmp10_ = ctr; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - ctr = _tmp21_ + 1; -#line 4303 "PhotoMetadata.c" + ctr = _tmp10_ + 1; +#line 4567 "PhotoMetadata.c" } #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = FALSE; -#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = ctr; + _tmp9_ = FALSE; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = tags; + _tmp11_ = ctr; #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23__length1 = tags_length1; -#line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!(_tmp22_ < _tmp23__length1)) { + if (!(_tmp11_ < tags_length1)) { #line 531 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 4317 "PhotoMetadata.c" +#line 4577 "PhotoMetadata.c" } #line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = tags; -#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24__length1 = tags_length1; -#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = ctr; -#line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = _tmp24_[_tmp25_]; + _tmp12_ = ctr; #line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = photo_metadata_get_tag_domain (_tmp26_); + _tmp13_ = tags[_tmp12_]; #line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = default_domain; + _tmp14_ = default_domain; #line 532 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp27_ == _tmp28_) { -#line 4333 "PhotoMetadata.c" - PhotoMetadataSetGenericValue _tmp29_; - void* _tmp29__target; - gchar** _tmp30_; - gint _tmp30__length1; - gint _tmp31_; - const gchar* _tmp32_; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = setter; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29__target = setter_target; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30_ = tags; -#line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30__length1 = tags_length1; + if (photo_metadata_get_tag_domain (_tmp13_) == _tmp14_) { +#line 4587 "PhotoMetadata.c" + gint _tmp15_; + const gchar* _tmp16_; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp31_ = ctr; + _tmp15_ = ctr; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp32_ = _tmp30_[_tmp31_]; + _tmp16_ = tags[_tmp15_]; #line 533 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ (_tmp32_, _tmp29__target); -#line 4354 "PhotoMetadata.c" + setter (_tmp16_, setter_target); +#line 4596 "PhotoMetadata.c" } } } @@ -4360,21 +4602,25 @@ static void photo_metadata_set_all_generic (PhotoMetadata* self, gchar** tags, i } -static Block1Data* block1_data_ref (Block1Data* _data1_) { +static Block1Data* +block1_data_ref (Block1Data* _data1_) +{ #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data1_->_ref_count_); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data1_; -#line 4368 "PhotoMetadata.c" +#line 4612 "PhotoMetadata.c" } -static void block1_data_unref (void * _userdata_) { +static void +block1_data_unref (void * _userdata_) +{ Block1Data* _data1_; _data1_ = (Block1Data*) _userdata_; #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data1_->_ref_count_)) { -#line 4377 "PhotoMetadata.c" +#line 4623 "PhotoMetadata.c" PhotoMetadata* self; #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data1_->self; @@ -4384,43 +4630,45 @@ static void block1_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block1Data, _data1_); -#line 4387 "PhotoMetadata.c" +#line 4633 "PhotoMetadata.c" } } -static void __lambda5_ (Block1Data* _data1_, const gchar* tag) { +static void +__lambda5_ (Block1Data* _data1_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - const gchar* _tmp1_; #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data1_->self; #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data1_->value; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, _tmp0_, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 4406 "PhotoMetadata.c" + photo_metadata_set_string (self, tag, _data1_->value, PHOTO_METADATA_PREPARE_STRING_OPTIONS); +#line 4649 "PhotoMetadata.c" } -static void ___lambda5__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda5__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda5_ (self, tag); -#line 4413 "PhotoMetadata.c" +#line 4659 "PhotoMetadata.c" } -void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_length1, const gchar* value, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_string (PhotoMetadata* self, + gchar** tags, + int tags_length1, + const gchar* value, + PhotoMetadataSetOption option) +{ Block1Data* _data1_; - const gchar* _tmp0_; - gchar* _tmp1_; - gchar** _tmp2_; - gint _tmp2__length1; - PhotoMetadataSetOption _tmp3_; + gchar* _tmp0_; #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4432,77 +4680,81 @@ void photo_metadata_set_all_string (PhotoMetadata* self, gchar** tags, int tags_ #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_->self = media_metadata_ref (self); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = value; -#line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (value); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_data1_->value); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data1_->value = _tmp1_; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tags; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = tags_length1; -#line 539 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + _data1_->value = _tmp0_; #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_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda5__photo_metadata_set_generic_value, _data1_); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block1_data_unref (_data1_); #line 538 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data1_ = NULL; -#line 4454 "PhotoMetadata.c" +#line 4694 "PhotoMetadata.c" } -static void _vala_array_add48 (gchar** * array, int* length, int* size, gchar* value) { +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 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *size = (*size) ? (2 * (*size)) : 4; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 4465 "PhotoMetadata.c" +#line 4710 "PhotoMetadata.c" } #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[(*length)++] = value; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[*length] = NULL; -#line 4471 "PhotoMetadata.c" +#line 4716 "PhotoMetadata.c" } -static void _vala_array_add49 (gchar** * array, int* length, int* size, gchar* value) { +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 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *size = (*size) ? (2 * (*size)) : 4; #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *array = g_renew (gchar*, *array, (*size) + 1); -#line 4482 "PhotoMetadata.c" +#line 4732 "PhotoMetadata.c" } #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[(*length)++] = value; #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" (*array)[*length] = NULL; -#line 4488 "PhotoMetadata.c" +#line 4738 "PhotoMetadata.c" } -void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, GeeCollection* collection) { +void +photo_metadata_set_string_multiple (PhotoMetadata* self, + const gchar* tag, + GeeCollection* collection) +{ gchar** values = NULL; gchar** _tmp0_; gint values_length1; gint _values_size_; + gchar** _tmp12_; + gint _tmp12__length1; + gchar** _tmp13_; + gint _tmp13__length1; + GExiv2Metadata* _tmp14_; gchar** _tmp15_; gint _tmp15__length1; - gchar** _tmp16_; - gint _tmp16__length1; - GExiv2Metadata* _tmp17_; - const gchar* _tmp18_; - gchar** _tmp19_; - gint _tmp19__length1; - gboolean _tmp20_; #line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4517,161 +4769,149 @@ void photo_metadata_set_string_multiple (PhotoMetadata* self, const gchar* tag, values_length1 = 0; #line 543 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _values_size_ = values_length1; -#line 4520 "PhotoMetadata.c" +#line 4772 "PhotoMetadata.c" { GeeIterator* _value_it = NULL; - GeeCollection* _tmp1_; - GeeIterator* _tmp2_; -#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = collection; + GeeIterator* _tmp1_; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (collection, GEE_TYPE_ITERABLE, GeeIterable)); #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _value_it = _tmp2_; + _value_it = _tmp1_; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 4533 "PhotoMetadata.c" - GeeIterator* _tmp3_; - gboolean _tmp4_; +#line 4782 "PhotoMetadata.c" + GeeIterator* _tmp2_; gchar* value = NULL; - GeeIterator* _tmp5_; - gpointer _tmp6_; + GeeIterator* _tmp3_; + gpointer _tmp4_; gchar* prepped = NULL; + const gchar* _tmp5_; + gchar* _tmp6_; const gchar* _tmp7_; - gchar* _tmp8_; - const gchar* _tmp9_; -#line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _value_it; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gee_iterator_next (_tmp3_); + _tmp2_ = _value_it; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp4_) { + if (!gee_iterator_next (_tmp2_)) { #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 4551 "PhotoMetadata.c" +#line 4797 "PhotoMetadata.c" } #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _value_it; + _tmp3_ = _value_it; #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gee_iterator_get (_tmp5_); + _tmp4_ = gee_iterator_get (_tmp3_); #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = (gchar*) _tmp6_; + value = (gchar*) _tmp4_; #line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = value; + _tmp5_ = value; #line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = prepare_input_text (_tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, -1); + _tmp6_ = prepare_input_text (_tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS, -1); #line 545 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - prepped = _tmp8_; + prepped = _tmp6_; #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = prepped; + _tmp7_ = prepped; #line 546 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp9_ != NULL) { -#line 4569 "PhotoMetadata.c" - gchar** _tmp10_; - gint _tmp10__length1; - const gchar* _tmp11_; - gchar* _tmp12_; + if (_tmp7_ != NULL) { +#line 4815 "PhotoMetadata.c" + gchar** _tmp8_; + gint _tmp8__length1; + const gchar* _tmp9_; + gchar* _tmp10_; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = values; + _tmp8_ = values; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10__length1 = values_length1; + _tmp8__length1 = values_length1; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = prepped; + _tmp9_ = prepped; #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = g_strdup (_tmp11_); + _tmp10_ = g_strdup (_tmp9_); #line 547 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_array_add48 (&values, &values_length1, &_values_size_, _tmp12_); -#line 4584 "PhotoMetadata.c" + _vala_array_add48 (&values, &values_length1, &_values_size_, _tmp10_); +#line 4830 "PhotoMetadata.c" } else { - const gchar* _tmp13_; - const gchar* _tmp14_; -#line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = value; + const gchar* _tmp11_; #line 549 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = tag; + _tmp11_ = value; #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" + g_warning ("PhotoMetadata.vala:549: Unable to set string %s to %s: invalid UTF-8", _tmp11_, tag); +#line 4837 "PhotoMetadata.c" } #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (prepped); #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); -#line 4600 "PhotoMetadata.c" +#line 4843 "PhotoMetadata.c" } #line 544 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_value_it); -#line 4604 "PhotoMetadata.c" +#line 4847 "PhotoMetadata.c" } #line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = values; + _tmp12_ = values; #line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15__length1 = values_length1; + _tmp12__length1 = values_length1; #line 552 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp15__length1 == 0) { + if (_tmp12__length1 == 0) { #line 553 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); #line 553 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 4616 "PhotoMetadata.c" +#line 4859 "PhotoMetadata.c" } #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = values; + _tmp13_ = values; #line 559 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16__length1 = values_length1; + _tmp13__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" - _tmp17_ = self->priv->exiv2; -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = tag; -#line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = values; + _tmp14_ = self->priv->exiv2; #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19__length1 = values_length1; + _tmp15_ = values; #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = gexiv2_metadata_set_tag_multiple (_tmp17_, _tmp18_, _tmp19_); + _tmp15__length1 = values_length1; #line 561 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp20_) { -#line 4636 "PhotoMetadata.c" - gchar** _tmp21_; - gint _tmp21__length1; - const gchar* _tmp22_; - const gchar* _tmp23_; + if (!gexiv2_metadata_set_tag_multiple (_tmp14_, tag, _tmp15_)) { +#line 4875 "PhotoMetadata.c" + gchar** _tmp16_; + gint _tmp16__length1; + const gchar* _tmp17_; #line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = values; + _tmp16_ = values; #line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21__length1 = values_length1; + _tmp16__length1 = values_length1; #line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = tag; -#line 562 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = self->priv->source_name; + _tmp17_ = self->priv->source_name; #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 4651 "PhotoMetadata.c" +" %s", _tmp16__length1, tag, _tmp17_); +#line 4887 "PhotoMetadata.c" } #line 542 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" values = (_vala_array_free (values, values_length1, (GDestroyNotify) g_free), NULL); -#line 4655 "PhotoMetadata.c" +#line 4891 "PhotoMetadata.c" } -static Block2Data* block2_data_ref (Block2Data* _data2_) { +static Block2Data* +block2_data_ref (Block2Data* _data2_) +{ #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data2_->_ref_count_); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data2_; -#line 4664 "PhotoMetadata.c" +#line 4902 "PhotoMetadata.c" } -static void block2_data_unref (void * _userdata_) { +static void +block2_data_unref (void * _userdata_) +{ Block2Data* _data2_; _data2_ = (Block2Data*) _userdata_; #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data2_->_ref_count_)) { -#line 4673 "PhotoMetadata.c" +#line 4913 "PhotoMetadata.c" PhotoMetadata* self; #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data2_->self; @@ -4681,43 +4921,45 @@ static void block2_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block2Data, _data2_); -#line 4683 "PhotoMetadata.c" +#line 4923 "PhotoMetadata.c" } } -static void __lambda6_ (Block2Data* _data2_, const gchar* tag) { +static void +__lambda6_ (Block2Data* _data2_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - GeeCollection* _tmp1_; #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data2_->self; #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data2_->values; -#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string_multiple (self, _tmp0_, _tmp1_); -#line 4702 "PhotoMetadata.c" + photo_metadata_set_string_multiple (self, tag, _data2_->values); +#line 4939 "PhotoMetadata.c" } -static void ___lambda6__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda6__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda6_ (self, tag); -#line 4709 "PhotoMetadata.c" +#line 4949 "PhotoMetadata.c" } -void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, int tags_length1, GeeCollection* values, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_string_multiple (PhotoMetadata* self, + gchar** tags, + int tags_length1, + GeeCollection* values, + PhotoMetadataSetOption option) +{ Block2Data* _data2_; GeeCollection* _tmp0_; - GeeCollection* _tmp1_; - gchar** _tmp2_; - gint _tmp2__length1; - PhotoMetadataSetOption _tmp3_; #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4729,47 +4971,35 @@ void photo_metadata_set_all_string_multiple (PhotoMetadata* self, gchar** tags, #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_->self = media_metadata_ref (self); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = values; -#line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _g_object_ref0 (_tmp0_); + _tmp0_ = _g_object_ref0 (values); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_data2_->values); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data2_->values = _tmp1_; -#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tags; + _data2_->values = _tmp0_; #line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = tags_length1; -#line 566 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; -#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_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda6__photo_metadata_set_generic_value, _data2_); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block2_data_unref (_data2_); #line 565 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data2_ = NULL; -#line 4750 "PhotoMetadata.c" +#line 4984 "PhotoMetadata.c" } -gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* value) { +gboolean +photo_metadata_get_long (PhotoMetadata* self, + const gchar* tag, + glong* value) +{ glong _vala_value = 0L; gboolean result = FALSE; - const gchar* _tmp0_; - gboolean _tmp1_; - GExiv2Metadata* _tmp2_; - const gchar* _tmp3_; - glong _tmp4_; + GExiv2Metadata* _tmp0_; #line 569 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 569 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, FALSE); #line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_has_tag (self, _tmp0_); -#line 570 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp1_) { + if (!photo_metadata_has_tag (self, tag)) { #line 571 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_value = (glong) 0; #line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4778,77 +5008,72 @@ gboolean photo_metadata_get_long (PhotoMetadata* self, const gchar* tag, glong* if (value) { #line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4780 "PhotoMetadata.c" +#line 5010 "PhotoMetadata.c" } #line 573 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4784 "PhotoMetadata.c" +#line 5014 "PhotoMetadata.c" } #line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = self->priv->exiv2; -#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = tag; -#line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_get_tag_long (_tmp2_, _tmp3_); + _tmp0_ = self->priv->exiv2; #line 576 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_value = _tmp4_; + _vala_value = gexiv2_metadata_get_tag_long (_tmp0_, tag); #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (value) { #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4800 "PhotoMetadata.c" +#line 5026 "PhotoMetadata.c" } #line 578 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4804 "PhotoMetadata.c" +#line 5030 "PhotoMetadata.c" } -gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong* value) { +gboolean +photo_metadata_get_first_long (PhotoMetadata* self, + gchar** tags, + int tags_length1, + glong* value) +{ glong _vala_value = 0L; gboolean result = FALSE; - gchar** _tmp0_; - gint _tmp0__length1; #line 581 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 4819 "PhotoMetadata.c" +#line 5044 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 4831 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 5056 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 4838 "PhotoMetadata.c" + tag = _tmp0_; +#line 5063 "PhotoMetadata.c" { - const gchar* _tmp2_; - glong _tmp3_ = 0L; - gboolean _tmp4_; + const gchar* _tmp1_; + glong _tmp2_ = 0L; + gboolean _tmp3_; #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_get_long (self, _tmp2_, &_tmp3_); + _tmp3_ = photo_metadata_get_long (self, _tmp1_, &_tmp2_); #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_value = _tmp3_; + _vala_value = _tmp2_; #line 583 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { + if (_tmp3_) { #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4857,15 +5082,15 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t if (value) { #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4859 "PhotoMetadata.c" +#line 5084 "PhotoMetadata.c" } #line 584 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4863 "PhotoMetadata.c" +#line 5088 "PhotoMetadata.c" } #line 582 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 4867 "PhotoMetadata.c" +#line 5092 "PhotoMetadata.c" } } } @@ -4877,19 +5102,20 @@ gboolean photo_metadata_get_first_long (PhotoMetadata* self, gchar** tags, int t if (value) { #line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *value = _vala_value; -#line 4879 "PhotoMetadata.c" +#line 5104 "PhotoMetadata.c" } #line 589 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 4883 "PhotoMetadata.c" +#line 5108 "PhotoMetadata.c" } -void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value) { +void +photo_metadata_set_long (PhotoMetadata* self, + const gchar* tag, + glong value) +{ GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; - glong _tmp2_; - gboolean _tmp3_; #line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 592 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4897,46 +5123,38 @@ void photo_metadata_set_long (PhotoMetadata* self, const gchar* tag, glong value #line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = value; -#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = gexiv2_metadata_set_tag_long (_tmp0_, _tmp1_, _tmp2_); -#line 593 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp3_) { -#line 4906 "PhotoMetadata.c" - const gchar* _tmp4_; - glong _tmp5_; - const gchar* _tmp6_; -#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = tag; -#line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = value; + if (!gexiv2_metadata_set_tag_long (_tmp0_, tag, value)) { +#line 5126 "PhotoMetadata.c" + const gchar* _tmp1_; #line 594 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = self->priv->source_name; + _tmp1_ = self->priv->source_name; #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 4918 "PhotoMetadata.c" +"s", tag, value, _tmp1_); +#line 5132 "PhotoMetadata.c" } } -static Block3Data* block3_data_ref (Block3Data* _data3_) { +static Block3Data* +block3_data_ref (Block3Data* _data3_) +{ #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data3_->_ref_count_); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data3_; -#line 4928 "PhotoMetadata.c" +#line 5144 "PhotoMetadata.c" } -static void block3_data_unref (void * _userdata_) { +static void +block3_data_unref (void * _userdata_) +{ Block3Data* _data3_; _data3_ = (Block3Data*) _userdata_; #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data3_->_ref_count_)) { -#line 4937 "PhotoMetadata.c" +#line 5155 "PhotoMetadata.c" PhotoMetadata* self; #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data3_->self; @@ -4944,42 +5162,44 @@ static void block3_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block3Data, _data3_); -#line 4945 "PhotoMetadata.c" +#line 5163 "PhotoMetadata.c" } } -static void __lambda7_ (Block3Data* _data3_, const gchar* tag) { +static void +__lambda7_ (Block3Data* _data3_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - glong _tmp1_; #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data3_->self; #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data3_->value; -#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_long (self, _tmp0_, _tmp1_); -#line 4964 "PhotoMetadata.c" + photo_metadata_set_long (self, tag, _data3_->value); +#line 5179 "PhotoMetadata.c" } -static void ___lambda7__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda7__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda7_ (self, tag); -#line 4971 "PhotoMetadata.c" +#line 5189 "PhotoMetadata.c" } -void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_length1, glong value, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_long (PhotoMetadata* self, + gchar** tags, + int tags_length1, + glong value, + PhotoMetadataSetOption option) +{ Block3Data* _data3_; - glong _tmp0_; - gchar** _tmp1_; - gint _tmp1__length1; - PhotoMetadataSetOption _tmp2_; #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -4989,36 +5209,31 @@ void photo_metadata_set_all_long (PhotoMetadata* self, gchar** tags, int tags_le #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_->self = media_metadata_ref (self); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = value; -#line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data3_->value = _tmp0_; -#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tags; -#line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = tags_length1; + _data3_->value = value; #line 598 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = option; -#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_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda7__photo_metadata_set_generic_value, _data3_); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block3_data_unref (_data3_); #line 597 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data3_ = NULL; -#line 5005 "PhotoMetadata.c" +#line 5217 "PhotoMetadata.c" } -gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational) { +gboolean +photo_metadata_get_rational (PhotoMetadata* self, + const gchar* tag, + MetadataRational* rational) +{ MetadataRational _vala_rational = {0}; gboolean result = FALSE; gint numerator = 0; gint denominator = 0; gboolean _result_ = FALSE; GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; + gint _tmp1_ = 0; gint _tmp2_ = 0; - gint _tmp3_ = 0; - gboolean _tmp4_; + gboolean _tmp3_; #line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 601 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5026,15 +5241,13 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; + _tmp3_ = gexiv2_metadata_get_exif_tag_rational (_tmp0_, tag, &_tmp1_, &_tmp2_); #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_metadata_get_exif_tag_rational (_tmp0_, _tmp1_, &_tmp2_, &_tmp3_); + numerator = _tmp1_; #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - numerator = _tmp2_; + denominator = _tmp2_; #line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - denominator = _tmp3_; -#line 603 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _result_ = _tmp4_; + _result_ = _tmp3_; #line 605 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" metadata_rational_init (&_vala_rational, numerator, denominator); #line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5043,57 +5256,56 @@ gboolean photo_metadata_get_rational (PhotoMetadata* self, const gchar* tag, Met if (rational) { #line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5044 "PhotoMetadata.c" +#line 5257 "PhotoMetadata.c" } #line 607 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5048 "PhotoMetadata.c" +#line 5261 "PhotoMetadata.c" } -gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational) { +gboolean +photo_metadata_get_first_rational (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataRational* rational) +{ MetadataRational _vala_rational = {0}; gboolean result = FALSE; - gchar** _tmp0_; - gint _tmp0__length1; #line 610 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); -#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 5063 "PhotoMetadata.c" +#line 5275 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 5075 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 5287 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 5082 "PhotoMetadata.c" + tag = _tmp0_; +#line 5294 "PhotoMetadata.c" { - const gchar* _tmp2_; - MetadataRational _tmp3_ = {0}; - gboolean _tmp4_; + const gchar* _tmp1_; + MetadataRational _tmp2_ = {0}; + gboolean _tmp3_; #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_get_rational (self, _tmp2_, &_tmp3_); + _tmp3_ = photo_metadata_get_rational (self, _tmp1_, &_tmp2_); #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_rational = _tmp3_; + _vala_rational = _tmp2_; #line 612 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { + if (_tmp3_) { #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5102,15 +5314,15 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i if (rational) { #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5103 "PhotoMetadata.c" +#line 5315 "PhotoMetadata.c" } #line 613 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5107 "PhotoMetadata.c" +#line 5319 "PhotoMetadata.c" } #line 611 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 5111 "PhotoMetadata.c" +#line 5323 "PhotoMetadata.c" } } } @@ -5122,22 +5334,24 @@ gboolean photo_metadata_get_first_rational (PhotoMetadata* self, gchar** tags, i if (rational) { #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *rational = _vala_rational; -#line 5123 "PhotoMetadata.c" +#line 5335 "PhotoMetadata.c" } #line 618 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5127 "PhotoMetadata.c" +#line 5339 "PhotoMetadata.c" } -void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, MetadataRational* rational) { +void +photo_metadata_set_rational (PhotoMetadata* self, + const gchar* tag, + MetadataRational* rational) +{ GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; - MetadataRational _tmp2_; - gint _tmp3_; - MetadataRational _tmp4_; - gint _tmp5_; - gboolean _tmp6_; + MetadataRational _tmp1_; + gint _tmp2_; + MetadataRational _tmp3_; + gint _tmp4_; #line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 621 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5147,57 +5361,54 @@ void photo_metadata_set_rational (PhotoMetadata* self, const gchar* tag, Metadat #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = *rational; + _tmp1_ = *rational; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_.numerator; -#line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = *rational; + _tmp2_ = _tmp1_.numerator; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp4_.denominator; + _tmp3_ = *rational; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gexiv2_metadata_set_exif_tag_rational (_tmp0_, _tmp1_, _tmp3_, _tmp5_); + _tmp4_ = _tmp3_.denominator; #line 622 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp6_) { -#line 5161 "PhotoMetadata.c" + if (!gexiv2_metadata_set_exif_tag_rational (_tmp0_, tag, _tmp2_, _tmp4_)) { +#line 5371 "PhotoMetadata.c" + gchar* _tmp5_; + gchar* _tmp6_; const gchar* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; - const gchar* _tmp10_; #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = tag; + _tmp5_ = metadata_rational_to_string (rational); #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = metadata_rational_to_string (rational); + _tmp6_ = _tmp5_; #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp8_; -#line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = self->priv->source_name; + _tmp7_ = self->priv->source_name; #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_); +"e %s", tag, _tmp6_, _tmp7_); #line 623 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp9_); -#line 5178 "PhotoMetadata.c" + _g_free0 (_tmp6_); +#line 5385 "PhotoMetadata.c" } } -static Block4Data* block4_data_ref (Block4Data* _data4_) { +static Block4Data* +block4_data_ref (Block4Data* _data4_) +{ #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data4_->_ref_count_); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data4_; -#line 5188 "PhotoMetadata.c" +#line 5397 "PhotoMetadata.c" } -static void block4_data_unref (void * _userdata_) { +static void +block4_data_unref (void * _userdata_) +{ Block4Data* _data4_; _data4_ = (Block4Data*) _userdata_; #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data4_->_ref_count_)) { -#line 5197 "PhotoMetadata.c" +#line 5408 "PhotoMetadata.c" PhotoMetadata* self; #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data4_->self; @@ -5205,42 +5416,48 @@ static void block4_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block4Data, _data4_); -#line 5205 "PhotoMetadata.c" +#line 5416 "PhotoMetadata.c" } } -static void __lambda8_ (Block4Data* _data4_, const gchar* tag) { +static void +__lambda8_ (Block4Data* _data4_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - MetadataRational _tmp1_; + MetadataRational _tmp0_; #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data4_->self; #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; + _tmp0_ = _data4_->rational; #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data4_->rational; -#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_rational (self, _tmp0_, &_tmp1_); -#line 5224 "PhotoMetadata.c" + photo_metadata_set_rational (self, tag, &_tmp0_); +#line 5435 "PhotoMetadata.c" } -static void ___lambda8__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda8__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda8_ (self, tag); -#line 5231 "PhotoMetadata.c" +#line 5445 "PhotoMetadata.c" } -void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataRational* rational, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_rational (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataRational* rational, + PhotoMetadataSetOption option) +{ Block4Data* _data4_; MetadataRational _tmp0_; - gchar** _tmp1_; - gint _tmp1__length1; - PhotoMetadataSetOption _tmp2_; #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5256,95 +5473,83 @@ void photo_metadata_set_all_rational (PhotoMetadata* self, gchar** tags, int tag #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_->rational = _tmp0_; #line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tags; -#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = tags_length1; -#line 629 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = option; -#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_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda8__photo_metadata_set_generic_value, _data4_); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block4_data_unref (_data4_); #line 628 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data4_ = NULL; -#line 5267 "PhotoMetadata.c" +#line 5478 "PhotoMetadata.c" } -MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar* tag) { +MetadataDateTime* +photo_metadata_get_date_time (PhotoMetadata* self, + const gchar* tag) +{ MetadataDateTime* result = NULL; gchar* value = NULL; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; + gchar* _tmp0_; + const gchar* _tmp1_; GError * _inner_error_ = NULL; #line 632 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 632 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (tag != NULL, NULL); #line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; + _tmp0_ = photo_metadata_get_string (self, tag, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_get_string (self, _tmp0_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); -#line 633 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - value = _tmp1_; + value = _tmp0_; #line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = value; + _tmp1_ = value; #line 634 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_ == NULL) { + if (_tmp1_ == NULL) { #line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 635 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5298 "PhotoMetadata.c" +#line 5509 "PhotoMetadata.c" } { - const gchar* _tmp3_; - MetadataDomain _tmp4_; -#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = tag; #line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_get_tag_domain (_tmp3_); -#line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp4_) { + switch (photo_metadata_get_tag_domain (tag)) { #line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 5311 "PhotoMetadata.c" +#line 5516 "PhotoMetadata.c" { - MetadataDateTime* _tmp5_ = NULL; - const gchar* _tmp6_; - MetadataDateTime* _tmp7_; - MetadataDateTime* _tmp8_; + MetadataDateTime* _tmp2_ = NULL; + const gchar* _tmp3_; + MetadataDateTime* _tmp4_; + MetadataDateTime* _tmp5_; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = value; + _tmp3_ = value; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = metadata_date_time_new_from_xmp (_tmp6_, &_inner_error_); + _tmp4_ = metadata_date_time_new_from_xmp (_tmp3_, &_inner_error_); #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp7_; + _tmp2_ = _tmp4_; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5325 "PhotoMetadata.c" +#line 5530 "PhotoMetadata.c" goto __catch30_g_error; } #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = _tmp5_; + _tmp5_ = _tmp2_; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = NULL; + _tmp2_ = NULL; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp8_; + result = _tmp5_; #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _metadata_date_time_unref0 (_tmp5_); + _metadata_date_time_unref0 (_tmp2_); #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 640 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5340 "PhotoMetadata.c" +#line 5545 "PhotoMetadata.c" } #line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 5344 "PhotoMetadata.c" +#line 5549 "PhotoMetadata.c" { #line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; @@ -5352,41 +5557,41 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _g_free0 (value); #line 645 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5352 "PhotoMetadata.c" +#line 5557 "PhotoMetadata.c" } default: #line 638 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 5357 "PhotoMetadata.c" +#line 5562 "PhotoMetadata.c" { - MetadataDateTime* _tmp9_ = NULL; - const gchar* _tmp10_; - MetadataDateTime* _tmp11_; - MetadataDateTime* _tmp12_; + MetadataDateTime* _tmp6_ = NULL; + const gchar* _tmp7_; + MetadataDateTime* _tmp8_; + MetadataDateTime* _tmp9_; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = value; + _tmp7_ = value; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = metadata_date_time_new_from_exif (_tmp10_, &_inner_error_); + _tmp8_ = metadata_date_time_new_from_exif (_tmp7_, &_inner_error_); #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp11_; + _tmp6_ = _tmp8_; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 5371 "PhotoMetadata.c" +#line 5576 "PhotoMetadata.c" goto __catch30_g_error; } #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = _tmp9_; + _tmp9_ = _tmp6_; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = NULL; + _tmp6_ = NULL; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp12_; + result = _tmp9_; #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _metadata_date_time_unref0 (_tmp9_); + _metadata_date_time_unref0 (_tmp6_); #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (value); #line 649 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5386 "PhotoMetadata.c" +#line 5591 "PhotoMetadata.c" } } } @@ -5394,24 +5599,21 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar __catch30_g_error: { GError* err = NULL; - const gchar* _tmp13_; - const gchar* _tmp14_; - GError* _tmp15_; - const gchar* _tmp16_; + const gchar* _tmp10_; + GError* _tmp11_; + const gchar* _tmp12_; #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" err = _inner_error_; #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _inner_error_ = NULL; #line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = tag; -#line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = self->priv->source_name; + _tmp10_ = self->priv->source_name; #line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = err; + _tmp11_ = err; #line 652 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = _tmp15_->message; + _tmp12_ = _tmp11_->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_); + g_warning ("PhotoMetadata.vala:652: Unable to read date/time %s from source %s: %s", tag, _tmp10_, _tmp12_); #line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5420,7 +5622,7 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar _g_free0 (value); #line 654 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5420 "PhotoMetadata.c" +#line 5622 "PhotoMetadata.c" } __finally30: #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5431,68 +5633,66 @@ MetadataDateTime* photo_metadata_get_date_time (PhotoMetadata* self, const gchar g_clear_error (&_inner_error_); #line 637 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 5431 "PhotoMetadata.c" +#line 5633 "PhotoMetadata.c" } -MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar** tags, int tags_length1) { +MetadataDateTime* +photo_metadata_get_first_date_time (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ MetadataDateTime* result = NULL; - gchar** _tmp0_; - gint _tmp0__length1; #line 658 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); -#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 5445 "PhotoMetadata.c" +#line 5645 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 5457 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 5657 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 5464 "PhotoMetadata.c" + tag = _tmp0_; +#line 5664 "PhotoMetadata.c" { MetadataDateTime* date_time = NULL; - const gchar* _tmp2_; + const gchar* _tmp1_; + MetadataDateTime* _tmp2_; MetadataDateTime* _tmp3_; - MetadataDateTime* _tmp4_; #line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_get_date_time (self, _tmp2_); + _tmp2_ = photo_metadata_get_date_time (self, _tmp1_); #line 660 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - date_time = _tmp3_; + date_time = _tmp2_; #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = date_time; + _tmp3_ = date_time; #line 661 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ != NULL) { + if (_tmp3_ != NULL) { #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = date_time; #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); #line 662 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5486 "PhotoMetadata.c" +#line 5686 "PhotoMetadata.c" } #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (date_time); #line 659 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 5492 "PhotoMetadata.c" +#line 5692 "PhotoMetadata.c" } } } @@ -5500,13 +5700,15 @@ MetadataDateTime* photo_metadata_get_first_date_time (PhotoMetadata* self, gchar result = NULL; #line 665 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5500 "PhotoMetadata.c" +#line 5700 "PhotoMetadata.c" } -void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, MetadataDateTime* date_time) { - const gchar* _tmp0_; - MetadataDomain _tmp1_; +void +photo_metadata_set_date_time (PhotoMetadata* self, + const gchar* tag, + MetadataDateTime* date_time) +{ #line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5514,112 +5716,93 @@ void photo_metadata_set_date_time (PhotoMetadata* self, const gchar* tag, Metada #line 668 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_METADATA_DATE_TIME (date_time)); #line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_get_tag_domain (_tmp0_); -#line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp1_) { + switch (photo_metadata_get_tag_domain (tag)) { #line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 5521 "PhotoMetadata.c" +#line 5719 "PhotoMetadata.c" { - const gchar* _tmp2_; - MetadataDateTime* _tmp3_; - gchar* _tmp4_; - gchar* _tmp5_; -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; -#line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = date_time; + gchar* _tmp0_; + gchar* _tmp1_; #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = metadata_date_time_get_exif_label (_tmp3_); + _tmp0_ = metadata_date_time_get_exif_label (date_time); #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp4_; + _tmp1_ = _tmp0_; #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, _tmp2_, _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, tag, _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 671 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp5_); + _g_free0 (_tmp1_); #line 672 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5541 "PhotoMetadata.c" +#line 5733 "PhotoMetadata.c" } #line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 5545 "PhotoMetadata.c" +#line 5737 "PhotoMetadata.c" { - const gchar* _tmp6_; - MetadataDateTime* _tmp7_; - gchar* _tmp8_; - gchar* _tmp9_; -#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = tag; -#line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = date_time; + gchar* _tmp2_; + gchar* _tmp3_; #line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = metadata_date_time_get_xmp_label (_tmp7_); + _tmp2_ = metadata_date_time_get_xmp_label (date_time); #line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = _tmp8_; + _tmp3_ = _tmp2_; #line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, _tmp6_, _tmp9_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, tag, _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 675 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp3_); #line 676 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5565 "PhotoMetadata.c" +#line 5751 "PhotoMetadata.c" } default: #line 669 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 5570 "PhotoMetadata.c" +#line 5756 "PhotoMetadata.c" { - const gchar* _tmp10_; - const gchar* _tmp11_; - const gchar* _tmp12_; - MetadataDomain _tmp13_; - GEnumValue* _tmp14_; + const gchar* _tmp4_; + GEnumValue* _tmp5_; #line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = tag; -#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = self->priv->source_name; -#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = tag; -#line 681 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = photo_metadata_get_tag_domain (_tmp12_); + _tmp4_ = self->priv->source_name; #line 682 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_enum_get_value (g_type_class_ref (TYPE_METADATA_DOMAIN), _tmp13_); + _tmp5_ = g_enum_get_value (g_type_class_ref (TYPE_METADATA_DOMAIN), photo_metadata_get_tag_domain (tag)); #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); +"supported metadata domain %s", tag, _tmp4_, (_tmp5_ != NULL) ? _tmp5_->value_name : NULL); #line 683 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 5591 "PhotoMetadata.c" +#line 5768 "PhotoMetadata.c" } } } -static gpointer _metadata_date_time_ref0 (gpointer self) { +static gpointer +_metadata_date_time_ref0 (gpointer self) +{ #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? metadata_date_time_ref (self) : NULL; -#line 5600 "PhotoMetadata.c" +#line 5779 "PhotoMetadata.c" } -static Block5Data* block5_data_ref (Block5Data* _data5_) { +static Block5Data* +block5_data_ref (Block5Data* _data5_) +{ #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data5_->_ref_count_); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data5_; -#line 5609 "PhotoMetadata.c" +#line 5790 "PhotoMetadata.c" } -static void block5_data_unref (void * _userdata_) { +static void +block5_data_unref (void * _userdata_) +{ Block5Data* _data5_; _data5_ = (Block5Data*) _userdata_; #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data5_->_ref_count_)) { -#line 5618 "PhotoMetadata.c" +#line 5801 "PhotoMetadata.c" PhotoMetadata* self; #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data5_->self; @@ -5629,43 +5812,45 @@ static void block5_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block5Data, _data5_); -#line 5628 "PhotoMetadata.c" +#line 5811 "PhotoMetadata.c" } } -static void __lambda9_ (Block5Data* _data5_, const gchar* tag) { +static void +__lambda9_ (Block5Data* _data5_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - MetadataDateTime* _tmp1_; #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data5_->self; #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data5_->date_time; -#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_date_time (self, _tmp0_, _tmp1_); -#line 5647 "PhotoMetadata.c" + photo_metadata_set_date_time (self, tag, _data5_->date_time); +#line 5827 "PhotoMetadata.c" } -static void ___lambda9__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +___lambda9__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" __lambda9_ (self, tag); -#line 5654 "PhotoMetadata.c" +#line 5837 "PhotoMetadata.c" } -void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int tags_length1, MetadataDateTime* date_time, PhotoMetadataSetOption option) { +void +photo_metadata_set_all_date_time (PhotoMetadata* self, + gchar** tags, + int tags_length1, + MetadataDateTime* date_time, + PhotoMetadataSetOption option) +{ Block5Data* _data5_; MetadataDateTime* _tmp0_; - MetadataDateTime* _tmp1_; - gchar** _tmp2_; - gint _tmp2__length1; - PhotoMetadataSetOption _tmp3_; #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5677,30 +5862,24 @@ void photo_metadata_set_all_date_time (PhotoMetadata* self, gchar** tags, int ta #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_->self = media_metadata_ref (self); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = date_time; -#line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _metadata_date_time_ref0 (_tmp0_); + _tmp0_ = _metadata_date_time_ref0 (date_time); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _metadata_date_time_unref0 (_data5_->date_time); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data5_->date_time = _tmp1_; -#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tags; + _data5_->date_time = _tmp0_; #line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = tags_length1; -#line 688 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; -#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_); + photo_metadata_set_all_generic (self, tags, tags_length1, option, ___lambda9__photo_metadata_set_generic_value, _data5_); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block5_data_unref (_data5_); #line 687 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data5_ = NULL; -#line 5695 "PhotoMetadata.c" +#line 5872 "PhotoMetadata.c" } -gchar* photo_metadata_exif_hash (PhotoMetadata* self) { +gchar* +photo_metadata_exif_hash (PhotoMetadata* self) +{ gchar* result = NULL; ExifData* _tmp0_; const gchar* _tmp1_; @@ -5732,13 +5911,13 @@ gchar* photo_metadata_exif_hash (PhotoMetadata* self) { result = NULL; #line 694 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5731 "PhotoMetadata.c" +#line 5910 "PhotoMetadata.c" } #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = self->priv->metadata_hash; #line 696 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ != NULL) { -#line 5737 "PhotoMetadata.c" +#line 5916 "PhotoMetadata.c" const gchar* _tmp2_; gchar* _tmp3_; #line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5749,7 +5928,7 @@ gchar* photo_metadata_exif_hash (PhotoMetadata* self) { result = _tmp3_; #line 697 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5748 "PhotoMetadata.c" +#line 5927 "PhotoMetadata.c" } #line 700 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" hash = NULL; @@ -5797,21 +5976,21 @@ gchar* photo_metadata_exif_hash (PhotoMetadata* self) { _tmp16_ = saved_size; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp16_ > ((guint) 0)) { -#line 5796 "PhotoMetadata.c" +#line 5975 "PhotoMetadata.c" guchar* _tmp17_; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp17_ = saved_data; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = _tmp17_ != NULL; -#line 5802 "PhotoMetadata.c" +#line 5981 "PhotoMetadata.c" } else { #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp15_ = FALSE; -#line 5806 "PhotoMetadata.c" +#line 5985 "PhotoMetadata.c" } #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp15_) { -#line 5810 "PhotoMetadata.c" +#line 5989 "PhotoMetadata.c" GChecksum* md5 = NULL; GChecksum* _tmp18_; GChecksum* _tmp19_; @@ -5857,17 +6036,19 @@ gchar* photo_metadata_exif_hash (PhotoMetadata* self) { self->priv->metadata_hash = _tmp27_; #line 717 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_checksum_free0 (md5); -#line 5856 "PhotoMetadata.c" +#line 6035 "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 5862 "PhotoMetadata.c" +#line 6041 "PhotoMetadata.c" } -gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { +gchar* +photo_metadata_thumbnail_hash (PhotoMetadata* self) +{ gchar* result = NULL; const gchar* _tmp0_; guchar* buffer = NULL; @@ -5883,7 +6064,7 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { _tmp0_ = self->priv->thumbnail_md5; #line 730 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp0_ != NULL) { -#line 5882 "PhotoMetadata.c" +#line 6063 "PhotoMetadata.c" const gchar* _tmp1_; gchar* _tmp2_; #line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -5894,7 +6075,7 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { result = _tmp2_; #line 731 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5893 "PhotoMetadata.c" +#line 6074 "PhotoMetadata.c" } #line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = self->priv->exiv2; @@ -5910,7 +6091,7 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { _buffer_size_ = buffer_length1; #line 735 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp6_) { -#line 5909 "PhotoMetadata.c" +#line 6090 "PhotoMetadata.c" GChecksum* md5 = NULL; GChecksum* _tmp7_; GChecksum* _tmp8_; @@ -5961,7 +6142,7 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { buffer = (g_free (buffer), NULL); #line 741 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5960 "PhotoMetadata.c" +#line 6141 "PhotoMetadata.c" } #line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; @@ -5969,11 +6150,13 @@ gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self) { buffer = (g_free (buffer), NULL); #line 744 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 5968 "PhotoMetadata.c" +#line 6149 "PhotoMetadata.c" } -guint photo_metadata_get_preview_count (PhotoMetadata* self) { +guint +photo_metadata_get_preview_count (PhotoMetadata* self) +{ guint result = 0U; GExiv2PreviewProperties** props = NULL; GExiv2Metadata* _tmp0_; @@ -6002,7 +6185,7 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) { _tmp4__length1 = props_length1; #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_ != NULL) { -#line 6001 "PhotoMetadata.c" +#line 6184 "PhotoMetadata.c" GExiv2PreviewProperties** _tmp5_; gint _tmp5__length1; #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6011,21 +6194,24 @@ guint photo_metadata_get_preview_count (PhotoMetadata* self) { _tmp5__length1 = props_length1; #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5__length1; -#line 6010 "PhotoMetadata.c" +#line 6193 "PhotoMetadata.c" } else { #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = 0; -#line 6014 "PhotoMetadata.c" +#line 6197 "PhotoMetadata.c" } #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = (guint) _tmp3_; #line 750 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6020 "PhotoMetadata.c" +#line 6203 "PhotoMetadata.c" } -PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { +PhotoPreview* +photo_metadata_get_preview (PhotoMetadata* self, + guint number) +{ PhotoPreview* result = NULL; GExiv2PreviewProperties** props = NULL; GExiv2Metadata* _tmp0_; @@ -6036,13 +6222,11 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { gboolean _tmp3_ = FALSE; GExiv2PreviewProperties** _tmp4_; gint _tmp4__length1; - const gchar* _tmp7_; - guint _tmp8_; - GExiv2PreviewProperties** _tmp9_; - gint _tmp9__length1; - guint _tmp10_; - GExiv2PreviewProperties* _tmp11_; - PhotoMetadataInternalPhotoPreview* _tmp12_; + const gchar* _tmp6_; + GExiv2PreviewProperties** _tmp7_; + gint _tmp7__length1; + GExiv2PreviewProperties* _tmp8_; + PhotoMetadataInternalPhotoPreview* _tmp9_; #line 754 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 755 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6063,20 +6247,17 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { if (_tmp4_ == NULL) { #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 6062 "PhotoMetadata.c" +#line 6246 "PhotoMetadata.c" } else { GExiv2PreviewProperties** _tmp5_; gint _tmp5__length1; - guint _tmp6_; #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = props; #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5__length1 = props_length1; #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = number; -#line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = ((guint) _tmp5__length1) <= _tmp6_; -#line 6075 "PhotoMetadata.c" + _tmp3_ = ((guint) _tmp5__length1) <= number; +#line 6256 "PhotoMetadata.c" } #line 756 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { @@ -6084,31 +6265,29 @@ PhotoPreview* photo_metadata_get_preview (PhotoMetadata* self, guint number) { result = NULL; #line 757 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6083 "PhotoMetadata.c" +#line 6264 "PhotoMetadata.c" } #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = self->priv->source_name; -#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = number; + _tmp6_ = self->priv->source_name; #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = props; + _tmp7_ = props; #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9__length1 = props_length1; + _tmp7__length1 = props_length1; #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = number; + _tmp8_ = _tmp7_[number]; #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = _tmp9_[_tmp10_]; + _tmp9_ = photo_metadata_internal_photo_preview_new (self, _tmp6_, number, _tmp8_); #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = photo_metadata_internal_photo_preview_new (self, _tmp7_, _tmp8_, _tmp11_); -#line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PHOTO_PREVIEW, PhotoPreview); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_PREVIEW, PhotoPreview); #line 759 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6103 "PhotoMetadata.c" +#line 6280 "PhotoMetadata.c" } -void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { +void +photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) +{ GExiv2Metadata* _tmp0_; ExifData* _tmp1_; #line 762 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6121,7 +6300,7 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { _tmp1_ = self->priv->exif; #line 764 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ != NULL) { -#line 6120 "PhotoMetadata.c" +#line 6299 "PhotoMetadata.c" ExifMem* _tmp2_; ExifMem* _tmp3_; ExifData* _tmp4_; @@ -6148,14 +6327,16 @@ void photo_metadata_remove_exif_thumbnail (PhotoMetadata* self) { _tmp7_ = self->priv->exif; #line 767 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_->size = (guint) 0; -#line 6147 "PhotoMetadata.c" +#line 6326 "PhotoMetadata.c" } } -void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) { +void +photo_metadata_remove_tag (PhotoMetadata* self, + const gchar* tag) +{ GExiv2Metadata* _tmp0_; - const gchar* _tmp1_; #line 771 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 771 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -6163,113 +6344,111 @@ void photo_metadata_remove_tag (PhotoMetadata* self, const gchar* tag) { #line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = tag; -#line 772 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_clear_tag (_tmp0_, _tmp1_); -#line 6165 "PhotoMetadata.c" + gexiv2_metadata_clear_tag (_tmp0_, tag); +#line 6344 "PhotoMetadata.c" } -void photo_metadata_remove_tags (PhotoMetadata* self, gchar** tags, int tags_length1) { - gchar** _tmp0_; - gint _tmp0__length1; +void +photo_metadata_remove_tags (PhotoMetadata* self, + gchar** tags, + int tags_length1) +{ #line 775 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); -#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tags; -#line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0__length1 = tags_length1; -#line 6178 "PhotoMetadata.c" +#line 6355 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; gint _tag_collection_size_ = 0; gint tag_it = 0; #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection = _tmp0_; + tag_collection = tags; #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag_collection_length1 = _tmp0__length1; + tag_collection_length1 = tags_length1; #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 6190 "PhotoMetadata.c" - gchar* _tmp1_; + for (tag_it = 0; tag_it < tags_length1; tag_it = tag_it + 1) { +#line 6367 "PhotoMetadata.c" + gchar* _tmp0_; gchar* tag = NULL; #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (tag_collection[tag_it]); + _tmp0_ = g_strdup (tag_collection[tag_it]); #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - tag = _tmp1_; -#line 6197 "PhotoMetadata.c" + tag = _tmp0_; +#line 6374 "PhotoMetadata.c" { - const gchar* _tmp2_; + const gchar* _tmp1_; #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = tag; + _tmp1_ = tag; #line 777 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tag (self, _tmp2_); + photo_metadata_remove_tag (self, _tmp1_); #line 776 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 6206 "PhotoMetadata.c" +#line 6383 "PhotoMetadata.c" } } } } -void photo_metadata_clear_domain (PhotoMetadata* self, MetadataDomain domain) { - MetadataDomain _tmp0_; +void +photo_metadata_clear_domain (PhotoMetadata* self, + MetadataDomain domain) +{ #line 780 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = domain; -#line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - switch (_tmp0_) { + switch (domain) { #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_EXIF: -#line 6223 "PhotoMetadata.c" +#line 6400 "PhotoMetadata.c" { - GExiv2Metadata* _tmp1_; + GExiv2Metadata* _tmp0_; #line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = self->priv->exiv2; + _tmp0_ = self->priv->exiv2; #line 783 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_clear_exif (_tmp1_); + gexiv2_metadata_clear_exif (_tmp0_); #line 784 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6232 "PhotoMetadata.c" +#line 6409 "PhotoMetadata.c" } #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_XMP: -#line 6236 "PhotoMetadata.c" +#line 6413 "PhotoMetadata.c" { - GExiv2Metadata* _tmp2_; + GExiv2Metadata* _tmp1_; #line 787 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = self->priv->exiv2; + _tmp1_ = self->priv->exiv2; #line 787 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_clear_xmp (_tmp2_); + gexiv2_metadata_clear_xmp (_tmp1_); #line 788 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6245 "PhotoMetadata.c" +#line 6422 "PhotoMetadata.c" } #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" case METADATA_DOMAIN_IPTC: -#line 6249 "PhotoMetadata.c" +#line 6426 "PhotoMetadata.c" { - GExiv2Metadata* _tmp3_; + GExiv2Metadata* _tmp2_; #line 791 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = self->priv->exiv2; + _tmp2_ = self->priv->exiv2; #line 791 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_clear_iptc (_tmp3_); + gexiv2_metadata_clear_iptc (_tmp2_); #line 792 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6258 "PhotoMetadata.c" +#line 6435 "PhotoMetadata.c" } default: #line 781 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6263 "PhotoMetadata.c" +#line 6440 "PhotoMetadata.c" } } -void photo_metadata_clear (PhotoMetadata* self) { +void +photo_metadata_clear (PhotoMetadata* self) +{ GExiv2Metadata* _tmp0_; #line 796 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); @@ -6277,11 +6456,13 @@ void photo_metadata_clear (PhotoMetadata* self) { _tmp0_ = self->priv->exiv2; #line 797 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" gexiv2_metadata_clear (_tmp0_); -#line 6276 "PhotoMetadata.c" +#line 6455 "PhotoMetadata.c" } -MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self) { +MetadataDateTime* +photo_metadata_get_modification_date_time (PhotoMetadata* self) +{ MetadataDateTime* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -6298,51 +6479,48 @@ MetadataDateTime* photo_metadata_get_modification_date_time (PhotoMetadata* self result = _tmp1_; #line 808 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6297 "PhotoMetadata.c" +#line 6478 "PhotoMetadata.c" } -void photo_metadata_set_modification_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { - MetadataDateTime* _tmp0_; +void +photo_metadata_set_modification_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option) +{ #line 811 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 811 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time)); #line 813 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = date_time; -#line 813 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ != NULL) { -#line 6311 "PhotoMetadata.c" - gchar** _tmp1_; - gint _tmp1__length1; - MetadataDateTime* _tmp2_; - PhotoMetadataSetOption _tmp3_; -#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_DATE_TIME_TAGS; -#line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = photo_metadata_DATE_TIME_TAGS_length1; + if (date_time != NULL) { +#line 6493 "PhotoMetadata.c" + gchar** _tmp0_; + gint _tmp0__length1; #line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = date_time; + _tmp0_ = photo_metadata_DATE_TIME_TAGS; #line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + _tmp0__length1 = photo_metadata_DATE_TIME_TAGS_length1; #line 814 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6326 "PhotoMetadata.c" + photo_metadata_set_all_date_time (self, _tmp0_, _tmp0__length1, date_time, option); +#line 6502 "PhotoMetadata.c" } else { - gchar** _tmp4_; - gint _tmp4__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_DATE_TIME_TAGS; + _tmp1_ = photo_metadata_DATE_TIME_TAGS; #line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_DATE_TIME_TAGS_length1; + _tmp1__length1 = photo_metadata_DATE_TIME_TAGS_length1; #line 816 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6336 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp1_, _tmp1__length1); +#line 6512 "PhotoMetadata.c" } } -MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) { +MetadataDateTime* +photo_metadata_get_exposure_date_time (PhotoMetadata* self) +{ MetadataDateTime* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -6359,51 +6537,48 @@ MetadataDateTime* photo_metadata_get_exposure_date_time (PhotoMetadata* self) { result = _tmp1_; #line 829 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6358 "PhotoMetadata.c" +#line 6536 "PhotoMetadata.c" } -void photo_metadata_set_exposure_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { - MetadataDateTime* _tmp0_; +void +photo_metadata_set_exposure_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option) +{ #line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 832 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time)); #line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = date_time; -#line 834 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ != NULL) { -#line 6372 "PhotoMetadata.c" - gchar** _tmp1_; - gint _tmp1__length1; - MetadataDateTime* _tmp2_; - PhotoMetadataSetOption _tmp3_; -#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; -#line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; + if (date_time != NULL) { +#line 6551 "PhotoMetadata.c" + gchar** _tmp0_; + gint _tmp0__length1; #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = date_time; + _tmp0_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + _tmp0__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; #line 835 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6387 "PhotoMetadata.c" + photo_metadata_set_all_date_time (self, _tmp0_, _tmp0__length1, date_time, option); +#line 6560 "PhotoMetadata.c" } else { - gchar** _tmp4_; - gint _tmp4__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; + _tmp1_ = photo_metadata_EXPOSURE_DATE_TIME_TAGS; #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; + _tmp1__length1 = photo_metadata_EXPOSURE_DATE_TIME_TAGS_length1; #line 837 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6397 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp1_, _tmp1__length1); +#line 6570 "PhotoMetadata.c" } } -MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) { +MetadataDateTime* +photo_metadata_get_digitized_date_time (PhotoMetadata* self) +{ MetadataDateTime* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -6420,51 +6595,48 @@ MetadataDateTime* photo_metadata_get_digitized_date_time (PhotoMetadata* self) { result = _tmp1_; #line 846 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6419 "PhotoMetadata.c" +#line 6594 "PhotoMetadata.c" } -void photo_metadata_set_digitized_date_time (PhotoMetadata* self, MetadataDateTime* date_time, PhotoMetadataSetOption option) { - MetadataDateTime* _tmp0_; +void +photo_metadata_set_digitized_date_time (PhotoMetadata* self, + MetadataDateTime* date_time, + PhotoMetadataSetOption option) +{ #line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 849 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail ((date_time == NULL) || IS_METADATA_DATE_TIME (date_time)); #line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = date_time; -#line 851 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ != NULL) { -#line 6433 "PhotoMetadata.c" - gchar** _tmp1_; - gint _tmp1__length1; - MetadataDateTime* _tmp2_; - PhotoMetadataSetOption _tmp3_; -#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; + if (date_time != NULL) { +#line 6609 "PhotoMetadata.c" + gchar** _tmp0_; + gint _tmp0__length1; #line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; -#line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = date_time; + _tmp0_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; #line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = option; + _tmp0__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; #line 852 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_date_time (self, _tmp1_, _tmp1__length1, _tmp2_, _tmp3_); -#line 6448 "PhotoMetadata.c" + photo_metadata_set_all_date_time (self, _tmp0_, _tmp0__length1, date_time, option); +#line 6618 "PhotoMetadata.c" } else { - gchar** _tmp4_; - gint _tmp4__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; + _tmp1_ = photo_metadata_DIGITIZED_DATE_TIME_TAGS; #line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; + _tmp1__length1 = photo_metadata_DIGITIZED_DATE_TIME_TAGS_length1; #line 854 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); -#line 6458 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp1_, _tmp1__length1); +#line 6628 "PhotoMetadata.c" } } -static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetadata* base) { +static MetadataDateTime* +photo_metadata_real_get_creation_date_time (MediaMetadata* base) +{ PhotoMetadata * self; MetadataDateTime* result = NULL; MetadataDateTime* creation = NULL; @@ -6480,7 +6652,7 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada _tmp1_ = creation; #line 859 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp1_ == NULL) { -#line 6479 "PhotoMetadata.c" +#line 6651 "PhotoMetadata.c" MetadataDateTime* _tmp2_; #line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = photo_metadata_get_digitized_date_time (self); @@ -6488,24 +6660,28 @@ static MetadataDateTime* photo_metadata_real_get_creation_date_time (MediaMetada _metadata_date_time_unref0 (creation); #line 860 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" creation = _tmp2_; -#line 6487 "PhotoMetadata.c" +#line 6659 "PhotoMetadata.c" } #line 862 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = creation; #line 862 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6493 "PhotoMetadata.c" +#line 6665 "PhotoMetadata.c" } -static gpointer _dimensions_dup0 (gpointer self) { +static gpointer +_dimensions_dup0 (gpointer self) +{ #line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? dimensions_dup (self) : NULL; -#line 6500 "PhotoMetadata.c" +#line 6674 "PhotoMetadata.c" } -Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { +Dimensions* +photo_metadata_get_pixel_dimensions (PhotoMetadata* self) +{ Dimensions* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -6523,19 +6699,19 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { _tmp1__length1 = photo_metadata_HEIGHT_TAGS_length1; #line 881 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp0__length1 == _tmp1__length1, "WIDTH_TAGS.length == HEIGHT_TAGS.length"); -#line 6522 "PhotoMetadata.c" +#line 6698 "PhotoMetadata.c" { gint ctr = 0; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = 0; -#line 6527 "PhotoMetadata.c" +#line 6703 "PhotoMetadata.c" { gboolean _tmp2_ = FALSE; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = TRUE; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 6534 "PhotoMetadata.c" +#line 6710 "PhotoMetadata.c" gint _tmp4_; gchar** _tmp5_; gint _tmp5__length1; @@ -6559,13 +6735,13 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { Dimensions* _tmp19_; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (!_tmp2_) { -#line 6558 "PhotoMetadata.c" +#line 6734 "PhotoMetadata.c" gint _tmp3_; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = ctr; #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ctr = _tmp3_ + 1; -#line 6564 "PhotoMetadata.c" +#line 6740 "PhotoMetadata.c" } #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = FALSE; @@ -6579,7 +6755,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { if (!(_tmp4_ < _tmp5__length1)) { #line 882 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 6578 "PhotoMetadata.c" +#line 6754 "PhotoMetadata.c" } #line 886 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp6_ = photo_metadata_WIDTH_TAGS; @@ -6597,7 +6773,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { if (!_tmp10_) { #line 887 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 6596 "PhotoMetadata.c" +#line 6772 "PhotoMetadata.c" } #line 890 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp11_ = photo_metadata_HEIGHT_TAGS; @@ -6615,7 +6791,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { if (!_tmp15_) { #line 891 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 6614 "PhotoMetadata.c" +#line 6790 "PhotoMetadata.c" } #line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp16_ = width; @@ -6629,7 +6805,7 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { result = _tmp19_; #line 893 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6628 "PhotoMetadata.c" +#line 6804 "PhotoMetadata.c" } } } @@ -6637,363 +6813,330 @@ Dimensions* photo_metadata_get_pixel_dimensions (PhotoMetadata* self) { result = NULL; #line 896 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6636 "PhotoMetadata.c" +#line 6812 "PhotoMetadata.c" } -void photo_metadata_set_pixel_dimensions (PhotoMetadata* self, Dimensions* dim, PhotoMetadataSetOption option) { - Dimensions* _tmp0_; +void +photo_metadata_set_pixel_dimensions (PhotoMetadata* self, + Dimensions* dim, + PhotoMetadataSetOption option) +{ #line 899 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 900 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = dim; -#line 900 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp0_ != NULL) { -#line 6648 "PhotoMetadata.c" - gchar** _tmp1_; - gint _tmp1__length1; - Dimensions* _tmp2_; + if (dim != NULL) { +#line 6825 "PhotoMetadata.c" + gchar** _tmp0_; + gint _tmp0__length1; + gint _tmp1_; + gchar** _tmp2_; + gint _tmp2__length1; gint _tmp3_; - PhotoMetadataSetOption _tmp4_; - gchar** _tmp5_; - gint _tmp5__length1; - Dimensions* _tmp6_; - gint _tmp7_; - PhotoMetadataSetOption _tmp8_; -#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_WIDTH_TAGS; #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1__length1 = photo_metadata_WIDTH_TAGS_length1; + _tmp0_ = photo_metadata_WIDTH_TAGS; #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = dim; + _tmp0__length1 = photo_metadata_WIDTH_TAGS_length1; #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = (*_tmp2_).width; + _tmp1_ = (*dim).width; #line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = option; -#line 901 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_long (self, _tmp1_, _tmp1__length1, (glong) _tmp3_, _tmp4_); -#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = photo_metadata_HEIGHT_TAGS; -#line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5__length1 = photo_metadata_HEIGHT_TAGS_length1; + photo_metadata_set_all_long (self, _tmp0_, _tmp0__length1, (glong) _tmp1_, option); #line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = dim; + _tmp2_ = photo_metadata_HEIGHT_TAGS; #line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = (*_tmp6_).height; + _tmp2__length1 = photo_metadata_HEIGHT_TAGS_length1; #line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = option; + _tmp3_ = (*dim).height; #line 902 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_long (self, _tmp5_, _tmp5__length1, (glong) _tmp7_, _tmp8_); -#line 6683 "PhotoMetadata.c" + photo_metadata_set_all_long (self, _tmp2_, _tmp2__length1, (glong) _tmp3_, option); +#line 6848 "PhotoMetadata.c" } else { - gchar** _tmp9_; - gint _tmp9__length1; - gchar** _tmp10_; - gint _tmp10__length1; + gchar** _tmp4_; + gint _tmp4__length1; + gchar** _tmp5_; + gint _tmp5__length1; #line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = photo_metadata_WIDTH_TAGS; + _tmp4_ = photo_metadata_WIDTH_TAGS; #line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9__length1 = photo_metadata_WIDTH_TAGS_length1; + _tmp4__length1 = photo_metadata_WIDTH_TAGS_length1; #line 904 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp9_, _tmp9__length1); + photo_metadata_remove_tags (self, _tmp4_, _tmp4__length1); #line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = photo_metadata_HEIGHT_TAGS; + _tmp5_ = photo_metadata_HEIGHT_TAGS; #line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10__length1 = photo_metadata_HEIGHT_TAGS_length1; + _tmp5__length1 = photo_metadata_HEIGHT_TAGS_length1; #line 905 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp10_, _tmp10__length1); -#line 6701 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp5_, _tmp5__length1); +#line 6866 "PhotoMetadata.c" } } -static gchar* string_strip (const gchar* self) { +static gchar* +string_strip (const gchar* self) +{ gchar* result = NULL; gchar* _result_ = NULL; gchar* _tmp0_; const gchar* _tmp1_; -#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1248 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = g_strdup (self); -#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1249 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _result_ = _tmp0_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = _result_; -#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1250 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_strstrip (_tmp1_); -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" result = _result_; -#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1251 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 6725 "PhotoMetadata.c" +#line 6892 "PhotoMetadata.c" } -static gboolean string_contains (const gchar* self, const gchar* needle) { +static gboolean +string_contains (const gchar* self, + const gchar* needle) +{ gboolean result = FALSE; - const gchar* _tmp0_; - gchar* _tmp1_; -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp0_; +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, FALSE); -#line 1403 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1417 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (needle != NULL, FALSE); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = needle; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = strstr ((gchar*) self, (gchar*) _tmp0_); -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp1_ != NULL; -#line 1404 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = strstr ((gchar*) self, (gchar*) needle); +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp0_ != NULL; +#line 1418 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 6745 "PhotoMetadata.c" +#line 6912 "PhotoMetadata.c" } -static gchar* photo_metadata_real_get_title (MediaMetadata* base) { +static gchar* +photo_metadata_real_get_title (MediaMetadata* base) +{ PhotoMetadata * self; gchar* result = NULL; GeeList* _tmp0_ = NULL; - gboolean _tmp1_; GeeList* titles = NULL; - GeeList* _tmp5_; - gchar* _tmp6_ = NULL; - gboolean _tmp7_ = FALSE; - GeeList* _tmp8_; + GeeList* _tmp4_; + gchar* _tmp5_ = NULL; + gboolean _tmp6_ = FALSE; + GeeList* _tmp7_; gchar* title = NULL; - gchar* _tmp14_; - const gchar* _tmp15_; - const gchar* _tmp18_ = NULL; + gchar* _tmp13_; + const gchar* _tmp14_; + const gchar* _tmp17_ = NULL; + gboolean _tmp18_ = FALSE; gboolean _tmp19_ = FALSE; - gboolean _tmp20_ = FALSE; - const gchar* _tmp21_; - gboolean _tmp22_; - gchar* _tmp28_; + const gchar* _tmp20_; + gchar* _tmp24_; #line 939 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PHOTO_METADATA, PhotoMetadata); #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); -#line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp1_) { -#line 6774 "PhotoMetadata.c" - GeeList* _tmp2_; + if (photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG)) { +#line 6939 "PhotoMetadata.c" + GeeList* _tmp1_; #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); + _tmp1_ = photo_metadata_get_string_multiple (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp0_); #line 948 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = _tmp2_; -#line 6782 "PhotoMetadata.c" + _tmp0_ = _tmp1_; +#line 6947 "PhotoMetadata.c" } else { - gchar** _tmp3_; - gint _tmp3__length1; - GeeList* _tmp4_; + gchar** _tmp2_; + gint _tmp2__length1; + GeeList* _tmp3_; #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = photo_metadata_STANDARD_TITLE_TAGS; + _tmp2_ = photo_metadata_STANDARD_TITLE_TAGS; #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; + _tmp2__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_get_first_string_multiple (self, _tmp3_, _tmp3__length1); + _tmp3_ = photo_metadata_get_first_string_multiple (self, _tmp2_, _tmp2__length1); #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp0_); #line 949 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = _tmp4_; -#line 6797 "PhotoMetadata.c" + _tmp0_ = _tmp3_; +#line 6962 "PhotoMetadata.c" } #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _g_object_ref0 (_tmp0_); + _tmp4_ = _g_object_ref0 (_tmp0_); #line 947 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - titles = _tmp5_; + titles = _tmp4_; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = titles; + _tmp7_ = titles; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp8_ != NULL) { -#line 6807 "PhotoMetadata.c" - GeeList* _tmp9_; + if (_tmp7_ != NULL) { +#line 6972 "PhotoMetadata.c" + GeeList* _tmp8_; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = titles; + _tmp8_ = titles; #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)); + _tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection)); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp11_ > 0; -#line 6819 "PhotoMetadata.c" + _tmp6_ = _tmp10_ > 0; +#line 6984 "PhotoMetadata.c" } else { #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = FALSE; -#line 6823 "PhotoMetadata.c" + _tmp6_ = FALSE; +#line 6988 "PhotoMetadata.c" } #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp7_) { -#line 6827 "PhotoMetadata.c" - GeeList* _tmp12_; - gpointer _tmp13_; + if (_tmp6_) { +#line 6992 "PhotoMetadata.c" + GeeList* _tmp11_; + gpointer _tmp12_; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = titles; + _tmp11_ = titles; #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = gee_list_get (_tmp12_, 0); + _tmp12_ = gee_list_get (_tmp11_, 0); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = (gchar*) _tmp13_; -#line 6838 "PhotoMetadata.c" + _tmp5_ = (gchar*) _tmp12_; +#line 7003 "PhotoMetadata.c" } else { #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = NULL; -#line 6844 "PhotoMetadata.c" + _tmp5_ = NULL; +#line 7009 "PhotoMetadata.c" } #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_strdup (_tmp6_); + _tmp13_ = g_strdup (_tmp5_); #line 954 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - title = _tmp14_; + title = _tmp13_; #line 957 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = title; + _tmp14_ = title; #line 957 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp15_ != NULL) { -#line 6854 "PhotoMetadata.c" - const gchar* _tmp16_; - gchar* _tmp17_; + if (_tmp14_ != NULL) { +#line 7019 "PhotoMetadata.c" + const gchar* _tmp15_; + gchar* _tmp16_; #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = title; + _tmp15_ = title; #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = string_strip (_tmp16_); + _tmp16_ = string_strip (_tmp15_); #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (title); #line 958 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - title = _tmp17_; -#line 6865 "PhotoMetadata.c" + title = _tmp16_; +#line 7030 "PhotoMetadata.c" } #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = title; -#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = is_string_empty (_tmp21_); -#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp22_) { -#line 6873 "PhotoMetadata.c" - const gchar* _tmp23_; - gboolean _tmp24_; + _tmp20_ = title; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = title; + if (!is_string_empty (_tmp20_)) { +#line 7036 "PhotoMetadata.c" + const gchar* _tmp21_; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = string_contains (_tmp23_, "\n"); + _tmp21_ = title; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = !_tmp24_; -#line 6882 "PhotoMetadata.c" + _tmp19_ = !string_contains (_tmp21_, "\n"); +#line 7042 "PhotoMetadata.c" } else { #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = FALSE; -#line 6886 "PhotoMetadata.c" + _tmp19_ = FALSE; +#line 7046 "PhotoMetadata.c" } #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp20_) { -#line 6890 "PhotoMetadata.c" - const gchar* _tmp25_; - gboolean _tmp26_; -#line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = title; + if (_tmp19_) { +#line 7050 "PhotoMetadata.c" + const gchar* _tmp22_; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = string_contains (_tmp25_, "\r"); + _tmp22_ = title; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = !_tmp26_; -#line 6899 "PhotoMetadata.c" + _tmp18_ = !string_contains (_tmp22_, "\r"); +#line 7056 "PhotoMetadata.c" } else { #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = FALSE; -#line 6903 "PhotoMetadata.c" + _tmp18_ = FALSE; +#line 7060 "PhotoMetadata.c" } #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp19_) { -#line 6907 "PhotoMetadata.c" - const gchar* _tmp27_; + if (_tmp18_) { +#line 7064 "PhotoMetadata.c" + const gchar* _tmp23_; #line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = title; + _tmp23_ = title; #line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = _tmp27_; -#line 6913 "PhotoMetadata.c" + _tmp17_ = _tmp23_; +#line 7070 "PhotoMetadata.c" } else { #line 962 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = NULL; -#line 6917 "PhotoMetadata.c" + _tmp17_ = NULL; +#line 7074 "PhotoMetadata.c" } #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = g_strdup (_tmp18_); + _tmp24_ = g_strdup (_tmp17_); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp28_; + result = _tmp24_; #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (title); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp6_); + _g_free0 (_tmp5_); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (titles); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_tmp0_); #line 961 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 6933 "PhotoMetadata.c" +#line 7090 "PhotoMetadata.c" } -void photo_metadata_set_title (PhotoMetadata* self, const gchar* title, PhotoMetadataSetOption option) { - const gchar* _tmp0_; - gboolean _tmp1_; +void +photo_metadata_set_title (PhotoMetadata* self, + const gchar* title, + PhotoMetadataSetOption option) +{ #line 965 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = title; -#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = is_string_empty (_tmp0_); -#line 966 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp1_) { -#line 6948 "PhotoMetadata.c" - gboolean _tmp2_; + if (!is_string_empty (title)) { #line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG); -#line 967 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_) { -#line 6954 "PhotoMetadata.c" - const gchar* _tmp3_; -#line 968 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = title; + if (photo_metadata_has_tag (self, PHOTO_METADATA_IPHOTO_TITLE_TAG)) { #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 6960 "PhotoMetadata.c" + photo_metadata_set_string (self, PHOTO_METADATA_IPHOTO_TITLE_TAG, title, PHOTO_METADATA_PREPARE_STRING_OPTIONS); +#line 7107 "PhotoMetadata.c" } else { - gchar** _tmp4_; - gint _tmp4__length1; - const gchar* _tmp5_; - PhotoMetadataSetOption _tmp6_; + gchar** _tmp0_; + gint _tmp0__length1; #line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_STANDARD_TITLE_TAGS; + _tmp0_ = photo_metadata_STANDARD_TITLE_TAGS; #line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; + _tmp0__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; #line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = title; -#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = option; -#line 970 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_all_string (self, _tmp4_, _tmp4__length1, _tmp5_, _tmp6_); -#line 6976 "PhotoMetadata.c" + photo_metadata_set_all_string (self, _tmp0_, _tmp0__length1, title, option); +#line 7117 "PhotoMetadata.c" } } else { - gchar** _tmp7_; - gint _tmp7__length1; + gchar** _tmp1_; + gint _tmp1__length1; #line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = photo_metadata_STANDARD_TITLE_TAGS; + _tmp1_ = photo_metadata_STANDARD_TITLE_TAGS; #line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; + _tmp1__length1 = photo_metadata_STANDARD_TITLE_TAGS_length1; #line 972 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp7_, _tmp7__length1); -#line 6987 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp1_, _tmp1__length1); +#line 7128 "PhotoMetadata.c" } } -static gchar* photo_metadata_real_get_comment (MediaMetadata* base) { +static gchar* +photo_metadata_real_get_comment (MediaMetadata* base) +{ PhotoMetadata * self; gchar* result = NULL; gchar** _tmp0_; @@ -7011,25 +7154,29 @@ static gchar* photo_metadata_real_get_comment (MediaMetadata* base) { result = _tmp1_; #line 982 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 7010 "PhotoMetadata.c" +#line 7153 "PhotoMetadata.c" } -static Block6Data* block6_data_ref (Block6Data* _data6_) { +static Block6Data* +block6_data_ref (Block6Data* _data6_) +{ #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_atomic_int_inc (&_data6_->_ref_count_); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return _data6_; -#line 7019 "PhotoMetadata.c" +#line 7164 "PhotoMetadata.c" } -static void block6_data_unref (void * _userdata_) { +static void +block6_data_unref (void * _userdata_) +{ Block6Data* _data6_; _data6_ = (Block6Data*) _userdata_; #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (g_atomic_int_dec_and_test (&_data6_->_ref_count_)) { -#line 7028 "PhotoMetadata.c" +#line 7175 "PhotoMetadata.c" PhotoMetadata* self; #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data6_->self; @@ -7039,42 +7186,43 @@ static void block6_data_unref (void * _userdata_) { _media_metadata_unref0 (self); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_slice_free (Block6Data, _data6_); -#line 7038 "PhotoMetadata.c" +#line 7185 "PhotoMetadata.c" } } -static void ___lambda10_ (Block6Data* _data6_, const gchar* tag) { +static void +___lambda10_ (Block6Data* _data6_, + const gchar* tag) +{ PhotoMetadata* self; - const gchar* _tmp0_; - const gchar* _tmp1_; #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = _data6_->self; #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (tag != NULL); #line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = tag; -#line 991 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = _data6_->comment; -#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 7057 "PhotoMetadata.c" + photo_metadata_set_string (self, tag, _data6_->comment, PHOTO_METADATA_PREPARE_STRING_OPTIONS & (~PREPARE_INPUT_TEXT_OPTIONS_STRIP_CRLF)); +#line 7201 "PhotoMetadata.c" } -static void ____lambda10__photo_metadata_set_generic_value (const gchar* tag, gpointer self) { +static void +____lambda10__photo_metadata_set_generic_value (const gchar* tag, + gpointer self) +{ #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" ___lambda10_ (self, tag); -#line 7064 "PhotoMetadata.c" +#line 7211 "PhotoMetadata.c" } -void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, PhotoMetadataSetOption option) { +void +photo_metadata_set_comment (PhotoMetadata* self, + const gchar* comment, + PhotoMetadataSetOption option) +{ Block6Data* _data6_; - const gchar* _tmp0_; - gchar* _tmp1_; - const gchar* _tmp2_; - gboolean _tmp3_; + gchar* _tmp0_; #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7084,60 +7232,56 @@ void photo_metadata_set_comment (PhotoMetadata* self, const gchar* comment, Phot #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data6_->self = media_metadata_ref (self); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = comment; -#line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (comment); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_data6_->comment); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _data6_->comment = _tmp1_; -#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = _data6_->comment; + _data6_->comment = _tmp0_; #line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = is_string_empty (_tmp2_); -#line 989 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp3_) { -#line 7096 "PhotoMetadata.c" - gchar** _tmp4_; - gint _tmp4__length1; - PhotoMetadataSetOption _tmp5_; -#line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_COMMENT_TAGS; + if (!is_string_empty (_data6_->comment)) { +#line 7238 "PhotoMetadata.c" + gchar** _tmp1_; + gint _tmp1__length1; #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4__length1 = photo_metadata_COMMENT_TAGS_length1; + _tmp1_ = photo_metadata_COMMENT_TAGS; #line 990 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = option; + _tmp1__length1 = photo_metadata_COMMENT_TAGS_length1; #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 7108 "PhotoMetadata.c" + photo_metadata_set_all_generic (self, _tmp1_, _tmp1__length1, option, ____lambda10__photo_metadata_set_generic_value, _data6_); +#line 7247 "PhotoMetadata.c" } else { - gchar** _tmp6_; - gint _tmp6__length1; + gchar** _tmp2_; + gint _tmp2__length1; #line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = photo_metadata_COMMENT_TAGS; + _tmp2_ = photo_metadata_COMMENT_TAGS; #line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6__length1 = photo_metadata_COMMENT_TAGS_length1; + _tmp2__length1 = photo_metadata_COMMENT_TAGS_length1; #line 995 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp6_, _tmp6__length1); -#line 7118 "PhotoMetadata.c" + photo_metadata_remove_tags (self, _tmp2_, _tmp2__length1); +#line 7257 "PhotoMetadata.c" } #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" block6_data_unref (_data6_); #line 985 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _data6_ = NULL; -#line 7124 "PhotoMetadata.c" +#line 7263 "PhotoMetadata.c" } -GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compare_func, void* compare_func_target, GDestroyNotify compare_func_target_destroy_notify) { +GeeSet* +photo_metadata_get_keywords (PhotoMetadata* self, + GCompareDataFunc compare_func, + void* compare_func_target, + GDestroyNotify compare_func_target_destroy_notify) +{ GeeSet* result = NULL; GeeSet* keywords = NULL; gchar** _tmp0_; gint _tmp0__length1; - GeeSet* _tmp22_ = NULL; - gboolean _tmp23_ = FALSE; - GeeSet* _tmp24_; - GeeSet* _tmp29_; + GeeSet* _tmp21_ = NULL; + gboolean _tmp22_ = FALSE; + GeeSet* _tmp23_; + GeeSet* _tmp28_; #line 1015 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1016 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7146,7 +7290,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _tmp0_ = photo_metadata_KEYWORD_TAGS; #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_KEYWORD_TAGS_length1; -#line 7145 "PhotoMetadata.c" +#line 7289 "PhotoMetadata.c" { gchar** tag_collection = NULL; gint tag_collection_length1 = 0; @@ -7158,14 +7302,14 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa tag_collection_length1 = _tmp0__length1; #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (tag_it = 0; tag_it < _tmp0__length1; tag_it = tag_it + 1) { -#line 7157 "PhotoMetadata.c" +#line 7301 "PhotoMetadata.c" gchar* _tmp1_; gchar* tag = NULL; #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = g_strdup (tag_collection[tag_it]); #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" tag = _tmp1_; -#line 7164 "PhotoMetadata.c" +#line 7308 "PhotoMetadata.c" { GeeCollection* values = NULL; const gchar* _tmp2_; @@ -7182,7 +7326,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _tmp5_ = values; #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_ != NULL) { -#line 7181 "PhotoMetadata.c" +#line 7325 "PhotoMetadata.c" GeeCollection* _tmp6_; gint _tmp7_; gint _tmp8_; @@ -7194,21 +7338,21 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _tmp8_ = _tmp7_; #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _tmp8_ > 0; -#line 7193 "PhotoMetadata.c" +#line 7337 "PhotoMetadata.c" } else { #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 7197 "PhotoMetadata.c" +#line 7341 "PhotoMetadata.c" } #line 1019 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp4_) { -#line 7201 "PhotoMetadata.c" +#line 7345 "PhotoMetadata.c" GeeSet* _tmp9_; #line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp9_ = keywords; #line 1020 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp9_ == NULL) { -#line 7207 "PhotoMetadata.c" +#line 7351 "PhotoMetadata.c" GCompareDataFunc _tmp10_; void* _tmp10__target; GDestroyNotify _tmp10__target_destroy_notify; @@ -7231,7 +7375,7 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _g_object_unref0 (keywords); #line 1021 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" keywords = _tmp11_; -#line 7230 "PhotoMetadata.c" +#line 7374 "PhotoMetadata.c" } { GeeIterator* _current_value_it = NULL; @@ -7245,101 +7389,98 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa _current_value_it = _tmp13_; #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7244 "PhotoMetadata.c" +#line 7388 "PhotoMetadata.c" GeeIterator* _tmp14_; - gboolean _tmp15_; gchar* current_value = NULL; - GeeIterator* _tmp16_; - gpointer _tmp17_; - GeeSet* _tmp18_; - const gchar* _tmp19_; + GeeIterator* _tmp15_; + gpointer _tmp16_; + GeeSet* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; gchar* _tmp20_; - gchar* _tmp21_; #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp14_ = _current_value_it; #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = gee_iterator_next (_tmp14_); -#line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp15_) { + if (!gee_iterator_next (_tmp14_)) { #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7262 "PhotoMetadata.c" +#line 7403 "PhotoMetadata.c" } #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = _current_value_it; + _tmp15_ = _current_value_it; #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = gee_iterator_get (_tmp16_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_value = (gchar*) _tmp17_; + current_value = (gchar*) _tmp16_; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = keywords; + _tmp17_ = keywords; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = current_value; + _tmp18_ = current_value; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp19_); + _tmp19_ = hierarchical_tag_utilities_make_flat_tag_safe (_tmp18_); #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = _tmp20_; + _tmp20_ = _tmp19_; #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_COLLECTION, GeeCollection), _tmp21_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_); #line 1024 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp21_); + _g_free0 (_tmp20_); #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 7284 "PhotoMetadata.c" +#line 7425 "PhotoMetadata.c" } #line 1023 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 7288 "PhotoMetadata.c" +#line 7429 "PhotoMetadata.c" } } #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 1017 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (tag); -#line 7295 "PhotoMetadata.c" +#line 7436 "PhotoMetadata.c" } } } #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = keywords; + _tmp23_ = keywords; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp24_ != NULL) { -#line 7303 "PhotoMetadata.c" - GeeSet* _tmp25_; + if (_tmp23_ != NULL) { +#line 7444 "PhotoMetadata.c" + GeeSet* _tmp24_; + gint _tmp25_; gint _tmp26_; - gint _tmp27_; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = keywords; + _tmp24_ = keywords; #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)); + _tmp25_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = _tmp26_; + _tmp26_ = _tmp25_; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = _tmp27_ > 0; -#line 7315 "PhotoMetadata.c" + _tmp22_ = _tmp26_ > 0; +#line 7456 "PhotoMetadata.c" } else { #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = FALSE; -#line 7319 "PhotoMetadata.c" + _tmp22_ = FALSE; +#line 7460 "PhotoMetadata.c" } #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp23_) { -#line 7323 "PhotoMetadata.c" - GeeSet* _tmp28_; + if (_tmp22_) { +#line 7464 "PhotoMetadata.c" + GeeSet* _tmp27_; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = keywords; + _tmp27_ = keywords; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = _tmp28_; -#line 7329 "PhotoMetadata.c" + _tmp21_ = _tmp27_; +#line 7470 "PhotoMetadata.c" } else { #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = NULL; -#line 7333 "PhotoMetadata.c" + _tmp21_ = NULL; +#line 7474 "PhotoMetadata.c" } #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = _g_object_ref0 (_tmp22_); + _tmp28_ = _g_object_ref0 (_tmp21_); #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp29_; + result = _tmp28_; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (keywords); #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7352,353 +7493,293 @@ GeeSet* photo_metadata_get_keywords (PhotoMetadata* self, GCompareDataFunc compa compare_func_target_destroy_notify = NULL; #line 1028 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 7351 "PhotoMetadata.c" +#line 7492 "PhotoMetadata.c" } -static gpointer _hierarchical_keyword_field_ref0 (gpointer self) { +static gpointer +_hierarchical_keyword_field_ref0 (gpointer self) +{ #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self ? hierarchical_keyword_field_ref (self) : NULL; -#line 7358 "PhotoMetadata.c" +#line 7501 "PhotoMetadata.c" } -static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) { +static gchar* +string_replace (const gchar* self, + const gchar* old, + const gchar* replacement) +{ gchar* result = NULL; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; GError * _inner_error_ = NULL; -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (old != NULL, NULL); -#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (replacement != NULL, NULL); -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if ((*((gchar*) self)) == '\0') { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp1_ = TRUE; -#line 7377 "PhotoMetadata.c" +#line 7524 "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 7384 "PhotoMetadata.c" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = (*((gchar*) old)) == '\0'; +#line 7528 "PhotoMetadata.c" } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp1_) { -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = TRUE; -#line 7390 "PhotoMetadata.c" +#line 7534 "PhotoMetadata.c" } else { - const gchar* _tmp3_; - const gchar* _tmp4_; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = old; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = replacement; -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0; -#line 7400 "PhotoMetadata.c" - } -#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = g_strcmp0 (old, replacement) == 0; +#line 7538 "PhotoMetadata.c" + } +#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 7404 "PhotoMetadata.c" - gchar* _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = g_strdup (self); -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp5_; -#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 7542 "PhotoMetadata.c" + gchar* _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = g_strdup (self); +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp2_; +#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7412 "PhotoMetadata.c" +#line 7550 "PhotoMetadata.c" } { GRegex* regex = NULL; - const gchar* _tmp6_; - gchar* _tmp7_; - gchar* _tmp8_; - GRegex* _tmp9_; - GRegex* _tmp10_; - gchar* _tmp11_ = NULL; - GRegex* _tmp12_; - const gchar* _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = old; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = g_regex_escape_string (_tmp6_, -1); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp8_ = _tmp7_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = _tmp9_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp8_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - regex = _tmp10_; -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp3_; + gchar* _tmp4_; + GRegex* _tmp5_; + GRegex* _tmp6_; + gchar* _tmp7_ = NULL; + GRegex* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = g_regex_escape_string (old, -1); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = _tmp3_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = _tmp5_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp4_); +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + regex = _tmp6_; +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7444 "PhotoMetadata.c" +#line 7578 "PhotoMetadata.c" goto __catch31_g_regex_error; } -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/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); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 7453 "PhotoMetadata.c" +#line 7587 "PhotoMetadata.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = regex; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = replacement; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = _tmp14_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp8_ = regex; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = _tmp9_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_inner_error_->domain == G_REGEX_ERROR) { -#line 7469 "PhotoMetadata.c" +#line 7601 "PhotoMetadata.c" goto __catch31_g_regex_error; } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/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); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 7480 "PhotoMetadata.c" +#line 7612 "PhotoMetadata.c" } -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = _tmp11_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = NULL; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp15_; -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _g_free0 (_tmp11_); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp10_ = _tmp7_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = NULL; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp10_; +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _g_free0 (_tmp7_); +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_regex_unref0 (regex); -#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7494 "PhotoMetadata.c" +#line 7626 "PhotoMetadata.c" } goto __finally31; __catch31_g_regex_error: { GError* e = NULL; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" e = _inner_error_; -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _inner_error_ = NULL; -#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_assert_not_reached (); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _g_error_free0 (e); -#line 7508 "PhotoMetadata.c" +#line 7640 "PhotoMetadata.c" } __finally31: -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" 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 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_clear_error (&_inner_error_); -#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return NULL; -#line 7519 "PhotoMetadata.c" +#line 7651 "PhotoMetadata.c" } } -static glong string_strnlen (gchar* str, glong maxlen) { +static glong +string_strnlen (gchar* str, + glong maxlen) +{ glong result = 0L; gchar* end = NULL; gchar* _tmp0_; - glong _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp0_ = str; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = maxlen; -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_); -#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - end = _tmp2_; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = end; -#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp3_ == NULL) { -#line 7543 "PhotoMetadata.c" - glong _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = maxlen; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp4_; -#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp1_; +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = memchr (str, 0, (gsize) maxlen); +#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + end = _tmp0_; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = end; +#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (_tmp1_ == NULL) { +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = maxlen; +#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7551 "PhotoMetadata.c" +#line 7676 "PhotoMetadata.c" } else { - gchar* _tmp5_; - gchar* _tmp6_; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = end; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = str; -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = (glong) (_tmp5_ - _tmp6_); -#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + gchar* _tmp2_; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = end; +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = (glong) (_tmp2_ - str); +#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7563 "PhotoMetadata.c" +#line 7685 "PhotoMetadata.c" } } -static gchar* string_substring (const gchar* self, glong offset, glong len) { +static gchar* +string_substring (const gchar* self, + glong offset, + glong len) +{ gchar* result = NULL; glong string_length = 0L; gboolean _tmp0_ = FALSE; - glong _tmp1_; - glong _tmp8_; - glong _tmp14_; - glong _tmp17_; - glong _tmp18_; - glong _tmp19_; - glong _tmp20_; - glong _tmp21_; - gchar* _tmp22_; -#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" + glong _tmp6_; + gchar* _tmp7_; +#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" g_return_val_if_fail (self != NULL, NULL); -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp1_ = offset; -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - if (_tmp1_ >= ((glong) 0)) { -#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 7593 "PhotoMetadata.c" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset >= ((glong) 0)) { +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp0_ = len >= ((glong) 0); +#line 7706 "PhotoMetadata.c" } else { -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" _tmp0_ = FALSE; -#line 7597 "PhotoMetadata.c" +#line 7710 "PhotoMetadata.c" } -#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" if (_tmp0_) { -#line 7601 "PhotoMetadata.c" +#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = string_strnlen ((gchar*) self, offset + len); +#line 7716 "PhotoMetadata.c" + } else { + gint _tmp1_; + gint _tmp2_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp1_ = strlen (self); +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp2_ = _tmp1_; +#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + string_length = (glong) _tmp2_; +#line 7726 "PhotoMetadata.c" + } +#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (offset < ((glong) 0)) { +#line 7730 "PhotoMetadata.c" glong _tmp3_; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp3_ = string_length; +#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + offset = _tmp3_ + offset; +#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset >= ((glong) 0), NULL); +#line 7738 "PhotoMetadata.c" + } else { glong _tmp4_; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp4_ = string_length; +#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail (offset <= _tmp4_, NULL); +#line 7745 "PhotoMetadata.c" + } +#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + if (len < ((glong) 0)) { +#line 7749 "PhotoMetadata.c" glong _tmp5_; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp3_ = offset; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp4_ = len; -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_); -#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = _tmp5_; -#line 7613 "PhotoMetadata.c" - } else { - gint _tmp6_; - gint _tmp7_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp6_ = strlen (self); -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp7_ = _tmp6_; -#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - string_length = (glong) _tmp7_; -#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 7629 "PhotoMetadata.c" - glong _tmp9_; - glong _tmp10_; - glong _tmp11_; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp9_ = string_length; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp10_ = offset; -#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - offset = _tmp9_ + _tmp10_; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp11_ = offset; -#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL); -#line 7643 "PhotoMetadata.c" - } else { - glong _tmp12_; - glong _tmp13_; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp12_ = offset; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp13_ = string_length; -#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL); -#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 7659 "PhotoMetadata.c" - glong _tmp15_; - glong _tmp16_; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp15_ = string_length; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp16_ = offset; -#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - len = _tmp15_ - _tmp16_; -#line 7668 "PhotoMetadata.c" - } -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp17_ = offset; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp18_ = len; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp19_ = string_length; -#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp20_ = offset; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp21_ = len; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - _tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_); -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" - result = _tmp22_; -#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi" +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp5_ = string_length; +#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + len = _tmp5_ - offset; +#line 7755 "PhotoMetadata.c" + } +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp6_ = string_length; +#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + g_return_val_if_fail ((offset + len) <= _tmp6_, NULL); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + _tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len); +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" + result = _tmp7_; +#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi" return result; -#line 7688 "PhotoMetadata.c" +#line 7767 "PhotoMetadata.c" } -static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, HierarchicalTagIndex* index) { +static void +photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* self, + HierarchicalTagIndex* index) +{ HierarchicalKeywordField** _tmp0_; gint _tmp0__length1; - HierarchicalTagIndex* _tmp4_; - HierarchicalKeywordField** _tmp5_; - gint _tmp5__length1; + HierarchicalKeywordField** _tmp4_; + gint _tmp4__length1; #line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1031 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7707,7 +7788,7 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7706 "PhotoMetadata.c" +#line 7787 "PhotoMetadata.c" { HierarchicalKeywordField** current_field_collection = NULL; gint current_field_collection_length1 = 0; @@ -7719,14 +7800,14 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se current_field_collection_length1 = _tmp0__length1; #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 7718 "PhotoMetadata.c" +#line 7799 "PhotoMetadata.c" HierarchicalKeywordField* _tmp1_; HierarchicalKeywordField* current_field = NULL; #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" current_field = _tmp1_; -#line 7725 "PhotoMetadata.c" +#line 7806 "PhotoMetadata.c" { HierarchicalKeywordField* _tmp2_; const gchar* _tmp3_; @@ -7738,192 +7819,186 @@ static void photo_metadata_internal_set_hierarchical_keywords (PhotoMetadata* se photo_metadata_remove_tag (self, _tmp3_); #line 1032 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7737 "PhotoMetadata.c" +#line 7818 "PhotoMetadata.c" } } } #line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = index; -#line 1035 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ == NULL) { + if (index == NULL) { #line 1036 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return; -#line 7747 "PhotoMetadata.c" +#line 7826 "PhotoMetadata.c" } #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; + _tmp4_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 7753 "PhotoMetadata.c" + _tmp4__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; +#line 7832 "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 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_field_collection = _tmp5_; + current_field_collection = _tmp4_; #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_field_collection_length1 = _tmp5__length1; + current_field_collection_length1 = _tmp4__length1; #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 7765 "PhotoMetadata.c" - HierarchicalKeywordField* _tmp6_; + for (current_field_it = 0; current_field_it < _tmp4__length1; current_field_it = current_field_it + 1) { +#line 7844 "PhotoMetadata.c" + HierarchicalKeywordField* _tmp5_; HierarchicalKeywordField* current_field = NULL; #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); + _tmp5_ = _hierarchical_keyword_field_ref0 (current_field_collection[current_field_it]); #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_field = _tmp6_; -#line 7772 "PhotoMetadata.c" + current_field = _tmp5_; +#line 7851 "PhotoMetadata.c" { - HierarchicalKeywordField* _tmp7_; - gboolean _tmp8_; + HierarchicalKeywordField* _tmp6_; + gboolean _tmp7_; GeeSet* writeable_set = NULL; - GeeTreeSet* _tmp9_; - HierarchicalKeywordField* _tmp29_; - const gchar* _tmp30_; - GeeSet* _tmp31_; + GeeTreeSet* _tmp8_; + HierarchicalKeywordField* _tmp26_; + const gchar* _tmp27_; + GeeSet* _tmp28_; #line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = current_field; + _tmp6_ = current_field; #line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = _tmp7_->is_writeable; + _tmp7_ = _tmp6_->is_writeable; #line 1039 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp8_) { + if (!_tmp7_) { #line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); #line 1040 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 7791 "PhotoMetadata.c" +#line 7870 "PhotoMetadata.c" } #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); + _tmp8_ = gee_tree_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 1042 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_SET, GeeSet); -#line 7797 "PhotoMetadata.c" + writeable_set = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_SET, GeeSet); +#line 7876 "PhotoMetadata.c" { GeeIterator* _current_path_it = NULL; - HierarchicalTagIndex* _tmp10_; - GeeCollection* _tmp11_; - GeeCollection* _tmp12_; - GeeIterator* _tmp13_; - GeeIterator* _tmp14_; -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = index; + GeeCollection* _tmp9_; + GeeCollection* _tmp10_; + GeeIterator* _tmp11_; + GeeIterator* _tmp12_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = hierarchical_tag_index_get_all_paths (_tmp10_); + _tmp9_ = hierarchical_tag_index_get_all_paths (index); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = _tmp13_; + _tmp12_ = _tmp11_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_object_unref0 (_tmp12_); + _g_object_unref0 (_tmp10_); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_path_it = _tmp14_; + _current_path_it = _tmp12_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7821 "PhotoMetadata.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 7897 "PhotoMetadata.c" + GeeIterator* _tmp13_; gchar* current_path = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; + GeeIterator* _tmp14_; + gpointer _tmp15_; gchar* writeable_path = NULL; - const gchar* _tmp19_; + const gchar* _tmp16_; + HierarchicalKeywordField* _tmp17_; + const gchar* _tmp18_; + gchar* _tmp19_; HierarchicalKeywordField* _tmp20_; - const gchar* _tmp21_; - gchar* _tmp22_; - HierarchicalKeywordField* _tmp23_; - gboolean _tmp24_; - GeeSet* _tmp27_; - const gchar* _tmp28_; + gboolean _tmp21_; + GeeSet* _tmp24_; + const gchar* _tmp25_; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _current_path_it; + _tmp13_ = _current_path_it; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp13_)) { #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7844 "PhotoMetadata.c" +#line 7917 "PhotoMetadata.c" } #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = _current_path_it; + _tmp14_ = _current_path_it; #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp15_ = gee_iterator_get (_tmp14_); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_path = (gchar*) _tmp18_; + current_path = (gchar*) _tmp15_; #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = current_path; + _tmp16_ = current_path; #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = current_field; + _tmp17_ = current_field; #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = _tmp20_->path_separator; + _tmp18_ = _tmp17_->path_separator; #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = string_replace (_tmp19_, TAG_PATH_SEPARATOR_STRING, _tmp21_); + _tmp19_ = string_replace (_tmp16_, TAG_PATH_SEPARATOR_STRING, _tmp18_); #line 1045 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - writeable_path = _tmp22_; + writeable_path = _tmp19_; #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = current_field; + _tmp20_ = current_field; #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = _tmp23_->wants_leading_separator; + _tmp21_ = _tmp20_->wants_leading_separator; #line 1047 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp24_) { -#line 7868 "PhotoMetadata.c" - const gchar* _tmp25_; - gchar* _tmp26_; + if (!_tmp21_) { +#line 7941 "PhotoMetadata.c" + const gchar* _tmp22_; + gchar* _tmp23_; #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = writeable_path; + _tmp22_ = writeable_path; #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = string_substring (_tmp25_, (glong) 1, (glong) -1); + _tmp23_ = string_substring (_tmp22_, (glong) 1, (glong) -1); #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (writeable_path); #line 1048 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - writeable_path = _tmp26_; -#line 7879 "PhotoMetadata.c" + writeable_path = _tmp23_; +#line 7952 "PhotoMetadata.c" } #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = writeable_set; + _tmp24_ = writeable_set; #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = writeable_path; + _tmp25_ = writeable_path; #line 1050 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, GEE_TYPE_COLLECTION, GeeCollection), _tmp28_); + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (writeable_path); #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_path); -#line 7891 "PhotoMetadata.c" +#line 7964 "PhotoMetadata.c" } #line 1044 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_path_it); -#line 7895 "PhotoMetadata.c" +#line 7968 "PhotoMetadata.c" } #line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = current_field; + _tmp26_ = current_field; #line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30_ = _tmp29_->field_name; + _tmp27_ = _tmp26_->field_name; #line 1053 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp31_ = writeable_set; + _tmp28_ = writeable_set; #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)); + photo_metadata_set_string_multiple (self, _tmp27_, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (writeable_set); #line 1038 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (current_field); -#line 7909 "PhotoMetadata.c" +#line 7982 "PhotoMetadata.c" } } } } -void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, PhotoMetadataSetOption option) { +void +photo_metadata_set_keywords (PhotoMetadata* self, + GeeCollection* keywords, + PhotoMetadataSetOption option) +{ HierarchicalTagIndex* htag_index = NULL; HierarchicalTagIndex* _tmp0_; GeeSet* flat_keywords = NULL; GeeTreeSet* _tmp1_; - GeeCollection* _tmp2_; - GeeCollection* _tmp28_; #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -7937,203 +8012,186 @@ void photo_metadata_set_keywords (PhotoMetadata* self, GeeCollection* keywords, #line 1059 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" flat_keywords = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet); #line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = keywords; -#line 1061 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_ != NULL) { -#line 7939 "PhotoMetadata.c" - GeeSet* _tmp24_; - HierarchicalTagIndex* _tmp25_; - GeeCollection* _tmp26_; - GeeCollection* _tmp27_; + if (keywords != NULL) { +#line 8012 "PhotoMetadata.c" + GeeSet* _tmp19_; + HierarchicalTagIndex* _tmp20_; + GeeCollection* _tmp21_; + GeeCollection* _tmp22_; { GeeIterator* _keyword_it = NULL; - GeeCollection* _tmp3_; - GeeIterator* _tmp4_; + GeeIterator* _tmp2_; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = keywords; + _tmp2_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (keywords, GEE_TYPE_ITERABLE, GeeIterable)); #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 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _keyword_it = _tmp4_; + _keyword_it = _tmp2_; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 7956 "PhotoMetadata.c" - GeeIterator* _tmp5_; - gboolean _tmp6_; +#line 8026 "PhotoMetadata.c" + GeeIterator* _tmp3_; gchar* keyword = NULL; - GeeIterator* _tmp7_; - gpointer _tmp8_; - const gchar* _tmp9_; - gboolean _tmp10_; -#line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _keyword_it; + GeeIterator* _tmp4_; + gpointer _tmp5_; + const gchar* _tmp6_; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = gee_iterator_next (_tmp5_); + _tmp3_ = _keyword_it; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp6_) { + if (!gee_iterator_next (_tmp3_)) { #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 7972 "PhotoMetadata.c" +#line 8038 "PhotoMetadata.c" } #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _keyword_it; + _tmp4_ = _keyword_it; #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = gee_iterator_get (_tmp7_); + _tmp5_ = gee_iterator_get (_tmp4_); #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - keyword = (gchar*) _tmp8_; -#line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = keyword; + keyword = (gchar*) _tmp5_; #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = g_str_has_prefix (_tmp9_, TAG_PATH_SEPARATOR_STRING); + _tmp6_ = keyword; #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp10_) { -#line 7986 "PhotoMetadata.c" + if (g_str_has_prefix (_tmp6_, TAG_PATH_SEPARATOR_STRING)) { +#line 8050 "PhotoMetadata.c" GeeCollection* path_components = NULL; - const gchar* _tmp11_; - GeeList* _tmp12_; + const gchar* _tmp7_; + GeeList* _tmp8_; #line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = keyword; + _tmp7_ = keyword; #line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = hierarchical_tag_utilities_enumerate_path_components (_tmp11_); + _tmp8_ = hierarchical_tag_utilities_enumerate_path_components (_tmp7_); #line 1064 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection); -#line 7996 "PhotoMetadata.c" + path_components = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection); +#line 8060 "PhotoMetadata.c" { GeeIterator* _component_it = NULL; - GeeCollection* _tmp13_; - GeeIterator* _tmp14_; + GeeCollection* _tmp9_; + GeeIterator* _tmp10_; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = path_components; + _tmp9_ = path_components; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _component_it = _tmp14_; + _component_it = _tmp10_; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8009 "PhotoMetadata.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 8073 "PhotoMetadata.c" + GeeIterator* _tmp11_; gchar* component = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; - HierarchicalTagIndex* _tmp19_; - const gchar* _tmp20_; - const gchar* _tmp21_; + GeeIterator* _tmp12_; + gpointer _tmp13_; + HierarchicalTagIndex* _tmp14_; + const gchar* _tmp15_; + const gchar* _tmp16_; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _component_it; + _tmp11_ = _component_it; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = gee_iterator_next (_tmp15_); -#line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp11_)) { #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8026 "PhotoMetadata.c" +#line 8087 "PhotoMetadata.c" } #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = _component_it; + _tmp12_ = _component_it; #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp13_ = gee_iterator_get (_tmp12_); #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - component = (gchar*) _tmp18_; + component = (gchar*) _tmp13_; #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = htag_index; + _tmp14_ = htag_index; #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = component; + _tmp15_ = component; #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = keyword; + _tmp16_ = keyword; #line 1067 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - hierarchical_tag_index_add_path (_tmp19_, _tmp20_, _tmp21_); + hierarchical_tag_index_add_path (_tmp14_, _tmp15_, _tmp16_); #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (component); -#line 8044 "PhotoMetadata.c" +#line 8105 "PhotoMetadata.c" } #line 1066 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_component_it); -#line 8048 "PhotoMetadata.c" +#line 8109 "PhotoMetadata.c" } #line 1063 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (path_components); -#line 8052 "PhotoMetadata.c" +#line 8113 "PhotoMetadata.c" } else { - GeeSet* _tmp22_; - const gchar* _tmp23_; + GeeSet* _tmp17_; + const gchar* _tmp18_; #line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = flat_keywords; + _tmp17_ = flat_keywords; #line 1069 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = keyword; + _tmp18_ = keyword; #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 8062 "PhotoMetadata.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_); +#line 8123 "PhotoMetadata.c" } #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (keyword); -#line 8066 "PhotoMetadata.c" +#line 8127 "PhotoMetadata.c" } #line 1062 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_keyword_it); -#line 8070 "PhotoMetadata.c" +#line 8131 "PhotoMetadata.c" } #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = flat_keywords; + _tmp19_ = flat_keywords; #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = htag_index; + _tmp20_ = htag_index; #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = hierarchical_tag_index_get_all_tags (_tmp25_); + _tmp21_ = hierarchical_tag_index_get_all_tags (_tmp20_); #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = _tmp26_; + _tmp22_ = _tmp21_; #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_); + gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp22_); #line 1073 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_object_unref0 (_tmp27_); -#line 8084 "PhotoMetadata.c" + _g_object_unref0 (_tmp22_); +#line 8145 "PhotoMetadata.c" } #line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = keywords; -#line 1076 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp28_ != NULL) { -#line 8090 "PhotoMetadata.c" - gchar** _tmp29_; - gint _tmp29__length1; - GeeSet* _tmp30_; - PhotoMetadataSetOption _tmp31_; - HierarchicalTagIndex* _tmp32_; -#line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = photo_metadata_KEYWORD_TAGS; + if (keywords != NULL) { +#line 8149 "PhotoMetadata.c" + gchar** _tmp23_; + gint _tmp23__length1; + GeeSet* _tmp24_; + HierarchicalTagIndex* _tmp25_; #line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29__length1 = photo_metadata_KEYWORD_TAGS_length1; + _tmp23_ = photo_metadata_KEYWORD_TAGS; #line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30_ = flat_keywords; + _tmp23__length1 = photo_metadata_KEYWORD_TAGS_length1; #line 1077 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp31_ = option; + _tmp24_ = flat_keywords; #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_); + photo_metadata_set_all_string_multiple (self, _tmp23_, _tmp23__length1, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), option); #line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp32_ = htag_index; + _tmp25_ = htag_index; #line 1078 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_internal_set_hierarchical_keywords (self, _tmp32_); -#line 8110 "PhotoMetadata.c" + photo_metadata_internal_set_hierarchical_keywords (self, _tmp25_); +#line 8166 "PhotoMetadata.c" } else { - gchar** _tmp33_; - gint _tmp33__length1; + gchar** _tmp26_; + gint _tmp26__length1; #line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp33_ = photo_metadata_KEYWORD_TAGS; + _tmp26_ = photo_metadata_KEYWORD_TAGS; #line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp33__length1 = photo_metadata_KEYWORD_TAGS_length1; + _tmp26__length1 = photo_metadata_KEYWORD_TAGS_length1; #line 1080 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_remove_tags (self, _tmp33_, _tmp33__length1); + photo_metadata_remove_tags (self, _tmp26_, _tmp26__length1); #line 1081 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_set_hierarchical_keywords (self, NULL); -#line 8122 "PhotoMetadata.c" +#line 8178 "PhotoMetadata.c" } #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (flat_keywords); #line 1057 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_tag_index_unref0 (htag_index); -#line 8128 "PhotoMetadata.c" +#line 8184 "PhotoMetadata.c" } -gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { +gboolean +photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) +{ gboolean result = FALSE; HierarchicalKeywordField** _tmp0_; gint _tmp0__length1; @@ -8143,7 +8201,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _tmp0_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8142 "PhotoMetadata.c" +#line 8200 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; @@ -8155,14 +8213,14 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { field_collection_length1 = _tmp0__length1; #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" for (field_it = 0; field_it < _tmp0__length1; field_it = field_it + 1) { -#line 8154 "PhotoMetadata.c" +#line 8212 "PhotoMetadata.c" HierarchicalKeywordField* _tmp1_; HierarchicalKeywordField* field = NULL; #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp1_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" field = _tmp1_; -#line 8161 "PhotoMetadata.c" +#line 8219 "PhotoMetadata.c" { GeeCollection* values = NULL; HierarchicalKeywordField* _tmp2_; @@ -8182,7 +8240,7 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _tmp6_ = values; #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp6_ != NULL) { -#line 8181 "PhotoMetadata.c" +#line 8239 "PhotoMetadata.c" GeeCollection* _tmp7_; gint _tmp8_; gint _tmp9_; @@ -8194,11 +8252,11 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _tmp9_ = _tmp8_; #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _tmp9_ > 0; -#line 8193 "PhotoMetadata.c" +#line 8251 "PhotoMetadata.c" } else { #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = FALSE; -#line 8197 "PhotoMetadata.c" +#line 8255 "PhotoMetadata.c" } #line 1089 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp5_) { @@ -8210,13 +8268,13 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { _hierarchical_keyword_field_unref0 (field); #line 1090 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8209 "PhotoMetadata.c" +#line 8267 "PhotoMetadata.c" } #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 1086 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8215 "PhotoMetadata.c" +#line 8273 "PhotoMetadata.c" } } } @@ -8224,195 +8282,191 @@ gboolean photo_metadata_has_hierarchical_keywords (PhotoMetadata* self) { result = FALSE; #line 1093 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8223 "PhotoMetadata.c" +#line 8281 "PhotoMetadata.c" } -GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { +GeeSet* +photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) +{ GeeSet* result = NULL; - gboolean _tmp0_; GeeSet* h_keywords = NULL; - GeeSet* _tmp1_; - HierarchicalKeywordField** _tmp2_; - gint _tmp2__length1; + GeeSet* _tmp0_; + HierarchicalKeywordField** _tmp1_; + gint _tmp1__length1; GError * _inner_error_ = NULL; #line 1096 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = photo_metadata_has_hierarchical_keywords (self); -#line 1097 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _vala_assert (_tmp0_, "has_hierarchical_keywords()"); + _vala_assert (photo_metadata_has_hierarchical_keywords (self), "has_hierarchical_keywords()"); #line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = photo_metadata_create_string_set (self, NULL, NULL, NULL); + _tmp0_ = photo_metadata_create_string_set (self, NULL, NULL, NULL); #line 1099 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - h_keywords = _tmp1_; + h_keywords = _tmp0_; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; + _tmp1_ = photo_metadata_HIERARCHICAL_KEYWORD_TAGS; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; -#line 8249 "PhotoMetadata.c" + _tmp1__length1 = photo_metadata_HIERARCHICAL_KEYWORD_TAGS_length1; +#line 8306 "PhotoMetadata.c" { HierarchicalKeywordField** field_collection = NULL; gint field_collection_length1 = 0; gint _field_collection_size_ = 0; gint field_it = 0; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - field_collection = _tmp2_; + field_collection = _tmp1_; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - field_collection_length1 = _tmp2__length1; + field_collection_length1 = _tmp1__length1; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - for (field_it = 0; field_it < _tmp2__length1; field_it = field_it + 1) { -#line 8261 "PhotoMetadata.c" - HierarchicalKeywordField* _tmp3_; + for (field_it = 0; field_it < _tmp1__length1; field_it = field_it + 1) { +#line 8318 "PhotoMetadata.c" + HierarchicalKeywordField* _tmp2_; HierarchicalKeywordField* field = NULL; #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); + _tmp2_ = _hierarchical_keyword_field_ref0 (field_collection[field_it]); #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - field = _tmp3_; -#line 8268 "PhotoMetadata.c" + field = _tmp2_; +#line 8325 "PhotoMetadata.c" { GeeCollection* values = NULL; - HierarchicalKeywordField* _tmp4_; - const gchar* _tmp5_; - GeeList* _tmp6_; - gboolean _tmp7_ = FALSE; - GeeCollection* _tmp8_; + HierarchicalKeywordField* _tmp3_; + const gchar* _tmp4_; + GeeList* _tmp5_; + gboolean _tmp6_ = FALSE; + GeeCollection* _tmp7_; GeeArrayList* transformed_values = NULL; - GeeArrayList* _tmp12_; + GeeArrayList* _tmp11_; #line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = field; + _tmp3_ = field; #line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = _tmp4_->field_name; + _tmp4_ = _tmp3_->field_name; #line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = photo_metadata_get_string_multiple (self, _tmp5_); + _tmp5_ = photo_metadata_get_string_multiple (self, _tmp4_); #line 1102 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - values = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection); + values = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection); #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = values; + _tmp7_ = values; #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp8_ == NULL) { + if (_tmp7_ == NULL) { #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = TRUE; -#line 8292 "PhotoMetadata.c" + _tmp6_ = TRUE; +#line 8349 "PhotoMetadata.c" } else { - GeeCollection* _tmp9_; + GeeCollection* _tmp8_; + gint _tmp9_; gint _tmp10_; - gint _tmp11_; #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = values; + _tmp8_ = values; #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = gee_collection_get_size (_tmp9_); + _tmp9_ = gee_collection_get_size (_tmp8_); #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = _tmp10_; + _tmp10_ = _tmp9_; #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp11_ < 1; -#line 8305 "PhotoMetadata.c" + _tmp6_ = _tmp10_ < 1; +#line 8362 "PhotoMetadata.c" } #line 1104 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp7_) { + if (_tmp6_) { #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (values); #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); #line 1105 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" continue; -#line 8315 "PhotoMetadata.c" +#line 8372 "PhotoMetadata.c" } #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); + _tmp11_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL); #line 1107 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - transformed_values = _tmp12_; -#line 8321 "PhotoMetadata.c" + transformed_values = _tmp11_; +#line 8378 "PhotoMetadata.c" { GeeIterator* _current_value_it = NULL; - GeeCollection* _tmp13_; - GeeIterator* _tmp14_; + GeeCollection* _tmp12_; + GeeIterator* _tmp13_; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = values; + _tmp12_ = values; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_ITERABLE, GeeIterable)); + _tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable)); #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_value_it = _tmp14_; + _current_value_it = _tmp13_; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8334 "PhotoMetadata.c" - GeeIterator* _tmp15_; - gboolean _tmp16_; +#line 8391 "PhotoMetadata.c" + GeeIterator* _tmp14_; gchar* current_value = NULL; - GeeIterator* _tmp17_; - gpointer _tmp18_; -#line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _current_value_it; + GeeIterator* _tmp15_; + gpointer _tmp16_; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = gee_iterator_next (_tmp15_); + _tmp14_ = _current_value_it; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp16_) { + if (!gee_iterator_next (_tmp14_)) { #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8348 "PhotoMetadata.c" +#line 8402 "PhotoMetadata.c" } #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = _current_value_it; + _tmp15_ = _current_value_it; #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = gee_iterator_get (_tmp17_); + _tmp16_ = gee_iterator_get (_tmp15_); #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_value = (gchar*) _tmp18_; -#line 8356 "PhotoMetadata.c" + current_value = (gchar*) _tmp16_; +#line 8410 "PhotoMetadata.c" { GeeList* transformed = NULL; - HierarchicalKeywordField* _tmp19_; - KeywordTransformer* _tmp20_; - const gchar* _tmp21_; + HierarchicalKeywordField* _tmp17_; + KeywordTransformer* _tmp18_; + const gchar* _tmp19_; + GeeList* _tmp20_; + GeeArrayList* _tmp21_; GeeList* _tmp22_; - GeeArrayList* _tmp23_; - GeeList* _tmp24_; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp19_ = field; + _tmp17_ = field; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp20_ = _tmp19_->transformer; + _tmp18_ = _tmp17_->transformer; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp21_ = current_value; + _tmp19_ = current_value; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp22_ = keyword_transformer_transform (_tmp20_, _tmp21_, &_inner_error_); + _tmp20_ = keyword_transformer_transform (_tmp18_, _tmp19_, &_inner_error_); #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - transformed = _tmp22_; + transformed = _tmp20_; #line 1110 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 8377 "PhotoMetadata.c" +#line 8431 "PhotoMetadata.c" goto __catch32_g_error; } #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp23_ = transformed_values; + _tmp21_ = transformed_values; #line 1111 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp24_ = transformed; + _tmp22_ = transformed; #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)); + gee_array_list_add_all (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection)); #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed); -#line 8388 "PhotoMetadata.c" +#line 8442 "PhotoMetadata.c" } goto __finally32; __catch32_g_error: { GError* _error_ = NULL; + const gchar* _tmp23_; + GError* _tmp24_; const gchar* _tmp25_; - GError* _tmp26_; - const gchar* _tmp27_; #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _error_ = _inner_error_; #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _inner_error_ = NULL; #line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp25_ = current_value; + _tmp23_ = current_value; #line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp26_ = _error_; + _tmp24_ = _error_; #line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp27_ = _tmp26_->message; + _tmp25_ = _tmp24_->message; #line 1113 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - g_critical ("PhotoMetadata.vala:1113: Failed to transform tag value %s: %s", _tmp25_, _tmp27_); + g_critical ("PhotoMetadata.vala:1113: Failed to transform tag value %s: %s", _tmp23_, _tmp25_); #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_error_free0 (_error_); -#line 8411 "PhotoMetadata.c" +#line 8465 "PhotoMetadata.c" } __finally32: #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8435,113 +8489,113 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { g_clear_error (&_inner_error_); #line 1109 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return NULL; -#line 8434 "PhotoMetadata.c" +#line 8488 "PhotoMetadata.c" } #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8438 "PhotoMetadata.c" +#line 8492 "PhotoMetadata.c" } #line 1108 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_it); -#line 8442 "PhotoMetadata.c" +#line 8496 "PhotoMetadata.c" } { GeeArrayList* _current_value_list = NULL; - GeeArrayList* _tmp28_; - GeeArrayList* _tmp29_; + GeeArrayList* _tmp26_; + GeeArrayList* _tmp27_; gint _current_value_size = 0; - GeeArrayList* _tmp30_; - gint _tmp31_; - gint _tmp32_; + GeeArrayList* _tmp28_; + gint _tmp29_; + gint _tmp30_; gint _current_value_index = 0; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp28_ = transformed_values; + _tmp26_ = transformed_values; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp29_ = _g_object_ref0 (_tmp28_); + _tmp27_ = _g_object_ref0 (_tmp26_); #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_value_list = _tmp29_; + _current_value_list = _tmp27_; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp30_ = _current_value_list; + _tmp28_ = _current_value_list; #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)); + _tmp29_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection)); #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp32_ = _tmp31_; + _tmp30_ = _tmp29_; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_value_size = _tmp32_; + _current_value_size = _tmp30_; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _current_value_index = -1; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 8471 "PhotoMetadata.c" +#line 8525 "PhotoMetadata.c" + gint _tmp31_; + gint _tmp32_; gint _tmp33_; - gint _tmp34_; - gint _tmp35_; gchar* current_value = NULL; - GeeArrayList* _tmp36_; - gint _tmp37_; - gpointer _tmp38_; + GeeArrayList* _tmp34_; + gint _tmp35_; + gpointer _tmp36_; gchar* canonicalized = NULL; + const gchar* _tmp37_; + HierarchicalKeywordField* _tmp38_; const gchar* _tmp39_; - HierarchicalKeywordField* _tmp40_; + gchar* _tmp40_; const gchar* _tmp41_; - gchar* _tmp42_; - const gchar* _tmp43_; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp33_ = _current_value_index; + _tmp31_ = _current_value_index; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _current_value_index = _tmp33_ + 1; + _current_value_index = _tmp31_ + 1; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp34_ = _current_value_index; + _tmp32_ = _current_value_index; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp35_ = _current_value_size; + _tmp33_ = _current_value_size; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!(_tmp34_ < _tmp35_)) { + if (!(_tmp32_ < _tmp33_)) { #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 8497 "PhotoMetadata.c" +#line 8551 "PhotoMetadata.c" } #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp36_ = _current_value_list; + _tmp34_ = _current_value_list; #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp37_ = _current_value_index; + _tmp35_ = _current_value_index; #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_); + _tmp36_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp35_); #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - current_value = (gchar*) _tmp38_; + current_value = (gchar*) _tmp36_; #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp39_ = current_value; + _tmp37_ = current_value; #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp40_ = field; + _tmp38_ = field; #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp41_ = _tmp40_->path_separator; + _tmp39_ = _tmp38_->path_separator; #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp42_ = hierarchical_tag_utilities_canonicalize (_tmp39_, _tmp41_); + _tmp40_ = hierarchical_tag_utilities_canonicalize (_tmp37_, _tmp39_); #line 1120 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - canonicalized = _tmp42_; + canonicalized = _tmp40_; #line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp43_ = canonicalized; + _tmp41_ = canonicalized; #line 1124 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp43_ != NULL) { -#line 8521 "PhotoMetadata.c" - GeeSet* _tmp44_; - const gchar* _tmp45_; + if (_tmp41_ != NULL) { +#line 8575 "PhotoMetadata.c" + GeeSet* _tmp42_; + const gchar* _tmp43_; #line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp44_ = h_keywords; + _tmp42_ = h_keywords; #line 1125 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp45_ = canonicalized; + _tmp43_ = canonicalized; #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 8530 "PhotoMetadata.c" + gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, GEE_TYPE_COLLECTION, GeeCollection), _tmp43_); +#line 8584 "PhotoMetadata.c" } #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (canonicalized); #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (current_value); -#line 8536 "PhotoMetadata.c" +#line 8590 "PhotoMetadata.c" } #line 1119 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (_current_value_list); -#line 8540 "PhotoMetadata.c" +#line 8594 "PhotoMetadata.c" } #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_object_unref0 (transformed_values); @@ -8549,7 +8603,7 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { _g_object_unref0 (values); #line 1101 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _hierarchical_keyword_field_unref0 (field); -#line 8548 "PhotoMetadata.c" +#line 8602 "PhotoMetadata.c" } } } @@ -8557,108 +8611,113 @@ GeeSet* photo_metadata_get_hierarchical_keywords (PhotoMetadata* self) { result = h_keywords; #line 1129 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8556 "PhotoMetadata.c" +#line 8610 "PhotoMetadata.c" } -gboolean photo_metadata_has_orientation (PhotoMetadata* self) { +gboolean +photo_metadata_has_orientation (PhotoMetadata* self) +{ gboolean result = FALSE; GExiv2Metadata* _tmp0_; - GExiv2Orientation _tmp1_; #line 1132 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), FALSE); #line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_get_orientation (_tmp0_); -#line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp1_ == GEXIV2_ORIENTATION_UNSPECIFIED; + result = gexiv2_metadata_get_orientation (_tmp0_) == GEXIV2_ORIENTATION_UNSPECIFIED; #line 1133 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8574 "PhotoMetadata.c" +#line 8627 "PhotoMetadata.c" } -Orientation photo_metadata_get_orientation (PhotoMetadata* self) { +Orientation +photo_metadata_get_orientation (PhotoMetadata* self) +{ Orientation result = 0; GExiv2Orientation orientation = 0; GExiv2Metadata* _tmp0_; - GExiv2Orientation _tmp1_; + gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gboolean _tmp3_ = FALSE; - GExiv2Orientation _tmp4_; + GExiv2Orientation _tmp3_; #line 1137 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = gexiv2_metadata_get_orientation (_tmp0_); -#line 1140 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - orientation = _tmp1_; + orientation = gexiv2_metadata_get_orientation (_tmp0_); #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = orientation; + _tmp3_ = orientation; #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_ == GEXIV2_ORIENTATION_UNSPECIFIED) { + if (_tmp3_ == GEXIV2_ORIENTATION_UNSPECIFIED) { #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = TRUE; -#line 8600 "PhotoMetadata.c" + _tmp2_ = TRUE; +#line 8652 "PhotoMetadata.c" } else { - GExiv2Orientation _tmp5_; + GExiv2Orientation _tmp4_; #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = orientation; + _tmp4_ = orientation; #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp5_ < ORIENTATION_MIN; -#line 8607 "PhotoMetadata.c" + _tmp2_ = _tmp4_ < ORIENTATION_MIN; +#line 8659 "PhotoMetadata.c" } #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp3_) { + if (_tmp2_) { #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = TRUE; -#line 8613 "PhotoMetadata.c" + _tmp1_ = TRUE; +#line 8665 "PhotoMetadata.c" } else { - GExiv2Orientation _tmp6_; + GExiv2Orientation _tmp5_; #line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = orientation; + _tmp5_ = orientation; #line 1142 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = _tmp6_ > ORIENTATION_MAX; -#line 8620 "PhotoMetadata.c" + _tmp1_ = _tmp5_ > ORIENTATION_MAX; +#line 8672 "PhotoMetadata.c" } #line 1141 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp2_) { + if (_tmp1_) { #line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = ORIENTATION_TOP_LEFT; #line 1143 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8628 "PhotoMetadata.c" +#line 8680 "PhotoMetadata.c" } else { - GExiv2Orientation _tmp7_; + GExiv2Orientation _tmp6_; #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = orientation; + _tmp6_ = orientation; #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = (Orientation) _tmp7_; + result = (Orientation) _tmp6_; #line 1145 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8637 "PhotoMetadata.c" +#line 8689 "PhotoMetadata.c" } } -void photo_metadata_set_orientation (PhotoMetadata* self, Orientation orientation) { +void +photo_metadata_set_orientation (PhotoMetadata* self, + Orientation orientation) +{ GExiv2Metadata* _tmp0_; - Orientation _tmp1_; #line 1148 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp0_ = self->priv->exiv2; #line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = orientation; -#line 1150 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) _tmp1_); -#line 8653 "PhotoMetadata.c" + gexiv2_metadata_set_orientation (_tmp0_, (GExiv2Orientation) orientation); +#line 8705 "PhotoMetadata.c" } -gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* * long_ref, gdouble* latitude, gchar* * lat_ref, gdouble* altitude) { +gboolean +photo_metadata_get_gps (PhotoMetadata* self, + gdouble* longitude, + gchar* * long_ref, + gdouble* latitude, + gchar* * lat_ref, + gdouble* altitude) +{ gdouble _vala_longitude = 0.0; gchar* _vala_long_ref = NULL; gdouble _vala_latitude = 0.0; @@ -8700,43 +8759,43 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* if (longitude) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8699 "PhotoMetadata.c" +#line 8758 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8705 "PhotoMetadata.c" +#line 8764 "PhotoMetadata.c" } else { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8709 "PhotoMetadata.c" +#line 8768 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8715 "PhotoMetadata.c" +#line 8774 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8721 "PhotoMetadata.c" +#line 8780 "PhotoMetadata.c" } else { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8725 "PhotoMetadata.c" +#line 8784 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8731 "PhotoMetadata.c" +#line 8790 "PhotoMetadata.c" } #line 1159 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8735 "PhotoMetadata.c" +#line 8794 "PhotoMetadata.c" } #line 1162 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = photo_metadata_get_string (self, "Exif.GPSInfo.GPSLongitudeRef", PHOTO_METADATA_PREPARE_STRING_OPTIONS); @@ -8756,47 +8815,50 @@ gboolean photo_metadata_get_gps (PhotoMetadata* self, gdouble* longitude, gchar* if (longitude) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *longitude = _vala_longitude; -#line 8755 "PhotoMetadata.c" +#line 8814 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (long_ref) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *long_ref = _vala_long_ref; -#line 8761 "PhotoMetadata.c" +#line 8820 "PhotoMetadata.c" } else { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_long_ref); -#line 8765 "PhotoMetadata.c" +#line 8824 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (latitude) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *latitude = _vala_latitude; -#line 8771 "PhotoMetadata.c" +#line 8830 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (lat_ref) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *lat_ref = _vala_lat_ref; -#line 8777 "PhotoMetadata.c" +#line 8836 "PhotoMetadata.c" } else { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (_vala_lat_ref); -#line 8781 "PhotoMetadata.c" +#line 8840 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (altitude) { #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *altitude = _vala_altitude; -#line 8787 "PhotoMetadata.c" +#line 8846 "PhotoMetadata.c" } #line 1165 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8791 "PhotoMetadata.c" +#line 8850 "PhotoMetadata.c" } -gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exposure) { +gboolean +photo_metadata_get_exposure (PhotoMetadata* self, + MetadataRational* exposure) +{ MetadataRational _vala_exposure = {0}; gboolean result = FALSE; MetadataRational _tmp0_ = {0}; @@ -8813,21 +8875,22 @@ gboolean photo_metadata_get_exposure (PhotoMetadata* self, MetadataRational* exp if (exposure) { #line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *exposure = _vala_exposure; -#line 8812 "PhotoMetadata.c" +#line 8874 "PhotoMetadata.c" } #line 1169 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8816 "PhotoMetadata.c" +#line 8878 "PhotoMetadata.c" } -gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { +gchar* +photo_metadata_get_exposure_string (PhotoMetadata* self) +{ gchar* result = NULL; MetadataRational exposure_time = {0}; MetadataRational _tmp0_ = {0}; gboolean _tmp1_; - gboolean _tmp2_; - gchar* _tmp3_; + gchar* _tmp2_; #line 1172 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1174 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -8840,29 +8903,30 @@ gchar* photo_metadata_get_exposure_string (PhotoMetadata* self) { result = NULL; #line 1175 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8839 "PhotoMetadata.c" +#line 8902 "PhotoMetadata.c" } #line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = metadata_rational_is_valid (&exposure_time); -#line 1177 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp2_) { + if (!metadata_rational_is_valid (&exposure_time)) { #line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = NULL; #line 1178 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8849 "PhotoMetadata.c" +#line 8910 "PhotoMetadata.c" } #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); + _tmp2_ = photo_metadata_get_string_interpreted (self, "Exif.Photo.ExposureTime", PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp3_; + result = _tmp2_; #line 1180 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8857 "PhotoMetadata.c" +#line 8918 "PhotoMetadata.c" } -gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { +gboolean +photo_metadata_get_iso (PhotoMetadata* self, + glong* iso) +{ glong _vala_iso = 0L; gboolean result = FALSE; gboolean fetched_ok = FALSE; @@ -8889,11 +8953,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (iso) { #line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8888 "PhotoMetadata.c" +#line 8952 "PhotoMetadata.c" } #line 1187 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8892 "PhotoMetadata.c" +#line 8956 "PhotoMetadata.c" } #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = _vala_iso; @@ -8901,14 +8965,14 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (_tmp4_ < ((glong) 6)) { #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = TRUE; -#line 8900 "PhotoMetadata.c" +#line 8964 "PhotoMetadata.c" } else { glong _tmp5_; #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp5_ = _vala_iso; #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = _tmp5_ > ((glong) 409600); -#line 8907 "PhotoMetadata.c" +#line 8971 "PhotoMetadata.c" } #line 1191 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp3_) { @@ -8918,11 +8982,11 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (iso) { #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8917 "PhotoMetadata.c" +#line 8981 "PhotoMetadata.c" } #line 1192 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8921 "PhotoMetadata.c" +#line 8985 "PhotoMetadata.c" } #line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = TRUE; @@ -8930,15 +8994,17 @@ gboolean photo_metadata_get_iso (PhotoMetadata* self, glong* iso) { if (iso) { #line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *iso = _vala_iso; -#line 8929 "PhotoMetadata.c" +#line 8993 "PhotoMetadata.c" } #line 1194 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8933 "PhotoMetadata.c" +#line 8997 "PhotoMetadata.c" } -gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { +gchar* +photo_metadata_get_iso_string (PhotoMetadata* self) +{ gchar* result = NULL; glong iso = 0L; glong _tmp0_ = 0L; @@ -8956,7 +9022,7 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { result = NULL; #line 1200 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8955 "PhotoMetadata.c" +#line 9021 "PhotoMetadata.c" } #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); @@ -8964,11 +9030,14 @@ gchar* photo_metadata_get_iso_string (PhotoMetadata* self) { result = _tmp2_; #line 1202 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8963 "PhotoMetadata.c" +#line 9029 "PhotoMetadata.c" } -gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* aperture) { +gboolean +photo_metadata_get_aperture (PhotoMetadata* self, + MetadataRational* aperture) +{ MetadataRational _vala_aperture = {0}; gboolean result = FALSE; MetadataRational _tmp0_ = {0}; @@ -8985,15 +9054,18 @@ gboolean photo_metadata_get_aperture (PhotoMetadata* self, MetadataRational* ape if (aperture) { #line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *aperture = _vala_aperture; -#line 8984 "PhotoMetadata.c" +#line 9053 "PhotoMetadata.c" } #line 1206 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 8988 "PhotoMetadata.c" +#line 9057 "PhotoMetadata.c" } -gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_formatted) { +gchar* +photo_metadata_get_aperture_string (PhotoMetadata* self, + gboolean pango_formatted) +{ gchar* result = NULL; MetadataRational aperture = {0}; MetadataRational _tmp0_ = {0}; @@ -9005,14 +9077,13 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f gint _tmp5_; gdouble _tmp6_; const gchar* _tmp7_ = NULL; - gboolean _tmp8_; - const gchar* _tmp9_ = NULL; + const gchar* _tmp8_ = NULL; + gdouble _tmp9_; gdouble _tmp10_; - gdouble _tmp11_; + gchar* _tmp11_; gchar* _tmp12_; gchar* _tmp13_; gchar* _tmp14_; - gchar* _tmp15_; #line 1209 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), NULL); #line 1211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9025,7 +9096,7 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f result = NULL; #line 1212 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9024 "PhotoMetadata.c" +#line 9095 "PhotoMetadata.c" } #line 1214 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp2_ = aperture; @@ -9042,50 +9113,50 @@ gchar* photo_metadata_get_aperture_string (PhotoMetadata* self, gboolean pango_f #line 1215 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" aperture_value = ((gint) (_tmp6_ * 10.0)) / 10.0; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = pango_formatted; -#line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp8_) { + if (pango_formatted) { #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "f/"; -#line 9046 "PhotoMetadata.c" +#line 9115 "PhotoMetadata.c" } else { #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp7_ = "f/"; -#line 9050 "PhotoMetadata.c" +#line 9119 "PhotoMetadata.c" } #line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = aperture_value; + _tmp9_ = aperture_value; #line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (fmod (_tmp10_, 1) == ((gdouble) 0)) { + if (fmod (_tmp9_, 1) == ((gdouble) 0)) { #line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = "%.0f"; -#line 9058 "PhotoMetadata.c" + _tmp8_ = "%.0f"; +#line 9127 "PhotoMetadata.c" } else { #line 1218 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = "%.1f"; -#line 9062 "PhotoMetadata.c" + _tmp8_ = "%.1f"; +#line 9131 "PhotoMetadata.c" } #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = aperture_value; + _tmp10_ = aperture_value; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = g_strdup_printf (_tmp9_, _tmp11_); + _tmp11_ = g_strdup_printf (_tmp8_, _tmp10_); #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = _tmp12_; + _tmp12_ = _tmp11_; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_strconcat (_tmp7_, _tmp13_, NULL); + _tmp13_ = g_strconcat (_tmp7_, _tmp12_, NULL); #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _tmp14_; + _tmp14_ = _tmp13_; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp13_); + _g_free0 (_tmp12_); #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp15_; + result = _tmp14_; #line 1217 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9080 "PhotoMetadata.c" +#line 9149 "PhotoMetadata.c" } -gchar* photo_metadata_get_camera_make (PhotoMetadata* self) { +gchar* +photo_metadata_get_camera_make (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1221 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9096,11 +9167,13 @@ gchar* photo_metadata_get_camera_make (PhotoMetadata* self) { result = _tmp0_; #line 1222 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9095 "PhotoMetadata.c" +#line 9166 "PhotoMetadata.c" } -gchar* photo_metadata_get_camera_model (PhotoMetadata* self) { +gchar* +photo_metadata_get_camera_model (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1225 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9111,11 +9184,14 @@ gchar* photo_metadata_get_camera_model (PhotoMetadata* self) { result = _tmp0_; #line 1226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9110 "PhotoMetadata.c" +#line 9183 "PhotoMetadata.c" } -gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) { +gboolean +photo_metadata_get_flash (PhotoMetadata* self, + glong* flash) +{ glong _vala_flash = 0L; gboolean result = FALSE; glong _tmp0_ = 0L; @@ -9132,15 +9208,17 @@ gboolean photo_metadata_get_flash (PhotoMetadata* self, glong* flash) { if (flash) { #line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *flash = _vala_flash; -#line 9131 "PhotoMetadata.c" +#line 9207 "PhotoMetadata.c" } #line 1231 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9135 "PhotoMetadata.c" +#line 9211 "PhotoMetadata.c" } -gchar* photo_metadata_get_flash_string (PhotoMetadata* self) { +gchar* +photo_metadata_get_flash_string (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1234 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9151,11 +9229,14 @@ gchar* photo_metadata_get_flash_string (PhotoMetadata* self) { result = _tmp0_; #line 1236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9150 "PhotoMetadata.c" +#line 9228 "PhotoMetadata.c" } -gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* focal_length) { +gboolean +photo_metadata_get_focal_length (PhotoMetadata* self, + MetadataRational* focal_length) +{ MetadataRational _vala_focal_length = {0}; gboolean result = FALSE; MetadataRational _tmp0_ = {0}; @@ -9172,15 +9253,17 @@ gboolean photo_metadata_get_focal_length (PhotoMetadata* self, MetadataRational* if (focal_length) { #line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" *focal_length = _vala_focal_length; -#line 9171 "PhotoMetadata.c" +#line 9252 "PhotoMetadata.c" } #line 1240 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9175 "PhotoMetadata.c" +#line 9256 "PhotoMetadata.c" } -gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) { +gchar* +photo_metadata_get_focal_length_string (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9191,11 +9274,13 @@ gchar* photo_metadata_get_focal_length_string (PhotoMetadata* self) { result = _tmp0_; #line 1244 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9190 "PhotoMetadata.c" +#line 9273 "PhotoMetadata.c" } -gchar* photo_metadata_get_artist (PhotoMetadata* self) { +gchar* +photo_metadata_get_artist (PhotoMetadata* self) +{ gchar* result = NULL; gchar** _tmp0_; gint _tmp0__length1; @@ -9212,11 +9297,13 @@ gchar* photo_metadata_get_artist (PhotoMetadata* self) { result = _tmp1_; #line 1254 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9211 "PhotoMetadata.c" +#line 9296 "PhotoMetadata.c" } -gchar* photo_metadata_get_copyright (PhotoMetadata* self) { +gchar* +photo_metadata_get_copyright (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1257 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9227,11 +9314,13 @@ gchar* photo_metadata_get_copyright (PhotoMetadata* self) { result = _tmp0_; #line 1258 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9226 "PhotoMetadata.c" +#line 9313 "PhotoMetadata.c" } -gchar* photo_metadata_get_software (PhotoMetadata* self) { +gchar* +photo_metadata_get_software (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1261 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9242,16 +9331,17 @@ gchar* photo_metadata_get_software (PhotoMetadata* self) { result = _tmp0_; #line 1262 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9241 "PhotoMetadata.c" +#line 9330 "PhotoMetadata.c" } -void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, const gchar* version) { - const gchar* _tmp0_; - const gchar* _tmp1_; - gchar* _tmp2_; - gchar* _tmp3_; - gboolean _tmp4_; +void +photo_metadata_set_software (PhotoMetadata* self, + const gchar* software, + const gchar* version) +{ + gchar* _tmp0_; + gchar* _tmp1_; #line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9259,38 +9349,27 @@ void photo_metadata_set_software (PhotoMetadata* self, const gchar* software, co #line 1265 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (version != NULL); #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = software; -#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = version; + _tmp0_ = g_strdup_printf ("%s %s", software, version); #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = g_strdup_printf ("%s %s", _tmp0_, _tmp1_); -#line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = _tmp2_; + _tmp1_ = _tmp0_; #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Exif.Image.Software", _tmp3_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Exif.Image.Software", _tmp1_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1267 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp3_); -#line 1269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = photo_metadata_has_iptc (self); + _g_free0 (_tmp1_); #line 1269 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp4_) { -#line 9273 "PhotoMetadata.c" - const gchar* _tmp5_; - const gchar* _tmp6_; + if (photo_metadata_has_iptc (self)) { #line 1270 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = software; -#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 1271 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = version; + photo_metadata_set_string (self, "Iptc.Application2.Program", software, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #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 9284 "PhotoMetadata.c" + photo_metadata_set_string (self, "Iptc.Application2.ProgramVersion", version, PHOTO_METADATA_PREPARE_STRING_OPTIONS); +#line 9361 "PhotoMetadata.c" } } -void photo_metadata_remove_software (PhotoMetadata* self) { +void +photo_metadata_remove_software (PhotoMetadata* self) +{ #line 1275 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1276 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9299,11 +9378,13 @@ void photo_metadata_remove_software (PhotoMetadata* self) { photo_metadata_remove_tag (self, "Iptc.Application2.Program"); #line 1278 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_remove_tag (self, "Iptc.Application2.ProgramVersion"); -#line 9298 "PhotoMetadata.c" +#line 9377 "PhotoMetadata.c" } -gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) { +gchar* +photo_metadata_get_exposure_bias (PhotoMetadata* self) +{ gchar* result = NULL; gchar* _tmp0_; #line 1281 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9314,23 +9395,23 @@ gchar* photo_metadata_get_exposure_bias (PhotoMetadata* self) { result = _tmp0_; #line 1282 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9313 "PhotoMetadata.c" +#line 9394 "PhotoMetadata.c" } -Rating photo_metadata_get_rating (PhotoMetadata* self) { +Rating +photo_metadata_get_rating (PhotoMetadata* self) +{ Rating result = 0; gchar* rating_string = NULL; gchar** _tmp0_; gint _tmp0__length1; gchar* _tmp1_; const gchar* _tmp2_; - gchar* _tmp6_; - const gchar* _tmp7_; + gchar* _tmp4_; + const gchar* _tmp5_; gint int_percent_rating = 0; - const gchar* _tmp8_; - gint _tmp9_; - Rating _tmp18_; + const gchar* _tmp6_; #line 1293 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (self), 0); #line 1294 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9345,227 +9426,208 @@ Rating photo_metadata_get_rating (PhotoMetadata* self) { _tmp2_ = rating_string; #line 1295 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" if (_tmp2_ != NULL) { -#line 9344 "PhotoMetadata.c" +#line 9425 "PhotoMetadata.c" const gchar* _tmp3_; - gint _tmp4_; - Rating _tmp5_; #line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp3_ = rating_string; #line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = atoi (_tmp3_); -#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = rating_unserialize (_tmp4_); -#line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp5_; + result = rating_unserialize (atoi (_tmp3_)); #line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1296 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9360 "PhotoMetadata.c" +#line 9435 "PhotoMetadata.c" } #line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS); + _tmp4_ = photo_metadata_get_string (self, "Exif.Image.RatingPercent", PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1298 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - rating_string = _tmp6_; + rating_string = _tmp4_; #line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = rating_string; + _tmp5_ = rating_string; #line 1299 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp7_ == NULL) { + if (_tmp5_ == NULL) { #line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" result = RATING_UNRATED; #line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1300 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9378 "PhotoMetadata.c" +#line 9453 "PhotoMetadata.c" } #line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = rating_string; -#line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = atoi (_tmp8_); + _tmp6_ = rating_string; #line 1303 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - int_percent_rating = _tmp9_; -#line 9386 "PhotoMetadata.c" + int_percent_rating = atoi (_tmp6_); +#line 9459 "PhotoMetadata.c" { gint i = 0; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" i = 5; -#line 9391 "PhotoMetadata.c" +#line 9464 "PhotoMetadata.c" { - gboolean _tmp10_ = FALSE; + gboolean _tmp7_ = FALSE; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = TRUE; + _tmp7_ = TRUE; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" while (TRUE) { -#line 9398 "PhotoMetadata.c" +#line 9471 "PhotoMetadata.c" + gint _tmp9_; + gint _tmp10_; + gint _tmp11_; gint _tmp12_; - gint _tmp13_; - gint _tmp14_; - gint _tmp15_; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!_tmp10_) { -#line 9405 "PhotoMetadata.c" - gint _tmp11_; + if (!_tmp7_) { +#line 9478 "PhotoMetadata.c" + gint _tmp8_; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = i; + _tmp8_ = i; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - i = _tmp11_ - 1; -#line 9411 "PhotoMetadata.c" + i = _tmp8_ - 1; +#line 9484 "PhotoMetadata.c" } #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = FALSE; + _tmp7_ = FALSE; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = i; + _tmp9_ = i; #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (!(_tmp12_ >= 0)) { + if (!(_tmp9_ >= 0)) { #line 1304 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" break; -#line 9421 "PhotoMetadata.c" +#line 9494 "PhotoMetadata.c" } #line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = int_percent_rating; + _tmp10_ = int_percent_rating; #line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = i; + _tmp11_ = i; #line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = RESOURCES_rating_thresholds[_tmp14_]; + _tmp12_ = RESOURCES_rating_thresholds[_tmp11_]; #line 1305 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (_tmp13_ >= _tmp15_) { -#line 9431 "PhotoMetadata.c" - gint _tmp16_; - Rating _tmp17_; -#line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp16_ = i; + if (_tmp10_ >= _tmp12_) { +#line 9504 "PhotoMetadata.c" + gint _tmp13_; #line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp17_ = rating_unserialize (_tmp16_); + _tmp13_ = i; #line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp17_; + result = rating_unserialize (_tmp13_); #line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1306 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9444 "PhotoMetadata.c" +#line 9514 "PhotoMetadata.c" } } } } #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp18_ = rating_unserialize (-1); -#line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - result = _tmp18_; + result = rating_unserialize (-1); #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _g_free0 (rating_string); #line 1308 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9457 "PhotoMetadata.c" +#line 9525 "PhotoMetadata.c" } -void photo_metadata_set_rating (PhotoMetadata* self, Rating rating) { +void +photo_metadata_set_rating (PhotoMetadata* self, + Rating rating) +{ gint int_rating = 0; - Rating _tmp0_; - gint _tmp1_; - gint _tmp2_; - gchar* _tmp3_; + gint _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gint _tmp3_; gchar* _tmp4_; - gint _tmp5_; - gchar* _tmp6_; - gchar* _tmp7_; - gint _tmp8_; + gchar* _tmp5_; + gint _tmp6_; #line 1316 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_if_fail (IS_PHOTO_METADATA (self)); #line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = rating; -#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = rating_serialize (_tmp0_); -#line 1317 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - int_rating = _tmp1_; + int_rating = rating_serialize (rating); #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = int_rating; + _tmp0_ = int_rating; #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = g_strdup_printf ("%i", _tmp2_); + _tmp1_ = g_strdup_printf ("%i", _tmp0_); #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = _tmp3_; + _tmp2_ = _tmp1_; #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Xmp.xmp.Rating", _tmp4_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Xmp.xmp.Rating", _tmp2_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1318 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp4_); + _g_free0 (_tmp2_); #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp5_ = int_rating; + _tmp3_ = int_rating; #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = g_strdup_printf ("%i", _tmp5_); + _tmp4_ = g_strdup_printf ("%i", _tmp3_); #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = _tmp6_; + _tmp5_ = _tmp4_; #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Exif.Image.Rating", _tmp7_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Exif.Image.Rating", _tmp5_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1319 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp7_); + _g_free0 (_tmp5_); #line 1321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = int_rating; + _tmp6_ = int_rating; #line 1321 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - if (0 <= _tmp8_) { -#line 9504 "PhotoMetadata.c" - gint _tmp9_; - gint _tmp10_; - gchar* _tmp11_; - gchar* _tmp12_; + if (0 <= _tmp6_) { +#line 9569 "PhotoMetadata.c" + gint _tmp7_; + gint _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = int_rating; + _tmp7_ = int_rating; #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = RESOURCES_rating_thresholds[_tmp9_]; + _tmp8_ = RESOURCES_rating_thresholds[_tmp7_]; #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = g_strdup_printf ("%i", _tmp10_); + _tmp9_ = g_strdup_printf ("%i", _tmp8_); #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = _tmp11_; + _tmp10_ = _tmp9_; #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp12_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp10_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1322 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp12_); -#line 9521 "PhotoMetadata.c" + _g_free0 (_tmp10_); +#line 9586 "PhotoMetadata.c" } else { - gint _tmp13_; - gchar* _tmp14_; - gchar* _tmp15_; + gint _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = int_rating; + _tmp11_ = int_rating; #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = g_strdup_printf ("%i", _tmp13_); + _tmp12_ = g_strdup_printf ("%i", _tmp11_); #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp15_ = _tmp14_; + _tmp13_ = _tmp12_; #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp15_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); + photo_metadata_set_string (self, "Exif.Image.RatingPercent", _tmp13_, PHOTO_METADATA_PREPARE_STRING_OPTIONS); #line 1324 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _g_free0 (_tmp15_); -#line 9536 "PhotoMetadata.c" + _g_free0 (_tmp13_); +#line 9601 "PhotoMetadata.c" } } -static gpointer _media_metadata_ref0 (gpointer self) { +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 9544 "PhotoMetadata.c" +#line 9611 "PhotoMetadata.c" } -static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_construct (GType object_type, PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) { +static PhotoMetadataInternalPhotoPreview* +photo_metadata_internal_photo_preview_construct (GType object_type, + PhotoMetadata* owner, + const gchar* name, + guint number, + GExiv2PreviewProperties* props) +{ PhotoMetadataInternalPhotoPreview* self = NULL; - const gchar* _tmp0_; - GExiv2PreviewProperties* _tmp1_; - guint32 _tmp2_; - GExiv2PreviewProperties* _tmp3_; - guint32 _tmp4_; - Dimensions _tmp5_ = {0}; - GExiv2PreviewProperties* _tmp6_; - guint32 _tmp7_; - GExiv2PreviewProperties* _tmp8_; - const gchar* _tmp9_; - GExiv2PreviewProperties* _tmp10_; - const gchar* _tmp11_; - PhotoMetadata* _tmp12_; - PhotoMetadata* _tmp13_; - guint _tmp14_; + Dimensions _tmp0_ = {0}; + const gchar* _tmp1_; + const gchar* _tmp2_; + PhotoMetadata* _tmp3_; #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (IS_PHOTO_METADATA (owner), NULL); #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -9573,57 +9635,43 @@ static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_ #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" g_return_val_if_fail (GEXIV2_IS_PREVIEW_PROPERTIES (props), NULL); #line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp0_ = name; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp1_ = props; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp2_ = gexiv2_preview_properties_get_width (_tmp1_); -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp3_ = props; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp4_ = gexiv2_preview_properties_get_height (_tmp3_); -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - dimensions_init (&_tmp5_, (gint) _tmp2_, (gint) _tmp4_); -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp6_ = props; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp7_ = gexiv2_preview_properties_get_size (_tmp6_); + dimensions_init (&_tmp0_, (gint) gexiv2_preview_properties_get_width (props), (gint) gexiv2_preview_properties_get_height (props)); #line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp8_ = props; + _tmp1_ = gexiv2_preview_properties_get_mime_type (props); #line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp9_ = gexiv2_preview_properties_get_mime_type (_tmp8_); + _tmp2_ = gexiv2_preview_properties_get_extension (props); #line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp10_ = props; -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp11_ = gexiv2_preview_properties_get_extension (_tmp10_); -#line 232 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self = (PhotoMetadataInternalPhotoPreview*) photo_preview_construct (object_type, _tmp0_, &_tmp5_, _tmp7_, _tmp9_, _tmp11_); -#line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp12_ = owner; + self = (PhotoMetadataInternalPhotoPreview*) photo_preview_construct (object_type, name, &_tmp0_, gexiv2_preview_properties_get_size (props), _tmp1_, _tmp2_); #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp13_ = _media_metadata_ref0 (_tmp12_); + _tmp3_ = _media_metadata_ref0 (owner); #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _media_metadata_unref0 (self->owner); #line 235 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->owner = _tmp13_; + self->owner = _tmp3_; #line 236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - _tmp14_ = number; -#line 236 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" - self->number = _tmp14_; + self->number = number; #line 230 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return self; -#line 9611 "PhotoMetadata.c" +#line 9651 "PhotoMetadata.c" } -static PhotoMetadataInternalPhotoPreview* photo_metadata_internal_photo_preview_new (PhotoMetadata* owner, const gchar* name, guint number, GExiv2PreviewProperties* props) { +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 9618 "PhotoMetadata.c" +#line 9663 "PhotoMetadata.c" } -static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, GError** error) { +static GBytes* +photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* base, + GError** error) +{ PhotoMetadataInternalPhotoPreview * self; GBytes* result = NULL; GExiv2PreviewProperties** props = NULL; @@ -9668,7 +9716,7 @@ static GBytes* 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 9667 "PhotoMetadata.c" +#line 9715 "PhotoMetadata.c" GExiv2PreviewProperties** _tmp6_; gint _tmp6__length1; guint _tmp7_; @@ -9680,11 +9728,11 @@ static GBytes* 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 9679 "PhotoMetadata.c" +#line 9727 "PhotoMetadata.c" } else { #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _tmp4_ = FALSE; -#line 9683 "PhotoMetadata.c" +#line 9731 "PhotoMetadata.c" } #line 241 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" _vala_assert (_tmp4_, "props != null && props.length > number"); @@ -9716,26 +9764,32 @@ static GBytes* photo_metadata_internal_photo_preview_real_flatten (PhotoPreview* result = _tmp18_; #line 243 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" return result; -#line 9715 "PhotoMetadata.c" +#line 9763 "PhotoMetadata.c" } -static void photo_metadata_internal_photo_preview_class_init (PhotoMetadataInternalPhotoPreviewClass * klass) { +static void +photo_metadata_internal_photo_preview_class_init (PhotoMetadataInternalPhotoPreviewClass * klass) +{ #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_internal_photo_preview_parent_class = g_type_class_peek_parent (klass); #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 = (GBytes* (*) (PhotoPreview *, GError**)) photo_metadata_internal_photo_preview_real_flatten; -#line 9726 "PhotoMetadata.c" +#line 9776 "PhotoMetadata.c" } -static void photo_metadata_internal_photo_preview_instance_init (PhotoMetadataInternalPhotoPreview * self) { +static void +photo_metadata_internal_photo_preview_instance_init (PhotoMetadataInternalPhotoPreview * self) +{ } -static void photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj) { +static void +photo_metadata_internal_photo_preview_finalize (PhotoPreview * obj) +{ PhotoMetadataInternalPhotoPreview * self; #line 226 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTO_METADATA_TYPE_INTERNAL_PHOTO_PREVIEW, PhotoMetadataInternalPhotoPreview); @@ -9743,11 +9797,13 @@ 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 9742 "PhotoMetadata.c" +#line 9796 "PhotoMetadata.c" } -static GType photo_metadata_internal_photo_preview_get_type (void) { +static GType +photo_metadata_internal_photo_preview_get_type (void) +{ static volatile gsize photo_metadata_internal_photo_preview_type_id__volatile = 0; if (g_once_init_enter (&photo_metadata_internal_photo_preview_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMetadataInternalPhotoPreviewClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_metadata_internal_photo_preview_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMetadataInternalPhotoPreview), 0, (GInstanceInitFunc) photo_metadata_internal_photo_preview_instance_init, NULL }; @@ -9759,7 +9815,9 @@ static GType photo_metadata_internal_photo_preview_get_type (void) { } -static void photo_metadata_class_init (PhotoMetadataClass * klass) { +static void +photo_metadata_class_init (PhotoMetadataClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -10096,11 +10154,13 @@ static void photo_metadata_class_init (PhotoMetadataClass * klass) { photo_metadata_RATING_TAGS = _tmp63_; #line 1285 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" photo_metadata_RATING_TAGS_length1 = 5; -#line 10095 "PhotoMetadata.c" +#line 10153 "PhotoMetadata.c" } -static void photo_metadata_instance_init (PhotoMetadata * self) { +static void +photo_metadata_instance_init (PhotoMetadata * self) +{ GExiv2Metadata* _tmp0_; gchar* _tmp1_; #line 211 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" @@ -10119,11 +10179,13 @@ static void photo_metadata_instance_init (PhotoMetadata * self) { self->priv->metadata_hash = NULL; #line 252 "/home/jens/Source/shotwell/src/photos/PhotoMetadata.vala" self->priv->thumbnail_md5 = NULL; -#line 10118 "PhotoMetadata.c" +#line 10178 "PhotoMetadata.c" } -static void photo_metadata_finalize (MediaMetadata * obj) { +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); @@ -10139,11 +10201,13 @@ static void photo_metadata_finalize (MediaMetadata * obj) { _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 10138 "PhotoMetadata.c" +#line 10200 "PhotoMetadata.c" } -GType photo_metadata_get_type (void) { +GType +photo_metadata_get_type (void) +{ static volatile gsize photo_metadata_type_id__volatile = 0; if (g_once_init_enter (&photo_metadata_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotoMetadataClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photo_metadata_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotoMetadata), 0, (GInstanceInitFunc) photo_metadata_instance_init, NULL }; @@ -10155,7 +10219,11 @@ GType photo_metadata_get_type (void) { } -static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_destroy (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ if ((array != NULL) && (destroy_func != NULL)) { int i; for (i = 0; i < array_length; i = i + 1) { @@ -10167,13 +10235,19 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti } -static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) { +static void +_vala_array_free (gpointer array, + gint array_length, + GDestroyNotify destroy_func) +{ _vala_array_destroy (array, array_length, destroy_func); g_free (array); } -static gint _vala_array_length (gpointer array) { +static gint +_vala_array_length (gpointer array) +{ int length; length = 0; if (array) { diff --git a/src/photos/Photos.c b/src/photos/Photos.c index d859d37..4b69412 100644 --- a/src/photos/Photos.c +++ b/src/photos/Photos.c @@ -1,4 +1,4 @@ -/* Photos.c generated by valac 0.36.6, the Vala compiler +/* Photos.c generated by valac 0.40.4, the Vala compiler * generated from Photos.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -15,6 +15,7 @@ * the preconfigure() method, implement it, and ensure in init() that it's been called. */ + #include #include @@ -40,16 +41,20 @@ void photo_file_format_init (PhotoFileFormat self); void photos_terminate (void); -void photos_preconfigure (void) { +void +photos_preconfigure (void) +{ } -void photos_init (GError** error) { +void +photos_init (GError** error) +{ gint _tmp0_; PhotoFileFormat* _tmp1_; #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala" _tmp1_ = photo_file_format_get_supported (&_tmp0_); -#line 53 "Photos.c" +#line 58 "Photos.c" { PhotoFileFormat* format_collection = NULL; gint format_collection_length1 = 0; @@ -61,28 +66,30 @@ void photos_init (GError** error) { format_collection_length1 = _tmp0_; #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala" for (format_it = 0; format_it < _tmp0_; format_it = format_it + 1) { -#line 65 "Photos.c" +#line 70 "Photos.c" PhotoFileFormat format = 0; #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala" format = format_collection[format_it]; -#line 69 "Photos.c" +#line 74 "Photos.c" { PhotoFileFormat _tmp2_; #line 24 "/home/jens/Source/shotwell/src/photos/Photos.vala" _tmp2_ = format; #line 24 "/home/jens/Source/shotwell/src/photos/Photos.vala" photo_file_format_init (_tmp2_); -#line 76 "Photos.c" +#line 81 "Photos.c" } } #line 23 "/home/jens/Source/shotwell/src/photos/Photos.vala" format_collection = (g_free (format_collection), NULL); -#line 81 "Photos.c" +#line 86 "Photos.c" } } -void photos_terminate (void) { +void +photos_terminate (void) +{ } diff --git a/src/photos/PngSupport.c b/src/photos/PngSupport.c index 28fa710..41e90da 100644 --- a/src/photos/PngSupport.c +++ b/src/photos/PngSupport.c @@ -1,4 +1,4 @@ -/* PngSupport.c generated by valac 0.36.6, the Vala compiler +/* PngSupport.c generated by valac 0.40.4, the Vala compiler * generated from PngSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -481,17 +482,20 @@ static PngFileFormatDriver* png_file_format_driver_instance = NULL; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; GType png_file_format_properties_get_type (void) G_GNUC_CONST; -enum { - PNG_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; void png_file_format_properties_init (void); PngFileFormatProperties* png_file_format_properties_new (void); PngFileFormatProperties* png_file_format_properties_construct (GType object_type); @@ -500,44 +504,73 @@ static PhotoFileFormat png_file_format_properties_real_get_file_format (PhotoFil static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); 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_dup12 (gchar** self, int length); +static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +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_dup13 (gchar** self, int length); +static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +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); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType png_sniffer_get_type (void) G_GNUC_CONST; -enum { - PNG_SNIFFER_DUMMY_PROPERTY -}; -PngSniffer* png_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -PngSniffer* png_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static gboolean png_sniffer_is_png_file (GFile* file, GError** error); -static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +PngSniffer* png_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +PngSniffer* png_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static gboolean png_sniffer_is_png_file (GFile* file, + GError** error); +static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -546,67 +579,94 @@ Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; GType gdk_reader_get_type (void) G_GNUC_CONST; GType png_reader_get_type (void) G_GNUC_CONST; -enum { - PNG_READER_DUMMY_PROPERTY -}; PngReader* png_reader_new (const gchar* filepath); -PngReader* png_reader_construct (GType object_type, const gchar* filepath); -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +PngReader* png_reader_construct (GType object_type, + const gchar* filepath); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); GType scale_constraint_get_type (void) G_GNUC_CONST; -void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleConstraint constraint, Dimensions* result); +void dimensions_get_scaled_by_constraint (Dimensions *self, + gint scale, + ScaleConstraint constraint, + Dimensions* result); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); GType photo_file_writer_get_type (void) G_GNUC_CONST; GType jpeg_quality_get_type (void) G_GNUC_CONST; GType png_writer_get_type (void) G_GNUC_CONST; -enum { - PNG_WRITER_DUMMY_PROPERTY -}; PngWriter* png_writer_new (const gchar* filepath); -PngWriter* png_writer_construct (GType object_type, const gchar* filepath); -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +PngWriter* png_writer_construct (GType object_type, + const gchar* filepath); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void png_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType png_metadata_writer_get_type (void) G_GNUC_CONST; -enum { - PNG_METADATA_WRITER_DUMMY_PROPERTY -}; PngMetadataWriter* png_metadata_writer_new (const gchar* filepath); -PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar* filepath); -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error); -void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error); +PngMetadataWriter* png_metadata_writer_construct (GType object_type, + const gchar* filepath); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error); +void photo_metadata_write_to_file (PhotoMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; GType png_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - PNG_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void png_file_format_driver_init (void); PngFileFormatDriver* png_file_format_driver_new (void); PngFileFormatDriver* png_file_format_driver_construct (GType object_type); PngFileFormatDriver* png_file_format_driver_get_instance (void); static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); -static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); @@ -615,7 +675,9 @@ static void png_file_format_driver_finalize (PhotoFileFormatDriver * obj); static const guint8 PNG_SNIFFER_MAGIC_SEQUENCE[8] = {(guint8) 137, (guint8) 80, (guint8) 78, (guint8) 71, (guint8) 13, (guint8) 10, (guint8) 26, (guint8) 10}; -void png_file_format_properties_init (void) { +void +png_file_format_properties_init (void) +{ PngFileFormatProperties* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = png_file_format_properties_new (); @@ -623,18 +685,22 @@ void png_file_format_properties_init (void) { _photo_file_format_properties_unref0 (png_file_format_properties_instance); #line 14 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_properties_instance = _tmp0_; -#line 627 "PngSupport.c" +#line 689 "PngSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +static gpointer +_photo_file_format_properties_ref0 (gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 634 "PngSupport.c" +#line 698 "PngSupport.c" } -PngFileFormatProperties* png_file_format_properties_get_instance (void) { +PngFileFormatProperties* +png_file_format_properties_get_instance (void) +{ PngFileFormatProperties* result = NULL; PngFileFormatProperties* _tmp0_; PngFileFormatProperties* _tmp1_; @@ -646,11 +712,13 @@ PngFileFormatProperties* png_file_format_properties_get_instance (void) { result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 650 "PngSupport.c" +#line 716 "PngSupport.c" } -static PhotoFileFormat png_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +png_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; PhotoFileFormat result = 0; #line 21 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -659,11 +727,13 @@ static PhotoFileFormat png_file_format_properties_real_get_file_format (PhotoFil result = PHOTO_FILE_FORMAT_PNG; #line 22 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 663 "PngSupport.c" +#line 731 "PngSupport.c" } -static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +png_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 25 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -672,11 +742,13 @@ static PhotoFileFormatFlags png_file_format_properties_real_get_flags (PhotoFile result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 26 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 676 "PngSupport.c" +#line 746 "PngSupport.c" } -static gchar* png_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +png_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -688,11 +760,13 @@ static gchar* png_file_format_properties_real_get_user_visible_name (PhotoFileFo result = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 692 "PngSupport.c" +#line 764 "PngSupport.c" } -static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +png_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -713,32 +787,38 @@ static gchar* png_file_format_properties_real_get_default_extension (PhotoFileFo result = _tmp2_; #line 34 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 717 "PngSupport.c" +#line 791 "PngSupport.c" } -static gchar** _vala_array_dup12 (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" result = g_new0 (gchar*, length + 1); #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" for (i = 0; i < length; i++) { -#line 728 "PngSupport.c" +#line 805 "PngSupport.c" gchar* _tmp0_; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = g_strdup (self[i]); #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result[i] = _tmp0_; -#line 734 "PngSupport.c" +#line 811 "PngSupport.c" } #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 738 "PngSupport.c" +#line 815 "PngSupport.c" } -static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +png_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ PngFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -765,17 +845,19 @@ static gchar** png_file_format_properties_real_get_known_extensions (PhotoFileFo if (result_length1) { #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *result_length1 = _tmp2__length1; -#line 769 "PngSupport.c" +#line 849 "PngSupport.c" } #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = _tmp2_; #line 38 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 775 "PngSupport.c" +#line 855 "PngSupport.c" } -static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +png_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ PngFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -796,32 +878,38 @@ static gchar* png_file_format_properties_real_get_default_mime_type (PhotoFileFo result = _tmp2_; #line 42 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 800 "PngSupport.c" +#line 882 "PngSupport.c" } -static gchar** _vala_array_dup13 (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" result = g_new0 (gchar*, length + 1); #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" for (i = 0; i < length; i++) { -#line 811 "PngSupport.c" +#line 896 "PngSupport.c" gchar* _tmp0_; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = g_strdup (self[i]); #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result[i] = _tmp0_; -#line 817 "PngSupport.c" +#line 902 "PngSupport.c" } #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 821 "PngSupport.c" +#line 906 "PngSupport.c" } -static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +png_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ PngFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -848,34 +936,40 @@ static gchar** png_file_format_properties_real_get_mime_types (PhotoFileFormatPr if (result_length1) { #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *result_length1 = _tmp2__length1; -#line 852 "PngSupport.c" +#line 940 "PngSupport.c" } #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = _tmp2_; #line 46 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 858 "PngSupport.c" +#line 946 "PngSupport.c" } -PngFileFormatProperties* png_file_format_properties_construct (GType object_type) { +PngFileFormatProperties* +png_file_format_properties_construct (GType object_type) +{ PngFileFormatProperties* self = NULL; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = (PngFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 868 "PngSupport.c" +#line 958 "PngSupport.c" } -PngFileFormatProperties* png_file_format_properties_new (void) { +PngFileFormatProperties* +png_file_format_properties_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_file_format_properties_construct (TYPE_PNG_FILE_FORMAT_PROPERTIES); -#line 875 "PngSupport.c" +#line 967 "PngSupport.c" } -static void png_file_format_properties_class_init (PngFileFormatPropertiesClass * klass) { +static void +png_file_format_properties_class_init (PngFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar** _tmp1_; gchar* _tmp2_; @@ -918,25 +1012,31 @@ static void png_file_format_properties_class_init (PngFileFormatPropertiesClass png_file_format_properties_KNOWN_MIME_TYPES = _tmp3_; #line 9 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 922 "PngSupport.c" +#line 1016 "PngSupport.c" } -static void png_file_format_properties_instance_init (PngFileFormatProperties * self) { +static void +png_file_format_properties_instance_init (PngFileFormatProperties * self) +{ } -static void png_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +png_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ PngFileFormatProperties * self; #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_PROPERTIES, PngFileFormatProperties); #line 7 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (png_file_format_properties_parent_class)->finalize (obj); -#line 936 "PngSupport.c" +#line 1034 "PngSupport.c" } -GType png_file_format_properties_get_type (void) { +GType +png_file_format_properties_get_type (void) +{ static volatile gsize png_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&png_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngFileFormatProperties), 0, (GInstanceInitFunc) png_file_format_properties_instance_init, NULL }; @@ -948,82 +1048,83 @@ GType png_file_format_properties_get_type (void) { } -PngSniffer* png_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PngSniffer* +png_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PngSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 54 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = file; -#line 54 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = options; -#line 54 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - self = (PngSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (PngSniffer*) gdk_sniffer_construct (object_type, file, options); #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 966 "PngSupport.c" +#line 1064 "PngSupport.c" } -PngSniffer* png_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +PngSniffer* +png_sniffer_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 53 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_sniffer_construct (TYPE_PNG_SNIFFER, file, options); -#line 973 "PngSupport.c" +#line 1074 "PngSupport.c" } -static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { +static gboolean +png_sniffer_is_png_file (GFile* file, + GError** error) +{ gboolean result = FALSE; GFileInputStream* instream = NULL; - GFile* _tmp0_; - GFileInputStream* _tmp1_; + GFileInputStream* _tmp0_; guint8* file_lead_sequence = NULL; - guint8* _tmp3_; + guint8* _tmp2_; gint file_lead_sequence_length1; gint _file_lead_sequence_size_; - GFileInputStream* _tmp4_; - guint8* _tmp5_; - gint _tmp5__length1; + GFileInputStream* _tmp3_; + guint8* _tmp4_; + gint _tmp4__length1; GError * _inner_error_ = NULL; #line 57 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = file; + _tmp0_ = g_file_read (file, NULL, &_inner_error_); #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = g_file_read (_tmp0_, NULL, &_inner_error_); -#line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - instream = _tmp1_; + instream = _tmp0_; #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1000 "PngSupport.c" - gboolean _tmp2_ = FALSE; +#line 1101 "PngSupport.c" + gboolean _tmp1_ = FALSE; #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 58 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - return _tmp2_; -#line 1006 "PngSupport.c" + return _tmp1_; +#line 1107 "PngSupport.c" } #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp3_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE)); + _tmp2_ = g_new0 (guint8, G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE)); #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - file_lead_sequence = _tmp3_; + file_lead_sequence = _tmp2_; #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" file_lead_sequence_length1 = G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE); #line 60 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _file_lead_sequence_size_ = file_lead_sequence_length1; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp4_ = instream; + _tmp3_ = instream; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp5_ = file_lead_sequence; + _tmp4_ = file_lead_sequence; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp5__length1 = file_lead_sequence_length1; + _tmp4__length1 = file_lead_sequence_length1; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, g_input_stream_get_type (), GInputStream), _tmp5_, (gsize) _tmp5__length1, NULL, &_inner_error_); + g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, g_input_stream_get_type (), GInputStream), _tmp4_, (gsize) _tmp4__length1, NULL, &_inner_error_); #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1026 "PngSupport.c" - gboolean _tmp6_ = FALSE; +#line 1127 "PngSupport.c" + gboolean _tmp5_ = FALSE; #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1031,62 +1132,62 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _g_object_unref0 (instream); #line 62 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - return _tmp6_; -#line 1036 "PngSupport.c" + return _tmp5_; +#line 1137 "PngSupport.c" } { gint i = 0; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" i = 0; -#line 1042 "PngSupport.c" +#line 1143 "PngSupport.c" { - gboolean _tmp7_ = FALSE; + gboolean _tmp6_ = FALSE; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp7_ = TRUE; + _tmp6_ = TRUE; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" while (TRUE) { -#line 1049 "PngSupport.c" - gint _tmp9_; - guint8* _tmp10_; - gint _tmp10__length1; - gint _tmp11_; - guint8 _tmp12_; - gint _tmp13_; - guint8 _tmp14_; +#line 1150 "PngSupport.c" + gint _tmp8_; + guint8* _tmp9_; + gint _tmp9__length1; + gint _tmp10_; + guint8 _tmp11_; + gint _tmp12_; + guint8 _tmp13_; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (!_tmp7_) { -#line 1059 "PngSupport.c" - gint _tmp8_; + if (!_tmp6_) { +#line 1160 "PngSupport.c" + gint _tmp7_; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp8_ = i; + _tmp7_ = i; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - i = _tmp8_ + 1; -#line 1065 "PngSupport.c" + i = _tmp7_ + 1; +#line 1166 "PngSupport.c" } #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp7_ = FALSE; + _tmp6_ = FALSE; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp9_ = i; + _tmp8_ = i; #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (!(_tmp9_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) { + if (!(_tmp8_ < G_N_ELEMENTS (PNG_SNIFFER_MAGIC_SEQUENCE))) { #line 64 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" break; -#line 1075 "PngSupport.c" +#line 1176 "PngSupport.c" } #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp10_ = file_lead_sequence; + _tmp9_ = file_lead_sequence; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp10__length1 = file_lead_sequence_length1; + _tmp9__length1 = file_lead_sequence_length1; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp11_ = i; + _tmp10_ = i; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp12_ = _tmp10_[_tmp11_]; + _tmp11_ = _tmp9_[_tmp10_]; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp13_ = i; + _tmp12_ = i; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp14_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp13_]; + _tmp13_ = PNG_SNIFFER_MAGIC_SEQUENCE[_tmp12_]; #line 65 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (_tmp12_ != _tmp14_) { + if (_tmp11_ != _tmp13_) { #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = FALSE; #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1095,7 +1196,7 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 66 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1099 "PngSupport.c" +#line 1200 "PngSupport.c" } } } @@ -1108,32 +1209,37 @@ static gboolean png_sniffer_is_png_file (GFile* file, GError** error) { _g_object_unref0 (instream); #line 69 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1112 "PngSupport.c" +#line 1213 "PngSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1119 "PngSupport.c" +#line 1222 "PngSupport.c" } -static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +png_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ PngSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; gboolean _tmp0_ = FALSE; GFile* _tmp1_; - gboolean _tmp2_; DetectedPhotoInformation* detected = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; + DetectedPhotoInformation* _tmp3_; DetectedPhotoInformation* _tmp4_; - DetectedPhotoInformation* _tmp5_; - DetectedPhotoInformation* _tmp6_ = NULL; - DetectedPhotoInformation* _tmp7_; - PhotoFileFormat _tmp8_; - DetectedPhotoInformation* _tmp10_; + DetectedPhotoInformation* _tmp5_ = NULL; + DetectedPhotoInformation* _tmp6_; + PhotoFileFormat _tmp7_; + DetectedPhotoInformation* _tmp9_; GError * _inner_error_ = NULL; #line 72 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_SNIFFER, PngSniffer); @@ -1142,16 +1248,14 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp2_ = png_sniffer_is_png_file (_tmp1_, &_inner_error_); -#line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = png_sniffer_is_png_file (_tmp1_, &_inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1155 "PngSupport.c" +#line 1259 "PngSupport.c" } #line 76 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (!_tmp0_) { @@ -1161,30 +1265,30 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1165 "PngSupport.c" +#line 1269 "PngSupport.c" } #line 77 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1169 "PngSupport.c" +#line 1273 "PngSupport.c" } #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (png_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp3_, &_inner_error_); + _tmp3_ = PHOTO_FILE_SNIFFER_CLASS (png_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp2_, &_inner_error_); #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _vala_is_corrupted = _tmp3_; + _vala_is_corrupted = _tmp2_; #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - detected = _tmp4_; + detected = _tmp3_; #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 79 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1183 "PngSupport.c" +#line 1287 "PngSupport.c" } #line 80 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp5_ = detected; + _tmp4_ = detected; #line 80 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = NULL; #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1193,62 +1297,68 @@ static DetectedPhotoInformation* png_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1197 "PngSupport.c" +#line 1301 "PngSupport.c" } #line 81 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1201 "PngSupport.c" +#line 1305 "PngSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp7_ = detected; + _tmp6_ = detected; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp8_ = _tmp7_->file_format; + _tmp7_ = _tmp6_->file_format; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_PNG) { -#line 1209 "PngSupport.c" - DetectedPhotoInformation* _tmp9_; + if (_tmp7_ == PHOTO_FILE_FORMAT_PNG) { +#line 1313 "PngSupport.c" + DetectedPhotoInformation* _tmp8_; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp9_ = detected; + _tmp8_ = detected; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp6_ = _tmp9_; -#line 1215 "PngSupport.c" + _tmp5_ = _tmp8_; +#line 1319 "PngSupport.c" } else { #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp6_ = NULL; -#line 1219 "PngSupport.c" + _tmp5_ = NULL; +#line 1323 "PngSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp10_ = _detected_photo_information_ref0 (_tmp6_); + _tmp9_ = _detected_photo_information_ref0 (_tmp5_); #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = _tmp10_; + result = _tmp9_; #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _detected_photo_information_unref0 (detected); #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (is_corrupted) { #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1231 "PngSupport.c" +#line 1335 "PngSupport.c" } #line 83 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1235 "PngSupport.c" +#line 1339 "PngSupport.c" } -static void png_sniffer_class_init (PngSnifferClass * klass) { +static void +png_sniffer_class_init (PngSnifferClass * klass) +{ #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_sniffer_parent_class = g_type_class_peek_parent (klass); #line 50 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) png_sniffer_real_sniff; -#line 1244 "PngSupport.c" +#line 1350 "PngSupport.c" } -static void png_sniffer_instance_init (PngSniffer * self) { +static void +png_sniffer_instance_init (PngSniffer * self) +{ } -GType png_sniffer_get_type (void) { +GType +png_sniffer_get_type (void) +{ static volatile gsize png_sniffer_type_id__volatile = 0; if (g_once_init_enter (&png_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngSniffer), 0, (GInstanceInitFunc) png_sniffer_instance_init, NULL }; @@ -1260,29 +1370,36 @@ GType png_sniffer_get_type (void) { } -PngReader* png_reader_construct (GType object_type, const gchar* filepath) { +PngReader* +png_reader_construct (GType object_type, + const gchar* filepath) +{ PngReader* self = NULL; - const gchar* _tmp0_; #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 89 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 89 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - self = (PngReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG); + self = (PngReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_PNG); #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1275 "PngSupport.c" +#line 1385 "PngSupport.c" } -PngReader* png_reader_new (const gchar* filepath) { +PngReader* +png_reader_new (const gchar* filepath) +{ #line 88 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_reader_construct (TYPE_PNG_READER, filepath); -#line 1282 "PngSupport.c" +#line 1394 "PngSupport.c" } -static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +png_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ PngReader * self; GdkPixbuf* result = NULL; GdkPixbuf* _result_ = NULL; @@ -1307,7 +1424,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions if (_tmp3_ > 9999) { #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1_ = TRUE; -#line 1311 "PngSupport.c" +#line 1428 "PngSupport.c" } else { Dimensions _tmp4_; gint _tmp5_; @@ -1317,11 +1434,11 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _tmp5_ = _tmp4_.height; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp1_ = _tmp5_ > 9999; -#line 1321 "PngSupport.c" +#line 1438 "PngSupport.c" } #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (_tmp1_) { -#line 1325 "PngSupport.c" +#line 1442 "PngSupport.c" gboolean _tmp6_ = FALSE; Dimensions _tmp7_; gint _tmp8_; @@ -1333,7 +1450,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions if (_tmp8_ < 100) { #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp6_ = TRUE; -#line 1337 "PngSupport.c" +#line 1454 "PngSupport.c" } else { Dimensions _tmp9_; gint _tmp10_; @@ -1343,19 +1460,19 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _tmp10_ = _tmp9_.height; #line 103 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp6_ = _tmp10_ < 100; -#line 1347 "PngSupport.c" +#line 1464 "PngSupport.c" } #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = _tmp6_; -#line 1351 "PngSupport.c" +#line 1468 "PngSupport.c" } else { #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = FALSE; -#line 1355 "PngSupport.c" +#line 1472 "PngSupport.c" } #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (_tmp0_) { -#line 1359 "PngSupport.c" +#line 1476 "PngSupport.c" Dimensions prefetch_dimensions = {0}; Dimensions _tmp11_ = {0}; GdkPixbuf* _tmp12_ = NULL; @@ -1406,7 +1523,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_result_); #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1410 "PngSupport.c" +#line 1527 "PngSupport.c" } #line 107 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp21_ = _tmp12_; @@ -1434,7 +1551,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _result_ = _tmp27_; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _g_object_unref0 (_tmp12_); -#line 1438 "PngSupport.c" +#line 1555 "PngSupport.c" } else { GdkPixbuf* _tmp28_ = NULL; gchar* _tmp29_; @@ -1474,7 +1591,7 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _g_object_unref0 (_result_); #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return NULL; -#line 1478 "PngSupport.c" +#line 1595 "PngSupport.c" } #line 112 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp37_ = _tmp28_; @@ -1486,30 +1603,36 @@ static GdkPixbuf* png_reader_real_scaled_read (PhotoFileReader* base, Dimensions _result_ = _tmp37_; #line 102 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _g_object_unref0 (_tmp28_); -#line 1490 "PngSupport.c" +#line 1607 "PngSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" result = _result_; #line 116 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1496 "PngSupport.c" +#line 1613 "PngSupport.c" } -static void png_reader_class_init (PngReaderClass * klass) { +static void +png_reader_class_init (PngReaderClass * klass) +{ #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_reader_parent_class = g_type_class_peek_parent (klass); #line 87 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) png_reader_real_scaled_read; -#line 1505 "PngSupport.c" +#line 1624 "PngSupport.c" } -static void png_reader_instance_init (PngReader * self) { +static void +png_reader_instance_init (PngReader * self) +{ } -GType png_reader_get_type (void) { +GType +png_reader_get_type (void) +{ static volatile gsize png_reader_type_id__volatile = 0; if (g_once_init_enter (&png_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngReader), 0, (GInstanceInitFunc) png_reader_instance_init, NULL }; @@ -1521,73 +1644,83 @@ GType png_reader_get_type (void) { } -PngWriter* png_writer_construct (GType object_type, const gchar* filepath) { +PngWriter* +png_writer_construct (GType object_type, + const gchar* filepath) +{ PngWriter* self = NULL; - const gchar* _tmp0_; #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 122 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 122 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - self = (PngWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG); + self = (PngWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_PNG); #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1536 "PngSupport.c" +#line 1659 "PngSupport.c" } -PngWriter* png_writer_new (const gchar* filepath) { +PngWriter* +png_writer_new (const gchar* filepath) +{ #line 121 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_writer_construct (TYPE_PNG_WRITER, filepath); -#line 1543 "PngSupport.c" +#line 1668 "PngSupport.c" } -static void png_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +png_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ PngWriter * self; - GdkPixbuf* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; GError * _inner_error_ = NULL; #line 125 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_WRITER, PngWriter); #line 125 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = pixbuf; -#line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - gdk_pixbuf_save (_tmp0_, _tmp2_, "png", &_inner_error_, "compression", "9", NULL, NULL); + gdk_pixbuf_save (pixbuf, _tmp1_, "png", &_inner_error_, "compression", "9", NULL, NULL); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 126 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return; -#line 1573 "PngSupport.c" +#line 1700 "PngSupport.c" } } -static void png_writer_class_init (PngWriterClass * klass) { +static void +png_writer_class_init (PngWriterClass * klass) +{ #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_writer_parent_class = g_type_class_peek_parent (klass); #line 120 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) png_writer_real_write; -#line 1583 "PngSupport.c" +#line 1712 "PngSupport.c" } -static void png_writer_instance_init (PngWriter * self) { +static void +png_writer_instance_init (PngWriter * self) +{ } -GType png_writer_get_type (void) { +GType +png_writer_get_type (void) +{ static volatile gsize png_writer_type_id__volatile = 0; if (g_once_init_enter (&png_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngWriter), 0, (GInstanceInitFunc) png_writer_instance_init, NULL }; @@ -1599,73 +1732,82 @@ GType png_writer_get_type (void) { } -PngMetadataWriter* png_metadata_writer_construct (GType object_type, const gchar* filepath) { +PngMetadataWriter* +png_metadata_writer_construct (GType object_type, + const gchar* filepath) +{ PngMetadataWriter* self = NULL; - const gchar* _tmp0_; #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 132 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 132 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - self = (PngMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_PNG); + self = (PngMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_PNG); #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1614 "PngSupport.c" +#line 1747 "PngSupport.c" } -PngMetadataWriter* png_metadata_writer_new (const gchar* filepath) { +PngMetadataWriter* +png_metadata_writer_new (const gchar* filepath) +{ #line 131 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_metadata_writer_construct (TYPE_PNG_METADATA_WRITER, filepath); -#line 1621 "PngSupport.c" +#line 1756 "PngSupport.c" } -static void png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { +static void +png_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error) +{ PngMetadataWriter * self; - PhotoMetadata* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; GError * _inner_error_ = NULL; #line 135 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_METADATA_WRITER, PngMetadataWriter); #line 135 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = metadata; + _tmp0_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp1_ = _tmp0_; #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp2_ = _tmp1_; + photo_metadata_write_to_file (metadata, _tmp1_, &_inner_error_); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - photo_metadata_write_to_file (_tmp0_, _tmp2_, &_inner_error_); -#line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_propagate_error (error, _inner_error_); #line 136 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return; -#line 1651 "PngSupport.c" +#line 1787 "PngSupport.c" } } -static void png_metadata_writer_class_init (PngMetadataWriterClass * klass) { +static void +png_metadata_writer_class_init (PngMetadataWriterClass * klass) +{ #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 130 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) png_metadata_writer_real_write_metadata; -#line 1661 "PngSupport.c" +#line 1799 "PngSupport.c" } -static void png_metadata_writer_instance_init (PngMetadataWriter * self) { +static void +png_metadata_writer_instance_init (PngMetadataWriter * self) +{ } -GType png_metadata_writer_get_type (void) { +GType +png_metadata_writer_get_type (void) +{ static volatile gsize png_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&png_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngMetadataWriter), 0, (GInstanceInitFunc) png_metadata_writer_instance_init, NULL }; @@ -1677,7 +1819,9 @@ GType png_metadata_writer_get_type (void) { } -void png_file_format_driver_init (void) { +void +png_file_format_driver_init (void) +{ PngFileFormatDriver* _tmp0_; #line 144 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" _tmp0_ = png_file_format_driver_new (); @@ -1687,18 +1831,22 @@ void png_file_format_driver_init (void) { png_file_format_driver_instance = _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_properties_init (); -#line 1691 "PngSupport.c" +#line 1835 "PngSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +static gpointer +_photo_file_format_driver_ref0 (gpointer self) +{ #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 1698 "PngSupport.c" +#line 1844 "PngSupport.c" } -PngFileFormatDriver* png_file_format_driver_get_instance (void) { +PngFileFormatDriver* +png_file_format_driver_get_instance (void) +{ PngFileFormatDriver* result = NULL; PngFileFormatDriver* _tmp0_; PngFileFormatDriver* _tmp1_; @@ -1710,11 +1858,13 @@ PngFileFormatDriver* png_file_format_driver_get_instance (void) { result = _tmp1_; #line 149 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1714 "PngSupport.c" +#line 1862 "PngSupport.c" } -static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +png_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ PngFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; PngFileFormatProperties* _tmp0_; @@ -1726,32 +1876,34 @@ static PhotoFileFormatProperties* png_file_format_driver_real_get_properties (Ph result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 153 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1730 "PngSupport.c" +#line 1880 "PngSupport.c" } -static PhotoFileReader* png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +png_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PngFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - PngReader* _tmp1_; + PngReader* _tmp0_; #line 156 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 156 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = png_reader_new (_tmp0_); + _tmp0_ = png_reader_new (filepath); #line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 157 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1751 "PngSupport.c" +#line 1901 "PngSupport.c" } -static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +png_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ PngFileFormatDriver * self; gboolean result = FALSE; #line 160 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1760,11 +1912,13 @@ static gboolean png_file_format_driver_real_can_write_image (PhotoFileFormatDriv result = TRUE; #line 161 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1764 "PngSupport.c" +#line 1916 "PngSupport.c" } -static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +png_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ PngFileFormatDriver * self; gboolean result = FALSE; #line 164 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1773,77 +1927,77 @@ static gboolean png_file_format_driver_real_can_write_metadata (PhotoFileFormatD result = TRUE; #line 165 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1777 "PngSupport.c" +#line 1931 "PngSupport.c" } -static PhotoFileWriter* png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +png_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PngFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_; - PngWriter* _tmp1_; + PngWriter* _tmp0_; #line 168 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 168 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; + _tmp0_ = png_writer_new (filepath); #line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = png_writer_new (_tmp0_); -#line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 169 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1798 "PngSupport.c" +#line 1952 "PngSupport.c" } -static PhotoFileMetadataWriter* png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +png_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PngFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_; - PngMetadataWriter* _tmp1_; + PngMetadataWriter* _tmp0_; #line 172 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 172 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = filepath; -#line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = png_metadata_writer_new (_tmp0_); + _tmp0_ = png_metadata_writer_new (filepath); #line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 173 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1819 "PngSupport.c" +#line 1973 "PngSupport.c" } -static PhotoFileSniffer* png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +png_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ PngFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - PngSniffer* _tmp2_; + PngSniffer* _tmp0_; #line 176 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 176 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp0_ = file; -#line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp1_ = options; + _tmp0_ = png_sniffer_new (file, options); #line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - _tmp2_ = png_sniffer_new (_tmp0_, _tmp1_); -#line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 177 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1843 "PngSupport.c" +#line 1995 "PngSupport.c" } -static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +png_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ PngFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -1855,28 +2009,34 @@ static PhotoMetadata* png_file_format_driver_real_create_metadata (PhotoFileForm result = _tmp0_; #line 181 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return result; -#line 1859 "PngSupport.c" +#line 2013 "PngSupport.c" } -PngFileFormatDriver* png_file_format_driver_construct (GType object_type) { +PngFileFormatDriver* +png_file_format_driver_construct (GType object_type) +{ PngFileFormatDriver* self = NULL; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = (PngFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return self; -#line 1869 "PngSupport.c" +#line 2025 "PngSupport.c" } -PngFileFormatDriver* png_file_format_driver_new (void) { +PngFileFormatDriver* +png_file_format_driver_new (void) +{ #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" return png_file_format_driver_construct (TYPE_PNG_FILE_FORMAT_DRIVER); -#line 1876 "PngSupport.c" +#line 2034 "PngSupport.c" } -static void png_file_format_driver_class_init (PngFileFormatDriverClass * klass) { +static void +png_file_format_driver_class_init (PngFileFormatDriverClass * klass) +{ #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" png_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" @@ -1897,25 +2057,31 @@ static void png_file_format_driver_class_init (PngFileFormatDriverClass * klass) ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) png_file_format_driver_real_create_sniffer; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) png_file_format_driver_real_create_metadata; -#line 1901 "PngSupport.c" +#line 2061 "PngSupport.c" } -static void png_file_format_driver_instance_init (PngFileFormatDriver * self) { +static void +png_file_format_driver_instance_init (PngFileFormatDriver * self) +{ } -static void png_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +png_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ PngFileFormatDriver * self; #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PNG_FILE_FORMAT_DRIVER, PngFileFormatDriver); #line 140 "/home/jens/Source/shotwell/src/photos/PngSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (png_file_format_driver_parent_class)->finalize (obj); -#line 1915 "PngSupport.c" +#line 2079 "PngSupport.c" } -GType png_file_format_driver_get_type (void) { +GType +png_file_format_driver_get_type (void) +{ static volatile gsize png_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&png_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PngFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) png_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PngFileFormatDriver), 0, (GInstanceInitFunc) png_file_format_driver_instance_init, NULL }; diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c index c22f941..bd5b4b7 100644 --- a/src/photos/RawSupport.c +++ b/src/photos/RawSupport.c @@ -1,4 +1,4 @@ -/* RawSupport.c generated by valac 0.36.6, the Vala compiler +/* RawSupport.c generated by valac 0.40.4, the Vala compiler * generated from RawSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -480,31 +481,55 @@ static gpointer raw_reader_parent_class = NULL; gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -513,15 +538,18 @@ GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; GType raw_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - RAW_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void raw_file_format_driver_init (void); RawFileFormatDriver* raw_file_format_driver_new (void); RawFileFormatDriver* raw_file_format_driver_construct (GType object_type); @@ -530,132 +558,201 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void); static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); GType raw_file_format_properties_get_type (void) G_GNUC_CONST; RawFileFormatProperties* raw_file_format_properties_get_instance (void); -static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); RawReader* raw_reader_new (const gchar* filepath); -RawReader* raw_reader_construct (GType object_type, const gchar* filepath); +RawReader* raw_reader_construct (GType object_type, + const gchar* filepath); GType raw_reader_get_type (void) G_GNUC_CONST; static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); -RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); +RawSniffer* raw_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +RawSniffer* raw_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); GType raw_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; -enum { - RAW_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; RawFileFormatProperties* raw_file_format_properties_new (void); RawFileFormatProperties* raw_file_format_properties_construct (GType object_type); static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base); static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); 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_dup10 (gchar** self, int length); +static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +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_dup11 (gchar** self, int length); +static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +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); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; -enum { - RAW_SNIFFER_DUMMY_PROPERTY -}; -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); +PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); DetectedPhotoInformation* detected_photo_information_new (void); DetectedPhotoInformation* detected_photo_information_construct (GType object_type); gpointer graw_processor_ref (gpointer instance); void graw_processor_unref (gpointer instance); -GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processor (GValue* value, gpointer v_object); -void graw_value_take_processor (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processor (GValue* value, + gpointer v_object); +void graw_value_take_processor (GValue* value, + gpointer v_object); gpointer graw_value_get_processor (const GValue* value); GType graw_processor_get_type (void) G_GNUC_CONST; GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options); -GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options); +GRawProcessor* graw_processor_construct (GType object_type, + enum LibRaw_constructor_flags options); libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self); GType graw_flip_get_type (void) G_GNUC_CONST; GQuark graw_exception_quark (void); -void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error); -void graw_processor_unpack (GRawProcessor* self, GError** error); -void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error); +void graw_processor_open_file (GRawProcessor* self, + const gchar* filename, + GError** error); +void graw_processor_unpack (GRawProcessor* self, + GError** error); +void graw_processor_adjust_sizes_info_only (GRawProcessor* self, + GError** error); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); 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); +void dimensions_init (Dimensions *self, + gint width, + gint height); +PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error); 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 -}; -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GError** error); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); +gchar* md5_file (GFile* file, + GError** error); +PhotoFileReader* photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, + GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** error); -void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size); +static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, + GError** error); +void graw_processor_configure_for_rgb_display (GRawProcessor* self, + gboolean half_size); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -void graw_processor_process (GRawProcessor* self, GError** error); +void graw_processor_process (GRawProcessor* self, + GError** error); gpointer graw_processed_image_ref (gpointer instance); void graw_processed_image_unref (gpointer instance); -GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processed_image (GValue* value, gpointer v_object); -void graw_value_take_processed_image (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processed_image (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processed_image (GValue* value, + gpointer v_object); +void graw_value_take_processed_image (GValue* value, + gpointer v_object); gpointer graw_value_get_processed_image (const GValue* value); GType graw_processed_image_get_type (void) G_GNUC_CONST; -GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error); +GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, + GError** error); GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self); -static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); GType photo_file_reader_role_get_type (void) G_GNUC_CONST; PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self); -void graw_processor_unpack_thumb (GRawProcessor* self, GError** error); -GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); +void graw_processor_unpack_thumb (GRawProcessor* self, + GError** error); +GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, + GError** error); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); GType raw_developer_get_type (void) G_GNUC_CONST; RawDeveloper* raw_developer_as_array (int* result_length1); gchar* raw_developer_to_string (RawDeveloper self); RawDeveloper raw_developer_from_string (const gchar* value); gchar* raw_developer_get_label (RawDeveloper self); -gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d); +gboolean raw_developer_is_equivalent (RawDeveloper self, + RawDeveloper d); gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; -BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error); +BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, + const gchar* raw_filepath, + const gchar* camera_development_filename, + GError** error); BackingPhotoRow* backing_photo_row_new (void); BackingPhotoRow* backing_photo_row_construct (GType object_type); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); gchar* library_files_convert_basename (const gchar* basename); -GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); -gboolean claim_file (GFile* file, GError** error); +GFile* generate_unique_file (GFile* dir, + const gchar* basename, + gboolean* collision, + GError** error); +gboolean claim_file (GFile* file, + GError** error); GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); GType orientation_get_type (void) G_GNUC_CONST; -void raw_file_format_driver_init (void) { +void +raw_file_format_driver_init (void) +{ RawFileFormatDriver* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_driver_new (); @@ -665,18 +762,22 @@ 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 669 "RawSupport.c" +#line 766 "RawSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +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 676 "RawSupport.c" +#line 775 "RawSupport.c" } -RawFileFormatDriver* raw_file_format_driver_get_instance (void) { +RawFileFormatDriver* +raw_file_format_driver_get_instance (void) +{ RawFileFormatDriver* result = NULL; RawFileFormatDriver* _tmp0_; RawFileFormatDriver* _tmp1_; @@ -688,11 +789,13 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) { result = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 692 "RawSupport.c" +#line 793 "RawSupport.c" } -static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; RawFileFormatProperties* _tmp0_; @@ -704,32 +807,34 @@ 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 708 "RawSupport.c" +#line 811 "RawSupport.c" } -static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ RawFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - RawReader* _tmp1_; + RawReader* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = filepath; -#line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = raw_reader_new (_tmp0_); + _tmp0_ = raw_reader_new (filepath); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 729 "RawSupport.c" +#line 832 "RawSupport.c" } -static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -741,11 +846,13 @@ 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 745 "RawSupport.c" +#line 850 "RawSupport.c" } -static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; gboolean result = FALSE; #line 31 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -754,11 +861,13 @@ 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 758 "RawSupport.c" +#line 865 "RawSupport.c" } -static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; gboolean result = FALSE; #line 35 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -767,11 +876,14 @@ 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 771 "RawSupport.c" +#line 880 "RawSupport.c" } -static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ RawFileFormatDriver * self; PhotoFileWriter* result = NULL; #line 39 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -782,11 +894,14 @@ 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 786 "RawSupport.c" +#line 898 "RawSupport.c" } -static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ RawFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; #line 43 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -797,52 +912,56 @@ 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 801 "RawSupport.c" +#line 916 "RawSupport.c" } -static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ RawFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - RawSniffer* _tmp2_; + RawSniffer* _tmp0_; #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = file; + _tmp0_ = raw_sniffer_new (file, options); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = options; -#line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = raw_sniffer_new (_tmp0_, _tmp1_); -#line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 825 "RawSupport.c" +#line 938 "RawSupport.c" } -RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) { +RawFileFormatDriver* +raw_file_format_driver_construct (GType object_type) +{ RawFileFormatDriver* self = NULL; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 835 "RawSupport.c" +#line 950 "RawSupport.c" } -RawFileFormatDriver* raw_file_format_driver_new (void) { +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 842 "RawSupport.c" +#line 959 "RawSupport.c" } -static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) { +static void +raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -863,25 +982,31 @@ 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 867 "RawSupport.c" +#line 986 "RawSupport.c" } -static void raw_file_format_driver_instance_init (RawFileFormatDriver * self) { +static void +raw_file_format_driver_instance_init (RawFileFormatDriver * self) +{ } -static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ RawFileFormatDriver * self; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" 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 881 "RawSupport.c" +#line 1004 "RawSupport.c" } -GType raw_file_format_driver_get_type (void) { +GType +raw_file_format_driver_get_type (void) +{ static volatile gsize raw_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&raw_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawFileFormatDriver), 0, (GInstanceInitFunc) raw_file_format_driver_instance_init, NULL }; @@ -893,7 +1018,9 @@ GType raw_file_format_driver_get_type (void) { } -void raw_file_format_properties_init (void) { +void +raw_file_format_properties_init (void) +{ RawFileFormatProperties* _tmp0_; #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_properties_new (); @@ -901,18 +1028,22 @@ 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 905 "RawSupport.c" +#line 1032 "RawSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +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 912 "RawSupport.c" +#line 1041 "RawSupport.c" } -RawFileFormatProperties* raw_file_format_properties_get_instance (void) { +RawFileFormatProperties* +raw_file_format_properties_get_instance (void) +{ RawFileFormatProperties* result = NULL; RawFileFormatProperties* _tmp0_; RawFileFormatProperties* _tmp1_; @@ -924,11 +1055,13 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) { result = _tmp1_; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 928 "RawSupport.c" +#line 1059 "RawSupport.c" } -static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; PhotoFileFormat result = 0; #line 129 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -937,11 +1070,13 @@ 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 941 "RawSupport.c" +#line 1074 "RawSupport.c" } -static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -953,11 +1088,13 @@ 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 957 "RawSupport.c" +#line 1092 "RawSupport.c" } -static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 137 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -966,11 +1103,13 @@ 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 970 "RawSupport.c" +#line 1107 "RawSupport.c" } -static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -982,32 +1121,38 @@ 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 986 "RawSupport.c" +#line 1125 "RawSupport.c" } -static gchar** _vala_array_dup10 (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 997 "RawSupport.c" +#line 1139 "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 1003 "RawSupport.c" +#line 1145 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1007 "RawSupport.c" +#line 1149 "RawSupport.c" } -static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ RawFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1034,17 +1179,19 @@ 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 1038 "RawSupport.c" +#line 1183 "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 1044 "RawSupport.c" +#line 1189 "RawSupport.c" } -static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -1065,32 +1212,38 @@ 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 1069 "RawSupport.c" +#line 1216 "RawSupport.c" } -static gchar** _vala_array_dup11 (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 1080 "RawSupport.c" +#line 1230 "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 1086 "RawSupport.c" +#line 1236 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1090 "RawSupport.c" +#line 1240 "RawSupport.c" } -static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ RawFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1117,34 +1270,40 @@ 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 1121 "RawSupport.c" +#line 1274 "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 1127 "RawSupport.c" +#line 1280 "RawSupport.c" } -RawFileFormatProperties* raw_file_format_properties_construct (GType object_type) { +RawFileFormatProperties* +raw_file_format_properties_construct (GType object_type) +{ RawFileFormatProperties* self = NULL; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1137 "RawSupport.c" +#line 1292 "RawSupport.c" } -RawFileFormatProperties* raw_file_format_properties_new (void) { +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 1144 "RawSupport.c" +#line 1301 "RawSupport.c" } -static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) { +static void +raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -1612,25 +1771,31 @@ 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 1616 "RawSupport.c" +#line 1775 "RawSupport.c" } -static void raw_file_format_properties_instance_init (RawFileFormatProperties * self) { +static void +raw_file_format_properties_instance_init (RawFileFormatProperties * self) +{ } -static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ RawFileFormatProperties * self; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" 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 1630 "RawSupport.c" +#line 1793 "RawSupport.c" } -GType raw_file_format_properties_get_type (void) { +GType +raw_file_format_properties_get_type (void) +{ static volatile gsize raw_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&raw_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawFileFormatProperties), 0, (GInstanceInitFunc) raw_file_format_properties_instance_init, NULL }; @@ -1642,39 +1807,46 @@ GType raw_file_format_properties_get_type (void) { } -RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +RawSniffer* +raw_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ RawSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = file; -#line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = options; -#line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (RawSniffer*) photo_file_sniffer_construct (object_type, file, options); #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1660 "RawSupport.c" +#line 1823 "RawSupport.c" } -RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +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 1667 "RawSupport.c" +#line 1833 "RawSupport.c" } -static gpointer _g_error_copy0 (gpointer self) { +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 1674 "RawSupport.c" +#line 1842 "RawSupport.c" } -static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +raw_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ RawSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; @@ -1687,26 +1859,24 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, libraw_output_params_t* _tmp4_; DetectedPhotoInformation* _tmp14_; GRawProcessor* _tmp15_; - libraw_image_sizes_t _tmp16_; - gushort _tmp17_; - GRawProcessor* _tmp18_; - libraw_image_sizes_t _tmp19_; - gushort _tmp20_; + gushort _tmp16_; + GRawProcessor* _tmp17_; + gushort _tmp18_; + DetectedPhotoInformation* _tmp19_; + DetectedPhotoInformation* _tmp20_; DetectedPhotoInformation* _tmp21_; - DetectedPhotoInformation* _tmp22_; - DetectedPhotoInformation* _tmp23_; RawReader* reader = NULL; - GFile* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - RawReader* _tmp27_; - RawReader* _tmp28_; - DetectedPhotoInformation* _tmp34_; - PhotoMetadata* _tmp35_; - gboolean _tmp44_; + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + RawReader* _tmp25_; + RawReader* _tmp26_; + DetectedPhotoInformation* _tmp32_; + PhotoMetadata* _tmp33_; + gboolean _tmp42_; + DetectedPhotoInformation* _tmp48_; + gchar* _tmp49_; 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); @@ -1728,7 +1898,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 1732 "RawSupport.c" +#line 1902 "RawSupport.c" { GRawProcessor* _tmp5_; GFile* _tmp6_; @@ -1752,7 +1922,7 @@ 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 1756 "RawSupport.c" +#line 1926 "RawSupport.c" goto __catch36_graw_exception; } #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1765,7 +1935,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 1769 "RawSupport.c" +#line 1939 "RawSupport.c" } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -1775,7 +1945,7 @@ 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 1779 "RawSupport.c" +#line 1949 "RawSupport.c" goto __catch36_graw_exception; } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1788,7 +1958,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 1792 "RawSupport.c" +#line 1962 "RawSupport.c" } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = processor; @@ -1798,7 +1968,7 @@ 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 1802 "RawSupport.c" +#line 1972 "RawSupport.c" goto __catch36_graw_exception; } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1811,7 +1981,7 @@ 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 1815 "RawSupport.c" +#line 1985 "RawSupport.c" } } goto __finally36; @@ -1841,11 +2011,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 1845 "RawSupport.c" +#line 2015 "RawSupport.c" } #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1849 "RawSupport.c" +#line 2019 "RawSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp12_ = exception; @@ -1855,7 +2025,7 @@ 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 1859 "RawSupport.c" +#line 2029 "RawSupport.c" goto __finally36; } __finally36: @@ -1869,81 +2039,77 @@ 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 1873 "RawSupport.c" +#line 2043 "RawSupport.c" } #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp14_ = detected; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp15_ = processor; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp16_ = graw_processor_get_sizes (_tmp15_); -#line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp17_ = _tmp16_.iwidth; + _tmp16_ = graw_processor_get_sizes (_tmp15_).iwidth; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp18_ = processor; -#line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp19_ = graw_processor_get_sizes (_tmp18_); + _tmp17_ = processor; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp20_ = _tmp19_.iheight; + _tmp18_ = graw_processor_get_sizes (_tmp17_).iheight; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - dimensions_init (&_tmp14_->image_dim, (gint) _tmp17_, (gint) _tmp20_); + dimensions_init (&_tmp14_->image_dim, (gint) _tmp16_, (gint) _tmp18_); #line 187 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_ = detected; + _tmp19_ = detected; #line 187 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_->colorspace = GDK_COLORSPACE_RGB; + _tmp19_->colorspace = GDK_COLORSPACE_RGB; #line 188 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_ = detected; + _tmp20_ = detected; #line 188 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_->channels = 3; + _tmp20_->channels = 3; #line 189 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_ = detected; + _tmp21_ = detected; #line 189 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_->bits_per_channel = 8; + _tmp21_->bits_per_channel = 8; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; + _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp25_ = g_file_get_path (_tmp24_); + _tmp23_ = g_file_get_path (_tmp22_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = raw_reader_new (_tmp26_); + _tmp25_ = raw_reader_new (_tmp24_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp24_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - reader = _tmp28_; -#line 1917 "RawSupport.c" + reader = _tmp26_; +#line 2083 "RawSupport.c" { - PhotoMetadata* _tmp29_ = NULL; - RawReader* _tmp30_; + PhotoMetadata* _tmp27_ = NULL; + RawReader* _tmp28_; + PhotoMetadata* _tmp29_; + DetectedPhotoInformation* _tmp30_; PhotoMetadata* _tmp31_; - DetectedPhotoInformation* _tmp32_; - PhotoMetadata* _tmp33_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = reader; + _tmp28_ = reader; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp31_ = photo_file_reader_read_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO_FILE_READER, PhotoFileReader), &_inner_error_); + _tmp29_ = photo_file_reader_read_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO_FILE_READER, PhotoFileReader), &_inner_error_); #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = _tmp31_; + _tmp27_ = _tmp29_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1932 "RawSupport.c" +#line 2098 "RawSupport.c" goto __catch37_g_error; } #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = detected; + _tmp30_ = detected; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp33_ = _tmp29_; + _tmp31_ = _tmp27_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = NULL; + _tmp27_ = NULL; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _media_metadata_unref0 (_tmp32_->metadata); + _media_metadata_unref0 (_tmp30_->metadata); #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_->metadata = _tmp33_; + _tmp30_->metadata = _tmp31_; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _media_metadata_unref0 (_tmp29_); -#line 1947 "RawSupport.c" + _media_metadata_unref0 (_tmp27_); +#line 2113 "RawSupport.c" } goto __finally37; __catch37_g_error: @@ -1955,7 +2121,7 @@ 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 1959 "RawSupport.c" +#line 2125 "RawSupport.c" } __finally37: #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1970,65 +2136,65 @@ 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 1974 "RawSupport.c" +#line 2140 "RawSupport.c" } #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = detected; + _tmp32_ = detected; #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = _tmp34_->metadata; + _tmp33_ = _tmp32_->metadata; #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp35_ != NULL) { -#line 1982 "RawSupport.c" - DetectedPhotoInformation* _tmp36_; - DetectedPhotoInformation* _tmp37_; - PhotoMetadata* _tmp38_; - gchar* _tmp39_; - DetectedPhotoInformation* _tmp40_; - DetectedPhotoInformation* _tmp41_; - PhotoMetadata* _tmp42_; - gchar* _tmp43_; + if (_tmp33_ != NULL) { +#line 2148 "RawSupport.c" + DetectedPhotoInformation* _tmp34_; + DetectedPhotoInformation* _tmp35_; + PhotoMetadata* _tmp36_; + gchar* _tmp37_; + DetectedPhotoInformation* _tmp38_; + DetectedPhotoInformation* _tmp39_; + PhotoMetadata* _tmp40_; + gchar* _tmp41_; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = detected; + _tmp34_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = detected; + _tmp35_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = _tmp37_->metadata; + _tmp36_ = _tmp35_->metadata; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = photo_metadata_exif_hash (_tmp38_); + _tmp37_ = photo_metadata_exif_hash (_tmp36_); #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp36_->exif_md5); + _g_free0 (_tmp34_->exif_md5); #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_->exif_md5 = _tmp39_; + _tmp34_->exif_md5 = _tmp37_; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_ = detected; + _tmp38_ = detected; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp41_ = detected; + _tmp39_ = detected; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp42_ = _tmp41_->metadata; + _tmp40_ = _tmp39_->metadata; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp43_ = photo_metadata_thumbnail_hash (_tmp42_); + _tmp41_ = photo_metadata_thumbnail_hash (_tmp40_); #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp40_->thumbnail_md5); + _g_free0 (_tmp38_->thumbnail_md5); #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_->thumbnail_md5 = _tmp43_; -#line 2015 "RawSupport.c" + _tmp38_->thumbnail_md5 = _tmp41_; +#line 2181 "RawSupport.c" } #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp44_) { -#line 2021 "RawSupport.c" - gchar* _tmp45_ = NULL; - GFile* _tmp46_; + if (_tmp42_) { +#line 2187 "RawSupport.c" + gchar* _tmp43_ = NULL; + GFile* _tmp44_; + gchar* _tmp45_; + DetectedPhotoInformation* _tmp46_; gchar* _tmp47_; - DetectedPhotoInformation* _tmp48_; - gchar* _tmp49_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; + _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp47_ = md5_file (_tmp46_, &_inner_error_); + _tmp45_ = md5_file (_tmp44_, &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp45_ = _tmp47_; + _tmp43_ = _tmp45_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2041,34 +2207,34 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2045 "RawSupport.c" +#line 2211 "RawSupport.c" } #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp48_ = detected; + _tmp46_ = detected; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp49_ = _tmp45_; + _tmp47_ = _tmp43_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp45_ = NULL; + _tmp43_ = NULL; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp48_->md5); + _g_free0 (_tmp46_->md5); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp48_->md5 = _tmp49_; + _tmp46_->md5 = _tmp47_; #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp45_); -#line 2059 "RawSupport.c" + _g_free0 (_tmp43_); +#line 2225 "RawSupport.c" } #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp50_ = detected; + _tmp48_ = detected; #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp51_ = g_strdup ("raw"); + _tmp49_ = g_strdup ("raw"); #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp50_->format_name); + _g_free0 (_tmp48_->format_name); #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp50_->format_name = _tmp51_; + _tmp48_->format_name = _tmp49_; #line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp52_ = detected; + _tmp50_ = detected; #line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp52_->file_format = PHOTO_FILE_FORMAT_RAW; + _tmp50_->file_format = PHOTO_FILE_FORMAT_RAW; #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = detected; #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2079,28 +2245,34 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 2083 "RawSupport.c" +#line 2249 "RawSupport.c" } #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2087 "RawSupport.c" +#line 2253 "RawSupport.c" } -static void raw_sniffer_class_init (RawSnifferClass * klass) { +static void +raw_sniffer_class_init (RawSnifferClass * klass) +{ #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" 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 2096 "RawSupport.c" +#line 2264 "RawSupport.c" } -static void raw_sniffer_instance_init (RawSniffer * self) { +static void +raw_sniffer_instance_init (RawSniffer * self) +{ } -GType raw_sniffer_get_type (void) { +GType +raw_sniffer_get_type (void) +{ static volatile gsize raw_sniffer_type_id__volatile = 0; if (g_once_init_enter (&raw_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawSniffer), 0, (GInstanceInitFunc) raw_sniffer_instance_init, NULL }; @@ -2112,29 +2284,34 @@ GType raw_sniffer_get_type (void) { } -RawReader* raw_reader_construct (GType object_type, const gchar* filepath) { +RawReader* +raw_reader_construct (GType object_type, + const gchar* filepath) +{ RawReader* self = NULL; - const gchar* _tmp0_; #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = filepath; -#line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW); + self = (RawReader*) photo_file_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_RAW); #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 2127 "RawSupport.c" +#line 2299 "RawSupport.c" } -RawReader* raw_reader_new (const gchar* filepath) { +RawReader* +raw_reader_new (const gchar* filepath) +{ #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_reader_construct (TYPE_RAW_READER, filepath); -#line 2134 "RawSupport.c" +#line 2308 "RawSupport.c" } -static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GError** error) { +static PhotoMetadata* +raw_reader_real_read_metadata (PhotoFileReader* base, + GError** error) +{ RawReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; @@ -2164,17 +2341,20 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr _media_metadata_unref0 (metadata); #line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2168 "RawSupport.c" +#line 2345 "RawSupport.c" } #line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = metadata; #line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2174 "RawSupport.c" +#line 2351 "RawSupport.c" } -static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** error) { +static GdkPixbuf* +raw_reader_real_unscaled_read (PhotoFileReader* base, + GError** error) +{ RawReader * self; GdkPixbuf* result = NULL; GRawProcessor* processor = NULL; @@ -2229,7 +2409,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2233 "RawSupport.c" +#line 2413 "RawSupport.c" } #line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = processor; @@ -2243,7 +2423,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2247 "RawSupport.c" +#line 2427 "RawSupport.c" } #line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -2257,7 +2437,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2261 "RawSupport.c" +#line 2441 "RawSupport.c" } #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp11_ = processor; @@ -2273,7 +2453,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2277 "RawSupport.c" +#line 2457 "RawSupport.c" } #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp13_ = graw_processed_image_get_pixbuf_copy (_tmp10_); @@ -2285,11 +2465,16 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2289 "RawSupport.c" +#line 2469 "RawSupport.c" } -static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +raw_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ RawReader * self; GdkPixbuf* result = NULL; gdouble width_proportion = 0.0; @@ -2315,17 +2500,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions GRawProcessor* _tmp17_; gchar* _tmp18_; gchar* _tmp19_; + GRawProcessor* _tmp29_; GRawProcessor* _tmp30_; - GRawProcessor* _tmp31_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp32_; + GRawProcessor* _tmp31_; + GRawProcessedImage* _tmp32_; GRawProcessedImage* _tmp33_; - GRawProcessedImage* _tmp34_; + GdkPixbuf* _tmp34_; GdkPixbuf* _tmp35_; - GdkPixbuf* _tmp36_; - Dimensions _tmp37_; + Dimensions _tmp36_; + GdkPixbuf* _tmp37_; GdkPixbuf* _tmp38_; - GdkPixbuf* _tmp39_; GError * _inner_error_ = NULL; #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); @@ -2357,17 +2542,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _tmp9_ = width_proportion; #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp9_ < 0.5) { -#line 2361 "RawSupport.c" +#line 2546 "RawSupport.c" gdouble _tmp10_; #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = height_proportion; #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = _tmp10_ < 0.5; -#line 2367 "RawSupport.c" +#line 2552 "RawSupport.c" } else { #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = FALSE; -#line 2371 "RawSupport.c" +#line 2556 "RawSupport.c" } #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" half_size = _tmp8_; @@ -2407,68 +2592,65 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2411 "RawSupport.c" +#line 2596 "RawSupport.c" } { - PhotoFileReaderRole _tmp20_; #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 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) { -#line 2419 "RawSupport.c" - GRawProcessor* _tmp21_; + if (photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader)) == PHOTO_FILE_READER_ROLE_THUMBNAIL) { +#line 2601 "RawSupport.c" + GRawProcessor* _tmp20_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp22_; + GRawProcessor* _tmp21_; + GRawProcessedImage* _tmp22_; GRawProcessedImage* _tmp23_; - GRawProcessedImage* _tmp24_; + GdkPixbuf* _tmp24_; GdkPixbuf* _tmp25_; - GdkPixbuf* _tmp26_; - Dimensions _tmp27_; + Dimensions _tmp26_; + GdkPixbuf* _tmp27_; GdkPixbuf* _tmp28_; - GdkPixbuf* _tmp29_; #line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_ = processor; + _tmp20_ = processor; #line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - graw_processor_unpack_thumb (_tmp21_, &_inner_error_); + graw_processor_unpack_thumb (_tmp20_, &_inner_error_); #line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2436 "RawSupport.c" +#line 2618 "RawSupport.c" goto __catch38_g_error; } #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_ = processor; + _tmp21_ = processor; #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_ = graw_processor_make_thumb_image (_tmp22_, &_inner_error_); + _tmp22_ = graw_processor_make_thumb_image (_tmp21_, &_inner_error_); #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - image = _tmp23_; + image = _tmp22_; #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2447 "RawSupport.c" +#line 2629 "RawSupport.c" goto __catch38_g_error; } #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp24_ = image; + _tmp23_ = image; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_); + _tmp24_ = graw_processed_image_get_pixbuf_copy (_tmp23_); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = *scaled; + _tmp26_ = *scaled; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR); + _tmp27_ = resize_pixbuf (_tmp25_, &_tmp26_, GDK_INTERP_BILINEAR); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp25_); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp29_; + result = _tmp28_; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (image); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2472 "RawSupport.c" +#line 2654 "RawSupport.c" } } goto __finally38; @@ -2481,7 +2663,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _inner_error_ = NULL; #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (_error_); -#line 2485 "RawSupport.c" +#line 2667 "RawSupport.c" } __finally38: #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2492,12 +2674,12 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2496 "RawSupport.c" +#line 2678 "RawSupport.c" } #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = processor; + _tmp29_ = processor; #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - graw_processor_unpack (_tmp30_, &_inner_error_); + graw_processor_unpack (_tmp29_, &_inner_error_); #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2506,12 +2688,12 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2510 "RawSupport.c" +#line 2692 "RawSupport.c" } #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp31_ = processor; + _tmp30_ = processor; #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - graw_processor_process (_tmp31_, &_inner_error_); + graw_processor_process (_tmp30_, &_inner_error_); #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2520,14 +2702,14 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2524 "RawSupport.c" +#line 2706 "RawSupport.c" } #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = processor; + _tmp31_ = processor; #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp33_ = graw_processor_make_mem_image (_tmp32_, &_inner_error_); + _tmp32_ = graw_processor_make_mem_image (_tmp31_, &_inner_error_); #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - image = _tmp33_; + image = _tmp32_; #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2536,35 +2718,37 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2540 "RawSupport.c" +#line 2722 "RawSupport.c" } #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = image; + _tmp33_ = image; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = graw_processed_image_get_pixbuf_copy (_tmp34_); + _tmp34_ = graw_processed_image_get_pixbuf_copy (_tmp33_); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = _tmp35_; + _tmp35_ = _tmp34_; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = *scaled; + _tmp36_ = *scaled; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = resize_pixbuf (_tmp36_, &_tmp37_, GDK_INTERP_BILINEAR); + _tmp37_ = resize_pixbuf (_tmp35_, &_tmp36_, GDK_INTERP_BILINEAR); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = _tmp38_; + _tmp38_ = _tmp37_; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp36_); + _g_object_unref0 (_tmp35_); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp39_; + result = _tmp38_; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (image); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2564 "RawSupport.c" +#line 2746 "RawSupport.c" } -static void raw_reader_class_init (RawReaderClass * klass) { +static void +raw_reader_class_init (RawReaderClass * klass) +{ #line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_reader_parent_class = g_type_class_peek_parent (klass); #line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2573,15 +2757,19 @@ static void raw_reader_class_init (RawReaderClass * klass) { ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) raw_reader_real_unscaled_read; #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 2577 "RawSupport.c" +#line 2761 "RawSupport.c" } -static void raw_reader_instance_init (RawReader * self) { +static void +raw_reader_instance_init (RawReader * self) +{ } -GType raw_reader_get_type (void) { +GType +raw_reader_get_type (void) +{ static volatile gsize raw_reader_type_id__volatile = 0; if (g_once_init_enter (&raw_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawReader), 0, (GInstanceInitFunc) raw_reader_instance_init, NULL }; @@ -2593,7 +2781,9 @@ GType raw_reader_get_type (void) { } -RawDeveloper* raw_developer_as_array (int* result_length1) { +RawDeveloper* +raw_developer_as_array (int* result_length1) +{ RawDeveloper* result = NULL; RawDeveloper* _tmp0_; RawDeveloper* _tmp1_; @@ -2614,23 +2804,25 @@ RawDeveloper* raw_developer_as_array (int* result_length1) { if (result_length1) { #line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp1__length1; -#line 2618 "RawSupport.c" +#line 2808 "RawSupport.c" } #line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; #line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2624 "RawSupport.c" +#line 2814 "RawSupport.c" } -gchar* raw_developer_to_string (RawDeveloper self) { +gchar* +raw_developer_to_string (RawDeveloper self) +{ gchar* result = NULL; #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (self) { #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2634 "RawSupport.c" +#line 2826 "RawSupport.c" { gchar* _tmp0_; #line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2639,11 +2831,11 @@ gchar* raw_developer_to_string (RawDeveloper self) { result = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2643 "RawSupport.c" +#line 2835 "RawSupport.c" } #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: -#line 2647 "RawSupport.c" +#line 2839 "RawSupport.c" { gchar* _tmp1_; #line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2652,11 +2844,11 @@ gchar* raw_developer_to_string (RawDeveloper self) { result = _tmp1_; #line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2656 "RawSupport.c" +#line 2848 "RawSupport.c" } #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2660 "RawSupport.c" +#line 2852 "RawSupport.c" { gchar* _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2665,99 +2857,100 @@ gchar* raw_developer_to_string (RawDeveloper self) { result = _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2669 "RawSupport.c" +#line 2861 "RawSupport.c" } default: { #line 288 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2675 "RawSupport.c" +#line 2867 "RawSupport.c" } } } -RawDeveloper raw_developer_from_string (const gchar* value) { +RawDeveloper +raw_developer_from_string (const gchar* value) +{ RawDeveloper result = 0; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; + GQuark _tmp2_ = 0U; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - static GQuark _tmp2_label0 = 0; + static GQuark _tmp1_label0 = 0; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - static GQuark _tmp2_label1 = 0; + static GQuark _tmp1_label1 = 0; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - static GQuark _tmp2_label2 = 0; + static GQuark _tmp1_label2 = 0; #line 292 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (value != NULL, 0); #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = value; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = _tmp0_; -#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #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")))) { + if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("SHOTWELL")))) { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2704 "RawSupport.c" +#line 2895 "RawSupport.c" default: { #line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_SHOTWELL; #line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2711 "RawSupport.c" +#line 2902 "RawSupport.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) { + } else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("CAMERA")))) { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2717 "RawSupport.c" +#line 2908 "RawSupport.c" default: { #line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_CAMERA; #line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2724 "RawSupport.c" +#line 2915 "RawSupport.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) { + } else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("EMBEDDED")))) { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2730 "RawSupport.c" +#line 2921 "RawSupport.c" default: { #line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_EMBEDDED; #line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2737 "RawSupport.c" +#line 2928 "RawSupport.c" } } } else { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2743 "RawSupport.c" +#line 2934 "RawSupport.c" default: { #line 301 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2748 "RawSupport.c" +#line 2939 "RawSupport.c" } } } } -gchar* raw_developer_get_label (RawDeveloper self) { +gchar* +raw_developer_get_label (RawDeveloper self) +{ gchar* result = NULL; #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (self) { #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2761 "RawSupport.c" +#line 2954 "RawSupport.c" { gchar* _tmp0_; #line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2766,13 +2959,13 @@ gchar* raw_developer_get_label (RawDeveloper self) { result = _tmp0_; #line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2770 "RawSupport.c" +#line 2963 "RawSupport.c" } #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2776 "RawSupport.c" +#line 2969 "RawSupport.c" { gchar* _tmp1_; #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2781,121 +2974,116 @@ gchar* raw_developer_get_label (RawDeveloper self) { result = _tmp1_; #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2785 "RawSupport.c" +#line 2978 "RawSupport.c" } default: { #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2791 "RawSupport.c" +#line 2984 "RawSupport.c" } } } -gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { +gboolean +raw_developer_is_equivalent (RawDeveloper self, + RawDeveloper d) +{ gboolean result = FALSE; - RawDeveloper _tmp0_; + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; #line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = d; -#line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (self == _tmp0_) { + if (self == d) { #line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = TRUE; #line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2810 "RawSupport.c" +#line 3003 "RawSupport.c" } #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_CAMERA) { -#line 2814 "RawSupport.c" - RawDeveloper _tmp3_; -#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = d; #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 2820 "RawSupport.c" + _tmp1_ = d == RAW_DEVELOPER_EMBEDDED; +#line 3009 "RawSupport.c" } else { #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = FALSE; -#line 2824 "RawSupport.c" + _tmp1_ = FALSE; +#line 3013 "RawSupport.c" } #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp2_) { + if (_tmp1_) { #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = TRUE; -#line 2830 "RawSupport.c" + _tmp0_ = TRUE; +#line 3019 "RawSupport.c" } else { - gboolean _tmp4_ = FALSE; + gboolean _tmp2_ = FALSE; #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_EMBEDDED) { -#line 2835 "RawSupport.c" - RawDeveloper _tmp5_; #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp5_ = d; -#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA; -#line 2841 "RawSupport.c" + _tmp2_ = d == RAW_DEVELOPER_CAMERA; +#line 3026 "RawSupport.c" } else { #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp4_ = FALSE; -#line 2845 "RawSupport.c" + _tmp2_ = FALSE; +#line 3030 "RawSupport.c" } #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = _tmp4_; -#line 2849 "RawSupport.c" + _tmp0_ = _tmp2_; +#line 3034 "RawSupport.c" } #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp1_) { + if (_tmp0_) { #line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = TRUE; #line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2857 "RawSupport.c" +#line 3042 "RawSupport.c" } #line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = FALSE; #line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2863 "RawSupport.c" +#line 3048 "RawSupport.c" } -BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error) { +BackingPhotoRow* +raw_developer_create_backing_row_for_development (RawDeveloper self, + const gchar* raw_filepath, + const gchar* camera_development_filename, + GError** error) +{ BackingPhotoRow* result = NULL; BackingPhotoRow* ns = NULL; BackingPhotoRow* _tmp0_; GFile* master = NULL; - const gchar* _tmp1_; - GFile* _tmp2_; + GFile* _tmp1_; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp3_; + GFile* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; gchar* basename = NULL; - const gchar* _tmp8_; gchar* newbasename = NULL; - const gchar* _tmp27_; - gchar* _tmp28_; + const gchar* _tmp24_; + gchar* _tmp25_; gboolean c = FALSE; GFile* new_back = NULL; - GFile* _tmp29_; - GFile* _tmp30_; + GFile* _tmp26_; + GFile* _tmp27_; + GFile* _tmp28_; + const gchar* _tmp29_; + gboolean _tmp30_ = FALSE; GFile* _tmp31_; - const gchar* _tmp32_; - gboolean _tmp33_ = FALSE; - GFile* _tmp34_; - GFile* _tmp35_; + GFile* _tmp32_; + GFile* _tmp33_; + BackingPhotoRow* _tmp34_; + BackingPhotoRow* _tmp35_; GFile* _tmp36_; - BackingPhotoRow* _tmp37_; - BackingPhotoRow* _tmp38_; - GFile* _tmp39_; - gchar* _tmp40_; + gchar* _tmp37_; GError * _inner_error_ = NULL; #line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (raw_filepath != NULL, NULL); @@ -2904,149 +3092,142 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper #line 334 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ns = _tmp0_; #line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = raw_filepath; + _tmp1_ = g_file_new_for_path (raw_filepath); #line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = g_file_new_for_path (_tmp1_); -#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - master = _tmp2_; + master = _tmp1_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = master; + _tmp2_ = master; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp4_ = g_file_get_basename (_tmp3_); + _tmp3_ = g_file_get_basename (_tmp2_); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_); + disassemble_filename (_tmp4_, &_tmp5_, &_tmp6_); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - name = _tmp6_; + name = _tmp5_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ext = _tmp7_; + ext = _tmp6_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp5_); -#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp8_ = camera_development_filename; + _g_free0 (_tmp4_); #line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp8_ == NULL) { -#line 2935 "RawSupport.c" - gchar* _tmp9_ = NULL; - const gchar* _tmp16_; - gchar* _tmp17_; + if (camera_development_filename == NULL) { +#line 3119 "RawSupport.c" + gchar* _tmp7_ = NULL; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + const gchar* _tmp17_; gchar* _tmp18_; - const gchar* _tmp19_; + gchar* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self != RAW_DEVELOPER_CAMERA) { -#line 2948 "RawSupport.c" +#line 3132 "RawSupport.c" + gchar* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; -#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp10_ = raw_developer_to_string (self); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp11_ = _tmp10_; + _tmp8_ = raw_developer_to_string (self); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1); + _tmp9_ = _tmp8_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp13_ = _tmp12_; + _tmp10_ = g_utf8_strdown (_tmp9_, (gssize) -1); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp14_ = g_strconcat ("_", _tmp13_, NULL); + _tmp11_ = _tmp10_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp9_); + _tmp12_ = g_strconcat ("_", _tmp11_, NULL); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp9_ = _tmp14_; + _g_free0 (_tmp7_); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp13_); + _tmp7_ = _tmp12_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp11_); -#line 2972 "RawSupport.c" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (_tmp9_); +#line 3156 "RawSupport.c" } else { - gchar* _tmp15_; + gchar* _tmp13_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp15_ = g_strdup (""); + _tmp13_ = g_strdup (""); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp9_ = _tmp15_; -#line 2981 "RawSupport.c" + _tmp7_ = _tmp13_; +#line 3165 "RawSupport.c" } #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp16_ = name; + _tmp14_ = name; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp17_ = g_strconcat (_tmp16_, "_", NULL); + _tmp15_ = g_strconcat (_tmp14_, "_", NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp19_ = ext; + _tmp17_ = ext; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL); + _tmp18_ = g_strconcat (_tmp16_, _tmp17_, NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_ = g_strconcat (_tmp21_, _tmp9_, NULL); + _tmp20_ = g_strconcat (_tmp19_, _tmp7_, NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp24_ = g_strconcat (_tmp23_, ".jpg", NULL); + _tmp22_ = g_strconcat (_tmp21_, ".jpg", NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - basename = _tmp24_; -#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp23_); + basename = _tmp22_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp21_); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp19_); +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (_tmp16_); #line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp9_); -#line 3013 "RawSupport.c" + _g_free0 (_tmp7_); +#line 3197 "RawSupport.c" } else { - const gchar* _tmp25_; - gchar* _tmp26_; -#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp25_ = camera_development_filename; + gchar* _tmp23_; #line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp26_ = g_strdup (_tmp25_); + _tmp23_ = g_strdup (camera_development_filename); #line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); #line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - basename = _tmp26_; -#line 3025 "RawSupport.c" + basename = _tmp23_; +#line 3206 "RawSupport.c" } #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = basename; + _tmp24_ = basename; #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = library_files_convert_basename (_tmp27_); + _tmp25_ = library_files_convert_basename (_tmp24_); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - newbasename = _tmp28_; + newbasename = _tmp25_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = master; + _tmp26_ = master; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = g_file_get_parent (_tmp29_); + _tmp27_ = g_file_get_parent (_tmp26_); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp31_ = _tmp30_; + _tmp28_ = _tmp27_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = newbasename; + _tmp29_ = newbasename; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = generate_unique_file (_tmp31_, _tmp32_, &_tmp33_, &_inner_error_); + _tmp31_ = generate_unique_file (_tmp28_, _tmp29_, &_tmp30_, &_inner_error_); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - c = _tmp33_; + c = _tmp30_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp31_); + _g_object_unref0 (_tmp28_); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - new_back = _tmp35_; + new_back = _tmp32_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3065,12 +3246,12 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _backing_photo_row_unref0 (ns); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3069 "RawSupport.c" +#line 3250 "RawSupport.c" } #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = new_back; + _tmp33_ = new_back; #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - claim_file (_tmp36_, &_inner_error_); + claim_file (_tmp33_, &_inner_error_); #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3091,22 +3272,22 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _backing_photo_row_unref0 (ns); #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3095 "RawSupport.c" +#line 3276 "RawSupport.c" } #line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = ns; + _tmp34_ = ns; #line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_->file_format = PHOTO_FILE_FORMAT_JFIF; + _tmp34_->file_format = PHOTO_FILE_FORMAT_JFIF; #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = ns; + _tmp35_ = ns; #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = new_back; + _tmp36_ = new_back; #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_ = g_file_get_path (_tmp39_); + _tmp37_ = g_file_get_path (_tmp36_); #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp38_->filepath); + _g_free0 (_tmp35_->filepath); #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_->filepath = _tmp40_; + _tmp35_->filepath = _tmp37_; #line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = ns; #line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3123,11 +3304,13 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _g_object_unref0 (master); #line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 3127 "RawSupport.c" +#line 3308 "RawSupport.c" } -GType raw_developer_get_type (void) { +GType +raw_developer_get_type (void) +{ static volatile gsize raw_developer_type_id__volatile = 0; if (g_once_init_enter (&raw_developer_type_id__volatile)) { static const GEnumValue values[] = {{RAW_DEVELOPER_SHOTWELL, "RAW_DEVELOPER_SHOTWELL", "shotwell"}, {RAW_DEVELOPER_CAMERA, "RAW_DEVELOPER_CAMERA", "camera"}, {RAW_DEVELOPER_EMBEDDED, "RAW_DEVELOPER_EMBEDDED", "embedded"}, {0, NULL, NULL}}; diff --git a/src/photos/TiffSupport.c b/src/photos/TiffSupport.c index 70e930b..d17a83b 100644 --- a/src/photos/TiffSupport.c +++ b/src/photos/TiffSupport.c @@ -1,4 +1,4 @@ -/* TiffSupport.c generated by valac 0.36.6, the Vala compiler +/* TiffSupport.c generated by valac 0.40.4, the Vala compiler * generated from TiffSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * See the COPYING file in this distribution. */ + #include #include #include @@ -471,31 +472,55 @@ static gpointer photos_tiff_metadata_writer_parent_class = NULL; gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -504,15 +529,18 @@ GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; GType photos_tiff_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_TIFF_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void photos_tiff_file_format_driver_init (void); PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_new (void); PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_construct (GType object_type); @@ -521,9 +549,11 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void); static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); GType photos_tiff_file_format_properties_get_type (void) G_GNUC_CONST; PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance (void); -static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); PhotosTiffReader* photos_tiff_reader_new (const gchar* filepath); -PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* filepath); +PhotosTiffReader* photos_tiff_reader_construct (GType object_type, + const gchar* filepath); GType gdk_reader_get_type (void) G_GNUC_CONST; GType photos_tiff_reader_get_type (void) G_GNUC_CONST; static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); @@ -531,82 +561,109 @@ PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); static gboolean photos_tiff_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); PhotosTiffWriter* photos_tiff_writer_new (const gchar* filepath); -PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* filepath); +PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, + const gchar* filepath); GType photos_tiff_writer_get_type (void) G_GNUC_CONST; -static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); PhotosTiffMetadataWriter* photos_tiff_metadata_writer_new (const gchar* filepath); -PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, const gchar* filepath); +PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, + const gchar* filepath); GType photos_tiff_metadata_writer_get_type (void) G_GNUC_CONST; -static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); -PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); +PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); GType gdk_sniffer_get_type (void) G_GNUC_CONST; GType photos_tiff_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_TIFF_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_new (void); PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_construct (GType object_type); static PhotoFileFormat photos_tiff_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base); static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); 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_dup14 (gchar** self, int length); +static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +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_dup15 (gchar** self, int length); +static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup15 (gchar** self, + int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_TIFF_SNIFFER_DUMMY_PROPERTY -}; -GdkSniffer* gdk_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); -gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error); -DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, gboolean* is_corrupted, GError** error); +GdkSniffer* gdk_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); +gboolean photos_is_tiff (GFile* file, + GCancellable* cancellable, + GError** error); +DetectedPhotoInformation* photo_file_sniffer_sniff (PhotoFileSniffer* self, + gboolean* is_corrupted, + GError** error); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); -enum { - PHOTOS_TIFF_READER_DUMMY_PROPERTY -}; -GdkReader* gdk_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); +GdkReader* gdk_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); GType jpeg_quality_get_type (void) G_GNUC_CONST; -enum { - PHOTOS_TIFF_WRITER_DUMMY_PROPERTY -}; #define PHOTOS_TIFF_WRITER_COMPRESSION_NONE "1" #define PHOTOS_TIFF_WRITER_COMPRESSION_HUFFMAN "2" #define PHOTOS_TIFF_WRITER_COMPRESSION_LZW "5" #define PHOTOS_TIFF_WRITER_COMPRESSION_JPEG "7" #define PHOTOS_TIFF_WRITER_COMPRESSION_DEFLATE "8" -PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error); +PhotoFileWriter* photo_file_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void photos_tiff_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -enum { - PHOTOS_TIFF_METADATA_WRITER_DUMMY_PROPERTY -}; -PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error); -void photo_metadata_write_to_file (PhotoMetadata* self, GFile* file, GError** error); +PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error); +void photo_metadata_write_to_file (PhotoMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -void photos_tiff_file_format_driver_init (void) { +void +photos_tiff_file_format_driver_init (void) +{ PhotosTiffFileFormatDriver* _tmp0_; #line 13 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = photos_tiff_file_format_driver_new (); @@ -616,18 +673,22 @@ void photos_tiff_file_format_driver_init (void) { photos_tiff_file_format_driver_instance = _tmp0_; #line 14 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_properties_init (); -#line 620 "TiffSupport.c" +#line 677 "TiffSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +static gpointer +_photo_file_format_driver_ref0 (gpointer self) +{ #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 627 "TiffSupport.c" +#line 686 "TiffSupport.c" } -PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) { +PhotosTiffFileFormatDriver* +photos_tiff_file_format_driver_get_instance (void) +{ PhotosTiffFileFormatDriver* result = NULL; PhotosTiffFileFormatDriver* _tmp0_; PhotosTiffFileFormatDriver* _tmp1_; @@ -639,11 +700,13 @@ PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_get_instance (void) { result = _tmp1_; #line 18 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 643 "TiffSupport.c" +#line 704 "TiffSupport.c" } -static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +photos_tiff_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ PhotosTiffFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; PhotosTiffFileFormatProperties* _tmp0_; @@ -655,32 +718,34 @@ static PhotoFileFormatProperties* photos_tiff_file_format_driver_real_get_proper result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 22 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 659 "TiffSupport.c" +#line 722 "TiffSupport.c" } -static PhotoFileReader* photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +photos_tiff_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosTiffFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - PhotosTiffReader* _tmp1_; + PhotosTiffReader* _tmp0_; #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 25 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photos_tiff_reader_new (_tmp0_); + _tmp0_ = photos_tiff_reader_new (filepath); #line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 26 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 680 "TiffSupport.c" +#line 743 "TiffSupport.c" } -static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +photos_tiff_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ PhotosTiffFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -692,11 +757,13 @@ static PhotoMetadata* photos_tiff_file_format_driver_real_create_metadata (Photo result = _tmp0_; #line 30 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 696 "TiffSupport.c" +#line 761 "TiffSupport.c" } -static gboolean photos_tiff_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +photos_tiff_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ PhotosTiffFileFormatDriver * self; gboolean result = FALSE; #line 33 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -705,11 +772,13 @@ static gboolean photos_tiff_file_format_driver_real_can_write_image (PhotoFileFo result = TRUE; #line 34 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 709 "TiffSupport.c" +#line 776 "TiffSupport.c" } -static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +photos_tiff_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ PhotosTiffFileFormatDriver * self; gboolean result = FALSE; #line 37 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -718,94 +787,98 @@ static gboolean photos_tiff_file_format_driver_real_can_write_metadata (PhotoFil result = TRUE; #line 38 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 722 "TiffSupport.c" +#line 791 "TiffSupport.c" } -static PhotoFileWriter* photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +photos_tiff_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosTiffFileFormatDriver * self; PhotoFileWriter* result = NULL; - const gchar* _tmp0_; - PhotosTiffWriter* _tmp1_; + PhotosTiffWriter* _tmp0_; #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 41 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photos_tiff_writer_new (_tmp0_); + _tmp0_ = photos_tiff_writer_new (filepath); #line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_WRITER, PhotoFileWriter); #line 42 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 743 "TiffSupport.c" +#line 812 "TiffSupport.c" } -static PhotoFileMetadataWriter* photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +photos_tiff_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ PhotosTiffFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; - const gchar* _tmp0_; - PhotosTiffMetadataWriter* _tmp1_; + PhotosTiffMetadataWriter* _tmp0_; #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 45 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photos_tiff_metadata_writer_new (_tmp0_); + _tmp0_ = photos_tiff_metadata_writer_new (filepath); #line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_METADATA_WRITER, PhotoFileMetadataWriter); #line 46 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 764 "TiffSupport.c" +#line 833 "TiffSupport.c" } -static PhotoFileSniffer* photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +photos_tiff_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotosTiffFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - PhotosTiffSniffer* _tmp2_; + PhotosTiffSniffer* _tmp0_; #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 49 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = file; + _tmp0_ = photos_tiff_sniffer_new (file, options); #line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = options; -#line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = photos_tiff_sniffer_new (_tmp0_, _tmp1_); -#line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 50 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 788 "TiffSupport.c" +#line 855 "TiffSupport.c" } -PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_construct (GType object_type) { +PhotosTiffFileFormatDriver* +photos_tiff_file_format_driver_construct (GType object_type) +{ PhotosTiffFileFormatDriver* self = NULL; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = (PhotosTiffFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 798 "TiffSupport.c" +#line 867 "TiffSupport.c" } -PhotosTiffFileFormatDriver* photos_tiff_file_format_driver_new (void) { +PhotosTiffFileFormatDriver* +photos_tiff_file_format_driver_new (void) +{ #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_file_format_driver_construct (PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER); -#line 805 "TiffSupport.c" +#line 876 "TiffSupport.c" } -static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDriverClass * klass) { +static void +photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDriverClass * klass) +{ #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -826,25 +899,31 @@ static void photos_tiff_file_format_driver_class_init (PhotosTiffFileFormatDrive ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) photos_tiff_file_format_driver_real_create_metadata_writer; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) photos_tiff_file_format_driver_real_create_sniffer; -#line 830 "TiffSupport.c" +#line 903 "TiffSupport.c" } -static void photos_tiff_file_format_driver_instance_init (PhotosTiffFileFormatDriver * self) { +static void +photos_tiff_file_format_driver_instance_init (PhotosTiffFileFormatDriver * self) +{ } -static void photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +photos_tiff_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ PhotosTiffFileFormatDriver * self; #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_DRIVER, PhotosTiffFileFormatDriver); #line 9 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (photos_tiff_file_format_driver_parent_class)->finalize (obj); -#line 844 "TiffSupport.c" +#line 921 "TiffSupport.c" } -GType photos_tiff_file_format_driver_get_type (void) { +GType +photos_tiff_file_format_driver_get_type (void) +{ static volatile gsize photos_tiff_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffFileFormatDriver), 0, (GInstanceInitFunc) photos_tiff_file_format_driver_instance_init, NULL }; @@ -856,7 +935,9 @@ GType photos_tiff_file_format_driver_get_type (void) { } -void photos_tiff_file_format_properties_init (void) { +void +photos_tiff_file_format_properties_init (void) +{ PhotosTiffFileFormatProperties* _tmp0_; #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = photos_tiff_file_format_properties_new (); @@ -864,18 +945,22 @@ void photos_tiff_file_format_properties_init (void) { _photo_file_format_properties_unref0 (photos_tiff_file_format_properties_instance); #line 66 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_properties_instance = _tmp0_; -#line 868 "TiffSupport.c" +#line 949 "TiffSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +static gpointer +_photo_file_format_properties_ref0 (gpointer self) +{ #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 875 "TiffSupport.c" +#line 958 "TiffSupport.c" } -PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance (void) { +PhotosTiffFileFormatProperties* +photos_tiff_file_format_properties_get_instance (void) +{ PhotosTiffFileFormatProperties* result = NULL; PhotosTiffFileFormatProperties* _tmp0_; PhotosTiffFileFormatProperties* _tmp1_; @@ -887,11 +972,13 @@ PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_get_instance result = _tmp1_; #line 70 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 891 "TiffSupport.c" +#line 976 "TiffSupport.c" } -static PhotoFileFormat photos_tiff_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +photos_tiff_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; PhotoFileFormat result = 0; #line 73 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -900,11 +987,13 @@ static PhotoFileFormat photos_tiff_file_format_properties_real_get_file_format ( result = PHOTO_FILE_FORMAT_TIFF; #line 74 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 904 "TiffSupport.c" +#line 991 "TiffSupport.c" } -static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +photos_tiff_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 77 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -913,11 +1002,13 @@ static PhotoFileFormatFlags photos_tiff_file_format_properties_real_get_flags (P result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 78 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 917 "TiffSupport.c" +#line 1006 "TiffSupport.c" } -static gchar* photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +photos_tiff_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -929,11 +1020,13 @@ static gchar* photos_tiff_file_format_properties_real_get_default_extension (Pho result = _tmp0_; #line 82 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 933 "TiffSupport.c" +#line 1024 "TiffSupport.c" } -static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +photos_tiff_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -945,32 +1038,38 @@ static gchar* photos_tiff_file_format_properties_real_get_user_visible_name (Pho result = _tmp0_; #line 86 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 949 "TiffSupport.c" +#line 1042 "TiffSupport.c" } -static gchar** _vala_array_dup14 (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" result = g_new0 (gchar*, length + 1); #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" for (i = 0; i < length; i++) { -#line 960 "TiffSupport.c" +#line 1056 "TiffSupport.c" gchar* _tmp0_; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = g_strdup (self[i]); #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result[i] = _tmp0_; -#line 966 "TiffSupport.c" +#line 1062 "TiffSupport.c" } #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 970 "TiffSupport.c" +#line 1066 "TiffSupport.c" } -static gchar** photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +photos_tiff_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ PhotosTiffFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -997,17 +1096,19 @@ static gchar** photos_tiff_file_format_properties_real_get_known_extensions (Pho if (result_length1) { #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *result_length1 = _tmp2__length1; -#line 1001 "TiffSupport.c" +#line 1100 "TiffSupport.c" } #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = _tmp2_; #line 90 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1007 "TiffSupport.c" +#line 1106 "TiffSupport.c" } -static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +photos_tiff_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ PhotosTiffFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -1028,32 +1129,38 @@ static gchar* photos_tiff_file_format_properties_real_get_default_mime_type (Pho result = _tmp2_; #line 94 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1032 "TiffSupport.c" +#line 1133 "TiffSupport.c" } -static gchar** _vala_array_dup15 (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" result = g_new0 (gchar*, length + 1); #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" for (i = 0; i < length; i++) { -#line 1043 "TiffSupport.c" +#line 1147 "TiffSupport.c" gchar* _tmp0_; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp0_ = g_strdup (self[i]); #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result[i] = _tmp0_; -#line 1049 "TiffSupport.c" +#line 1153 "TiffSupport.c" } #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1053 "TiffSupport.c" +#line 1157 "TiffSupport.c" } -static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +photos_tiff_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ PhotosTiffFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1080,34 +1187,40 @@ static gchar** photos_tiff_file_format_properties_real_get_mime_types (PhotoFile if (result_length1) { #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *result_length1 = _tmp2__length1; -#line 1084 "TiffSupport.c" +#line 1191 "TiffSupport.c" } #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = _tmp2_; #line 98 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1090 "TiffSupport.c" +#line 1197 "TiffSupport.c" } -PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_construct (GType object_type) { +PhotosTiffFileFormatProperties* +photos_tiff_file_format_properties_construct (GType object_type) +{ PhotosTiffFileFormatProperties* self = NULL; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = (PhotosTiffFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1100 "TiffSupport.c" +#line 1209 "TiffSupport.c" } -PhotosTiffFileFormatProperties* photos_tiff_file_format_properties_new (void) { +PhotosTiffFileFormatProperties* +photos_tiff_file_format_properties_new (void) +{ #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_file_format_properties_construct (PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES); -#line 1107 "TiffSupport.c" +#line 1218 "TiffSupport.c" } -static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatPropertiesClass * klass) { +static void +photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar** _tmp2_; @@ -1155,25 +1268,31 @@ static void photos_tiff_file_format_properties_class_init (PhotosTiffFileFormatP photos_tiff_file_format_properties_KNOWN_MIME_TYPES = _tmp4_; #line 59 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_file_format_properties_KNOWN_MIME_TYPES_length1 = 1; -#line 1159 "TiffSupport.c" +#line 1272 "TiffSupport.c" } -static void photos_tiff_file_format_properties_instance_init (PhotosTiffFileFormatProperties * self) { +static void +photos_tiff_file_format_properties_instance_init (PhotosTiffFileFormatProperties * self) +{ } -static void photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +photos_tiff_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ PhotosTiffFileFormatProperties * self; #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, PHOTOS_TYPE_TIFF_FILE_FORMAT_PROPERTIES, PhotosTiffFileFormatProperties); #line 54 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (photos_tiff_file_format_properties_parent_class)->finalize (obj); -#line 1173 "TiffSupport.c" +#line 1290 "TiffSupport.c" } -GType photos_tiff_file_format_properties_get_type (void) { +GType +photos_tiff_file_format_properties_get_type (void) +{ static volatile gsize photos_tiff_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffFileFormatProperties), 0, (GInstanceInitFunc) photos_tiff_file_format_properties_instance_init, NULL }; @@ -1185,53 +1304,59 @@ GType photos_tiff_file_format_properties_get_type (void) { } -PhotosTiffSniffer* photos_tiff_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +PhotosTiffSniffer* +photos_tiff_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ PhotosTiffSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = file; -#line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = options; -#line 104 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - self = (PhotosTiffSniffer*) gdk_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (PhotosTiffSniffer*) gdk_sniffer_construct (object_type, file, options); #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1203 "TiffSupport.c" +#line 1320 "TiffSupport.c" } -PhotosTiffSniffer* photos_tiff_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +PhotosTiffSniffer* +photos_tiff_sniffer_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 103 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_sniffer_construct (PHOTOS_TYPE_TIFF_SNIFFER, file, options); -#line 1210 "TiffSupport.c" +#line 1330 "TiffSupport.c" } -static gpointer _detected_photo_information_ref0 (gpointer self) { +static gpointer +_detected_photo_information_ref0 (gpointer self) +{ #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self ? detected_photo_information_ref (self) : NULL; -#line 1217 "TiffSupport.c" +#line 1339 "TiffSupport.c" } -static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +photos_tiff_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ PhotosTiffSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; gboolean _tmp0_ = FALSE; GFile* _tmp1_; - gboolean _tmp2_; DetectedPhotoInformation* detected = NULL; - gboolean _tmp3_ = FALSE; + gboolean _tmp2_ = FALSE; + DetectedPhotoInformation* _tmp3_; DetectedPhotoInformation* _tmp4_; - DetectedPhotoInformation* _tmp5_; - DetectedPhotoInformation* _tmp6_ = NULL; - DetectedPhotoInformation* _tmp7_; - PhotoFileFormat _tmp8_; - DetectedPhotoInformation* _tmp10_; + DetectedPhotoInformation* _tmp5_ = NULL; + DetectedPhotoInformation* _tmp6_; + PhotoFileFormat _tmp7_; + DetectedPhotoInformation* _tmp9_; GError * _inner_error_ = NULL; #line 107 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_SNIFFER, PhotosTiffSniffer); @@ -1240,16 +1365,14 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = photos_is_tiff (_tmp1_, NULL, &_inner_error_); -#line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = photos_is_tiff (_tmp1_, NULL, &_inner_error_); #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return NULL; -#line 1253 "TiffSupport.c" +#line 1376 "TiffSupport.c" } #line 111 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (!_tmp0_) { @@ -1259,30 +1382,30 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe if (is_corrupted) { #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1263 "TiffSupport.c" +#line 1386 "TiffSupport.c" } #line 112 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1267 "TiffSupport.c" +#line 1390 "TiffSupport.c" } #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp4_ = PHOTO_FILE_SNIFFER_CLASS (photos_tiff_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_); + _tmp3_ = PHOTO_FILE_SNIFFER_CLASS (photos_tiff_sniffer_parent_class)->sniff (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_GDK_SNIFFER, GdkSniffer), TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer), &_tmp2_, &_inner_error_); #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _vala_is_corrupted = _tmp3_; + _vala_is_corrupted = _tmp2_; #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - detected = _tmp4_; + detected = _tmp3_; #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 114 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return NULL; -#line 1281 "TiffSupport.c" +#line 1404 "TiffSupport.c" } #line 115 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp5_ = detected; + _tmp4_ = detected; #line 115 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - if (_tmp5_ == NULL) { + if (_tmp4_ == NULL) { #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = NULL; #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1291,62 +1414,68 @@ static DetectedPhotoInformation* photos_tiff_sniffer_real_sniff (PhotoFileSniffe if (is_corrupted) { #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1295 "TiffSupport.c" +#line 1418 "TiffSupport.c" } #line 116 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1299 "TiffSupport.c" +#line 1422 "TiffSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp7_ = detected; + _tmp6_ = detected; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp8_ = _tmp7_->file_format; + _tmp7_ = _tmp6_->file_format; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - if (_tmp8_ == PHOTO_FILE_FORMAT_TIFF) { -#line 1307 "TiffSupport.c" - DetectedPhotoInformation* _tmp9_; + if (_tmp7_ == PHOTO_FILE_FORMAT_TIFF) { +#line 1430 "TiffSupport.c" + DetectedPhotoInformation* _tmp8_; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp9_ = detected; + _tmp8_ = detected; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp6_ = _tmp9_; -#line 1313 "TiffSupport.c" + _tmp5_ = _tmp8_; +#line 1436 "TiffSupport.c" } else { #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp6_ = NULL; -#line 1317 "TiffSupport.c" + _tmp5_ = NULL; +#line 1440 "TiffSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp10_ = _detected_photo_information_ref0 (_tmp6_); + _tmp9_ = _detected_photo_information_ref0 (_tmp5_); #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - result = _tmp10_; + result = _tmp9_; #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _detected_photo_information_unref0 (detected); #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (is_corrupted) { #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1329 "TiffSupport.c" +#line 1452 "TiffSupport.c" } #line 118 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1333 "TiffSupport.c" +#line 1456 "TiffSupport.c" } -static void photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) { +static void +photos_tiff_sniffer_class_init (PhotosTiffSnifferClass * klass) +{ #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_sniffer_parent_class = g_type_class_peek_parent (klass); #line 102 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) photos_tiff_sniffer_real_sniff; -#line 1342 "TiffSupport.c" +#line 1467 "TiffSupport.c" } -static void photos_tiff_sniffer_instance_init (PhotosTiffSniffer * self) { +static void +photos_tiff_sniffer_instance_init (PhotosTiffSniffer * self) +{ } -GType photos_tiff_sniffer_get_type (void) { +GType +photos_tiff_sniffer_get_type (void) +{ static volatile gsize photos_tiff_sniffer_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffSniffer), 0, (GInstanceInitFunc) photos_tiff_sniffer_instance_init, NULL }; @@ -1358,40 +1487,48 @@ GType photos_tiff_sniffer_get_type (void) { } -PhotosTiffReader* photos_tiff_reader_construct (GType object_type, const gchar* filepath) { +PhotosTiffReader* +photos_tiff_reader_construct (GType object_type, + const gchar* filepath) +{ PhotosTiffReader* self = NULL; - const gchar* _tmp0_; #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 124 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 124 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - self = (PhotosTiffReader*) gdk_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF); + self = (PhotosTiffReader*) gdk_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_TIFF); #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1373 "TiffSupport.c" +#line 1502 "TiffSupport.c" } -PhotosTiffReader* photos_tiff_reader_new (const gchar* filepath) { +PhotosTiffReader* +photos_tiff_reader_new (const gchar* filepath) +{ #line 123 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_reader_construct (PHOTOS_TYPE_TIFF_READER, filepath); -#line 1380 "TiffSupport.c" +#line 1511 "TiffSupport.c" } -static void photos_tiff_reader_class_init (PhotosTiffReaderClass * klass) { +static void +photos_tiff_reader_class_init (PhotosTiffReaderClass * klass) +{ #line 122 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_reader_parent_class = g_type_class_peek_parent (klass); -#line 1387 "TiffSupport.c" +#line 1520 "TiffSupport.c" } -static void photos_tiff_reader_instance_init (PhotosTiffReader * self) { +static void +photos_tiff_reader_instance_init (PhotosTiffReader * self) +{ } -GType photos_tiff_reader_get_type (void) { +GType +photos_tiff_reader_get_type (void) +{ static volatile gsize photos_tiff_reader_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffReader), 0, (GInstanceInitFunc) photos_tiff_reader_instance_init, NULL }; @@ -1403,73 +1540,83 @@ GType photos_tiff_reader_get_type (void) { } -PhotosTiffWriter* photos_tiff_writer_construct (GType object_type, const gchar* filepath) { +PhotosTiffWriter* +photos_tiff_writer_construct (GType object_type, + const gchar* filepath) +{ PhotosTiffWriter* self = NULL; - const gchar* _tmp0_; #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 136 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 136 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - self = (PhotosTiffWriter*) photo_file_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF); + self = (PhotosTiffWriter*) photo_file_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_TIFF); #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1418 "TiffSupport.c" +#line 1555 "TiffSupport.c" } -PhotosTiffWriter* photos_tiff_writer_new (const gchar* filepath) { +PhotosTiffWriter* +photos_tiff_writer_new (const gchar* filepath) +{ #line 135 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_writer_construct (PHOTOS_TYPE_TIFF_WRITER, filepath); -#line 1425 "TiffSupport.c" +#line 1564 "TiffSupport.c" } -static void photos_tiff_writer_real_write (PhotoFileWriter* base, GdkPixbuf* pixbuf, JpegQuality quality, GError** error) { +static void +photos_tiff_writer_real_write (PhotoFileWriter* base, + GdkPixbuf* pixbuf, + JpegQuality quality, + GError** error) +{ PhotosTiffWriter * self; - GdkPixbuf* _tmp0_; + gchar* _tmp0_; gchar* _tmp1_; - gchar* _tmp2_; GError * _inner_error_ = NULL; #line 139 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_WRITER, PhotosTiffWriter); #line 139 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = pixbuf; -#line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_filepath (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - gdk_pixbuf_save (_tmp0_, _tmp2_, "tiff", &_inner_error_, "compression", PHOTOS_TIFF_WRITER_COMPRESSION_LZW, NULL); + gdk_pixbuf_save (pixbuf, _tmp1_, "tiff", &_inner_error_, "compression", PHOTOS_TIFF_WRITER_COMPRESSION_LZW, NULL); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _g_free0 (_tmp2_); + _g_free0 (_tmp1_); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 140 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return; -#line 1455 "TiffSupport.c" +#line 1596 "TiffSupport.c" } } -static void photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) { +static void +photos_tiff_writer_class_init (PhotosTiffWriterClass * klass) +{ #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_writer_parent_class = g_type_class_peek_parent (klass); #line 128 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photos_tiff_writer_real_write; -#line 1465 "TiffSupport.c" +#line 1608 "TiffSupport.c" } -static void photos_tiff_writer_instance_init (PhotosTiffWriter * self) { +static void +photos_tiff_writer_instance_init (PhotosTiffWriter * self) +{ } -GType photos_tiff_writer_get_type (void) { +GType +photos_tiff_writer_get_type (void) +{ static volatile gsize photos_tiff_writer_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffWriter), 0, (GInstanceInitFunc) photos_tiff_writer_instance_init, NULL }; @@ -1481,73 +1628,82 @@ GType photos_tiff_writer_get_type (void) { } -PhotosTiffMetadataWriter* photos_tiff_metadata_writer_construct (GType object_type, const gchar* filepath) { +PhotosTiffMetadataWriter* +photos_tiff_metadata_writer_construct (GType object_type, + const gchar* filepath) +{ PhotosTiffMetadataWriter* self = NULL; - const gchar* _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 146 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = filepath; -#line 146 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - self = (PhotosTiffMetadataWriter*) photo_file_metadata_writer_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_TIFF); + self = (PhotosTiffMetadataWriter*) photo_file_metadata_writer_construct (object_type, filepath, PHOTO_FILE_FORMAT_TIFF); #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return self; -#line 1496 "TiffSupport.c" +#line 1643 "TiffSupport.c" } -PhotosTiffMetadataWriter* photos_tiff_metadata_writer_new (const gchar* filepath) { +PhotosTiffMetadataWriter* +photos_tiff_metadata_writer_new (const gchar* filepath) +{ #line 145 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return photos_tiff_metadata_writer_construct (PHOTOS_TYPE_TIFF_METADATA_WRITER, filepath); -#line 1503 "TiffSupport.c" +#line 1652 "TiffSupport.c" } -static void photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, PhotoMetadata* metadata, GError** error) { +static void +photos_tiff_metadata_writer_real_write_metadata (PhotoFileMetadataWriter* base, + PhotoMetadata* metadata, + GError** error) +{ PhotosTiffMetadataWriter * self; - PhotoMetadata* _tmp0_; + GFile* _tmp0_; GFile* _tmp1_; - GFile* _tmp2_; GError * _inner_error_ = NULL; #line 149 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, PHOTOS_TYPE_TIFF_METADATA_WRITER, PhotosTiffMetadataWriter); #line 149 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_if_fail (IS_PHOTO_METADATA (metadata)); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = metadata; -#line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); + _tmp0_ = photo_file_adapter_get_file (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter)); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = _tmp1_; + _tmp1_ = _tmp0_; #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - photo_metadata_write_to_file (_tmp0_, _tmp2_, &_inner_error_); + photo_metadata_write_to_file (metadata, _tmp1_, &_inner_error_); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _g_object_unref0 (_tmp2_); + _g_object_unref0 (_tmp1_); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 150 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return; -#line 1533 "TiffSupport.c" +#line 1683 "TiffSupport.c" } } -static void photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClass * klass) { +static void +photos_tiff_metadata_writer_class_init (PhotosTiffMetadataWriterClass * klass) +{ #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" photos_tiff_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 144 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photos_tiff_metadata_writer_real_write_metadata; -#line 1543 "TiffSupport.c" +#line 1695 "TiffSupport.c" } -static void photos_tiff_metadata_writer_instance_init (PhotosTiffMetadataWriter * self) { +static void +photos_tiff_metadata_writer_instance_init (PhotosTiffMetadataWriter * self) +{ } -GType photos_tiff_metadata_writer_get_type (void) { +GType +photos_tiff_metadata_writer_get_type (void) +{ static volatile gsize photos_tiff_metadata_writer_type_id__volatile = 0; if (g_once_init_enter (&photos_tiff_metadata_writer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (PhotosTiffMetadataWriterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) photos_tiff_metadata_writer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (PhotosTiffMetadataWriter), 0, (GInstanceInitFunc) photos_tiff_metadata_writer_instance_init, NULL }; @@ -1559,62 +1715,55 @@ GType photos_tiff_metadata_writer_get_type (void) { } -gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) { +gboolean +photos_is_tiff (GFile* file, + GCancellable* cancellable, + GError** error) +{ gboolean result = FALSE; GFileInputStream* _tmp0_ = NULL; - GFile* _tmp1_; - GFileInputStream* _tmp2_; + GFileInputStream* _tmp1_; GDataInputStream* dins = NULL; - GDataInputStream* _tmp4_; + GDataInputStream* _tmp3_; GDataStreamByteOrder order = 0; - guint16 _tmp5_ = 0U; - GDataInputStream* _tmp6_; - GCancellable* _tmp7_; - guint16 _tmp8_; - GDataInputStream* _tmp10_; - GDataStreamByteOrder _tmp11_; + guint16 _tmp4_ = 0U; + GDataInputStream* _tmp5_; + GDataInputStream* _tmp7_; + GDataStreamByteOrder _tmp8_; guint16 lue = 0U; - GDataInputStream* _tmp12_; - GCancellable* _tmp13_; - guint16 _tmp14_; - guint16 _tmp16_; + GDataInputStream* _tmp9_; + guint16 _tmp11_; GError * _inner_error_ = NULL; #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail (G_IS_FILE (file), FALSE); #line 154 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_return_val_if_fail ((cancellable == NULL) || G_IS_CANCELLABLE (cancellable), FALSE); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp1_ = file; -#line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp2_ = g_file_read (_tmp1_, NULL, &_inner_error_); + _tmp1_ = g_file_read (file, NULL, &_inner_error_); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp0_ = _tmp2_; + _tmp0_ = _tmp1_; #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1595 "TiffSupport.c" - gboolean _tmp3_ = FALSE; +#line 1748 "TiffSupport.c" + gboolean _tmp2_ = FALSE; #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - return _tmp3_; -#line 1601 "TiffSupport.c" + return _tmp2_; +#line 1754 "TiffSupport.c" } #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp4_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); + _tmp3_ = g_data_input_stream_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, g_input_stream_get_type (), GInputStream)); #line 155 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - dins = _tmp4_; + dins = _tmp3_; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp6_ = dins; + _tmp5_ = dins; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp7_ = cancellable; -#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp8_ = g_data_input_stream_read_uint16 (_tmp6_, _tmp7_, &_inner_error_); -#line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp5_ = _tmp8_; + _tmp4_ = g_data_input_stream_read_uint16 (_tmp5_, cancellable, &_inner_error_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1617 "TiffSupport.c" - gboolean _tmp9_ = FALSE; +#line 1766 "TiffSupport.c" + gboolean _tmp6_ = FALSE; #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1622,30 +1771,30 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _g_object_unref0 (_tmp0_); #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - return _tmp9_; -#line 1627 "TiffSupport.c" + return _tmp6_; +#line 1776 "TiffSupport.c" } #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - switch (_tmp5_) { + switch (_tmp4_) { #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" case 0x4949: -#line 1633 "TiffSupport.c" +#line 1782 "TiffSupport.c" { #line 161 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" order = G_DATA_STREAM_BYTE_ORDER_LITTLE_ENDIAN; #line 162 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" break; -#line 1639 "TiffSupport.c" +#line 1788 "TiffSupport.c" } #line 159 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" case 0x4D4D: -#line 1643 "TiffSupport.c" +#line 1792 "TiffSupport.c" { #line 165 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" order = G_DATA_STREAM_BYTE_ORDER_BIG_ENDIAN; #line 166 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" break; -#line 1649 "TiffSupport.c" +#line 1798 "TiffSupport.c" } default: { @@ -1657,27 +1806,23 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 169 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1661 "TiffSupport.c" +#line 1810 "TiffSupport.c" } } #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp10_ = dins; + _tmp7_ = dins; #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp11_ = order; + _tmp8_ = order; #line 172 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - g_data_input_stream_set_byte_order (_tmp10_, _tmp11_); -#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp12_ = dins; -#line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp13_ = cancellable; + g_data_input_stream_set_byte_order (_tmp7_, _tmp8_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp14_ = g_data_input_stream_read_uint16 (_tmp12_, _tmp13_, &_inner_error_); + _tmp9_ = dins; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - lue = _tmp14_; + lue = g_data_input_stream_read_uint16 (_tmp9_, cancellable, &_inner_error_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1680 "TiffSupport.c" - gboolean _tmp15_ = FALSE; +#line 1825 "TiffSupport.c" + gboolean _tmp10_ = FALSE; #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" g_propagate_error (error, _inner_error_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1685,13 +1830,13 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" _g_object_unref0 (_tmp0_); #line 175 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - return _tmp15_; -#line 1690 "TiffSupport.c" + return _tmp10_; +#line 1835 "TiffSupport.c" } #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - _tmp16_ = lue; + _tmp11_ = lue; #line 176 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" - if (((gint) _tmp16_) != 42) { + if (((gint) _tmp11_) != 42) { #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = FALSE; #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" @@ -1700,7 +1845,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 177 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1704 "TiffSupport.c" +#line 1849 "TiffSupport.c" } #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" result = TRUE; @@ -1710,7 +1855,7 @@ gboolean photos_is_tiff (GFile* file, GCancellable* cancellable, GError** error) _g_object_unref0 (_tmp0_); #line 180 "/home/jens/Source/shotwell/src/photos/TiffSupport.vala" return result; -#line 1714 "TiffSupport.c" +#line 1859 "TiffSupport.c" } -- cgit v1.2.3