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/GRaw.c | 406 +++++++++++++++++++++++++++--------------------------- 1 file changed, 203 insertions(+), 203 deletions(-) (limited to 'src/photos/GRaw.c') diff --git a/src/photos/GRaw.c b/src/photos/GRaw.c index 27a2ffb..6ea3ba4 100644 --- a/src/photos/GRaw.c +++ b/src/photos/GRaw.c @@ -1,4 +1,4 @@ -/* GRaw.c generated by valac 0.34.7, the Vala compiler +/* GRaw.c generated by valac 0.36.6, the Vala compiler * generated from GRaw.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -200,7 +200,7 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self); gushort graw_processed_image_get_bits (GRawProcessedImage* self); guint8* graw_processed_image_get_data (GRawProcessedImage* self); guint graw_processed_image_get_data_size (GRawProcessedImage* self); -static void graw_processed_image_finalize (GRawProcessedImage* obj); +static void graw_processed_image_finalize (GRawProcessedImage * obj); gpointer graw_processor_ref (gpointer instance); void graw_processor_unref (gpointer instance); GParamSpec* graw_param_spec_processor (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); @@ -231,7 +231,7 @@ void graw_processor_unpack (GRawProcessor* self, GError** error); void graw_processor_unpack_thumb (GRawProcessor* self, GError** error); void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size); libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self); -static void graw_processor_finalize (GRawProcessor* obj); +static void graw_processor_finalize (GRawProcessor * obj); GType graw_colorspace_get_type (void) { @@ -314,24 +314,24 @@ GType graw_use_camera_matrix_get_type (void) { GRawProcessedImage* graw_processed_image_construct (GType object_type, libraw_data_t* proc, GError** error) { GRawProcessedImage* self = NULL; enum LibRaw_errors _result_ = 0; - libraw_data_t* _tmp0_ = NULL; - libraw_processed_image_t* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; - libraw_processed_image_t* _tmp3_ = NULL; - libraw_processed_image_t* _tmp4_ = NULL; - guint8* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - libraw_processed_image_t* _tmp6_ = NULL; - gushort _tmp7_ = 0U; - libraw_processed_image_t* _tmp8_ = NULL; - gushort _tmp9_ = 0U; - libraw_processed_image_t* _tmp10_ = NULL; - gushort _tmp11_ = 0U; - libraw_processed_image_t* _tmp12_ = NULL; - gushort _tmp13_ = 0U; - libraw_processed_image_t* _tmp14_ = NULL; - gushort _tmp15_ = 0U; - GdkPixbuf* _tmp16_ = NULL; + libraw_data_t* _tmp0_; + libraw_processed_image_t* _tmp1_; + enum LibRaw_errors _tmp2_; + libraw_processed_image_t* _tmp3_; + libraw_processed_image_t* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + libraw_processed_image_t* _tmp6_; + gushort _tmp7_; + libraw_processed_image_t* _tmp8_; + gushort _tmp9_; + libraw_processed_image_t* _tmp10_; + gushort _tmp11_; + libraw_processed_image_t* _tmp12_; + gushort _tmp13_; + libraw_processed_image_t* _tmp14_; + gushort _tmp15_; + GdkPixbuf* _tmp16_; GError * _inner_error_ = NULL; #line 112 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (proc != NULL, NULL); @@ -424,26 +424,26 @@ GRawProcessedImage* graw_processed_image_new (libraw_data_t* proc, GError** erro GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type, libraw_data_t* proc, GError** error) { GRawProcessedImage* self = NULL; enum LibRaw_errors _result_ = 0; - libraw_data_t* _tmp0_ = NULL; - libraw_processed_image_t* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; - libraw_processed_image_t* _tmp3_ = NULL; - libraw_processed_image_t* _tmp17_ = NULL; - GdkPixbuf* _tmp18_ = NULL; - gint _tmp19_ = 0; - gint _tmp20_ = 0; - libraw_processed_image_t* _tmp21_ = NULL; - GdkPixbuf* _tmp22_ = NULL; - gint _tmp23_ = 0; - gint _tmp24_ = 0; - libraw_processed_image_t* _tmp25_ = NULL; - GdkPixbuf* _tmp26_ = NULL; - gint _tmp27_ = 0; - gint _tmp28_ = 0; - libraw_processed_image_t* _tmp29_ = NULL; - GdkPixbuf* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; + libraw_data_t* _tmp0_; + libraw_processed_image_t* _tmp1_; + enum LibRaw_errors _tmp2_; + libraw_processed_image_t* _tmp3_; + libraw_processed_image_t* _tmp17_; + GdkPixbuf* _tmp18_; + gint _tmp19_; + gint _tmp20_; + libraw_processed_image_t* _tmp21_; + GdkPixbuf* _tmp22_; + gint _tmp23_; + gint _tmp24_; + libraw_processed_image_t* _tmp25_; + GdkPixbuf* _tmp26_; + gint _tmp27_; + gint _tmp28_; + libraw_processed_image_t* _tmp29_; + GdkPixbuf* _tmp30_; + gint _tmp31_; + gint _tmp32_; GError * _inner_error_ = NULL; #line 124 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (proc != NULL, NULL); @@ -491,17 +491,17 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type #line 492 "GRaw.c" { GBytes* bytes = NULL; - libraw_processed_image_t* _tmp4_ = NULL; - guint8* _tmp5_ = NULL; - gint _tmp5__length1 = 0; - GBytes* _tmp6_ = NULL; + libraw_processed_image_t* _tmp4_; + guint8* _tmp5_; + gint _tmp5__length1; + GBytes* _tmp6_; GdkPixbuf* _tmp7_ = NULL; - GBytes* _tmp8_ = NULL; - GMemoryInputStream* _tmp9_ = NULL; - GMemoryInputStream* _tmp10_ = NULL; - GdkPixbuf* _tmp11_ = NULL; - GdkPixbuf* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; + GBytes* _tmp8_; + GMemoryInputStream* _tmp9_; + GMemoryInputStream* _tmp10_; + GdkPixbuf* _tmp11_; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp4_ = self->priv->image; #line 134 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -551,9 +551,9 @@ GRawProcessedImage* graw_processed_image_construct_from_thumb (GType object_type __catch29_g_error: { GError* err = NULL; - GError* _tmp14_ = NULL; - const gchar* _tmp15_ = NULL; - GError* _tmp16_ = NULL; + GError* _tmp14_; + const gchar* _tmp15_; + GError* _tmp16_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" err = _inner_error_; #line 133 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -648,8 +648,8 @@ GRawProcessedImage* graw_processed_image_new_from_thumb (libraw_data_t* proc, GE GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) { GdkPixbuf* result = NULL; - GdkPixbuf* _tmp0_ = NULL; - GdkPixbuf* _tmp1_ = NULL; + GdkPixbuf* _tmp0_; + GdkPixbuf* _tmp1_; #line 149 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL); #line 150 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -666,8 +666,8 @@ GdkPixbuf* graw_processed_image_get_pixbuf_copy (GRawProcessedImage* self) { gushort graw_processed_image_get_width (GRawProcessedImage* self) { gushort result; - libraw_processed_image_t* _tmp0_ = NULL; - gushort _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + gushort _tmp1_; #line 77 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 78 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -684,8 +684,8 @@ gushort graw_processed_image_get_width (GRawProcessedImage* self) { gushort graw_processed_image_get_height (GRawProcessedImage* self) { gushort result; - libraw_processed_image_t* _tmp0_ = NULL; - gushort _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + gushort _tmp1_; #line 83 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 84 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -702,8 +702,8 @@ gushort graw_processed_image_get_height (GRawProcessedImage* self) { gushort graw_processed_image_get_colors (GRawProcessedImage* self) { gushort result; - libraw_processed_image_t* _tmp0_ = NULL; - gushort _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + gushort _tmp1_; #line 89 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 90 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -720,8 +720,8 @@ gushort graw_processed_image_get_colors (GRawProcessedImage* self) { gushort graw_processed_image_get_bits (GRawProcessedImage* self) { gushort result; - libraw_processed_image_t* _tmp0_ = NULL; - gushort _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + gushort _tmp1_; #line 95 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 96 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -738,9 +738,9 @@ gushort graw_processed_image_get_bits (GRawProcessedImage* self) { guint8* graw_processed_image_get_data (GRawProcessedImage* self) { guint8* result; - libraw_processed_image_t* _tmp0_ = NULL; - guint8* _tmp1_ = NULL; - gint _tmp1__length1 = 0; + libraw_processed_image_t* _tmp0_; + guint8* _tmp1_; + gint _tmp1__length1; #line 101 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), NULL); #line 102 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -759,8 +759,8 @@ guint8* graw_processed_image_get_data (GRawProcessedImage* self) { guint graw_processed_image_get_data_size (GRawProcessedImage* self) { guint result; - libraw_processed_image_t* _tmp0_ = NULL; - guint _tmp1_ = 0U; + libraw_processed_image_t* _tmp0_; + guint _tmp1_; #line 107 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSED_IMAGE (self), 0U); #line 108 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -817,7 +817,7 @@ static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_c #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (collect_values[0].v_pointer) { #line 820 "GRaw.c" - GRawProcessedImage* object; + GRawProcessedImage * object; object = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (object->parent_instance.g_class == NULL) { @@ -844,7 +844,7 @@ static gchar* graw_value_processed_image_collect_value (GValue* value, guint n_c static gchar* graw_value_processed_image_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GRawProcessedImage** object_p; + GRawProcessedImage ** object_p; object_p = collect_values[0].v_pointer; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!object_p) { @@ -896,7 +896,7 @@ gpointer graw_value_get_processed_image (const GValue* value) { void graw_value_set_processed_image (GValue* value, gpointer v_object) { - GRawProcessedImage* old; + GRawProcessedImage * old; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE)); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -927,7 +927,7 @@ void graw_value_set_processed_image (GValue* value, gpointer v_object) { void graw_value_take_processed_image (GValue* value, gpointer v_object) { - GRawProcessedImage* old; + GRawProcessedImage * old; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSED_IMAGE)); #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -977,7 +977,7 @@ static void graw_processed_image_instance_init (GRawProcessedImage * self) { } -static void graw_processed_image_finalize (GRawProcessedImage* obj) { +static void graw_processed_image_finalize (GRawProcessedImage * obj) { GRawProcessedImage * self; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSED_IMAGE, GRawProcessedImage); @@ -1006,7 +1006,7 @@ GType graw_processed_image_get_type (void) { gpointer graw_processed_image_ref (gpointer instance) { - GRawProcessedImage* self; + GRawProcessedImage * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_atomic_int_inc (&self->ref_count); @@ -1017,7 +1017,7 @@ gpointer graw_processed_image_ref (gpointer instance) { void graw_processed_image_unref (gpointer instance) { - GRawProcessedImage* self; + GRawProcessedImage * self; self = instance; #line 72 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -1032,8 +1032,8 @@ void graw_processed_image_unref (gpointer instance) { GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options) { GRawProcessor* self = NULL; - enum LibRaw_constructor_flags _tmp0_ = 0; - libraw_data_t* _tmp1_ = NULL; + enum LibRaw_constructor_flags _tmp0_; + libraw_data_t* _tmp1_; #line 163 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = (GRawProcessor*) g_type_create_instance (object_type); #line 164 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1058,8 +1058,8 @@ GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options) { void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) { - libraw_data_t* _tmp0_ = NULL; - enum LibRaw_errors _tmp1_ = 0; + libraw_data_t* _tmp0_; + enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 167 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1093,7 +1093,7 @@ void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) { libraw_imgother_t result = {0}; - libraw_imgother_t _tmp0_ = {0}; + libraw_imgother_t _tmp0_; #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = self->other; #line 188 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1106,8 +1106,8 @@ static libraw_imgother_t libraw_get_image_other (libraw_data_t* self) { libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) { libraw_imgother_t result = {0}; - libraw_data_t* _tmp0_ = NULL; - libraw_imgother_t _tmp1_ = {0}; + libraw_data_t* _tmp0_; + libraw_imgother_t _tmp1_; #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 172 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1122,7 +1122,7 @@ libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self) { static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) { libraw_iparams_t result = {0}; - libraw_iparams_t _tmp0_ = {0}; + libraw_iparams_t _tmp0_; #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = self->idata; #line 189 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1135,8 +1135,8 @@ static libraw_iparams_t libraw_get_image_params (libraw_data_t* self) { libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) { libraw_iparams_t result = {0}; - libraw_data_t* _tmp0_ = NULL; - libraw_iparams_t _tmp1_ = {0}; + libraw_data_t* _tmp0_; + libraw_iparams_t _tmp1_; #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 176 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1151,7 +1151,7 @@ libraw_iparams_t graw_processor_get_image_params (GRawProcessor* self) { static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) { libraw_image_sizes_t result = {0}; - libraw_image_sizes_t _tmp0_ = {0}; + libraw_image_sizes_t _tmp0_; #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = self->sizes; #line 192 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1164,8 +1164,8 @@ static libraw_image_sizes_t libraw_get_sizes (libraw_data_t* self) { libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) { libraw_image_sizes_t result = {0}; - libraw_data_t* _tmp0_ = NULL; - libraw_image_sizes_t _tmp1_ = {0}; + libraw_data_t* _tmp0_; + libraw_image_sizes_t _tmp1_; #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 180 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1180,7 +1180,7 @@ libraw_image_sizes_t graw_processor_get_sizes (GRawProcessor* self) { static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) { libraw_thumbnail_t result = {0}; - libraw_thumbnail_t _tmp0_ = {0}; + libraw_thumbnail_t _tmp0_; #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = self->thumbnail; #line 193 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1193,8 +1193,8 @@ static libraw_thumbnail_t libraw_get_thumbnail (libraw_data_t* self) { libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) { libraw_thumbnail_t result = {0}; - libraw_data_t* _tmp0_ = NULL; - libraw_thumbnail_t _tmp1_ = {0}; + libraw_data_t* _tmp0_; + libraw_thumbnail_t _tmp1_; #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp0_ = self->priv->proc; #line 184 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1210,9 +1210,9 @@ libraw_thumbnail_t graw_processor_get_thumbnail (GRawProcessor* self) { GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** error) { GRawProcessedImage* result = NULL; GRawProcessedImage* _tmp0_ = NULL; - libraw_data_t* _tmp1_ = NULL; - GRawProcessedImage* _tmp2_ = NULL; - GRawProcessedImage* _tmp3_ = NULL; + libraw_data_t* _tmp1_; + GRawProcessedImage* _tmp2_; + GRawProcessedImage* _tmp3_; GError * _inner_error_ = NULL; #line 187 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL); @@ -1258,9 +1258,9 @@ GRawProcessedImage* graw_processor_make_mem_image (GRawProcessor* self, GError** GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError** error) { GRawProcessedImage* result = NULL; GRawProcessedImage* _tmp0_ = NULL; - libraw_data_t* _tmp1_ = NULL; - GRawProcessedImage* _tmp2_ = NULL; - GRawProcessedImage* _tmp3_ = NULL; + libraw_data_t* _tmp1_; + GRawProcessedImage* _tmp2_; + GRawProcessedImage* _tmp3_; GError * _inner_error_ = NULL; #line 191 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL); @@ -1304,10 +1304,10 @@ GRawProcessedImage* graw_processor_make_thumb_image (GRawProcessor* self, GError void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer_length1, GError** error) { - libraw_data_t* _tmp0_ = NULL; - guint8* _tmp1_ = NULL; - gint _tmp1__length1 = 0; - enum LibRaw_errors _tmp2_ = 0; + libraw_data_t* _tmp0_; + guint8* _tmp1_; + gint _tmp1__length1; + enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 195 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1344,9 +1344,9 @@ void graw_processor_open_buffer (GRawProcessor* self, guint8* buffer, int buffer void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error) { - libraw_data_t* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; + libraw_data_t* _tmp0_; + const gchar* _tmp1_; + enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 199 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1383,8 +1383,8 @@ void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GErro void graw_processor_process (GRawProcessor* self, GError** error) { - libraw_data_t* _tmp0_ = NULL; - enum LibRaw_errors _tmp1_ = 0; + libraw_data_t* _tmp0_; + enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 203 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1417,9 +1417,9 @@ void graw_processor_process (GRawProcessor* self, GError** error) { void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error) { - libraw_data_t* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; + libraw_data_t* _tmp0_; + const gchar* _tmp1_; + enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 207 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1456,9 +1456,9 @@ void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error) { - libraw_data_t* _tmp0_ = NULL; - const gchar* _tmp1_ = NULL; - enum LibRaw_errors _tmp2_ = 0; + libraw_data_t* _tmp0_; + const gchar* _tmp1_; + enum LibRaw_errors _tmp2_; GError * _inner_error_ = NULL; #line 211 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1495,7 +1495,7 @@ void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GE void graw_processor_recycle (GRawProcessor* self) { - libraw_data_t* _tmp0_ = NULL; + libraw_data_t* _tmp0_; #line 215 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 216 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1507,8 +1507,8 @@ void graw_processor_recycle (GRawProcessor* self) { void graw_processor_unpack (GRawProcessor* self, GError** error) { - libraw_data_t* _tmp0_ = NULL; - enum LibRaw_errors _tmp1_ = 0; + libraw_data_t* _tmp0_; + enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 219 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1541,8 +1541,8 @@ void graw_processor_unpack (GRawProcessor* self, GError** error) { void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { - libraw_data_t* _tmp0_ = NULL; - enum LibRaw_errors _tmp1_ = 0; + libraw_data_t* _tmp0_; + enum LibRaw_errors _tmp1_; GError * _inner_error_ = NULL; #line 223 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); @@ -1575,12 +1575,12 @@ void graw_processor_unpack_thumb (GRawProcessor* self, GError** error) { static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_params_t* params, gdouble red_multiplier, gdouble green_multiplier) { - libraw_output_params_t* _tmp0_ = NULL; - gdouble _tmp1_ = 0.0; - gdouble _tmp2_ = 0.0; - libraw_output_params_t* _tmp3_ = NULL; - gdouble _tmp4_ = 0.0; - gdouble _tmp5_ = 0.0; + libraw_output_params_t* _tmp0_; + gdouble _tmp1_; + gdouble _tmp2_; + libraw_output_params_t* _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = params; #line 148 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1602,12 +1602,12 @@ static void lib_raw_output_params_set_chromatic_aberrations (libraw_output_param static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* params, gdouble power, gdouble slope) { - libraw_output_params_t* _tmp0_ = NULL; - gdouble _tmp1_ = 0.0; - gdouble _tmp2_ = 0.0; - libraw_output_params_t* _tmp3_ = NULL; - gdouble _tmp4_ = 0.0; - gdouble _tmp5_ = 0.0; + libraw_output_params_t* _tmp0_; + gdouble _tmp1_; + gdouble _tmp2_; + libraw_output_params_t* _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" _tmp0_ = params; #line 153 "/home/jens/Source/shotwell/vapi/libraw.vapi" @@ -1629,37 +1629,37 @@ static void lib_raw_output_params_set_gamma_curve (libraw_output_params_t* param void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean half_size) { - libraw_output_params_t* _tmp0_ = NULL; - libraw_output_params_t* _tmp1_ = NULL; - libraw_output_params_t* _tmp2_ = NULL; - libraw_output_params_t* _tmp3_ = NULL; - libraw_output_params_t* _tmp4_ = NULL; - libraw_output_params_t* _tmp5_ = NULL; - libraw_output_params_t* _tmp6_ = NULL; - libraw_output_params_t* _tmp7_ = NULL; - gboolean _tmp8_ = FALSE; - libraw_output_params_t* _tmp9_ = NULL; - libraw_output_params_t* _tmp10_ = NULL; - libraw_output_params_t* _tmp11_ = NULL; - libraw_output_params_t* _tmp12_ = NULL; - libraw_output_params_t* _tmp13_ = NULL; - libraw_output_params_t* _tmp14_ = NULL; - libraw_output_params_t* _tmp15_ = NULL; - libraw_output_params_t* _tmp16_ = NULL; - libraw_output_params_t* _tmp17_ = NULL; - libraw_output_params_t* _tmp18_ = NULL; - libraw_output_params_t* _tmp19_ = NULL; - libraw_output_params_t* _tmp20_ = NULL; - libraw_output_params_t* _tmp21_ = NULL; - libraw_output_params_t* _tmp22_ = NULL; - libraw_output_params_t* _tmp23_ = NULL; - libraw_output_params_t* _tmp24_ = NULL; - libraw_output_params_t* _tmp25_ = NULL; - libraw_output_params_t* _tmp26_ = NULL; - libraw_output_params_t* _tmp27_ = NULL; - libraw_output_params_t* _tmp28_ = NULL; - libraw_output_params_t* _tmp29_ = NULL; - libraw_output_params_t* _tmp30_ = NULL; + libraw_output_params_t* _tmp0_; + libraw_output_params_t* _tmp1_; + libraw_output_params_t* _tmp2_; + libraw_output_params_t* _tmp3_; + libraw_output_params_t* _tmp4_; + libraw_output_params_t* _tmp5_; + libraw_output_params_t* _tmp6_; + libraw_output_params_t* _tmp7_; + gboolean _tmp8_; + libraw_output_params_t* _tmp9_; + libraw_output_params_t* _tmp10_; + libraw_output_params_t* _tmp11_; + libraw_output_params_t* _tmp12_; + libraw_output_params_t* _tmp13_; + libraw_output_params_t* _tmp14_; + libraw_output_params_t* _tmp15_; + libraw_output_params_t* _tmp16_; + libraw_output_params_t* _tmp17_; + libraw_output_params_t* _tmp18_; + libraw_output_params_t* _tmp19_; + libraw_output_params_t* _tmp20_; + libraw_output_params_t* _tmp21_; + libraw_output_params_t* _tmp22_; + libraw_output_params_t* _tmp23_; + libraw_output_params_t* _tmp24_; + libraw_output_params_t* _tmp25_; + libraw_output_params_t* _tmp26_; + libraw_output_params_t* _tmp27_; + libraw_output_params_t* _tmp28_; + libraw_output_params_t* _tmp29_; + libraw_output_params_t* _tmp30_; #line 230 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (GRAW_IS_PROCESSOR (self)); #line 235 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1760,7 +1760,7 @@ void graw_processor_configure_for_rgb_display (GRawProcessor* self, gboolean hal libraw_output_params_t* graw_processor_get_output_params (GRawProcessor* self) { libraw_output_params_t* result; - libraw_data_t* _tmp0_ = NULL; + libraw_data_t* _tmp0_; #line 156 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_val_if_fail (GRAW_IS_PROCESSOR (self), NULL); #line 157 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1815,7 +1815,7 @@ static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (collect_values[0].v_pointer) { #line 1818 "GRaw.c" - GRawProcessor* object; + GRawProcessor * object; object = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (object->parent_instance.g_class == NULL) { @@ -1842,7 +1842,7 @@ static gchar* graw_value_processor_collect_value (GValue* value, guint n_collect static gchar* graw_value_processor_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - GRawProcessor** object_p; + GRawProcessor ** object_p; object_p = collect_values[0].v_pointer; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (!object_p) { @@ -1894,7 +1894,7 @@ gpointer graw_value_get_processor (const GValue* value) { void graw_value_set_processor (GValue* value, gpointer v_object) { - GRawProcessor* old; + GRawProcessor * old; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR)); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1925,7 +1925,7 @@ void graw_value_set_processor (GValue* value, gpointer v_object) { void graw_value_take_processor (GValue* value, gpointer v_object) { - GRawProcessor* old; + GRawProcessor * old; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, GRAW_TYPE_PROCESSOR)); #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -1973,7 +1973,7 @@ static void graw_processor_instance_init (GRawProcessor * self) { } -static void graw_processor_finalize (GRawProcessor* obj) { +static void graw_processor_finalize (GRawProcessor * obj) { GRawProcessor * self; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, GRAW_TYPE_PROCESSOR, GRawProcessor); @@ -2000,7 +2000,7 @@ GType graw_processor_get_type (void) { gpointer graw_processor_ref (gpointer instance) { - GRawProcessor* self; + GRawProcessor * self; self = instance; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_atomic_int_inc (&self->ref_count); @@ -2011,7 +2011,7 @@ gpointer graw_processor_ref (gpointer instance) { void graw_processor_unref (gpointer instance) { - GRawProcessor* self; + GRawProcessor * self; self = instance; #line 154 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -2025,13 +2025,13 @@ void graw_processor_unref (gpointer instance) { void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GError** error) { - enum LibRaw_errors _tmp0_ = 0; + enum LibRaw_errors _tmp0_; gchar* msg = NULL; - const gchar* _tmp7_ = NULL; - enum LibRaw_errors _tmp8_ = 0; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; - enum LibRaw_errors _tmp11_ = 0; + const gchar* _tmp7_; + enum LibRaw_errors _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; + enum LibRaw_errors _tmp11_; GError * _inner_error_ = NULL; #line 266 "/home/jens/Source/shotwell/src/photos/GRaw.vala" g_return_if_fail (caller != NULL); @@ -2043,17 +2043,17 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr return; #line 2045 "GRaw.c" } else { - enum LibRaw_errors _tmp1_ = 0; + enum LibRaw_errors _tmp1_; #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp1_ = _result_; #line 269 "/home/jens/Source/shotwell/src/photos/GRaw.vala" if (_tmp1_ > 0) { #line 2052 "GRaw.c" - const gchar* _tmp2_ = NULL; - enum LibRaw_errors _tmp3_ = 0; - enum LibRaw_errors _tmp4_ = 0; - const gchar* _tmp5_ = NULL; - GError* _tmp6_ = NULL; + const gchar* _tmp2_; + enum LibRaw_errors _tmp3_; + enum LibRaw_errors _tmp4_; + const gchar* _tmp5_; + GError* _tmp6_; #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp2_ = caller; #line 270 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2102,8 +2102,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_UNSPECIFIED_ERROR: #line 2104 "GRaw.c" { - const gchar* _tmp12_ = NULL; - GError* _tmp13_ = NULL; + const gchar* _tmp12_; + GError* _tmp13_; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp12_ = msg; #line 276 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2135,8 +2135,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_FILE_UNSUPPORTED: #line 2137 "GRaw.c" { - const gchar* _tmp14_ = NULL; - GError* _tmp15_ = NULL; + const gchar* _tmp14_; + GError* _tmp15_; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp14_ = msg; #line 279 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2168,8 +2168,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_REQUEST_FOR_NONEXISTENT_IMAGE: #line 2170 "GRaw.c" { - const gchar* _tmp16_ = NULL; - GError* _tmp17_ = NULL; + const gchar* _tmp16_; + GError* _tmp17_; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp16_ = msg; #line 282 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2201,8 +2201,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_OUT_OF_ORDER_CALL: #line 2203 "GRaw.c" { - const gchar* _tmp18_ = NULL; - GError* _tmp19_ = NULL; + const gchar* _tmp18_; + GError* _tmp19_; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp18_ = msg; #line 285 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2234,8 +2234,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_NO_THUMBNAIL: #line 2236 "GRaw.c" { - const gchar* _tmp20_ = NULL; - GError* _tmp21_ = NULL; + const gchar* _tmp20_; + GError* _tmp21_; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp20_ = msg; #line 288 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2267,8 +2267,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_UNSUPPORTED_THUMBNAIL: #line 2269 "GRaw.c" { - const gchar* _tmp22_ = NULL; - GError* _tmp23_ = NULL; + const gchar* _tmp22_; + GError* _tmp23_; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp22_ = msg; #line 291 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2300,8 +2300,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_UNSUFFICIENT_MEMORY: #line 2302 "GRaw.c" { - const gchar* _tmp24_ = NULL; - GError* _tmp25_ = NULL; + const gchar* _tmp24_; + GError* _tmp25_; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp24_ = msg; #line 294 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2333,8 +2333,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_DATA_ERROR: #line 2335 "GRaw.c" { - const gchar* _tmp26_ = NULL; - GError* _tmp27_ = NULL; + const gchar* _tmp26_; + GError* _tmp27_; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp26_ = msg; #line 297 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2366,8 +2366,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_IO_ERROR: #line 2368 "GRaw.c" { - const gchar* _tmp28_ = NULL; - GError* _tmp29_ = NULL; + const gchar* _tmp28_; + GError* _tmp29_; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp28_ = msg; #line 300 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2399,8 +2399,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_CANCELLED_BY_CALLBACK: #line 2401 "GRaw.c" { - const gchar* _tmp30_ = NULL; - GError* _tmp31_ = NULL; + const gchar* _tmp30_; + GError* _tmp31_; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp30_ = msg; #line 303 "/home/jens/Source/shotwell/src/photos/GRaw.vala" @@ -2432,8 +2432,8 @@ void graw_throw_exception (const gchar* caller, enum LibRaw_errors _result_, GEr case LIBRAW_BAD_CROP: #line 2434 "GRaw.c" { - const gchar* _tmp32_ = NULL; - GError* _tmp33_ = NULL; + const gchar* _tmp32_; + GError* _tmp33_; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" _tmp32_ = msg; #line 306 "/home/jens/Source/shotwell/src/photos/GRaw.vala" -- cgit v1.2.3