From ab841afa5cb39058d9ab2cebb67cfe6369443f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 25 Jun 2018 20:55:59 +0200 Subject: New upstream version 0.28.3 --- src/photos/RawSupport.c | 1289 +++++++++++++++++++++++++++-------------------- 1 file changed, 736 insertions(+), 553 deletions(-) (limited to 'src/photos/RawSupport.c') diff --git a/src/photos/RawSupport.c b/src/photos/RawSupport.c index c22f941..bd5b4b7 100644 --- a/src/photos/RawSupport.c +++ b/src/photos/RawSupport.c @@ -1,4 +1,4 @@ -/* RawSupport.c generated by valac 0.36.6, the Vala compiler +/* RawSupport.c generated by valac 0.40.4, the Vala compiler * generated from RawSupport.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include #include #include @@ -480,31 +481,55 @@ static gpointer raw_reader_parent_class = NULL; gpointer photo_file_format_driver_ref (gpointer instance); void photo_file_format_driver_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_driver (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_driver (GValue* value, gpointer v_object); -void value_take_photo_file_format_driver (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_driver (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_driver (GValue* value, + gpointer v_object); +void value_take_photo_file_format_driver (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_driver (const GValue* value); GType photo_file_format_driver_get_type (void) G_GNUC_CONST; gpointer photo_file_format_properties_ref (gpointer instance); void photo_file_format_properties_unref (gpointer instance); -GParamSpec* param_spec_photo_file_format_properties (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_format_properties (GValue* value, gpointer v_object); -void value_take_photo_file_format_properties (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_format_properties (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_format_properties (GValue* value, + gpointer v_object); +void value_take_photo_file_format_properties (GValue* value, + gpointer v_object); gpointer value_get_photo_file_format_properties (const GValue* value); GType photo_file_format_properties_get_type (void) G_GNUC_CONST; gpointer photo_file_adapter_ref (gpointer instance); void photo_file_adapter_unref (gpointer instance); -GParamSpec* param_spec_photo_file_adapter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_adapter (GValue* value, gpointer v_object); -void value_take_photo_file_adapter (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_adapter (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_adapter (GValue* value, + gpointer v_object); +void value_take_photo_file_adapter (GValue* value, + gpointer v_object); gpointer value_get_photo_file_adapter (const GValue* value); GType photo_file_adapter_get_type (void) G_GNUC_CONST; GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); -GParamSpec* param_spec_media_metadata (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_media_metadata (GValue* value, gpointer v_object); -void value_take_media_metadata (GValue* value, gpointer v_object); +GParamSpec* param_spec_media_metadata (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_media_metadata (GValue* value, + gpointer v_object); +void value_take_media_metadata (GValue* value, + gpointer v_object); gpointer value_get_media_metadata (const GValue* value); GType media_metadata_get_type (void) G_GNUC_CONST; GType photo_metadata_get_type (void) G_GNUC_CONST; @@ -513,15 +538,18 @@ GType photo_file_metadata_writer_get_type (void) G_GNUC_CONST; GType photo_file_sniffer_options_get_type (void) G_GNUC_CONST; gpointer photo_file_sniffer_ref (gpointer instance); void photo_file_sniffer_unref (gpointer instance); -GParamSpec* param_spec_photo_file_sniffer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_photo_file_sniffer (GValue* value, gpointer v_object); -void value_take_photo_file_sniffer (GValue* value, gpointer v_object); +GParamSpec* param_spec_photo_file_sniffer (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_photo_file_sniffer (GValue* value, + gpointer v_object); +void value_take_photo_file_sniffer (GValue* value, + gpointer v_object); gpointer value_get_photo_file_sniffer (const GValue* value); GType photo_file_sniffer_get_type (void) G_GNUC_CONST; GType raw_file_format_driver_get_type (void) G_GNUC_CONST; -enum { - RAW_FILE_FORMAT_DRIVER_DUMMY_PROPERTY -}; void raw_file_format_driver_init (void); RawFileFormatDriver* raw_file_format_driver_new (void); RawFileFormatDriver* raw_file_format_driver_construct (GType object_type); @@ -530,132 +558,201 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void); static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base); GType raw_file_format_properties_get_type (void) G_GNUC_CONST; RawFileFormatProperties* raw_file_format_properties_get_instance (void); -static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath); +static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath); RawReader* raw_reader_new (const gchar* filepath); -RawReader* raw_reader_construct (GType object_type, const gchar* filepath); +RawReader* raw_reader_construct (GType object_type, + const gchar* filepath); GType raw_reader_get_type (void) G_GNUC_CONST; static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base); PhotoMetadata* photo_metadata_new (void); PhotoMetadata* photo_metadata_construct (GType object_type); static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base); static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base); -static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath); -static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options); -RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options); -RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); +static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath); +static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options); +RawSniffer* raw_sniffer_new (GFile* file, + PhotoFileSnifferOptions options); +RawSniffer* raw_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); GType raw_sniffer_get_type (void) G_GNUC_CONST; PhotoFileFormatDriver* photo_file_format_driver_construct (GType object_type); static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj); GType photo_file_format_get_type (void) G_GNUC_CONST; GType photo_file_format_flags_get_type (void) G_GNUC_CONST; -enum { - RAW_FILE_FORMAT_PROPERTIES_DUMMY_PROPERTY -}; RawFileFormatProperties* raw_file_format_properties_new (void); RawFileFormatProperties* raw_file_format_properties_construct (GType object_type); static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base); static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base); static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base); static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base); -static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup10 (gchar** self, int length); +static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup10 (gchar** self, + int length); static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base); -static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1); -static gchar** _vala_array_dup11 (gchar** self, int length); +static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1); +static gchar** _vala_array_dup11 (gchar** self, + int length); PhotoFileFormatProperties* photo_file_format_properties_construct (GType object_type); static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj); gpointer detected_photo_information_ref (gpointer instance); void detected_photo_information_unref (gpointer instance); -GParamSpec* param_spec_detected_photo_information (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_detected_photo_information (GValue* value, gpointer v_object); -void value_take_detected_photo_information (GValue* value, gpointer v_object); +GParamSpec* param_spec_detected_photo_information (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_detected_photo_information (GValue* value, + gpointer v_object); +void value_take_detected_photo_information (GValue* value, + gpointer v_object); gpointer value_get_detected_photo_information (const GValue* value); GType detected_photo_information_get_type (void) G_GNUC_CONST; -enum { - RAW_SNIFFER_DUMMY_PROPERTY -}; -PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options); -static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error); +PhotoFileSniffer* photo_file_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options); +static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error); DetectedPhotoInformation* detected_photo_information_new (void); DetectedPhotoInformation* detected_photo_information_construct (GType object_type); gpointer graw_processor_ref (gpointer instance); void graw_processor_unref (gpointer instance); -GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processor (GValue* value, gpointer v_object); -void graw_value_take_processor (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processor (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processor (GValue* value, + gpointer v_object); +void graw_value_take_processor (GValue* value, + gpointer v_object); gpointer graw_value_get_processor (const GValue* value); GType graw_processor_get_type (void) G_GNUC_CONST; GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options); -GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options); +GRawProcessor* graw_processor_construct (GType object_type, + enum LibRaw_constructor_flags options); libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self); GType graw_flip_get_type (void) G_GNUC_CONST; GQuark graw_exception_quark (void); -void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error); -void graw_processor_unpack (GRawProcessor* self, GError** error); -void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error); +void graw_processor_open_file (GRawProcessor* self, + const gchar* filename, + GError** error); +void graw_processor_unpack (GRawProcessor* self, + GError** error); +void graw_processor_adjust_sizes_info_only (GRawProcessor* self, + GError** error); GType dimensions_get_type (void) G_GNUC_CONST; Dimensions* dimensions_dup (const Dimensions* self); void dimensions_free (Dimensions* self); libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self); -void dimensions_init (Dimensions *self, gint width, gint height); -PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, GError** error); +void dimensions_init (Dimensions *self, + gint width, + gint height); +PhotoMetadata* photo_file_reader_read_metadata (PhotoFileReader* self, + GError** error); gchar* photo_metadata_exif_hash (PhotoMetadata* self); gchar* photo_metadata_thumbnail_hash (PhotoMetadata* self); -gchar* md5_file (GFile* file, GError** error); -enum { - RAW_READER_DUMMY_PROPERTY -}; -PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format); -static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GError** error); -void media_metadata_read_from_file (MediaMetadata* self, GFile* file, GError** error); +gchar* md5_file (GFile* file, + GError** error); +PhotoFileReader* photo_file_reader_construct (GType object_type, + const gchar* filepath, + PhotoFileFormat file_format); +static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, + GError** error); +void media_metadata_read_from_file (MediaMetadata* self, + GFile* file, + GError** error); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); -static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** error); -void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size); +static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, + GError** error); +void graw_processor_configure_for_rgb_display (GRawProcessor* self, + gboolean half_size); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); -void graw_processor_process (GRawProcessor* self, GError** error); +void graw_processor_process (GRawProcessor* self, + GError** error); gpointer graw_processed_image_ref (gpointer instance); void graw_processed_image_unref (gpointer instance); -GParamSpec* graw_param_spec_processed_image (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void graw_value_set_processed_image (GValue* value, gpointer v_object); -void graw_value_take_processed_image (GValue* value, gpointer v_object); +GParamSpec* graw_param_spec_processed_image (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void graw_value_set_processed_image (GValue* value, + gpointer v_object); +void graw_value_take_processed_image (GValue* value, + gpointer v_object); gpointer graw_value_get_processed_image (const GValue* value); GType graw_processed_image_get_type (void) G_GNUC_CONST; -GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error); +GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, + GError** error); GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self); -static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error); +static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error); GType photo_file_reader_role_get_type (void) G_GNUC_CONST; PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self); -void graw_processor_unpack_thumb (GRawProcessor* self, GError** error); -GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error); -GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); +void graw_processor_unpack_thumb (GRawProcessor* self, + GError** error); +GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, + GError** error); +GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, + Dimensions* resized, + GdkInterpType interp); GType raw_developer_get_type (void) G_GNUC_CONST; RawDeveloper* raw_developer_as_array (int* result_length1); gchar* raw_developer_to_string (RawDeveloper self); RawDeveloper raw_developer_from_string (const gchar* value); gchar* raw_developer_get_label (RawDeveloper self); -gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d); +gboolean raw_developer_is_equivalent (RawDeveloper self, + RawDeveloper d); gpointer backing_photo_row_ref (gpointer instance); void backing_photo_row_unref (gpointer instance); -GParamSpec* param_spec_backing_photo_row (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_backing_photo_row (GValue* value, gpointer v_object); -void value_take_backing_photo_row (GValue* value, gpointer v_object); +GParamSpec* param_spec_backing_photo_row (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_backing_photo_row (GValue* value, + gpointer v_object); +void value_take_backing_photo_row (GValue* value, + gpointer v_object); gpointer value_get_backing_photo_row (const GValue* value); GType backing_photo_row_get_type (void) G_GNUC_CONST; -BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error); +BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, + const gchar* raw_filepath, + const gchar* camera_development_filename, + GError** error); BackingPhotoRow* backing_photo_row_new (void); BackingPhotoRow* backing_photo_row_construct (GType object_type); -void disassemble_filename (const gchar* basename, gchar* * name, gchar* * ext); +void disassemble_filename (const gchar* basename, + gchar* * name, + gchar* * ext); gchar* library_files_convert_basename (const gchar* basename); -GFile* generate_unique_file (GFile* dir, const gchar* basename, gboolean* collision, GError** error); -gboolean claim_file (GFile* file, GError** error); +GFile* generate_unique_file (GFile* dir, + const gchar* basename, + gboolean* collision, + GError** error); +gboolean claim_file (GFile* file, + GError** error); GType backing_photo_id_get_type (void) G_GNUC_CONST; BackingPhotoID* backing_photo_id_dup (const BackingPhotoID* self); void backing_photo_id_free (BackingPhotoID* self); GType orientation_get_type (void) G_GNUC_CONST; -void raw_file_format_driver_init (void) { +void +raw_file_format_driver_init (void) +{ RawFileFormatDriver* _tmp0_; #line 11 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_driver_new (); @@ -665,18 +762,22 @@ void raw_file_format_driver_init (void) { raw_file_format_driver_instance = _tmp0_; #line 12 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_init (); -#line 669 "RawSupport.c" +#line 766 "RawSupport.c" } -static gpointer _photo_file_format_driver_ref0 (gpointer self) { +static gpointer +_photo_file_format_driver_ref0 (gpointer self) +{ #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? photo_file_format_driver_ref (self) : NULL; -#line 676 "RawSupport.c" +#line 775 "RawSupport.c" } -RawFileFormatDriver* raw_file_format_driver_get_instance (void) { +RawFileFormatDriver* +raw_file_format_driver_get_instance (void) +{ RawFileFormatDriver* result = NULL; RawFileFormatDriver* _tmp0_; RawFileFormatDriver* _tmp1_; @@ -688,11 +789,13 @@ RawFileFormatDriver* raw_file_format_driver_get_instance (void) { result = _tmp1_; #line 16 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 692 "RawSupport.c" +#line 793 "RawSupport.c" } -static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) { +static PhotoFileFormatProperties* +raw_file_format_driver_real_get_properties (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; PhotoFileFormatProperties* result = NULL; RawFileFormatProperties* _tmp0_; @@ -704,32 +807,34 @@ static PhotoFileFormatProperties* raw_file_format_driver_real_get_properties (Ph result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_FORMAT_PROPERTIES, PhotoFileFormatProperties); #line 20 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 708 "RawSupport.c" +#line 811 "RawSupport.c" } -static PhotoFileReader* raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileReader* +raw_file_format_driver_real_create_reader (PhotoFileFormatDriver* base, + const gchar* filepath) +{ RawFileFormatDriver * self; PhotoFileReader* result = NULL; - const gchar* _tmp0_; - RawReader* _tmp1_; + RawReader* _tmp0_; #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 23 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = filepath; -#line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = raw_reader_new (_tmp0_); + _tmp0_ = raw_reader_new (filepath); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PHOTO_FILE_READER, PhotoFileReader); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_READER, PhotoFileReader); #line 24 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 729 "RawSupport.c" +#line 832 "RawSupport.c" } -static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) { +static PhotoMetadata* +raw_file_format_driver_real_create_metadata (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; PhotoMetadata* result = NULL; PhotoMetadata* _tmp0_; @@ -741,11 +846,13 @@ static PhotoMetadata* raw_file_format_driver_real_create_metadata (PhotoFileForm result = _tmp0_; #line 28 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 745 "RawSupport.c" +#line 850 "RawSupport.c" } -static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) { +static gboolean +raw_file_format_driver_real_can_write_image (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; gboolean result = FALSE; #line 31 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -754,11 +861,13 @@ static gboolean raw_file_format_driver_real_can_write_image (PhotoFileFormatDriv result = FALSE; #line 32 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 758 "RawSupport.c" +#line 865 "RawSupport.c" } -static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) { +static gboolean +raw_file_format_driver_real_can_write_metadata (PhotoFileFormatDriver* base) +{ RawFileFormatDriver * self; gboolean result = FALSE; #line 35 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -767,11 +876,14 @@ static gboolean raw_file_format_driver_real_can_write_metadata (PhotoFileFormatD result = FALSE; #line 36 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 771 "RawSupport.c" +#line 880 "RawSupport.c" } -static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileWriter* +raw_file_format_driver_real_create_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ RawFileFormatDriver * self; PhotoFileWriter* result = NULL; #line 39 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -782,11 +894,14 @@ static PhotoFileWriter* raw_file_format_driver_real_create_writer (PhotoFileForm result = NULL; #line 40 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 786 "RawSupport.c" +#line 898 "RawSupport.c" } -static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, const gchar* filepath) { +static PhotoFileMetadataWriter* +raw_file_format_driver_real_create_metadata_writer (PhotoFileFormatDriver* base, + const gchar* filepath) +{ RawFileFormatDriver * self; PhotoFileMetadataWriter* result = NULL; #line 43 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -797,52 +912,56 @@ static PhotoFileMetadataWriter* raw_file_format_driver_real_create_metadata_writ result = NULL; #line 44 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 801 "RawSupport.c" +#line 916 "RawSupport.c" } -static PhotoFileSniffer* raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, GFile* file, PhotoFileSnifferOptions options) { +static PhotoFileSniffer* +raw_file_format_driver_real_create_sniffer (PhotoFileFormatDriver* base, + GFile* file, + PhotoFileSnifferOptions options) +{ RawFileFormatDriver * self; PhotoFileSniffer* result = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; - RawSniffer* _tmp2_; + RawSniffer* _tmp0_; #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 47 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = file; + _tmp0_ = raw_sniffer_new (file, options); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = options; -#line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = raw_sniffer_new (_tmp0_, _tmp1_); -#line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); + result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer); #line 48 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 825 "RawSupport.c" +#line 938 "RawSupport.c" } -RawFileFormatDriver* raw_file_format_driver_construct (GType object_type) { +RawFileFormatDriver* +raw_file_format_driver_construct (GType object_type) +{ RawFileFormatDriver* self = NULL; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = (RawFileFormatDriver*) photo_file_format_driver_construct (object_type); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 835 "RawSupport.c" +#line 950 "RawSupport.c" } -RawFileFormatDriver* raw_file_format_driver_new (void) { +RawFileFormatDriver* +raw_file_format_driver_new (void) +{ #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_file_format_driver_construct (TYPE_RAW_FILE_FORMAT_DRIVER); -#line 842 "RawSupport.c" +#line 959 "RawSupport.c" } -static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) { +static void +raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) +{ #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_driver_parent_class = g_type_class_peek_parent (klass); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -863,25 +982,31 @@ static void raw_file_format_driver_class_init (RawFileFormatDriverClass * klass) ((PhotoFileFormatDriverClass *) klass)->create_metadata_writer = (PhotoFileMetadataWriter* (*) (PhotoFileFormatDriver *, const gchar*)) raw_file_format_driver_real_create_metadata_writer; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileFormatDriverClass *) klass)->create_sniffer = (PhotoFileSniffer* (*) (PhotoFileFormatDriver *, GFile*, PhotoFileSnifferOptions)) raw_file_format_driver_real_create_sniffer; -#line 867 "RawSupport.c" +#line 986 "RawSupport.c" } -static void raw_file_format_driver_instance_init (RawFileFormatDriver * self) { +static void +raw_file_format_driver_instance_init (RawFileFormatDriver * self) +{ } -static void raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) { +static void +raw_file_format_driver_finalize (PhotoFileFormatDriver * obj) +{ RawFileFormatDriver * self; #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_DRIVER, RawFileFormatDriver); #line 7 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_DRIVER_CLASS (raw_file_format_driver_parent_class)->finalize (obj); -#line 881 "RawSupport.c" +#line 1004 "RawSupport.c" } -GType raw_file_format_driver_get_type (void) { +GType +raw_file_format_driver_get_type (void) +{ static volatile gsize raw_file_format_driver_type_id__volatile = 0; if (g_once_init_enter (&raw_file_format_driver_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawFileFormatDriverClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_file_format_driver_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawFileFormatDriver), 0, (GInstanceInitFunc) raw_file_format_driver_instance_init, NULL }; @@ -893,7 +1018,9 @@ GType raw_file_format_driver_get_type (void) { } -void raw_file_format_properties_init (void) { +void +raw_file_format_properties_init (void) +{ RawFileFormatProperties* _tmp0_; #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = raw_file_format_properties_new (); @@ -901,18 +1028,22 @@ void raw_file_format_properties_init (void) { _photo_file_format_properties_unref0 (raw_file_format_properties_instance); #line 122 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_instance = _tmp0_; -#line 905 "RawSupport.c" +#line 1032 "RawSupport.c" } -static gpointer _photo_file_format_properties_ref0 (gpointer self) { +static gpointer +_photo_file_format_properties_ref0 (gpointer self) +{ #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? photo_file_format_properties_ref (self) : NULL; -#line 912 "RawSupport.c" +#line 1041 "RawSupport.c" } -RawFileFormatProperties* raw_file_format_properties_get_instance (void) { +RawFileFormatProperties* +raw_file_format_properties_get_instance (void) +{ RawFileFormatProperties* result = NULL; RawFileFormatProperties* _tmp0_; RawFileFormatProperties* _tmp1_; @@ -924,11 +1055,13 @@ RawFileFormatProperties* raw_file_format_properties_get_instance (void) { result = _tmp1_; #line 126 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 928 "RawSupport.c" +#line 1059 "RawSupport.c" } -static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) { +static PhotoFileFormat +raw_file_format_properties_real_get_file_format (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; PhotoFileFormat result = 0; #line 129 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -937,11 +1070,13 @@ static PhotoFileFormat raw_file_format_properties_real_get_file_format (PhotoFil result = PHOTO_FILE_FORMAT_RAW; #line 130 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 941 "RawSupport.c" +#line 1074 "RawSupport.c" } -static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) { +static gchar* +raw_file_format_properties_real_get_user_visible_name (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -953,11 +1088,13 @@ static gchar* raw_file_format_properties_real_get_user_visible_name (PhotoFileFo result = _tmp0_; #line 134 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 957 "RawSupport.c" +#line 1092 "RawSupport.c" } -static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) { +static PhotoFileFormatFlags +raw_file_format_properties_real_get_flags (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; PhotoFileFormatFlags result = 0; #line 137 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -966,11 +1103,13 @@ static PhotoFileFormatFlags raw_file_format_properties_real_get_flags (PhotoFile result = PHOTO_FILE_FORMAT_FLAGS_NONE; #line 138 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 970 "RawSupport.c" +#line 1107 "RawSupport.c" } -static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) { +static gchar* +raw_file_format_properties_real_get_default_extension (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; gchar* result = NULL; gchar* _tmp0_; @@ -982,32 +1121,38 @@ static gchar* raw_file_format_properties_real_get_default_extension (PhotoFileFo result = _tmp0_; #line 145 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 986 "RawSupport.c" +#line 1125 "RawSupport.c" } -static gchar** _vala_array_dup10 (gchar** self, int length) { +static gchar** +_vala_array_dup10 (gchar** self, + int length) +{ gchar** result; int i; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = g_new0 (gchar*, length + 1); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 997 "RawSupport.c" +#line 1139 "RawSupport.c" gchar* _tmp0_; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup (self[i]); #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result[i] = _tmp0_; -#line 1003 "RawSupport.c" +#line 1145 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1007 "RawSupport.c" +#line 1149 "RawSupport.c" } -static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +raw_file_format_properties_real_get_known_extensions (PhotoFileFormatProperties* base, + int* result_length1) +{ RawFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1034,17 +1179,19 @@ static gchar** raw_file_format_properties_real_get_known_extensions (PhotoFileFo if (result_length1) { #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp2__length1; -#line 1038 "RawSupport.c" +#line 1183 "RawSupport.c" } #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 149 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1044 "RawSupport.c" +#line 1189 "RawSupport.c" } -static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) { +static gchar* +raw_file_format_properties_real_get_default_mime_type (PhotoFileFormatProperties* base) +{ RawFileFormatProperties * self; gchar* result = NULL; gchar** _tmp0_; @@ -1065,32 +1212,38 @@ static gchar* raw_file_format_properties_real_get_default_mime_type (PhotoFileFo result = _tmp2_; #line 153 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1069 "RawSupport.c" +#line 1216 "RawSupport.c" } -static gchar** _vala_array_dup11 (gchar** self, int length) { +static gchar** +_vala_array_dup11 (gchar** self, + int length) +{ gchar** result; int i; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = g_new0 (gchar*, length + 1); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" for (i = 0; i < length; i++) { -#line 1080 "RawSupport.c" +#line 1230 "RawSupport.c" gchar* _tmp0_; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = g_strdup (self[i]); #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result[i] = _tmp0_; -#line 1086 "RawSupport.c" +#line 1236 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1090 "RawSupport.c" +#line 1240 "RawSupport.c" } -static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, int* result_length1) { +static gchar** +raw_file_format_properties_real_get_mime_types (PhotoFileFormatProperties* base, + int* result_length1) +{ RawFileFormatProperties * self; gchar** result = NULL; gchar** _tmp0_; @@ -1117,34 +1270,40 @@ static gchar** raw_file_format_properties_real_get_mime_types (PhotoFileFormatPr if (result_length1) { #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp2__length1; -#line 1121 "RawSupport.c" +#line 1274 "RawSupport.c" } #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp2_; #line 157 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1127 "RawSupport.c" +#line 1280 "RawSupport.c" } -RawFileFormatProperties* raw_file_format_properties_construct (GType object_type) { +RawFileFormatProperties* +raw_file_format_properties_construct (GType object_type) +{ RawFileFormatProperties* self = NULL; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = (RawFileFormatProperties*) photo_file_format_properties_construct (object_type); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1137 "RawSupport.c" +#line 1292 "RawSupport.c" } -RawFileFormatProperties* raw_file_format_properties_new (void) { +RawFileFormatProperties* +raw_file_format_properties_new (void) +{ #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_file_format_properties_construct (TYPE_RAW_FILE_FORMAT_PROPERTIES); -#line 1144 "RawSupport.c" +#line 1301 "RawSupport.c" } -static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) { +static void +raw_file_format_properties_class_init (RawFileFormatPropertiesClass * klass) +{ gchar* _tmp0_; gchar* _tmp1_; gchar* _tmp2_; @@ -1612,25 +1771,31 @@ static void raw_file_format_properties_class_init (RawFileFormatPropertiesClass raw_file_format_properties_KNOWN_MIME_TYPES = _tmp88_; #line 59 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_file_format_properties_KNOWN_MIME_TYPES_length1 = 51; -#line 1616 "RawSupport.c" +#line 1775 "RawSupport.c" } -static void raw_file_format_properties_instance_init (RawFileFormatProperties * self) { +static void +raw_file_format_properties_instance_init (RawFileFormatProperties * self) +{ } -static void raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) { +static void +raw_file_format_properties_finalize (PhotoFileFormatProperties * obj) +{ RawFileFormatProperties * self; #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RAW_FILE_FORMAT_PROPERTIES, RawFileFormatProperties); #line 52 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" PHOTO_FILE_FORMAT_PROPERTIES_CLASS (raw_file_format_properties_parent_class)->finalize (obj); -#line 1630 "RawSupport.c" +#line 1793 "RawSupport.c" } -GType raw_file_format_properties_get_type (void) { +GType +raw_file_format_properties_get_type (void) +{ static volatile gsize raw_file_format_properties_type_id__volatile = 0; if (g_once_init_enter (&raw_file_format_properties_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawFileFormatPropertiesClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_file_format_properties_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawFileFormatProperties), 0, (GInstanceInitFunc) raw_file_format_properties_instance_init, NULL }; @@ -1642,39 +1807,46 @@ GType raw_file_format_properties_get_type (void) { } -RawSniffer* raw_sniffer_construct (GType object_type, GFile* file, PhotoFileSnifferOptions options) { +RawSniffer* +raw_sniffer_construct (GType object_type, + GFile* file, + PhotoFileSnifferOptions options) +{ RawSniffer* self = NULL; - GFile* _tmp0_; - PhotoFileSnifferOptions _tmp1_; #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (G_IS_FILE (file), NULL); #line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = file; -#line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = options; -#line 163 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - self = (RawSniffer*) photo_file_sniffer_construct (object_type, _tmp0_, _tmp1_); + self = (RawSniffer*) photo_file_sniffer_construct (object_type, file, options); #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 1660 "RawSupport.c" +#line 1823 "RawSupport.c" } -RawSniffer* raw_sniffer_new (GFile* file, PhotoFileSnifferOptions options) { +RawSniffer* +raw_sniffer_new (GFile* file, + PhotoFileSnifferOptions options) +{ #line 162 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_sniffer_construct (TYPE_RAW_SNIFFER, file, options); -#line 1667 "RawSupport.c" +#line 1833 "RawSupport.c" } -static gpointer _g_error_copy0 (gpointer self) { +static gpointer +_g_error_copy0 (gpointer self) +{ #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self ? g_error_copy (self) : NULL; -#line 1674 "RawSupport.c" +#line 1842 "RawSupport.c" } -static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, gboolean* is_corrupted, GError** error) { +static DetectedPhotoInformation* +raw_sniffer_real_sniff (PhotoFileSniffer* base, + gboolean* is_corrupted, + GError** error) +{ RawSniffer * self; gboolean _vala_is_corrupted = FALSE; DetectedPhotoInformation* result = NULL; @@ -1687,26 +1859,24 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, libraw_output_params_t* _tmp4_; DetectedPhotoInformation* _tmp14_; GRawProcessor* _tmp15_; - libraw_image_sizes_t _tmp16_; - gushort _tmp17_; - GRawProcessor* _tmp18_; - libraw_image_sizes_t _tmp19_; - gushort _tmp20_; + gushort _tmp16_; + GRawProcessor* _tmp17_; + gushort _tmp18_; + DetectedPhotoInformation* _tmp19_; + DetectedPhotoInformation* _tmp20_; DetectedPhotoInformation* _tmp21_; - DetectedPhotoInformation* _tmp22_; - DetectedPhotoInformation* _tmp23_; RawReader* reader = NULL; - GFile* _tmp24_; - gchar* _tmp25_; - gchar* _tmp26_; - RawReader* _tmp27_; - RawReader* _tmp28_; - DetectedPhotoInformation* _tmp34_; - PhotoMetadata* _tmp35_; - gboolean _tmp44_; + GFile* _tmp22_; + gchar* _tmp23_; + gchar* _tmp24_; + RawReader* _tmp25_; + RawReader* _tmp26_; + DetectedPhotoInformation* _tmp32_; + PhotoMetadata* _tmp33_; + gboolean _tmp42_; + DetectedPhotoInformation* _tmp48_; + gchar* _tmp49_; DetectedPhotoInformation* _tmp50_; - gchar* _tmp51_; - DetectedPhotoInformation* _tmp52_; GError * _inner_error_ = NULL; #line 166 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_SNIFFER, RawSniffer); @@ -1728,7 +1898,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _tmp4_ = _tmp3_; #line 173 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" (*_tmp4_).user_flip = (gint) GRAW_FLIP_NONE; -#line 1732 "RawSupport.c" +#line 1902 "RawSupport.c" { GRawProcessor* _tmp5_; GFile* _tmp6_; @@ -1752,7 +1922,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1756 "RawSupport.c" +#line 1926 "RawSupport.c" goto __catch36_graw_exception; } #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1765,7 +1935,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 176 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1769 "RawSupport.c" +#line 1939 "RawSupport.c" } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -1775,7 +1945,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1779 "RawSupport.c" +#line 1949 "RawSupport.c" goto __catch36_graw_exception; } #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1788,7 +1958,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 177 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1792 "RawSupport.c" +#line 1962 "RawSupport.c" } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = processor; @@ -1798,7 +1968,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (G_UNLIKELY (_inner_error_ != NULL)) { #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_inner_error_->domain == GRAW_EXCEPTION) { -#line 1802 "RawSupport.c" +#line 1972 "RawSupport.c" goto __catch36_graw_exception; } #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1811,7 +1981,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, g_clear_error (&_inner_error_); #line 178 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1815 "RawSupport.c" +#line 1985 "RawSupport.c" } } goto __finally36; @@ -1841,11 +2011,11 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 1845 "RawSupport.c" +#line 2015 "RawSupport.c" } #line 181 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 1849 "RawSupport.c" +#line 2019 "RawSupport.c" } #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp12_ = exception; @@ -1855,7 +2025,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = _tmp13_; #line 183 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (exception); -#line 1859 "RawSupport.c" +#line 2029 "RawSupport.c" goto __finally36; } __finally36: @@ -1869,81 +2039,77 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 175 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1873 "RawSupport.c" +#line 2043 "RawSupport.c" } #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp14_ = detected; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp15_ = processor; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp16_ = graw_processor_get_sizes (_tmp15_); -#line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp17_ = _tmp16_.iwidth; + _tmp16_ = graw_processor_get_sizes (_tmp15_).iwidth; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp18_ = processor; -#line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp19_ = graw_processor_get_sizes (_tmp18_); + _tmp17_ = processor; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp20_ = _tmp19_.iheight; + _tmp18_ = graw_processor_get_sizes (_tmp17_).iheight; #line 186 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - dimensions_init (&_tmp14_->image_dim, (gint) _tmp17_, (gint) _tmp20_); + dimensions_init (&_tmp14_->image_dim, (gint) _tmp16_, (gint) _tmp18_); #line 187 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_ = detected; + _tmp19_ = detected; #line 187 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_->colorspace = GDK_COLORSPACE_RGB; + _tmp19_->colorspace = GDK_COLORSPACE_RGB; #line 188 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_ = detected; + _tmp20_ = detected; #line 188 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_->channels = 3; + _tmp20_->channels = 3; #line 189 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_ = detected; + _tmp21_ = detected; #line 189 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_->bits_per_channel = 8; + _tmp21_->bits_per_channel = 8; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; + _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp25_ = g_file_get_path (_tmp24_); + _tmp23_ = g_file_get_path (_tmp22_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp26_ = _tmp25_; + _tmp24_ = _tmp23_; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = raw_reader_new (_tmp26_); + _tmp25_ = raw_reader_new (_tmp24_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = _tmp27_; + _tmp26_ = _tmp25_; #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp26_); + _g_free0 (_tmp24_); #line 191 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - reader = _tmp28_; -#line 1917 "RawSupport.c" + reader = _tmp26_; +#line 2083 "RawSupport.c" { - PhotoMetadata* _tmp29_ = NULL; - RawReader* _tmp30_; + PhotoMetadata* _tmp27_ = NULL; + RawReader* _tmp28_; + PhotoMetadata* _tmp29_; + DetectedPhotoInformation* _tmp30_; PhotoMetadata* _tmp31_; - DetectedPhotoInformation* _tmp32_; - PhotoMetadata* _tmp33_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = reader; + _tmp28_ = reader; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp31_ = photo_file_reader_read_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_PHOTO_FILE_READER, PhotoFileReader), &_inner_error_); + _tmp29_ = photo_file_reader_read_metadata (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_PHOTO_FILE_READER, PhotoFileReader), &_inner_error_); #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = _tmp31_; + _tmp27_ = _tmp29_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1932 "RawSupport.c" +#line 2098 "RawSupport.c" goto __catch37_g_error; } #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = detected; + _tmp30_ = detected; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp33_ = _tmp29_; + _tmp31_ = _tmp27_; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = NULL; + _tmp27_ = NULL; #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _media_metadata_unref0 (_tmp32_->metadata); + _media_metadata_unref0 (_tmp30_->metadata); #line 193 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_->metadata = _tmp33_; + _tmp30_->metadata = _tmp31_; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _media_metadata_unref0 (_tmp29_); -#line 1947 "RawSupport.c" + _media_metadata_unref0 (_tmp27_); +#line 2113 "RawSupport.c" } goto __finally37; __catch37_g_error: @@ -1955,7 +2121,7 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _inner_error_ = NULL; #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (err); -#line 1959 "RawSupport.c" +#line 2125 "RawSupport.c" } __finally37: #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -1970,65 +2136,65 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 192 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 1974 "RawSupport.c" +#line 2140 "RawSupport.c" } #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = detected; + _tmp32_ = detected; #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = _tmp34_->metadata; + _tmp33_ = _tmp32_->metadata; #line 198 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp35_ != NULL) { -#line 1982 "RawSupport.c" - DetectedPhotoInformation* _tmp36_; - DetectedPhotoInformation* _tmp37_; - PhotoMetadata* _tmp38_; - gchar* _tmp39_; - DetectedPhotoInformation* _tmp40_; - DetectedPhotoInformation* _tmp41_; - PhotoMetadata* _tmp42_; - gchar* _tmp43_; + if (_tmp33_ != NULL) { +#line 2148 "RawSupport.c" + DetectedPhotoInformation* _tmp34_; + DetectedPhotoInformation* _tmp35_; + PhotoMetadata* _tmp36_; + gchar* _tmp37_; + DetectedPhotoInformation* _tmp38_; + DetectedPhotoInformation* _tmp39_; + PhotoMetadata* _tmp40_; + gchar* _tmp41_; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = detected; + _tmp34_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = detected; + _tmp35_ = detected; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = _tmp37_->metadata; + _tmp36_ = _tmp35_->metadata; #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = photo_metadata_exif_hash (_tmp38_); + _tmp37_ = photo_metadata_exif_hash (_tmp36_); #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp36_->exif_md5); + _g_free0 (_tmp34_->exif_md5); #line 199 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_->exif_md5 = _tmp39_; + _tmp34_->exif_md5 = _tmp37_; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_ = detected; + _tmp38_ = detected; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp41_ = detected; + _tmp39_ = detected; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp42_ = _tmp41_->metadata; + _tmp40_ = _tmp39_->metadata; #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp43_ = photo_metadata_thumbnail_hash (_tmp42_); + _tmp41_ = photo_metadata_thumbnail_hash (_tmp40_); #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp40_->thumbnail_md5); + _g_free0 (_tmp38_->thumbnail_md5); #line 200 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_->thumbnail_md5 = _tmp43_; -#line 2015 "RawSupport.c" + _tmp38_->thumbnail_md5 = _tmp41_; +#line 2181 "RawSupport.c" } #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; + _tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->calc_md5; #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp44_) { -#line 2021 "RawSupport.c" - gchar* _tmp45_ = NULL; - GFile* _tmp46_; + if (_tmp42_) { +#line 2187 "RawSupport.c" + gchar* _tmp43_ = NULL; + GFile* _tmp44_; + gchar* _tmp45_; + DetectedPhotoInformation* _tmp46_; gchar* _tmp47_; - DetectedPhotoInformation* _tmp48_; - gchar* _tmp49_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; + _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_SNIFFER, PhotoFileSniffer)->file; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp47_ = md5_file (_tmp46_, &_inner_error_); + _tmp45_ = md5_file (_tmp44_, &_inner_error_); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp45_ = _tmp47_; + _tmp43_ = _tmp45_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2041,34 +2207,34 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, _detected_photo_information_unref0 (detected); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2045 "RawSupport.c" +#line 2211 "RawSupport.c" } #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp48_ = detected; + _tmp46_ = detected; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp49_ = _tmp45_; + _tmp47_ = _tmp43_; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp45_ = NULL; + _tmp43_ = NULL; #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp48_->md5); + _g_free0 (_tmp46_->md5); #line 204 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp48_->md5 = _tmp49_; + _tmp46_->md5 = _tmp47_; #line 203 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp45_); -#line 2059 "RawSupport.c" + _g_free0 (_tmp43_); +#line 2225 "RawSupport.c" } #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp50_ = detected; + _tmp48_ = detected; #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp51_ = g_strdup ("raw"); + _tmp49_ = g_strdup ("raw"); #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp50_->format_name); + _g_free0 (_tmp48_->format_name); #line 206 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp50_->format_name = _tmp51_; + _tmp48_->format_name = _tmp49_; #line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp52_ = detected; + _tmp50_ = detected; #line 207 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp52_->file_format = PHOTO_FILE_FORMAT_RAW; + _tmp50_->file_format = PHOTO_FILE_FORMAT_RAW; #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = detected; #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2079,28 +2245,34 @@ static DetectedPhotoInformation* raw_sniffer_real_sniff (PhotoFileSniffer* base, if (is_corrupted) { #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *is_corrupted = _vala_is_corrupted; -#line 2083 "RawSupport.c" +#line 2249 "RawSupport.c" } #line 209 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2087 "RawSupport.c" +#line 2253 "RawSupport.c" } -static void raw_sniffer_class_init (RawSnifferClass * klass) { +static void +raw_sniffer_class_init (RawSnifferClass * klass) +{ #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_sniffer_parent_class = g_type_class_peek_parent (klass); #line 161 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileSnifferClass *) klass)->sniff = (DetectedPhotoInformation* (*) (PhotoFileSniffer *, gboolean*, GError**)) raw_sniffer_real_sniff; -#line 2096 "RawSupport.c" +#line 2264 "RawSupport.c" } -static void raw_sniffer_instance_init (RawSniffer * self) { +static void +raw_sniffer_instance_init (RawSniffer * self) +{ } -GType raw_sniffer_get_type (void) { +GType +raw_sniffer_get_type (void) +{ static volatile gsize raw_sniffer_type_id__volatile = 0; if (g_once_init_enter (&raw_sniffer_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawSnifferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_sniffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawSniffer), 0, (GInstanceInitFunc) raw_sniffer_instance_init, NULL }; @@ -2112,29 +2284,34 @@ GType raw_sniffer_get_type (void) { } -RawReader* raw_reader_construct (GType object_type, const gchar* filepath) { +RawReader* +raw_reader_construct (GType object_type, + const gchar* filepath) +{ RawReader* self = NULL; - const gchar* _tmp0_; #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = filepath; -#line 215 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - self = (RawReader*) photo_file_reader_construct (object_type, _tmp0_, PHOTO_FILE_FORMAT_RAW); + self = (RawReader*) photo_file_reader_construct (object_type, filepath, PHOTO_FILE_FORMAT_RAW); #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return self; -#line 2127 "RawSupport.c" +#line 2299 "RawSupport.c" } -RawReader* raw_reader_new (const gchar* filepath) { +RawReader* +raw_reader_new (const gchar* filepath) +{ #line 214 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return raw_reader_construct (TYPE_RAW_READER, filepath); -#line 2134 "RawSupport.c" +#line 2308 "RawSupport.c" } -static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GError** error) { +static PhotoMetadata* +raw_reader_real_read_metadata (PhotoFileReader* base, + GError** error) +{ RawReader * self; PhotoMetadata* result = NULL; PhotoMetadata* metadata = NULL; @@ -2164,17 +2341,20 @@ static PhotoMetadata* raw_reader_real_read_metadata (PhotoFileReader* base, GErr _media_metadata_unref0 (metadata); #line 220 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2168 "RawSupport.c" +#line 2345 "RawSupport.c" } #line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = metadata; #line 222 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2174 "RawSupport.c" +#line 2351 "RawSupport.c" } -static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** error) { +static GdkPixbuf* +raw_reader_real_unscaled_read (PhotoFileReader* base, + GError** error) +{ RawReader * self; GdkPixbuf* result = NULL; GRawProcessor* processor = NULL; @@ -2229,7 +2409,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 230 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2233 "RawSupport.c" +#line 2413 "RawSupport.c" } #line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = processor; @@ -2243,7 +2423,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 231 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2247 "RawSupport.c" +#line 2427 "RawSupport.c" } #line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp9_ = processor; @@ -2257,7 +2437,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 232 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2261 "RawSupport.c" +#line 2441 "RawSupport.c" } #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp11_ = processor; @@ -2273,7 +2453,7 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2277 "RawSupport.c" +#line 2457 "RawSupport.c" } #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp13_ = graw_processed_image_get_pixbuf_copy (_tmp10_); @@ -2285,11 +2465,16 @@ static GdkPixbuf* raw_reader_real_unscaled_read (PhotoFileReader* base, GError** _graw_processor_unref0 (processor); #line 234 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2289 "RawSupport.c" +#line 2469 "RawSupport.c" } -static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions* full, Dimensions* scaled, GError** error) { +static GdkPixbuf* +raw_reader_real_scaled_read (PhotoFileReader* base, + Dimensions* full, + Dimensions* scaled, + GError** error) +{ RawReader * self; GdkPixbuf* result = NULL; gdouble width_proportion = 0.0; @@ -2315,17 +2500,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions GRawProcessor* _tmp17_; gchar* _tmp18_; gchar* _tmp19_; + GRawProcessor* _tmp29_; GRawProcessor* _tmp30_; - GRawProcessor* _tmp31_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp32_; + GRawProcessor* _tmp31_; + GRawProcessedImage* _tmp32_; GRawProcessedImage* _tmp33_; - GRawProcessedImage* _tmp34_; + GdkPixbuf* _tmp34_; GdkPixbuf* _tmp35_; - GdkPixbuf* _tmp36_; - Dimensions _tmp37_; + Dimensions _tmp36_; + GdkPixbuf* _tmp37_; GdkPixbuf* _tmp38_; - GdkPixbuf* _tmp39_; GError * _inner_error_ = NULL; #line 237 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RAW_READER, RawReader); @@ -2357,17 +2542,17 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _tmp9_ = width_proportion; #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (_tmp9_ < 0.5) { -#line 2361 "RawSupport.c" +#line 2546 "RawSupport.c" gdouble _tmp10_; #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp10_ = height_proportion; #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = _tmp10_ < 0.5; -#line 2367 "RawSupport.c" +#line 2552 "RawSupport.c" } else { #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp8_ = FALSE; -#line 2371 "RawSupport.c" +#line 2556 "RawSupport.c" } #line 241 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" half_size = _tmp8_; @@ -2407,68 +2592,65 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 247 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2411 "RawSupport.c" +#line 2596 "RawSupport.c" } { - PhotoFileReaderRole _tmp20_; #line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp20_ = photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader)); -#line 249 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp20_ == PHOTO_FILE_READER_ROLE_THUMBNAIL) { -#line 2419 "RawSupport.c" - GRawProcessor* _tmp21_; + if (photo_file_reader_get_role (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PHOTO_FILE_READER, PhotoFileReader)) == PHOTO_FILE_READER_ROLE_THUMBNAIL) { +#line 2601 "RawSupport.c" + GRawProcessor* _tmp20_; GRawProcessedImage* image = NULL; - GRawProcessor* _tmp22_; + GRawProcessor* _tmp21_; + GRawProcessedImage* _tmp22_; GRawProcessedImage* _tmp23_; - GRawProcessedImage* _tmp24_; + GdkPixbuf* _tmp24_; GdkPixbuf* _tmp25_; - GdkPixbuf* _tmp26_; - Dimensions _tmp27_; + Dimensions _tmp26_; + GdkPixbuf* _tmp27_; GdkPixbuf* _tmp28_; - GdkPixbuf* _tmp29_; #line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_ = processor; + _tmp20_ = processor; #line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - graw_processor_unpack_thumb (_tmp21_, &_inner_error_); + graw_processor_unpack_thumb (_tmp20_, &_inner_error_); #line 250 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2436 "RawSupport.c" +#line 2618 "RawSupport.c" goto __catch38_g_error; } #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_ = processor; + _tmp21_ = processor; #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_ = graw_processor_make_thumb_image (_tmp22_, &_inner_error_); + _tmp22_ = graw_processor_make_thumb_image (_tmp21_, &_inner_error_); #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - image = _tmp23_; + image = _tmp22_; #line 251 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 2447 "RawSupport.c" +#line 2629 "RawSupport.c" goto __catch38_g_error; } #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp24_ = image; + _tmp23_ = image; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp25_ = graw_processed_image_get_pixbuf_copy (_tmp24_); + _tmp24_ = graw_processed_image_get_pixbuf_copy (_tmp23_); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp26_ = _tmp25_; + _tmp25_ = _tmp24_; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = *scaled; + _tmp26_ = *scaled; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = resize_pixbuf (_tmp26_, &_tmp27_, GDK_INTERP_BILINEAR); + _tmp27_ = resize_pixbuf (_tmp25_, &_tmp26_, GDK_INTERP_BILINEAR); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = _tmp28_; + _tmp28_ = _tmp27_; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp26_); + _g_object_unref0 (_tmp25_); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp29_; + result = _tmp28_; #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (image); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); #line 252 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2472 "RawSupport.c" +#line 2654 "RawSupport.c" } } goto __finally38; @@ -2481,7 +2663,7 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _inner_error_ = NULL; #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_error_free0 (_error_); -#line 2485 "RawSupport.c" +#line 2667 "RawSupport.c" } __finally38: #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2492,12 +2674,12 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 248 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2496 "RawSupport.c" +#line 2678 "RawSupport.c" } #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = processor; + _tmp29_ = processor; #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - graw_processor_unpack (_tmp30_, &_inner_error_); + graw_processor_unpack (_tmp29_, &_inner_error_); #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2506,12 +2688,12 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 260 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2510 "RawSupport.c" +#line 2692 "RawSupport.c" } #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp31_ = processor; + _tmp30_ = processor; #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - graw_processor_process (_tmp31_, &_inner_error_); + graw_processor_process (_tmp30_, &_inner_error_); #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2520,14 +2702,14 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 261 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2524 "RawSupport.c" +#line 2706 "RawSupport.c" } #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = processor; + _tmp31_ = processor; #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp33_ = graw_processor_make_mem_image (_tmp32_, &_inner_error_); + _tmp32_ = graw_processor_make_mem_image (_tmp31_, &_inner_error_); #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - image = _tmp33_; + image = _tmp32_; #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2536,35 +2718,37 @@ static GdkPixbuf* raw_reader_real_scaled_read (PhotoFileReader* base, Dimensions _graw_processor_unref0 (processor); #line 263 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 2540 "RawSupport.c" +#line 2722 "RawSupport.c" } #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = image; + _tmp33_ = image; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = graw_processed_image_get_pixbuf_copy (_tmp34_); + _tmp34_ = graw_processed_image_get_pixbuf_copy (_tmp33_); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = _tmp35_; + _tmp35_ = _tmp34_; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = *scaled; + _tmp36_ = *scaled; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = resize_pixbuf (_tmp36_, &_tmp37_, GDK_INTERP_BILINEAR); + _tmp37_ = resize_pixbuf (_tmp35_, &_tmp36_, GDK_INTERP_BILINEAR); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = _tmp38_; + _tmp38_ = _tmp37_; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp36_); + _g_object_unref0 (_tmp35_); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - result = _tmp39_; + result = _tmp38_; #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processed_image_unref0 (image); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _graw_processor_unref0 (processor); #line 265 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2564 "RawSupport.c" +#line 2746 "RawSupport.c" } -static void raw_reader_class_init (RawReaderClass * klass) { +static void +raw_reader_class_init (RawReaderClass * klass) +{ #line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" raw_reader_parent_class = g_type_class_peek_parent (klass); #line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2573,15 +2757,19 @@ static void raw_reader_class_init (RawReaderClass * klass) { ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) raw_reader_real_unscaled_read; #line 213 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) raw_reader_real_scaled_read; -#line 2577 "RawSupport.c" +#line 2761 "RawSupport.c" } -static void raw_reader_instance_init (RawReader * self) { +static void +raw_reader_instance_init (RawReader * self) +{ } -GType raw_reader_get_type (void) { +GType +raw_reader_get_type (void) +{ static volatile gsize raw_reader_type_id__volatile = 0; if (g_once_init_enter (&raw_reader_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (RawReaderClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) raw_reader_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RawReader), 0, (GInstanceInitFunc) raw_reader_instance_init, NULL }; @@ -2593,7 +2781,9 @@ GType raw_reader_get_type (void) { } -RawDeveloper* raw_developer_as_array (int* result_length1) { +RawDeveloper* +raw_developer_as_array (int* result_length1) +{ RawDeveloper* result = NULL; RawDeveloper* _tmp0_; RawDeveloper* _tmp1_; @@ -2614,23 +2804,25 @@ RawDeveloper* raw_developer_as_array (int* result_length1) { if (result_length1) { #line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" *result_length1 = _tmp1__length1; -#line 2618 "RawSupport.c" +#line 2808 "RawSupport.c" } #line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = _tmp1_; #line 276 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2624 "RawSupport.c" +#line 2814 "RawSupport.c" } -gchar* raw_developer_to_string (RawDeveloper self) { +gchar* +raw_developer_to_string (RawDeveloper self) +{ gchar* result = NULL; #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (self) { #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2634 "RawSupport.c" +#line 2826 "RawSupport.c" { gchar* _tmp0_; #line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2639,11 +2831,11 @@ gchar* raw_developer_to_string (RawDeveloper self) { result = _tmp0_; #line 282 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2643 "RawSupport.c" +#line 2835 "RawSupport.c" } #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: -#line 2647 "RawSupport.c" +#line 2839 "RawSupport.c" { gchar* _tmp1_; #line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2652,11 +2844,11 @@ gchar* raw_developer_to_string (RawDeveloper self) { result = _tmp1_; #line 284 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2656 "RawSupport.c" +#line 2848 "RawSupport.c" } #line 280 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2660 "RawSupport.c" +#line 2852 "RawSupport.c" { gchar* _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2665,99 +2857,100 @@ gchar* raw_developer_to_string (RawDeveloper self) { result = _tmp2_; #line 286 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2669 "RawSupport.c" +#line 2861 "RawSupport.c" } default: { #line 288 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2675 "RawSupport.c" +#line 2867 "RawSupport.c" } } } -RawDeveloper raw_developer_from_string (const gchar* value) { +RawDeveloper +raw_developer_from_string (const gchar* value) +{ RawDeveloper result = 0; const gchar* _tmp0_; - const gchar* _tmp1_; - GQuark _tmp3_ = 0U; + GQuark _tmp2_ = 0U; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - static GQuark _tmp2_label0 = 0; + static GQuark _tmp1_label0 = 0; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - static GQuark _tmp2_label1 = 0; + static GQuark _tmp1_label1 = 0; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - static GQuark _tmp2_label2 = 0; + static GQuark _tmp1_label2 = 0; #line 292 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (value != NULL, 0); #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _tmp0_ = value; #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = _tmp0_; -#line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_); + _tmp2_ = (NULL == _tmp0_) ? 0 : g_quark_from_string (_tmp0_); #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("SHOTWELL")))) { + if (_tmp2_ == ((0 != _tmp1_label0) ? _tmp1_label0 : (_tmp1_label0 = g_quark_from_static_string ("SHOTWELL")))) { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2704 "RawSupport.c" +#line 2895 "RawSupport.c" default: { #line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_SHOTWELL; #line 295 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2711 "RawSupport.c" +#line 2902 "RawSupport.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("CAMERA")))) { + } else if (_tmp2_ == ((0 != _tmp1_label1) ? _tmp1_label1 : (_tmp1_label1 = g_quark_from_static_string ("CAMERA")))) { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2717 "RawSupport.c" +#line 2908 "RawSupport.c" default: { #line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_CAMERA; #line 297 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2724 "RawSupport.c" +#line 2915 "RawSupport.c" } } - } else if (_tmp3_ == ((0 != _tmp2_label2) ? _tmp2_label2 : (_tmp2_label2 = g_quark_from_static_string ("EMBEDDED")))) { + } else if (_tmp2_ == ((0 != _tmp1_label2) ? _tmp1_label2 : (_tmp1_label2 = g_quark_from_static_string ("EMBEDDED")))) { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2730 "RawSupport.c" +#line 2921 "RawSupport.c" default: { #line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = RAW_DEVELOPER_EMBEDDED; #line 299 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2737 "RawSupport.c" +#line 2928 "RawSupport.c" } } } else { #line 293 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (0) { -#line 2743 "RawSupport.c" +#line 2934 "RawSupport.c" default: { #line 301 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2748 "RawSupport.c" +#line 2939 "RawSupport.c" } } } } -gchar* raw_developer_get_label (RawDeveloper self) { +gchar* +raw_developer_get_label (RawDeveloper self) +{ gchar* result = NULL; #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" switch (self) { #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_SHOTWELL: -#line 2761 "RawSupport.c" +#line 2954 "RawSupport.c" { gchar* _tmp0_; #line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2766,13 +2959,13 @@ gchar* raw_developer_get_label (RawDeveloper self) { result = _tmp0_; #line 308 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2770 "RawSupport.c" +#line 2963 "RawSupport.c" } #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_CAMERA: #line 306 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" case RAW_DEVELOPER_EMBEDDED: -#line 2776 "RawSupport.c" +#line 2969 "RawSupport.c" { gchar* _tmp1_; #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -2781,121 +2974,116 @@ gchar* raw_developer_get_label (RawDeveloper self) { result = _tmp1_; #line 311 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2785 "RawSupport.c" +#line 2978 "RawSupport.c" } default: { #line 313 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_assert_not_reached (); -#line 2791 "RawSupport.c" +#line 2984 "RawSupport.c" } } } -gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d) { +gboolean +raw_developer_is_equivalent (RawDeveloper self, + RawDeveloper d) +{ gboolean result = FALSE; - RawDeveloper _tmp0_; + gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - gboolean _tmp2_ = FALSE; #line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp0_ = d; -#line 320 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (self == _tmp0_) { + if (self == d) { #line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = TRUE; #line 321 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2810 "RawSupport.c" +#line 3003 "RawSupport.c" } #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_CAMERA) { -#line 2814 "RawSupport.c" - RawDeveloper _tmp3_; -#line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = d; #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = _tmp3_ == RAW_DEVELOPER_EMBEDDED; -#line 2820 "RawSupport.c" + _tmp1_ = d == RAW_DEVELOPER_EMBEDDED; +#line 3009 "RawSupport.c" } else { #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = FALSE; -#line 2824 "RawSupport.c" + _tmp1_ = FALSE; +#line 3013 "RawSupport.c" } #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp2_) { + if (_tmp1_) { #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = TRUE; -#line 2830 "RawSupport.c" + _tmp0_ = TRUE; +#line 3019 "RawSupport.c" } else { - gboolean _tmp4_ = FALSE; + gboolean _tmp2_ = FALSE; #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self == RAW_DEVELOPER_EMBEDDED) { -#line 2835 "RawSupport.c" - RawDeveloper _tmp5_; #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp5_ = d; -#line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp4_ = _tmp5_ == RAW_DEVELOPER_CAMERA; -#line 2841 "RawSupport.c" + _tmp2_ = d == RAW_DEVELOPER_CAMERA; +#line 3026 "RawSupport.c" } else { #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp4_ = FALSE; -#line 2845 "RawSupport.c" + _tmp2_ = FALSE; +#line 3030 "RawSupport.c" } #line 324 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = _tmp4_; -#line 2849 "RawSupport.c" + _tmp0_ = _tmp2_; +#line 3034 "RawSupport.c" } #line 323 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp1_) { + if (_tmp0_) { #line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = TRUE; #line 325 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2857 "RawSupport.c" +#line 3042 "RawSupport.c" } #line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = FALSE; #line 327 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 2863 "RawSupport.c" +#line 3048 "RawSupport.c" } -BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper self, const gchar* raw_filepath, const gchar* camera_development_filename, GError** error) { +BackingPhotoRow* +raw_developer_create_backing_row_for_development (RawDeveloper self, + const gchar* raw_filepath, + const gchar* camera_development_filename, + GError** error) +{ BackingPhotoRow* result = NULL; BackingPhotoRow* ns = NULL; BackingPhotoRow* _tmp0_; GFile* master = NULL; - const gchar* _tmp1_; - GFile* _tmp2_; + GFile* _tmp1_; gchar* name = NULL; gchar* ext = NULL; - GFile* _tmp3_; + GFile* _tmp2_; + gchar* _tmp3_; gchar* _tmp4_; - gchar* _tmp5_; + gchar* _tmp5_ = NULL; gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; gchar* basename = NULL; - const gchar* _tmp8_; gchar* newbasename = NULL; - const gchar* _tmp27_; - gchar* _tmp28_; + const gchar* _tmp24_; + gchar* _tmp25_; gboolean c = FALSE; GFile* new_back = NULL; - GFile* _tmp29_; - GFile* _tmp30_; + GFile* _tmp26_; + GFile* _tmp27_; + GFile* _tmp28_; + const gchar* _tmp29_; + gboolean _tmp30_ = FALSE; GFile* _tmp31_; - const gchar* _tmp32_; - gboolean _tmp33_ = FALSE; - GFile* _tmp34_; - GFile* _tmp35_; + GFile* _tmp32_; + GFile* _tmp33_; + BackingPhotoRow* _tmp34_; + BackingPhotoRow* _tmp35_; GFile* _tmp36_; - BackingPhotoRow* _tmp37_; - BackingPhotoRow* _tmp38_; - GFile* _tmp39_; - gchar* _tmp40_; + gchar* _tmp37_; GError * _inner_error_ = NULL; #line 332 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" g_return_val_if_fail (raw_filepath != NULL, NULL); @@ -2904,149 +3092,142 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper #line 334 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" ns = _tmp0_; #line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp1_ = raw_filepath; + _tmp1_ = g_file_new_for_path (raw_filepath); #line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp2_ = g_file_new_for_path (_tmp1_); -#line 335 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - master = _tmp2_; + master = _tmp1_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp3_ = master; + _tmp2_ = master; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp4_ = g_file_get_basename (_tmp3_); + _tmp3_ = g_file_get_basename (_tmp2_); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp5_ = _tmp4_; + _tmp4_ = _tmp3_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - disassemble_filename (_tmp5_, &_tmp6_, &_tmp7_); + disassemble_filename (_tmp4_, &_tmp5_, &_tmp6_); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (name); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - name = _tmp6_; + name = _tmp5_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (ext); #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - ext = _tmp7_; + ext = _tmp6_; #line 337 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp5_); -#line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp8_ = camera_development_filename; + _g_free0 (_tmp4_); #line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - if (_tmp8_ == NULL) { -#line 2935 "RawSupport.c" - gchar* _tmp9_ = NULL; - const gchar* _tmp16_; - gchar* _tmp17_; + if (camera_development_filename == NULL) { +#line 3119 "RawSupport.c" + gchar* _tmp7_ = NULL; + const gchar* _tmp14_; + gchar* _tmp15_; + gchar* _tmp16_; + const gchar* _tmp17_; gchar* _tmp18_; - const gchar* _tmp19_; + gchar* _tmp19_; gchar* _tmp20_; gchar* _tmp21_; gchar* _tmp22_; - gchar* _tmp23_; - gchar* _tmp24_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (self != RAW_DEVELOPER_CAMERA) { -#line 2948 "RawSupport.c" +#line 3132 "RawSupport.c" + gchar* _tmp8_; + gchar* _tmp9_; gchar* _tmp10_; gchar* _tmp11_; gchar* _tmp12_; - gchar* _tmp13_; - gchar* _tmp14_; -#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp10_ = raw_developer_to_string (self); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp11_ = _tmp10_; + _tmp8_ = raw_developer_to_string (self); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp12_ = g_utf8_strdown (_tmp11_, (gssize) -1); + _tmp9_ = _tmp8_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp13_ = _tmp12_; + _tmp10_ = g_utf8_strdown (_tmp9_, (gssize) -1); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp14_ = g_strconcat ("_", _tmp13_, NULL); + _tmp11_ = _tmp10_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp9_); + _tmp12_ = g_strconcat ("_", _tmp11_, NULL); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp9_ = _tmp14_; + _g_free0 (_tmp7_); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp13_); + _tmp7_ = _tmp12_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp11_); -#line 2972 "RawSupport.c" +#line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (_tmp9_); +#line 3156 "RawSupport.c" } else { - gchar* _tmp15_; + gchar* _tmp13_; #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp15_ = g_strdup (""); + _tmp13_ = g_strdup (""); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp9_); + _g_free0 (_tmp7_); #line 345 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp9_ = _tmp15_; -#line 2981 "RawSupport.c" + _tmp7_ = _tmp13_; +#line 3165 "RawSupport.c" } #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp16_ = name; + _tmp14_ = name; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp17_ = g_strconcat (_tmp16_, "_", NULL); + _tmp15_ = g_strconcat (_tmp14_, "_", NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp18_ = _tmp17_; + _tmp16_ = _tmp15_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp19_ = ext; + _tmp17_ = ext; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp20_ = g_strconcat (_tmp18_, _tmp19_, NULL); + _tmp18_ = g_strconcat (_tmp16_, _tmp17_, NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp21_ = _tmp20_; + _tmp19_ = _tmp18_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp22_ = g_strconcat (_tmp21_, _tmp9_, NULL); + _tmp20_ = g_strconcat (_tmp19_, _tmp7_, NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp23_ = _tmp22_; + _tmp21_ = _tmp20_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp24_ = g_strconcat (_tmp23_, ".jpg", NULL); + _tmp22_ = g_strconcat (_tmp21_, ".jpg", NULL); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - basename = _tmp24_; -#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp23_); + basename = _tmp22_; #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (_tmp21_); #line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp18_); + _g_free0 (_tmp19_); +#line 344 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" + _g_free0 (_tmp16_); #line 343 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp9_); -#line 3013 "RawSupport.c" + _g_free0 (_tmp7_); +#line 3197 "RawSupport.c" } else { - const gchar* _tmp25_; - gchar* _tmp26_; -#line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp25_ = camera_development_filename; + gchar* _tmp23_; #line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp26_ = g_strdup (_tmp25_); + _tmp23_ = g_strdup (camera_development_filename); #line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" _g_free0 (basename); #line 347 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - basename = _tmp26_; -#line 3025 "RawSupport.c" + basename = _tmp23_; +#line 3206 "RawSupport.c" } #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp27_ = basename; + _tmp24_ = basename; #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp28_ = library_files_convert_basename (_tmp27_); + _tmp25_ = library_files_convert_basename (_tmp24_); #line 350 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - newbasename = _tmp28_; + newbasename = _tmp25_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp29_ = master; + _tmp26_ = master; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp30_ = g_file_get_parent (_tmp29_); + _tmp27_ = g_file_get_parent (_tmp26_); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp31_ = _tmp30_; + _tmp28_ = _tmp27_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp32_ = newbasename; + _tmp29_ = newbasename; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp34_ = generate_unique_file (_tmp31_, _tmp32_, &_tmp33_, &_inner_error_); + _tmp31_ = generate_unique_file (_tmp28_, _tmp29_, &_tmp30_, &_inner_error_); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - c = _tmp33_; + c = _tmp30_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp35_ = _tmp34_; + _tmp32_ = _tmp31_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_object_unref0 (_tmp31_); + _g_object_unref0 (_tmp28_); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - new_back = _tmp35_; + new_back = _tmp32_; #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3065,12 +3246,12 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _backing_photo_row_unref0 (ns); #line 353 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3069 "RawSupport.c" +#line 3250 "RawSupport.c" } #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp36_ = new_back; + _tmp33_ = new_back; #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - claim_file (_tmp36_, &_inner_error_); + claim_file (_tmp33_, &_inner_error_); #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3091,22 +3272,22 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _backing_photo_row_unref0 (ns); #line 354 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return NULL; -#line 3095 "RawSupport.c" +#line 3276 "RawSupport.c" } #line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_ = ns; + _tmp34_ = ns; #line 355 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp37_->file_format = PHOTO_FILE_FORMAT_JFIF; + _tmp34_->file_format = PHOTO_FILE_FORMAT_JFIF; #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_ = ns; + _tmp35_ = ns; #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp39_ = new_back; + _tmp36_ = new_back; #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp40_ = g_file_get_path (_tmp39_); + _tmp37_ = g_file_get_path (_tmp36_); #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _g_free0 (_tmp38_->filepath); + _g_free0 (_tmp35_->filepath); #line 356 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" - _tmp38_->filepath = _tmp40_; + _tmp35_->filepath = _tmp37_; #line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" result = ns; #line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" @@ -3123,11 +3304,13 @@ BackingPhotoRow* raw_developer_create_backing_row_for_development (RawDeveloper _g_object_unref0 (master); #line 358 "/home/jens/Source/shotwell/src/photos/RawSupport.vala" return result; -#line 3127 "RawSupport.c" +#line 3308 "RawSupport.c" } -GType raw_developer_get_type (void) { +GType +raw_developer_get_type (void) +{ static volatile gsize raw_developer_type_id__volatile = 0; if (g_once_init_enter (&raw_developer_type_id__volatile)) { static const GEnumValue values[] = {{RAW_DEVELOPER_SHOTWELL, "RAW_DEVELOPER_SHOTWELL", "shotwell"}, {RAW_DEVELOPER_CAMERA, "RAW_DEVELOPER_CAMERA", "camera"}, {RAW_DEVELOPER_EMBEDDED, "RAW_DEVELOPER_EMBEDDED", "embedded"}, {0, NULL, NULL}}; -- cgit v1.2.3