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/RawSupport.c | 1215 +++++++++++++++++++++-------------------------- 1 file changed, 551 insertions(+), 664 deletions(-) (limited to 'src/photos/RawSupport.c') 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" } -- cgit v1.2.3