diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-12-15 20:38:57 +0100 |
| commit | f1353e9ffd34db5f755c7da0b3f9c10638fbfd38 (patch) | |
| tree | a1f2ab30332a6383b0677bfcc2aec687b98851d6 /src/photos/RawSupport.c | |
| parent | f8ca421bdacee8851965a4b802ada1d2366bdbc1 (diff) | |
| parent | ede50c561ec9811704821a9ea0f04c3d6c20b5af (diff) | |
Merge branch 'release/0.26.4-1'0.26.4-1
Diffstat (limited to 'src/photos/RawSupport.c')
| -rw-r--r-- | src/photos/RawSupport.c | 1110 |
1 files changed, 552 insertions, 558 deletions
diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c index 8e23487..8b670ea 100644 --- a/src/photos/RawSupport.c +++ b/src/photos/RawSupport.c @@ -1,4 +1,4 @@ -/* RawSupport.c generated by valac 0.34.7, the Vala compiler +/* RawSupport.c generated by valac 0.36.6, the Vala compiler * generated from RawSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -546,7 +546,7 @@ RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options); RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); GType raw_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); -static void raw_file_format_driver_finalize (PhotoFileFormatDriver* obj); +static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; enum { @@ -564,7 +564,7 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); static gchar** _vala_array_dup13 (gchar** self, int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); -static void raw_file_format_properties_finalize (PhotoFileFormatProperties* obj); +static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -646,7 +646,8 @@ GType backing_photo_row_get_type (void) G_GNUC_CONST; BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error); BackingPhotoRow* backing_photo_row_new (void); BackingPhotoRow* backing_photo_row_construct (GType object_type); -void disassemble_filename (const gchar* basename, gchar** name, gchar** ext); +void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +gchar* library_files_convert_basename (const gchar* basename); GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); gboolean claim_file (GFile* file, GError** error); GType backing_photo_id_get_type (void) G_GNUC_CONST; @@ -656,7 +657,7 @@ GType orientation_get_type (void) G_GNUC_CONST; void raw_file_format_driver_init (void) { - RawFileFormatDriver* _tmp0_ = NULL; + RawFileFormatDriver* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_driver_new (); #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -665,21 +666,21 @@ void raw_file_format_driver_init (void) { raw_file_format_driver_instance = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_init (); -#line 669 "RawSupport.c" +#line 670 "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 676 "RawSupport.c" +#line 677 "RawSupport.c" } RawFileFormatDriver* raw_file_format_driver_get_instance (void) { RawFileFormatDriver* result = NULL; - RawFileFormatDriver* _tmp0_ = NULL; - RawFileFormatDriver* _tmp1_ = NULL; + RawFileFormatDriver* _tmp0_; + RawFileFormatDriver* _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_driver_instance; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -688,14 +689,14 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) { result = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 692 "RawSupport.c" +#line 693 "RawSupport.c" } static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { RawFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; - RawFileFormatProperties* _tmp0_ = NULL; + RawFileFormatProperties* _tmp0_; #line 19 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -704,15 +705,15 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 708 "RawSupport.c" +#line 709 "RawSupport.c" } static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { RawFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_ = NULL; - RawReader* _tmp1_ = NULL; + const gchar* _tmp0_; + RawReader* _tmp1_; #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -725,14 +726,14 @@ 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 729 "RawSupport.c" +#line 730 "RawSupport.c" } static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { RawFileFormatDriver * self; PhotoMetadata* result = NULL; - PhotoMetadata* _tmp0_ = NULL; + PhotoMetadata* _tmp0_; #line 27 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -741,7 +742,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 745 "RawSupport.c" +#line 746 "RawSupport.c" } @@ -754,7 +755,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 758 "RawSupport.c" +#line 759 "RawSupport.c" } @@ -767,7 +768,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 771 "RawSupport.c" +#line 772 "RawSupport.c" } @@ -782,7 +783,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 786 "RawSupport.c" +#line 787 "RawSupport.c" } @@ -797,16 +798,16 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ result = NULL; #line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 801 "RawSupport.c" +#line 802 "RawSupport.c" } static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { RawFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; - RawSniffer* _tmp2_ = NULL; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; + RawSniffer* _tmp2_; #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -821,7 +822,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 825 "RawSupport.c" +#line 826 "RawSupport.c" } @@ -831,14 +832,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 835 "RawSupport.c" +#line 836 "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 842 "RawSupport.c" +#line 843 "RawSupport.c" } @@ -848,22 +849,22 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileFormatDriverClass *) klass)->finalize = raw_file_format_driver_finalize; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_get_properties; + ((PhotoFileFormatDriverClass *) klass)->get_properties = (PhotoFileFormatProperties* (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_get_properties; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_reader; + ((PhotoFileFormatDriverClass *) klass)->create_reader = (PhotoFileReader* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_reader; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_create_metadata; + ((PhotoFileFormatDriverClass *) klass)->create_metadata = (PhotoMetadata* (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_create_metadata; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_image; + ((PhotoFileFormatDriverClass *) klass)->can_write_image = (gboolean (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_can_write_image; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*)(PhotoFileFormatDriver*)) raw_file_format_driver_real_can_write_metadata; + ((PhotoFileFormatDriverClass *) klass)->can_write_metadata = (gboolean (*) (PhotoFileFormatDriver *)) raw_file_format_driver_real_can_write_metadata; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_writer; + ((PhotoFileFormatDriverClass *) klass)->create_writer = (PhotoFileWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_writer; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*)(PhotoFileFormatDriver*, const gchar*)) raw_file_format_driver_real_create_metadata_writer; + ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_metadata_writer; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*)(PhotoFileFormatDriver*, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer; -#line 867 "RawSupport.c" + ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer; +#line 868 "RawSupport.c" } @@ -871,13 +872,13 @@ static void raw_file_format_driver_instance_init (RawFileFormatDriver * self) { } -static void raw_file_format_driver_finalize (PhotoFileFormatDriver* obj) { +static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) { RawFileFormatDriver * self; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj); -#line 881 "RawSupport.c" +#line 882 "RawSupport.c" } @@ -894,28 +895,28 @@ GType raw_file_format_driver_get_type (void) { void raw_file_format_properties_init (void) { - RawFileFormatProperties* _tmp0_ = NULL; + RawFileFormatProperties* _tmp0_; #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_properties_new (); #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _photo_file_format_properties_unref0 (raw_file_format_properties_instance); #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_instance = _tmp0_; -#line 905 "RawSupport.c" +#line 906 "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 912 "RawSupport.c" +#line 913 "RawSupport.c" } RawFileFormatProperties* raw_file_format_properties_get_instance (void) { RawFileFormatProperties* result = NULL; - RawFileFormatProperties* _tmp0_ = NULL; - RawFileFormatProperties* _tmp1_ = NULL; + RawFileFormatProperties* _tmp0_; + RawFileFormatProperties* _tmp1_; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_properties_instance; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -924,7 +925,7 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) { result = _tmp1_; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 928 "RawSupport.c" +#line 929 "RawSupport.c" } @@ -937,26 +938,23 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil result = PHOTO_FILE_FORMAT_RAW; #line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 941 "RawSupport.c" +#line 942 "RawSupport.c" } static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { RawFileFormatProperties * self; gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 133 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = _ ("RAW"); + _tmp0_ = g_strdup (_ ("RAW")); #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 960 "RawSupport.c" +#line 958 "RawSupport.c" } @@ -969,14 +967,14 @@ 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 973 "RawSupport.c" +#line 971 "RawSupport.c" } static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { RawFileFormatProperties * self; gchar* result = NULL; - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 141 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -985,7 +983,7 @@ 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 989 "RawSupport.c" +#line 987 "RawSupport.c" } @@ -996,29 +994,29 @@ static gchar** _vala_array_dup12 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 1000 "RawSupport.c" - gchar* _tmp0_ = NULL; +#line 998 "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 1006 "RawSupport.c" +#line 1004 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1010 "RawSupport.c" +#line 1008 "RawSupport.c" } static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { RawFileFormatProperties * self; gchar** result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; + gchar** _tmp2_; + gint _tmp2__length1; #line 148 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1037,23 +1035,23 @@ 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 1041 "RawSupport.c" +#line 1039 "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 1047 "RawSupport.c" +#line 1045 "RawSupport.c" } static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { RawFileFormatProperties * self; gchar* result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - const gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; + gchar** _tmp0_; + gint _tmp0__length1; + const gchar* _tmp1_; + gchar* _tmp2_; #line 152 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1068,7 +1066,7 @@ 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 1072 "RawSupport.c" +#line 1070 "RawSupport.c" } @@ -1079,29 +1077,29 @@ static gchar** _vala_array_dup13 (gchar** self, int length) { result = g_new0 (gchar*, length + 1); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 1083 "RawSupport.c" - gchar* _tmp0_ = NULL; +#line 1081 "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 1089 "RawSupport.c" +#line 1087 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1093 "RawSupport.c" +#line 1091 "RawSupport.c" } static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { RawFileFormatProperties * self; gchar** result = NULL; - gchar** _tmp0_ = NULL; - gint _tmp0__length1 = 0; - gchar** _tmp1_ = NULL; - gint _tmp1__length1 = 0; - gchar** _tmp2_ = NULL; - gint _tmp2__length1 = 0; + gchar** _tmp0_; + gint _tmp0__length1; + gchar** _tmp1_; + gint _tmp1__length1; + gchar** _tmp2_; + gint _tmp2__length1; #line 156 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1120,13 +1118,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 1124 "RawSupport.c" +#line 1122 "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 1130 "RawSupport.c" +#line 1128 "RawSupport.c" } @@ -1136,125 +1134,125 @@ 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 1140 "RawSupport.c" +#line 1138 "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 1147 "RawSupport.c" +#line 1145 "RawSupport.c" } static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) { - gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; - gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - gchar* _tmp27_ = NULL; - gchar* _tmp28_ = NULL; - gchar* _tmp29_ = NULL; - gchar* _tmp30_ = NULL; - gchar* _tmp31_ = NULL; - gchar* _tmp32_ = NULL; - gchar* _tmp33_ = NULL; - gchar* _tmp34_ = NULL; - gchar* _tmp35_ = NULL; - gchar** _tmp36_ = NULL; - gchar* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; - gchar* _tmp39_ = NULL; - gchar* _tmp40_ = NULL; - gchar* _tmp41_ = NULL; - gchar* _tmp42_ = NULL; - gchar* _tmp43_ = NULL; - gchar* _tmp44_ = NULL; - gchar* _tmp45_ = NULL; - gchar* _tmp46_ = NULL; - gchar* _tmp47_ = NULL; - gchar* _tmp48_ = NULL; - gchar* _tmp49_ = NULL; - gchar* _tmp50_ = NULL; - gchar* _tmp51_ = NULL; - gchar* _tmp52_ = NULL; - gchar* _tmp53_ = NULL; - gchar* _tmp54_ = NULL; - gchar* _tmp55_ = NULL; - gchar* _tmp56_ = NULL; - gchar* _tmp57_ = NULL; - gchar* _tmp58_ = NULL; - gchar* _tmp59_ = NULL; - gchar* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - gchar* _tmp62_ = NULL; - gchar* _tmp63_ = NULL; - gchar* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - gchar* _tmp66_ = NULL; - gchar* _tmp67_ = NULL; - gchar* _tmp68_ = NULL; - gchar* _tmp69_ = NULL; - gchar* _tmp70_ = NULL; - gchar* _tmp71_ = NULL; - gchar* _tmp72_ = NULL; - gchar* _tmp73_ = NULL; - gchar* _tmp74_ = NULL; - gchar* _tmp75_ = NULL; - gchar* _tmp76_ = NULL; - gchar* _tmp77_ = NULL; - gchar* _tmp78_ = NULL; - gchar* _tmp79_ = NULL; - gchar* _tmp80_ = NULL; - gchar* _tmp81_ = NULL; - gchar* _tmp82_ = NULL; - gchar* _tmp83_ = NULL; - gchar* _tmp84_ = NULL; - gchar* _tmp85_ = NULL; - gchar* _tmp86_ = NULL; - gchar* _tmp87_ = NULL; - gchar** _tmp88_ = NULL; + gchar* _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + gchar* _tmp9_; + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + gchar* _tmp27_; + gchar* _tmp28_; + gchar* _tmp29_; + gchar* _tmp30_; + gchar* _tmp31_; + gchar* _tmp32_; + gchar* _tmp33_; + gchar* _tmp34_; + gchar* _tmp35_; + gchar** _tmp36_; + gchar* _tmp37_; + gchar* _tmp38_; + gchar* _tmp39_; + gchar* _tmp40_; + gchar* _tmp41_; + gchar* _tmp42_; + gchar* _tmp43_; + gchar* _tmp44_; + gchar* _tmp45_; + gchar* _tmp46_; + gchar* _tmp47_; + gchar* _tmp48_; + gchar* _tmp49_; + gchar* _tmp50_; + gchar* _tmp51_; + gchar* _tmp52_; + gchar* _tmp53_; + gchar* _tmp54_; + gchar* _tmp55_; + gchar* _tmp56_; + gchar* _tmp57_; + gchar* _tmp58_; + gchar* _tmp59_; + gchar* _tmp60_; + gchar* _tmp61_; + gchar* _tmp62_; + gchar* _tmp63_; + gchar* _tmp64_; + gchar* _tmp65_; + gchar* _tmp66_; + gchar* _tmp67_; + gchar* _tmp68_; + gchar* _tmp69_; + gchar* _tmp70_; + gchar* _tmp71_; + gchar* _tmp72_; + gchar* _tmp73_; + gchar* _tmp74_; + gchar* _tmp75_; + gchar* _tmp76_; + gchar* _tmp77_; + gchar* _tmp78_; + gchar* _tmp79_; + gchar* _tmp80_; + gchar* _tmp81_; + gchar* _tmp82_; + gchar* _tmp83_; + gchar* _tmp84_; + gchar* _tmp85_; + gchar* _tmp86_; + gchar* _tmp87_; + gchar** _tmp88_; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_parent_class = g_type_class_peek_parent (klass); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileFormatPropertiesClass *) klass)->finalize = raw_file_format_properties_finalize; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_file_format; + ((PhotoFileFormatPropertiesClass *) klass)->get_file_format = (PhotoFileFormat (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_file_format; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_user_visible_name; + ((PhotoFileFormatPropertiesClass *) klass)->get_user_visible_name = (gchar* (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_user_visible_name; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_flags; + ((PhotoFileFormatPropertiesClass *) klass)->get_flags = (PhotoFileFormatFlags (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_flags; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_extension; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_extension = (gchar* (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_default_extension; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_known_extensions; + ((PhotoFileFormatPropertiesClass *) klass)->get_known_extensions = (gchar** (*) (PhotoFileFormatProperties *, int*)) raw_file_format_properties_real_get_known_extensions; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*)(PhotoFileFormatProperties*)) raw_file_format_properties_real_get_default_mime_type; + ((PhotoFileFormatPropertiesClass *) klass)->get_default_mime_type = (gchar* (*) (PhotoFileFormatProperties *)) raw_file_format_properties_real_get_default_mime_type; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*)(PhotoFileFormatProperties*, int*)) raw_file_format_properties_real_get_mime_types; + ((PhotoFileFormatPropertiesClass *) klass)->get_mime_types = (gchar** (*) (PhotoFileFormatProperties *, int*)) raw_file_format_properties_real_get_mime_types; #line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup ("3fr"); #line 53 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1615,7 +1613,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 1619 "RawSupport.c" +#line 1617 "RawSupport.c" } @@ -1623,13 +1621,13 @@ static void raw_file_format_properties_instance_init (RawFileFormatProperties * } -static void raw_file_format_properties_finalize (PhotoFileFormatProperties* obj) { +static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) { RawFileFormatProperties * self; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj); -#line 1633 "RawSupport.c" +#line 1631 "RawSupport.c" } @@ -1647,8 +1645,8 @@ GType raw_file_format_properties_get_type (void) { RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { RawSniffer* self = NULL; - GFile* _tmp0_ = NULL; - PhotoFileSnifferOptions _tmp1_ = 0; + GFile* _tmp0_; + PhotoFileSnifferOptions _tmp1_; #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1659,21 +1657,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 1663 "RawSupport.c" +#line 1661 "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 1670 "RawSupport.c" +#line 1668 "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 1677 "RawSupport.c" +#line 1675 "RawSupport.c" } @@ -1682,34 +1680,34 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; DetectedPhotoInformation* detected = NULL; - DetectedPhotoInformation* _tmp0_ = NULL; + DetectedPhotoInformation* _tmp0_; GRawProcessor* processor = NULL; - GRawProcessor* _tmp1_ = NULL; - GRawProcessor* _tmp2_ = NULL; - libraw_output_params_t* _tmp3_ = NULL; - libraw_output_params_t* _tmp4_ = NULL; - DetectedPhotoInformation* _tmp14_ = NULL; - GRawProcessor* _tmp15_ = NULL; - libraw_image_sizes_t _tmp16_ = {0}; - gushort _tmp17_ = 0U; - GRawProcessor* _tmp18_ = NULL; - libraw_image_sizes_t _tmp19_ = {0}; - gushort _tmp20_ = 0U; - DetectedPhotoInformation* _tmp21_ = NULL; - DetectedPhotoInformation* _tmp22_ = NULL; - DetectedPhotoInformation* _tmp23_ = NULL; + GRawProcessor* _tmp1_; + GRawProcessor* _tmp2_; + libraw_output_params_t* _tmp3_; + libraw_output_params_t* _tmp4_; + DetectedPhotoInformation* _tmp14_; + GRawProcessor* _tmp15_; + libraw_image_sizes_t _tmp16_; + gushort _tmp17_; + GRawProcessor* _tmp18_; + libraw_image_sizes_t _tmp19_; + gushort _tmp20_; + DetectedPhotoInformation* _tmp21_; + DetectedPhotoInformation* _tmp22_; + DetectedPhotoInformation* _tmp23_; RawReader* reader = NULL; - GFile* _tmp24_ = NULL; - gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; - RawReader* _tmp27_ = NULL; - RawReader* _tmp28_ = NULL; - DetectedPhotoInformation* _tmp34_ = NULL; - PhotoMetadata* _tmp35_ = NULL; - gboolean _tmp58_ = FALSE; - DetectedPhotoInformation* _tmp64_ = NULL; - gchar* _tmp65_ = NULL; - DetectedPhotoInformation* _tmp66_ = NULL; + GFile* _tmp24_; + gchar* _tmp25_; + gchar* _tmp26_; + RawReader* _tmp27_; + RawReader* _tmp28_; + DetectedPhotoInformation* _tmp34_; + PhotoMetadata* _tmp35_; + gboolean _tmp58_; + DetectedPhotoInformation* _tmp64_; + gchar* _tmp65_; + DetectedPhotoInformation* _tmp66_; 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); @@ -1731,14 +1729,14 @@ 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 1735 "RawSupport.c" +#line 1733 "RawSupport.c" { - GRawProcessor* _tmp5_ = NULL; - GFile* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - gchar* _tmp8_ = NULL; - GRawProcessor* _tmp9_ = NULL; - GRawProcessor* _tmp10_ = NULL; + GRawProcessor* _tmp5_; + GFile* _tmp6_; + gchar* _tmp7_; + gchar* _tmp8_; + GRawProcessor* _tmp9_; + GRawProcessor* _tmp10_; #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp5_ = processor; #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1755,7 +1753,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1759 "RawSupport.c" +#line 1757 "RawSupport.c" goto __catch32_graw_exception; } #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1768,7 +1766,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 1772 "RawSupport.c" +#line 1770 "RawSupport.c" } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -1778,7 +1776,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1782 "RawSupport.c" +#line 1780 "RawSupport.c" goto __catch32_graw_exception; } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1791,7 +1789,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 1795 "RawSupport.c" +#line 1793 "RawSupport.c" } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = processor; @@ -1801,7 +1799,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1805 "RawSupport.c" +#line 1803 "RawSupport.c" goto __catch32_graw_exception; } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1814,16 +1812,16 @@ 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 1818 "RawSupport.c" +#line 1816 "RawSupport.c" } } goto __finally32; __catch32_graw_exception: { GError* exception = NULL; - GError* _tmp11_ = NULL; - GError* _tmp12_ = NULL; - GError* _tmp13_ = NULL; + GError* _tmp11_; + GError* _tmp12_; + GError* _tmp13_; #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" exception = _inner_error_; #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1844,11 +1842,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 1848 "RawSupport.c" +#line 1846 "RawSupport.c" } #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1852 "RawSupport.c" +#line 1850 "RawSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp12_ = exception; @@ -1858,7 +1856,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = _tmp13_; #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (exception); -#line 1862 "RawSupport.c" +#line 1860 "RawSupport.c" goto __finally32; } __finally32: @@ -1872,7 +1870,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 1876 "RawSupport.c" +#line 1874 "RawSupport.c" } #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp14_ = detected; @@ -1916,13 +1914,13 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp26_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" reader = _tmp28_; -#line 1920 "RawSupport.c" +#line 1918 "RawSupport.c" { PhotoMetadata* _tmp29_ = NULL; - RawReader* _tmp30_ = NULL; - PhotoMetadata* _tmp31_ = NULL; - DetectedPhotoInformation* _tmp32_ = NULL; - PhotoMetadata* _tmp33_ = NULL; + RawReader* _tmp30_; + PhotoMetadata* _tmp31_; + DetectedPhotoInformation* _tmp32_; + PhotoMetadata* _tmp33_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp30_ = reader; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1931,7 +1929,7 @@ 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 1935 "RawSupport.c" +#line 1933 "RawSupport.c" goto __catch33_g_error; } #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1946,7 +1944,7 @@ 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 1950 "RawSupport.c" +#line 1948 "RawSupport.c" } goto __finally33; __catch33_g_error: @@ -1958,7 +1956,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = NULL; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (err); -#line 1962 "RawSupport.c" +#line 1960 "RawSupport.c" } __finally33: #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1973,7 +1971,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 1977 "RawSupport.c" +#line 1975 "RawSupport.c" } #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp34_ = detected; @@ -1981,27 +1979,27 @@ 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 1985 "RawSupport.c" +#line 1983 "RawSupport.c" guint8* flattened_sans_thumbnail = NULL; - DetectedPhotoInformation* _tmp36_ = NULL; - PhotoMetadata* _tmp37_ = NULL; - gint _tmp38_ = 0; - guint8* _tmp39_ = NULL; - gint flattened_sans_thumbnail_length1 = 0; - gint _flattened_sans_thumbnail_size_ = 0; + DetectedPhotoInformation* _tmp36_; + PhotoMetadata* _tmp37_; + gint _tmp38_; + guint8* _tmp39_; + gint flattened_sans_thumbnail_length1; + gint _flattened_sans_thumbnail_size_; gboolean _tmp40_ = FALSE; - guint8* _tmp41_ = NULL; - gint _tmp41__length1 = 0; + guint8* _tmp41_; + gint _tmp41__length1; guint8* flattened_thumbnail = NULL; - DetectedPhotoInformation* _tmp47_ = NULL; - PhotoMetadata* _tmp48_ = NULL; - gint _tmp49_ = 0; - guint8* _tmp50_ = NULL; - gint flattened_thumbnail_length1 = 0; - gint _flattened_thumbnail_size_ = 0; + DetectedPhotoInformation* _tmp47_; + PhotoMetadata* _tmp48_; + gint _tmp49_; + guint8* _tmp50_; + gint flattened_thumbnail_length1; + gint _flattened_thumbnail_size_; gboolean _tmp51_ = FALSE; - guint8* _tmp52_ = NULL; - gint _tmp52__length1 = 0; + guint8* _tmp52_; + gint _tmp52__length1; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp36_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2020,30 +2018,30 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp41__length1 = flattened_sans_thumbnail_length1; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp41_ != NULL) { -#line 2024 "RawSupport.c" - guint8* _tmp42_ = NULL; - gint _tmp42__length1 = 0; +#line 2022 "RawSupport.c" + guint8* _tmp42_; + gint _tmp42__length1; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp42_ = flattened_sans_thumbnail; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp42__length1 = flattened_sans_thumbnail_length1; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp40_ = _tmp42__length1 > 0; -#line 2033 "RawSupport.c" +#line 2031 "RawSupport.c" } else { #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp40_ = FALSE; -#line 2037 "RawSupport.c" +#line 2035 "RawSupport.c" } #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp40_) { -#line 2041 "RawSupport.c" - DetectedPhotoInformation* _tmp43_ = NULL; - guint8* _tmp44_ = NULL; - gint _tmp44__length1 = 0; - guint8* _tmp45_ = NULL; - gint _tmp45__length1 = 0; - gchar* _tmp46_ = NULL; +#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" @@ -2060,7 +2058,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp43_->exif_md5); #line 201 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp43_->exif_md5 = _tmp46_; -#line 2064 "RawSupport.c" +#line 2062 "RawSupport.c" } #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp47_ = detected; @@ -2080,30 +2078,30 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp52__length1 = flattened_thumbnail_length1; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp52_ != NULL) { -#line 2084 "RawSupport.c" - guint8* _tmp53_ = NULL; - gint _tmp53__length1 = 0; +#line 2082 "RawSupport.c" + guint8* _tmp53_; + gint _tmp53__length1; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp53_ = flattened_thumbnail; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp53__length1 = flattened_thumbnail_length1; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp51_ = _tmp53__length1 > 0; -#line 2093 "RawSupport.c" +#line 2091 "RawSupport.c" } else { #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp51_ = FALSE; -#line 2097 "RawSupport.c" +#line 2095 "RawSupport.c" } #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp51_) { -#line 2101 "RawSupport.c" - DetectedPhotoInformation* _tmp54_ = NULL; - guint8* _tmp55_ = NULL; - gint _tmp55__length1 = 0; - guint8* _tmp56_ = NULL; - gint _tmp56__length1 = 0; - gchar* _tmp57_ = NULL; +#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" @@ -2120,24 +2118,24 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _g_free0 (_tmp54_->thumbnail_md5); #line 205 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp54_->thumbnail_md5 = _tmp57_; -#line 2124 "RawSupport.c" +#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 2130 "RawSupport.c" +#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 2136 "RawSupport.c" +#line 2134 "RawSupport.c" gchar* _tmp59_ = NULL; - GFile* _tmp60_ = NULL; - gchar* _tmp61_ = NULL; - DetectedPhotoInformation* _tmp62_ = NULL; - gchar* _tmp63_ = 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" @@ -2156,7 +2154,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2160 "RawSupport.c" +#line 2158 "RawSupport.c" } #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp62_ = detected; @@ -2170,7 +2168,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp62_->md5 = _tmp63_; #line 208 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp59_); -#line 2174 "RawSupport.c" +#line 2172 "RawSupport.c" } #line 211 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp64_ = detected; @@ -2194,11 +2192,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 2198 "RawSupport.c" +#line 2196 "RawSupport.c" } #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2202 "RawSupport.c" +#line 2200 "RawSupport.c" } @@ -2206,8 +2204,8 @@ static void raw_sniffer_class_init (RawSnifferClass * klass) { #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_sniffer_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*)(PhotoFileSniffer*, gboolean*, GError**)) raw_sniffer_real_sniff; -#line 2211 "RawSupport.c" + ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) raw_sniffer_real_sniff; +#line 2209 "RawSupport.c" } @@ -2229,7 +2227,7 @@ GType raw_sniffer_get_type (void) { RawReader* raw_reader_construct (GType object_type, const gchar* filepath) { RawReader* self = NULL; - const gchar* _tmp0_ = NULL; + const gchar* _tmp0_; #line 219 "/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" @@ -2238,14 +2236,14 @@ RawReader* raw_reader_construct (GType object_type, const gchar* filepath) { self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW); #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 2242 "RawSupport.c" +#line 2240 "RawSupport.c" } RawReader* raw_reader_new (const gchar* filepath) { #line 219 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_reader_construct (TYPE_RAW_READER, filepath); -#line 2249 "RawSupport.c" +#line 2247 "RawSupport.c" } @@ -2253,9 +2251,9 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr RawReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; - PhotoMetadata* _tmp0_ = NULL; - GFile* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + PhotoMetadata* _tmp0_; + GFile* _tmp1_; + GFile* _tmp2_; GError * _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); @@ -2279,13 +2277,13 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr _media_metadata_unref0 (metadata); #line 225 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2283 "RawSupport.c" +#line 2281 "RawSupport.c" } #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = metadata; #line 227 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2289 "RawSupport.c" +#line 2287 "RawSupport.c" } @@ -2293,23 +2291,20 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** RawReader * self; GdkPixbuf* result = NULL; GRawProcessor* processor = NULL; - GRawProcessor* _tmp0_ = NULL; - GRawProcessor* _tmp1_ = NULL; - GRawProcessor* _tmp2_ = NULL; - libraw_output_params_t* _tmp3_ = NULL; - libraw_output_params_t* _tmp4_ = NULL; - GRawProcessor* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; - GRawProcessor* _tmp8_ = NULL; - GRawProcessor* _tmp9_ = NULL; + GRawProcessor* _tmp0_; + GRawProcessor* _tmp1_; + GRawProcessor* _tmp2_; + libraw_output_params_t* _tmp3_; + libraw_output_params_t* _tmp4_; + GRawProcessor* _tmp5_; + gchar* _tmp6_; + gchar* _tmp7_; + GRawProcessor* _tmp8_; + GRawProcessor* _tmp9_; GRawProcessedImage* _tmp10_ = NULL; - GRawProcessor* _tmp11_ = NULL; - GRawProcessedImage* _tmp12_ = NULL; - GRawProcessedImage* _tmp13_ = NULL; - GRawProcessedImage* _tmp14_ = NULL; - GdkPixbuf* _tmp15_ = NULL; - GdkPixbuf* _tmp16_ = NULL; + GRawProcessor* _tmp11_; + GRawProcessedImage* _tmp12_; + GdkPixbuf* _tmp13_; GError * _inner_error_ = NULL; #line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); @@ -2347,7 +2342,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 235 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2351 "RawSupport.c" +#line 2346 "RawSupport.c" } #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = processor; @@ -2361,7 +2356,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 236 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2365 "RawSupport.c" +#line 2360 "RawSupport.c" } #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -2375,7 +2370,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2379 "RawSupport.c" +#line 2374 "RawSupport.c" } #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp11_ = processor; @@ -2391,29 +2386,19 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2395 "RawSupport.c" +#line 2390 "RawSupport.c" } #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp13_ = _tmp10_; -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp10_ = NULL; + _tmp13_ = graw_processed_image_get_pixbuf_copy (_tmp10_); #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp14_ = _tmp13_; -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp15_ = graw_processed_image_get_pixbuf_copy (_tmp14_); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp16_ = _tmp15_; -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _graw_processed_image_unref0 (_tmp14_); -#line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp16_; + result = _tmp13_; #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (_tmp10_); #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); #line 239 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2417 "RawSupport.c" +#line 2402 "RawSupport.c" } @@ -2421,39 +2406,39 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions RawReader * self; GdkPixbuf* result = NULL; gdouble width_proportion = 0.0; - Dimensions _tmp0_ = {0}; - gint _tmp1_ = 0; - Dimensions _tmp2_ = {0}; - gint _tmp3_ = 0; + Dimensions _tmp0_; + gint _tmp1_; + Dimensions _tmp2_; + gint _tmp3_; gdouble height_proportion = 0.0; - Dimensions _tmp4_ = {0}; - gint _tmp5_ = 0; - Dimensions _tmp6_ = {0}; - gint _tmp7_ = 0; + Dimensions _tmp4_; + gint _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; gboolean _tmp8_ = FALSE; - gdouble _tmp9_ = 0.0; + gdouble _tmp9_; gboolean half_size = FALSE; GRawProcessor* processor = NULL; - GRawProcessor* _tmp11_ = NULL; - GRawProcessor* _tmp12_ = NULL; - gboolean _tmp13_ = FALSE; - GRawProcessor* _tmp14_ = NULL; - libraw_output_params_t* _tmp15_ = NULL; - libraw_output_params_t* _tmp16_ = NULL; - GRawProcessor* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - GRawProcessor* _tmp30_ = NULL; - GRawProcessor* _tmp31_ = NULL; + GRawProcessor* _tmp11_; + GRawProcessor* _tmp12_; + gboolean _tmp13_; + GRawProcessor* _tmp14_; + libraw_output_params_t* _tmp15_; + libraw_output_params_t* _tmp16_; + GRawProcessor* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + GRawProcessor* _tmp30_; + GRawProcessor* _tmp31_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp32_ = NULL; - GRawProcessedImage* _tmp33_ = NULL; - GRawProcessedImage* _tmp34_ = NULL; - GdkPixbuf* _tmp35_ = NULL; - GdkPixbuf* _tmp36_ = NULL; - Dimensions _tmp37_ = {0}; - GdkPixbuf* _tmp38_ = NULL; - GdkPixbuf* _tmp39_ = NULL; + GRawProcessor* _tmp32_; + GRawProcessedImage* _tmp33_; + GRawProcessedImage* _tmp34_; + GdkPixbuf* _tmp35_; + GdkPixbuf* _tmp36_; + Dimensions _tmp37_; + GdkPixbuf* _tmp38_; + GdkPixbuf* _tmp39_; GError * _inner_error_ = NULL; #line 242 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); @@ -2485,17 +2470,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _tmp9_ = width_proportion; #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp9_ < 0.5) { -#line 2489 "RawSupport.c" - gdouble _tmp10_ = 0.0; +#line 2474 "RawSupport.c" + gdouble _tmp10_; #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = height_proportion; #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = _tmp10_ < 0.5; -#line 2495 "RawSupport.c" +#line 2480 "RawSupport.c" } else { #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = FALSE; -#line 2499 "RawSupport.c" +#line 2484 "RawSupport.c" } #line 246 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" half_size = _tmp8_; @@ -2535,32 +2520,32 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2539 "RawSupport.c" +#line 2524 "RawSupport.c" } { - PhotoFileReaderRole _tmp20_ = 0; + PhotoFileReaderRole _tmp20_; #line 254 "/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" if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) { -#line 2547 "RawSupport.c" - GRawProcessor* _tmp21_ = NULL; +#line 2532 "RawSupport.c" + GRawProcessor* _tmp21_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp22_ = NULL; - GRawProcessedImage* _tmp23_ = NULL; - GRawProcessedImage* _tmp24_ = NULL; - GdkPixbuf* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - Dimensions _tmp27_ = {0}; - GdkPixbuf* _tmp28_ = NULL; - GdkPixbuf* _tmp29_ = NULL; + GRawProcessor* _tmp22_; + GRawProcessedImage* _tmp23_; + GRawProcessedImage* _tmp24_; + GdkPixbuf* _tmp25_; + GdkPixbuf* _tmp26_; + Dimensions _tmp27_; + GdkPixbuf* _tmp28_; + GdkPixbuf* _tmp29_; #line 255 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp21_ = processor; #line 255 "/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" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2564 "RawSupport.c" +#line 2549 "RawSupport.c" goto __catch34_g_error; } #line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2571,7 +2556,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions image = _tmp23_; #line 256 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2575 "RawSupport.c" +#line 2560 "RawSupport.c" goto __catch34_g_error; } #line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2596,7 +2581,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 257 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2600 "RawSupport.c" +#line 2585 "RawSupport.c" } } goto __finally34; @@ -2609,7 +2594,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _inner_error_ = NULL; #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (_error_); -#line 2613 "RawSupport.c" +#line 2598 "RawSupport.c" } __finally34: #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2620,7 +2605,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 253 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2624 "RawSupport.c" +#line 2609 "RawSupport.c" } #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp30_ = processor; @@ -2634,7 +2619,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2638 "RawSupport.c" +#line 2623 "RawSupport.c" } #line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp31_ = processor; @@ -2648,7 +2633,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 266 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2652 "RawSupport.c" +#line 2637 "RawSupport.c" } #line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp32_ = processor; @@ -2664,7 +2649,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 268 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2668 "RawSupport.c" +#line 2653 "RawSupport.c" } #line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp34_ = image; @@ -2688,7 +2673,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 270 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2692 "RawSupport.c" +#line 2677 "RawSupport.c" } @@ -2696,12 +2681,12 @@ static void raw_reader_class_init (RawReaderClass * klass) { #line 218 "/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" - ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) raw_reader_real_read_metadata; + ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) raw_reader_real_read_metadata; #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) raw_reader_real_unscaled_read; + ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) raw_reader_real_unscaled_read; #line 218 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read; -#line 2705 "RawSupport.c" + ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read; +#line 2690 "RawSupport.c" } @@ -2723,9 +2708,9 @@ GType raw_reader_get_type (void) { RawDeveloper* raw_developer_as_array (int* result_length1) { RawDeveloper* result = NULL; - RawDeveloper* _tmp0_ = NULL; - RawDeveloper* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + RawDeveloper* _tmp0_; + RawDeveloper* _tmp1_; + gint _tmp1__length1; #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_new0 (RawDeveloper, 3); #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2742,13 +2727,13 @@ RawDeveloper* raw_developer_as_array (int* result_length1) { if (result_length1) { #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp1__length1; -#line 2746 "RawSupport.c" +#line 2731 "RawSupport.c" } #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; #line 281 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2752 "RawSupport.c" +#line 2737 "RawSupport.c" } @@ -2758,48 +2743,48 @@ gchar* raw_developer_to_string (RawDeveloper self) { switch (self) { #line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2762 "RawSupport.c" +#line 2747 "RawSupport.c" { - gchar* _tmp0_ = NULL; + gchar* _tmp0_; #line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup ("SHOTWELL"); #line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp0_; #line 287 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2771 "RawSupport.c" +#line 2756 "RawSupport.c" } #line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: -#line 2775 "RawSupport.c" +#line 2760 "RawSupport.c" { - gchar* _tmp1_ = NULL; + gchar* _tmp1_; #line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = g_strdup ("CAMERA"); #line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; #line 289 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2784 "RawSupport.c" +#line 2769 "RawSupport.c" } #line 285 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2788 "RawSupport.c" +#line 2773 "RawSupport.c" { - gchar* _tmp2_ = NULL; + gchar* _tmp2_; #line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = g_strdup ("EMBEDDED"); #line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 291 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2797 "RawSupport.c" +#line 2782 "RawSupport.c" } default: { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2803 "RawSupport.c" +#line 2788 "RawSupport.c" } } } @@ -2807,8 +2792,8 @@ gchar* raw_developer_to_string (RawDeveloper self) { RawDeveloper raw_developer_from_string (const gchar* value) { RawDeveloper result = 0; - const gchar* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + const gchar* _tmp1_; GQuark _tmp3_ = 0U; #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" static GQuark _tmp2_label0 = 0; @@ -2828,51 +2813,51 @@ RawDeveloper raw_developer_from_string (const gchar* value) { 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" switch (0) { -#line 2832 "RawSupport.c" +#line 2817 "RawSupport.c" default: { #line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_SHOTWELL; #line 300 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2839 "RawSupport.c" +#line 2824 "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" switch (0) { -#line 2845 "RawSupport.c" +#line 2830 "RawSupport.c" default: { #line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_CAMERA; #line 302 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2852 "RawSupport.c" +#line 2837 "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" switch (0) { -#line 2858 "RawSupport.c" +#line 2843 "RawSupport.c" default: { #line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_EMBEDDED; #line 304 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2865 "RawSupport.c" +#line 2850 "RawSupport.c" } } } else { #line 298 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2871 "RawSupport.c" +#line 2856 "RawSupport.c" default: { #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2876 "RawSupport.c" +#line 2861 "RawSupport.c" } } } @@ -2885,43 +2870,37 @@ gchar* raw_developer_get_label (RawDeveloper self) { switch (self) { #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2889 "RawSupport.c" +#line 2874 "RawSupport.c" { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; -#line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = _ ("Shotwell"); + gchar* _tmp0_; #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = g_strdup (_tmp0_); + _tmp0_ = g_strdup (_ ("Shotwell")); #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp1_; + result = _tmp0_; #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2901 "RawSupport.c" +#line 2883 "RawSupport.c" } #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2907 "RawSupport.c" +#line 2889 "RawSupport.c" { - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = _ ("Camera"); + gchar* _tmp1_; #line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (_ ("Camera")); #line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp3_; + result = _tmp1_; #line 316 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2919 "RawSupport.c" +#line 2898 "RawSupport.c" } default: { #line 318 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2925 "RawSupport.c" +#line 2904 "RawSupport.c" } } } @@ -2929,7 +2908,7 @@ gchar* raw_developer_get_label (RawDeveloper self) { gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { gboolean result = FALSE; - RawDeveloper _tmp0_ = 0; + RawDeveloper _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; #line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2940,46 +2919,46 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { result = TRUE; #line 326 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2944 "RawSupport.c" +#line 2923 "RawSupport.c" } #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_CAMERA) { -#line 2948 "RawSupport.c" - RawDeveloper _tmp3_ = 0; +#line 2927 "RawSupport.c" + RawDeveloper _tmp3_; #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp3_ = d; #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 2954 "RawSupport.c" +#line 2933 "RawSupport.c" } else { #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp2_ = FALSE; -#line 2958 "RawSupport.c" +#line 2937 "RawSupport.c" } #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp2_) { #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = TRUE; -#line 2964 "RawSupport.c" +#line 2943 "RawSupport.c" } else { gboolean _tmp4_ = FALSE; #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_EMBEDDED) { -#line 2969 "RawSupport.c" - RawDeveloper _tmp5_ = 0; +#line 2948 "RawSupport.c" + RawDeveloper _tmp5_; #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp5_ = d; #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA; -#line 2975 "RawSupport.c" +#line 2954 "RawSupport.c" } else { #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp4_ = FALSE; -#line 2979 "RawSupport.c" +#line 2958 "RawSupport.c" } #line 329 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp1_ = _tmp4_; -#line 2983 "RawSupport.c" +#line 2962 "RawSupport.c" } #line 328 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp1_) { @@ -2987,46 +2966,49 @@ gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { result = TRUE; #line 330 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2991 "RawSupport.c" +#line 2970 "RawSupport.c" } #line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = FALSE; #line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2997 "RawSupport.c" +#line 2976 "RawSupport.c" } BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error) { BackingPhotoRow* result = NULL; BackingPhotoRow* ns = NULL; - BackingPhotoRow* _tmp0_ = NULL; + BackingPhotoRow* _tmp0_; GFile* master = NULL; - const gchar* _tmp1_ = NULL; - GFile* _tmp2_ = NULL; + const gchar* _tmp1_; + GFile* _tmp2_; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + GFile* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; gchar* _tmp6_ = NULL; gchar* _tmp7_ = NULL; gchar* basename = NULL; - const gchar* _tmp8_ = NULL; + const gchar* _tmp8_; + gchar* newbasename = NULL; + const gchar* _tmp27_; + gchar* _tmp28_; gboolean c = FALSE; GFile* new_back = NULL; - GFile* _tmp27_ = NULL; - GFile* _tmp28_ = NULL; - GFile* _tmp29_ = NULL; - const gchar* _tmp30_ = NULL; - gboolean _tmp31_ = FALSE; - GFile* _tmp32_ = NULL; - GFile* _tmp33_ = NULL; - GFile* _tmp34_ = NULL; - BackingPhotoRow* _tmp35_ = NULL; - BackingPhotoRow* _tmp36_ = NULL; - GFile* _tmp37_ = NULL; - gchar* _tmp38_ = NULL; + GFile* _tmp29_; + GFile* _tmp30_; + GFile* _tmp31_; + const gchar* _tmp32_; + gboolean _tmp33_ = FALSE; + GFile* _tmp34_; + GFile* _tmp35_; + GFile* _tmp36_; + BackingPhotoRow* _tmp37_; + BackingPhotoRow* _tmp38_; + GFile* _tmp39_; + gchar* _tmp40_; GError * _inner_error_ = NULL; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (raw_filepath != NULL, NULL); @@ -3062,25 +3044,25 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _tmp8_ = camera_development_filename; #line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp8_ == NULL) { -#line 3066 "RawSupport.c" +#line 3048 "RawSupport.c" gchar* _tmp9_ = NULL; - const gchar* _tmp16_ = NULL; - gchar* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; - gchar* _tmp22_ = NULL; - gchar* _tmp23_ = NULL; - gchar* _tmp24_ = NULL; + const gchar* _tmp16_; + gchar* _tmp17_; + gchar* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; + gchar* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self != RAW_DEVELOPER_CAMERA) { -#line 3079 "RawSupport.c" - gchar* _tmp10_ = NULL; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gchar* _tmp13_ = NULL; - gchar* _tmp14_ = NULL; +#line 3061 "RawSupport.c" + gchar* _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gchar* _tmp13_; + gchar* _tmp14_; #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = raw_developer_to_string (self); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3099,16 +3081,16 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _g_free0 (_tmp13_); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp11_); -#line 3103 "RawSupport.c" +#line 3085 "RawSupport.c" } else { - gchar* _tmp15_ = NULL; + gchar* _tmp15_; #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp15_ = g_strdup (""); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp9_); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = _tmp15_; -#line 3112 "RawSupport.c" +#line 3094 "RawSupport.c" } #line 349 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp16_ = name; @@ -3140,10 +3122,10 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _g_free0 (_tmp18_); #line 348 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp9_); -#line 3144 "RawSupport.c" +#line 3126 "RawSupport.c" } else { - const gchar* _tmp25_ = NULL; - gchar* _tmp26_ = NULL; + const gchar* _tmp25_; + gchar* _tmp26_; #line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp25_ = camera_development_filename; #line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3152,97 +3134,109 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _g_free0 (basename); #line 352 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" basename = _tmp26_; -#line 3156 "RawSupport.c" +#line 3138 "RawSupport.c" } -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = master; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = g_file_get_parent (_tmp27_); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = _tmp28_; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = basename; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = generate_unique_file (_tmp29_, _tmp30_, &_tmp31_, &_inner_error_); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - c = _tmp31_; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp33_ = _tmp32_; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp29_); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - new_back = _tmp33_; -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp27_ = basename; +#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp28_ = library_files_convert_basename (_tmp27_); +#line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + newbasename = _tmp28_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp29_ = master; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp30_ = g_file_get_parent (_tmp29_); +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp31_ = _tmp30_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp32_ = newbasename; +#line 358 "/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" + c = _tmp33_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp35_ = _tmp34_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_object_unref0 (_tmp31_); +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + new_back = _tmp35_; +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (newbasename); +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (master); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _backing_photo_row_unref0 (ns); -#line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3192 "RawSupport.c" +#line 3182 "RawSupport.c" } -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = new_back; -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - claim_file (_tmp34_, &_inner_error_); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp36_ = new_back; +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + claim_file (_tmp36_, &_inner_error_); +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_propagate_error (error, _inner_error_); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (new_back); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (newbasename); +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (master); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _backing_photo_row_unref0 (ns); -#line 357 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3216 "RawSupport.c" +#line 3208 "RawSupport.c" } -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = ns; -#line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_->file_format = PHOTO_FILE_FORMAT_JFIF; -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = ns; -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = new_back; -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = g_file_get_path (_tmp37_); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp36_->filepath); -#line 359 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_->filepath = _tmp38_; +#line 360 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp37_ = ns; +#line 360 "/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" - result = ns; + _tmp38_ = ns; #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (new_back); + _tmp39_ = new_back; #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (basename); + _tmp40_ = g_file_get_path (_tmp39_); #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (ext); + _g_free0 (_tmp38_->filepath); #line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _tmp38_->filepath = _tmp40_; +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + result = ns; +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_object_unref0 (new_back); +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (newbasename); +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (basename); +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (ext); +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); -#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_object_unref0 (master); -#line 361 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" +#line 363 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 3246 "RawSupport.c" +#line 3240 "RawSupport.c" } |