From 2492891f112caac6076ce49721d9d5d78a152c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:53:58 +0100 Subject: New upstream version 0.26.4 --- src/photos/PhotoFileAdapter.c | 128 +++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 64 deletions(-) (limited to 'src/photos/PhotoFileAdapter.c') diff --git a/src/photos/PhotoFileAdapter.c b/src/photos/PhotoFileAdapter.c index a2fb384..6ec6ea2 100644 --- a/src/photos/PhotoFileAdapter.c +++ b/src/photos/PhotoFileAdapter.c @@ -1,4 +1,4 @@ -/* PhotoFileAdapter.c generated by valac 0.34.7, the Vala compiler +/* PhotoFileAdapter.c generated by valac 0.36.6, the Vala compiler * generated from PhotoFileAdapter.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -217,7 +217,7 @@ gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self); gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self); GFile* photo_file_adapter_get_file (PhotoFileAdapter* self); PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self); -static void photo_file_adapter_finalize (PhotoFileAdapter* obj); +static void photo_file_adapter_finalize (PhotoFileAdapter * obj); GType photo_file_reader_get_type (void) G_GNUC_CONST; gpointer media_metadata_ref (gpointer instance); void media_metadata_unref (gpointer instance); @@ -252,7 +252,7 @@ static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dim GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp); void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role); PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self); -static void photo_file_reader_finalize (PhotoFileAdapter* obj); +static void photo_file_reader_finalize (PhotoFileAdapter * obj); GType jpeg_quality_get_type (void) G_GNUC_CONST; enum { PHOTO_FILE_WRITER_DUMMY_PROPERTY @@ -273,9 +273,9 @@ static void photo_file_metadata_writer_real_write_metadata (PhotoFileMetadataWri PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { PhotoFileAdapter* self = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; - PhotoFileFormat _tmp2_ = 0; + const gchar* _tmp0_; + gchar* _tmp1_; + PhotoFileFormat _tmp2_; #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 25 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -300,8 +300,8 @@ PhotoFileAdapter* photo_file_adapter_construct (GType object_type, const gchar* gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) { gboolean result = FALSE; - const gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; + const gchar* _tmp0_; + gboolean _tmp1_; #line 30 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), FALSE); #line 31 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -318,8 +318,8 @@ gboolean photo_file_adapter_file_exists (PhotoFileAdapter* self) { gchar* photo_file_adapter_get_filepath (PhotoFileAdapter* self) { gchar* result = NULL; - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + const gchar* _tmp0_; + gchar* _tmp1_; #line 34 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL); #line 35 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -349,23 +349,23 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), NULL); #line 351 "PhotoFileAdapter.c" { - GFile* _tmp0_ = NULL; + GFile* _tmp0_; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp0_ = self->priv->file; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_rec_mutex_lock (&self->priv->__lock_file); #line 358 "PhotoFileAdapter.c" { - GFile* _tmp1_ = NULL; - GFile* _tmp4_ = NULL; - GFile* _tmp5_ = NULL; + GFile* _tmp1_; + GFile* _tmp4_; + GFile* _tmp5_; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp1_ = self->priv->file; #line 41 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (_tmp1_ == NULL) { #line 367 "PhotoFileAdapter.c" - const gchar* _tmp2_ = NULL; - GFile* _tmp3_ = NULL; + const gchar* _tmp2_; + GFile* _tmp3_; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp2_ = self->priv->filepath; #line 42 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -388,7 +388,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { } __finally24: { - GFile* _tmp6_ = NULL; + GFile* _tmp6_; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" _tmp6_ = self->priv->file; #line 40 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -418,7 +418,7 @@ GFile* photo_file_adapter_get_file (PhotoFileAdapter* self) { PhotoFileFormat photo_file_adapter_get_file_format (PhotoFileAdapter* self) { PhotoFileFormat result = 0; - PhotoFileFormat _tmp0_ = 0; + PhotoFileFormat _tmp0_; #line 50 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_ADAPTER (self), 0); #line 51 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -473,7 +473,7 @@ static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_col #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (collect_values[0].v_pointer) { #line 476 "PhotoFileAdapter.c" - PhotoFileAdapter* object; + PhotoFileAdapter * object; object = collect_values[0].v_pointer; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (object->parent_instance.g_class == NULL) { @@ -500,7 +500,7 @@ static gchar* value_photo_file_adapter_collect_value (GValue* value, guint n_col static gchar* value_photo_file_adapter_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - PhotoFileAdapter** object_p; + PhotoFileAdapter ** object_p; object_p = collect_values[0].v_pointer; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (!object_p) { @@ -552,7 +552,7 @@ gpointer value_get_photo_file_adapter (const GValue* value) { void value_set_photo_file_adapter (GValue* value, gpointer v_object) { - PhotoFileAdapter* old; + PhotoFileAdapter * old; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER)); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -583,7 +583,7 @@ void value_set_photo_file_adapter (GValue* value, gpointer v_object) { void value_take_photo_file_adapter (GValue* value, gpointer v_object) { - PhotoFileAdapter* old; + PhotoFileAdapter * old; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_PHOTO_FILE_ADAPTER)); #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -635,7 +635,7 @@ static void photo_file_adapter_instance_init (PhotoFileAdapter * self) { } -static void photo_file_adapter_finalize (PhotoFileAdapter* obj) { +static void photo_file_adapter_finalize (PhotoFileAdapter * obj) { PhotoFileAdapter * self; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_ADAPTER, PhotoFileAdapter); @@ -666,7 +666,7 @@ GType photo_file_adapter_get_type (void) { gpointer photo_file_adapter_ref (gpointer instance) { - PhotoFileAdapter* self; + PhotoFileAdapter * self; self = instance; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_atomic_int_inc (&self->ref_count); @@ -677,7 +677,7 @@ gpointer photo_file_adapter_ref (gpointer instance) { void photo_file_adapter_unref (gpointer instance) { - PhotoFileAdapter* self; + PhotoFileAdapter * self; self = instance; #line 20 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -704,8 +704,8 @@ GType photo_file_reader_role_get_type (void) { PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { PhotoFileReader* self = NULL; - const gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; + const gchar* _tmp0_; + PhotoFileFormat _tmp1_; #line 67 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 68 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -723,12 +723,12 @@ PhotoFileReader* photo_file_reader_construct (GType object_type, const gchar* fi PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError** error) { PhotoFileWriter* result = NULL; PhotoFileWriter* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PhotoFileWriter* _tmp4_ = NULL; - PhotoFileWriter* _tmp5_ = NULL; - PhotoFileWriter* _tmp6_ = NULL; + PhotoFileFormat _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PhotoFileWriter* _tmp4_; + PhotoFileWriter* _tmp5_; + PhotoFileWriter* _tmp6_; GError * _inner_error_ = NULL; #line 71 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); @@ -782,12 +782,12 @@ PhotoFileWriter* photo_file_reader_create_writer (PhotoFileReader* self, GError* PhotoFileMetadataWriter* photo_file_reader_create_metadata_writer (PhotoFileReader* self, GError** error) { PhotoFileMetadataWriter* result = NULL; PhotoFileMetadataWriter* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; - gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; - PhotoFileMetadataWriter* _tmp4_ = NULL; - PhotoFileMetadataWriter* _tmp5_ = NULL; - PhotoFileMetadataWriter* _tmp6_ = NULL; + PhotoFileFormat _tmp1_; + gchar* _tmp2_; + gchar* _tmp3_; + PhotoFileMetadataWriter* _tmp4_; + PhotoFileMetadataWriter* _tmp5_; + PhotoFileMetadataWriter* _tmp6_; GError * _inner_error_ = NULL; #line 75 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), NULL); @@ -877,9 +877,9 @@ GdkPixbuf* photo_file_reader_unscaled_read (PhotoFileReader* self, GError** erro static GdkPixbuf* photo_file_reader_real_scaled_read (PhotoFileReader* self, Dimensions* full, Dimensions* scaled, GError** error) { GdkPixbuf* result = NULL; GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; - Dimensions _tmp2_ = {0}; - GdkPixbuf* _tmp3_ = NULL; + GdkPixbuf* _tmp1_; + Dimensions _tmp2_; + GdkPixbuf* _tmp3_; GError * _inner_error_ = NULL; #line 83 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (full != NULL, NULL); @@ -921,7 +921,7 @@ GdkPixbuf* photo_file_reader_scaled_read (PhotoFileReader* self, Dimensions* ful void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role) { - PhotoFileReaderRole _tmp0_ = 0; + PhotoFileReaderRole _tmp0_; #line 87 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_if_fail (IS_PHOTO_FILE_READER (self)); #line 88 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -934,7 +934,7 @@ void photo_file_reader_set_role (PhotoFileReader* self, PhotoFileReaderRole role PhotoFileReaderRole photo_file_reader_get_role (PhotoFileReader* self) { PhotoFileReaderRole result = 0; - PhotoFileReaderRole _tmp0_ = 0; + PhotoFileReaderRole _tmp0_; #line 91 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_READER (self), 0); #line 92 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -955,11 +955,11 @@ static void photo_file_reader_class_init (PhotoFileReaderClass * klass) { #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_type_class_add_private (klass, sizeof (PhotoFileReaderPrivate)); #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*)(PhotoFileReader*, GError**)) photo_file_reader_real_read_metadata; + ((PhotoFileReaderClass *) klass)->read_metadata = (PhotoMetadata* (*) (PhotoFileReader *, GError**)) photo_file_reader_real_read_metadata; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*)(PhotoFileReader*, GError**)) photo_file_reader_real_unscaled_read; + ((PhotoFileReaderClass *) klass)->unscaled_read = (GdkPixbuf* (*) (PhotoFileReader *, GError**)) photo_file_reader_real_unscaled_read; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*)(PhotoFileReader*, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read; + ((PhotoFileReaderClass *) klass)->scaled_read = (GdkPixbuf* (*) (PhotoFileReader *, Dimensions*, Dimensions*, GError**)) photo_file_reader_real_scaled_read; #line 964 "PhotoFileAdapter.c" } @@ -973,7 +973,7 @@ static void photo_file_reader_instance_init (PhotoFileReader * self) { } -static void photo_file_reader_finalize (PhotoFileAdapter* obj) { +static void photo_file_reader_finalize (PhotoFileAdapter * obj) { PhotoFileReader * self; #line 59 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_PHOTO_FILE_READER, PhotoFileReader); @@ -997,8 +997,8 @@ GType photo_file_reader_get_type (void) { PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { PhotoFileWriter* self = NULL; - const gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; + const gchar* _tmp0_; + PhotoFileFormat _tmp1_; #line 101 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 102 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -1015,11 +1015,11 @@ PhotoFileWriter* photo_file_writer_construct (GType object_type, const gchar* fi PhotoFileReader* photo_file_writer_create_reader (PhotoFileWriter* self) { PhotoFileReader* result = NULL; - PhotoFileFormat _tmp0_ = 0; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PhotoFileReader* _tmp3_ = NULL; - PhotoFileReader* _tmp4_ = NULL; + PhotoFileFormat _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PhotoFileReader* _tmp3_; + PhotoFileReader* _tmp4_; #line 105 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_WRITER (self), NULL); #line 106 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -1064,7 +1064,7 @@ static void photo_file_writer_class_init (PhotoFileWriterClass * klass) { #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_writer_parent_class = g_type_class_peek_parent (klass); #line 100 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileWriterClass *) klass)->write = (void (*)(PhotoFileWriter*, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write; + ((PhotoFileWriterClass *) klass)->write = (void (*) (PhotoFileWriter *, GdkPixbuf*, JpegQuality, GError**)) photo_file_writer_real_write; #line 1069 "PhotoFileAdapter.c" } @@ -1087,8 +1087,8 @@ GType photo_file_writer_get_type (void) { PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type, const gchar* filepath, PhotoFileFormat file_format) { PhotoFileMetadataWriter* self = NULL; - const gchar* _tmp0_ = NULL; - PhotoFileFormat _tmp1_ = 0; + const gchar* _tmp0_; + PhotoFileFormat _tmp1_; #line 117 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (filepath != NULL, NULL); #line 118 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -1105,11 +1105,11 @@ PhotoFileMetadataWriter* photo_file_metadata_writer_construct (GType object_type PhotoFileReader* photo_file_metadata_writer_create_reader (PhotoFileMetadataWriter* self) { PhotoFileReader* result = NULL; - PhotoFileFormat _tmp0_ = 0; - gchar* _tmp1_ = NULL; - gchar* _tmp2_ = NULL; - PhotoFileReader* _tmp3_ = NULL; - PhotoFileReader* _tmp4_ = NULL; + PhotoFileFormat _tmp0_; + gchar* _tmp1_; + gchar* _tmp2_; + PhotoFileReader* _tmp3_; + PhotoFileReader* _tmp4_; #line 121 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" g_return_val_if_fail (IS_PHOTO_FILE_METADATA_WRITER (self), NULL); #line 122 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" @@ -1154,7 +1154,7 @@ static void photo_file_metadata_writer_class_init (PhotoFileMetadataWriterClass #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" photo_file_metadata_writer_parent_class = g_type_class_peek_parent (klass); #line 116 "/home/jens/Source/shotwell/src/photos/PhotoFileAdapter.vala" - ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*)(PhotoFileMetadataWriter*, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata; + ((PhotoFileMetadataWriterClass *) klass)->write_metadata = (void (*) (PhotoFileMetadataWriter *, PhotoMetadata*, GError**)) photo_file_metadata_writer_real_write_metadata; #line 1159 "PhotoFileAdapter.c" } -- cgit v1.2.3