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/editing_tools/StraightenTool.c | 991 ++++++++++++++++++------------------- 1 file changed, 491 insertions(+), 500 deletions(-) (limited to 'src/editing_tools/StraightenTool.c') diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c index a0de5bf..9420cb8 100644 --- a/src/editing_tools/StraightenTool.c +++ b/src/editing_tools/StraightenTool.c @@ -1,4 +1,4 @@ -/* StraightenTool.c generated by valac 0.34.7, the Vala compiler +/* StraightenTool.c generated by valac 0.36.6, the Vala compiler * generated from StraightenTool.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -480,7 +480,7 @@ gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self); void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result); void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dimensions* result); -static gboolean _dimensions_equal (const Dimensions* s1, const Dimensions* s2); +static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2); GType photo_exception_get_type (void) G_GNUC_CONST; GType backing_fetch_mode_get_type (void) G_GNUC_CONST; GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error); @@ -532,7 +532,7 @@ enum { EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_DUMMY_PROPERTY }; static gdouble* _double_dup (gdouble* self); -static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide* obj); +static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj); enum { EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_DUMMY_PROPERTY }; @@ -541,8 +541,8 @@ enum { EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container); static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self); static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject* obj); -static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool* obj); +static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj); +static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj); static const gdouble EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[2] = {(gdouble) 10, (gdouble) 10}; @@ -565,7 +565,7 @@ static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) { EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) { EditingToolsStraightenTool* result = NULL; - EditingToolsStraightenTool* _tmp0_ = NULL; + EditingToolsStraightenTool* _tmp0_; #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = editing_tools_straighten_tool_new (); #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -599,33 +599,33 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal * of the photo and centered at the Photo's center. */ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self) { - EditingToolsPhotoCanvas* _tmp0_ = NULL; - Photo* _tmp1_ = NULL; - Photo* _tmp2_ = NULL; + EditingToolsPhotoCanvas* _tmp0_; + Photo* _tmp1_; + Photo* _tmp2_; gdouble slider_val = 0.0; - EditingToolsStraightenToolStraightenToolWindow* _tmp3_ = NULL; - GtkScale* _tmp4_ = NULL; - gdouble _tmp5_ = 0.0; + EditingToolsStraightenToolStraightenToolWindow* _tmp3_; + GtkScale* _tmp4_; + gdouble _tmp5_; GdkPoint new_crop_center = {0}; - GdkPoint _tmp6_ = {0}; - Dimensions _tmp7_ = {0}; - gint _tmp8_ = 0; - Dimensions _tmp9_ = {0}; - gint _tmp10_ = 0; + GdkPoint _tmp6_; + Dimensions _tmp7_; + gint _tmp8_; + Dimensions _tmp9_; + gint _tmp10_; GdkPoint _tmp11_ = {0}; StraightenCommand* command = NULL; - EditingToolsPhotoCanvas* _tmp12_ = NULL; - Photo* _tmp13_ = NULL; - Photo* _tmp14_ = NULL; - GdkPoint _tmp15_ = {0}; - gdouble _tmp16_ = 0.0; - gint _tmp17_ = 0; - gdouble _tmp18_ = 0.0; - gint _tmp19_ = 0; + EditingToolsPhotoCanvas* _tmp12_; + Photo* _tmp13_; + Photo* _tmp14_; + GdkPoint _tmp15_; + gdouble _tmp16_; + gint _tmp17_; + gdouble _tmp18_; + gint _tmp19_; Box _tmp20_ = {0}; - StraightenCommand* _tmp21_ = NULL; - StraightenCommand* _tmp22_ = NULL; - Dimensions _tmp23_ = {0}; + StraightenCommand* _tmp21_; + StraightenCommand* _tmp22_; + Dimensions _tmp23_; #line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -697,7 +697,7 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self) { - EditingToolsPhotoCanvas* _tmp0_ = NULL; + EditingToolsPhotoCanvas* _tmp0_; #line 227 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 228 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -723,10 +723,10 @@ static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingTool static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) { EditingToolsStraightenTool * self; - EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gdouble _tmp3_ = 0.0; + EditingToolsStraightenToolStraightenGuide* _tmp0_; + gint _tmp1_; + gint _tmp2_; + gdouble _tmp3_; #line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -745,14 +745,14 @@ static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditin static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) { EditingToolsStraightenTool * self; - EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + EditingToolsStraightenToolStraightenGuide* _tmp0_; + gint _tmp1_; + gint _tmp2_; gdouble* a = NULL; - EditingToolsStraightenToolStraightenGuide* _tmp3_ = NULL; - gdouble* _tmp4_ = NULL; - EditingToolsStraightenToolStraightenGuide* _tmp5_ = NULL; - gdouble* _tmp6_ = NULL; + EditingToolsStraightenToolStraightenGuide* _tmp3_; + gdouble* _tmp4_; + EditingToolsStraightenToolStraightenGuide* _tmp5_; + gdouble* _tmp6_; #line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -778,9 +778,9 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp6_ != NULL) { #line 781 "StraightenTool.c" - EditingToolsStraightenToolStraightenToolWindow* _tmp7_ = NULL; - GtkScale* _tmp8_ = NULL; - gdouble* _tmp9_ = NULL; + EditingToolsStraightenToolStraightenToolWindow* _tmp7_; + GtkScale* _tmp8_; + gdouble* _tmp9_; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = self->priv->window; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -801,10 +801,10 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) { EditingToolsStraightenTool * self; - EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gboolean _tmp3_ = FALSE; + EditingToolsStraightenToolStraightenGuide* _tmp0_; + gint _tmp1_; + gint _tmp2_; + gboolean _tmp3_; #line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -818,7 +818,7 @@ static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingToo #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp3_) { #line 821 "StraightenTool.c" - EditingToolsPhotoCanvas* _tmp4_ = NULL; + EditingToolsPhotoCanvas* _tmp4_; #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -833,14 +833,14 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GdkEventKey* _tmp2_ = NULL; - guint _tmp3_ = 0U; - const gchar* _tmp4_ = NULL; - GdkEventKey* _tmp11_ = NULL; - guint _tmp12_ = 0U; - const gchar* _tmp13_ = NULL; - GdkEventKey* _tmp14_ = NULL; - gboolean _tmp15_ = FALSE; + GdkEventKey* _tmp2_; + guint _tmp3_; + const gchar* _tmp4_; + GdkEventKey* _tmp11_; + guint _tmp12_; + const gchar* _tmp13_; + GdkEventKey* _tmp14_; + gboolean _tmp15_; #line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -857,9 +857,9 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit _tmp1_ = TRUE; #line 859 "StraightenTool.c" } else { - GdkEventKey* _tmp5_ = NULL; - guint _tmp6_ = 0U; - const gchar* _tmp7_ = NULL; + GdkEventKey* _tmp5_; + guint _tmp6_; + const gchar* _tmp7_; #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = event; #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -876,9 +876,9 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit _tmp0_ = TRUE; #line 878 "StraightenTool.c" } else { - GdkEventKey* _tmp8_ = NULL; - guint _tmp9_ = 0U; - const gchar* _tmp10_ = NULL; + GdkEventKey* _tmp8_; + guint _tmp9_; + const gchar* _tmp10_; #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = event; #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -927,7 +927,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit } -static gboolean _dimensions_equal (const Dimensions* s1, const Dimensions* s2) { +static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1 == s2) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -966,49 +966,49 @@ static gboolean _dimensions_equal (const Dimensions* s1, const Dimensions* s2) { static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self) { Dimensions canvas_dims = {0}; - EditingToolsPhotoCanvas* _tmp0_ = NULL; + EditingToolsPhotoCanvas* _tmp0_; Dimensions _tmp1_ = {0}; Dimensions viewport = {0}; Dimensions _tmp2_ = {0}; - Dimensions _tmp3_ = {0}; - Dimensions _tmp4_ = {0}; - Dimensions _tmp5_ = {0}; + Dimensions _tmp3_; + Dimensions _tmp4_; + Dimensions _tmp5_; GdkPixbuf* low_res_tmp = NULL; - GdkPixbuf* _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; - Dimensions _tmp24_ = {0}; - gint _tmp25_ = 0; - GdkPixbuf* _tmp26_ = NULL; - gint _tmp27_ = 0; - gint _tmp28_ = 0; - GdkPixbuf* _tmp29_ = NULL; - gint _tmp30_ = 0; - gint _tmp31_ = 0; - cairo_surface_t* _tmp32_ = NULL; + GdkPixbuf* _tmp21_; + gint _tmp22_; + gint _tmp23_; + Dimensions _tmp24_; + gint _tmp25_; + GdkPixbuf* _tmp26_; + gint _tmp27_; + gint _tmp28_; + GdkPixbuf* _tmp29_; + gint _tmp30_; + gint _tmp31_; + cairo_surface_t* _tmp32_; cairo_t* ctx = NULL; - cairo_surface_t* _tmp33_ = NULL; - cairo_t* _tmp34_ = NULL; - cairo_t* _tmp35_ = NULL; - GdkPixbuf* _tmp36_ = NULL; - cairo_t* _tmp37_ = NULL; - GdkPixbuf* _tmp38_ = NULL; - gint _tmp39_ = 0; - gint _tmp40_ = 0; - GdkPixbuf* _tmp41_ = NULL; - gint _tmp42_ = 0; - gint _tmp43_ = 0; - cairo_t* _tmp44_ = NULL; - cairo_t* _tmp45_ = NULL; - gint _tmp46_ = 0; - gdouble _tmp47_ = 0.0; - gint _tmp48_ = 0; - gdouble _tmp49_ = 0.0; - gint _tmp50_ = 0; - gint _tmp51_ = 0; - cairo_surface_t* _tmp52_ = NULL; - cairo_surface_t* _tmp53_ = NULL; - cairo_t* _tmp54_ = NULL; + cairo_surface_t* _tmp33_; + cairo_t* _tmp34_; + cairo_t* _tmp35_; + GdkPixbuf* _tmp36_; + cairo_t* _tmp37_; + GdkPixbuf* _tmp38_; + gint _tmp39_; + gint _tmp40_; + GdkPixbuf* _tmp41_; + gint _tmp42_; + gint _tmp43_; + cairo_t* _tmp44_; + cairo_t* _tmp45_; + gint _tmp46_; + gdouble _tmp47_; + gint _tmp48_; + gdouble _tmp49_; + gint _tmp50_; + gint _tmp51_; + cairo_surface_t* _tmp52_; + cairo_surface_t* _tmp53_; + cairo_t* _tmp54_; GError * _inner_error_ = NULL; #line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); @@ -1041,14 +1041,14 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT #line 1042 "StraightenTool.c" { GdkPixbuf* _tmp6_ = NULL; - EditingToolsPhotoCanvas* _tmp7_ = NULL; - Photo* _tmp8_ = NULL; - Photo* _tmp9_ = NULL; - Dimensions _tmp10_ = {0}; + EditingToolsPhotoCanvas* _tmp7_; + Photo* _tmp8_; + Photo* _tmp9_; + Dimensions _tmp10_; Scaling _tmp11_ = {0}; - GdkPixbuf* _tmp12_ = NULL; - GdkPixbuf* _tmp13_ = NULL; - GdkPixbuf* _tmp14_ = NULL; + GdkPixbuf* _tmp12_; + GdkPixbuf* _tmp13_; + GdkPixbuf* _tmp14_; #line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1088,12 +1088,12 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT __catch23_g_error: { GError* e = NULL; - EditingToolsPhotoCanvas* _tmp15_ = NULL; - Photo* _tmp16_ = NULL; - Photo* _tmp17_ = NULL; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - GdkPixbuf* _tmp20_ = NULL; + EditingToolsPhotoCanvas* _tmp15_; + Photo* _tmp16_; + Photo* _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + GdkPixbuf* _tmp20_; #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" e = _inner_error_; #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1244,33 +1244,33 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self) { gdouble width = 0.0; gdouble height = 0.0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; + gint _tmp0_; + gint _tmp1_; + gdouble _tmp2_; gdouble _tmp3_ = 0.0; gdouble _tmp4_ = 0.0; - Dimensions _tmp5_ = {0}; - gint _tmp6_ = 0; - Dimensions _tmp7_ = {0}; - gint _tmp8_ = 0; - gdouble _tmp9_ = 0.0; - gdouble _tmp10_ = 0.0; - gdouble _tmp11_ = 0.0; - GdkPoint _tmp12_ = {0}; + Dimensions _tmp5_; + gint _tmp6_; + Dimensions _tmp7_; + gint _tmp8_; + gdouble _tmp9_; + gdouble _tmp10_; + gdouble _tmp11_; + GdkPoint _tmp12_; gint radius_x = 0; - gdouble _tmp13_ = 0.0; + gdouble _tmp13_; gint radius_y = 0; - gdouble _tmp14_ = 0.0; - GdkPoint _tmp15_ = {0}; - gint _tmp16_ = 0; - Dimensions _tmp17_ = {0}; - gint _tmp18_ = 0; - gint _tmp19_ = 0; - GdkPoint _tmp20_ = {0}; - gint _tmp21_ = 0; - Dimensions _tmp22_ = {0}; - gint _tmp23_ = 0; - gint _tmp24_ = 0; + gdouble _tmp14_; + GdkPoint _tmp15_; + gint _tmp16_; + Dimensions _tmp17_; + gint _tmp18_; + gint _tmp19_; + GdkPoint _tmp20_; + gint _tmp21_; + Dimensions _tmp22_; + gint _tmp23_; + gint _tmp24_; #line 309 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1366,57 +1366,57 @@ static gpointer _g_object_ref0 (gpointer self) { static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) { EditingToolsStraightenTool * self; - EditingToolsPhotoCanvas* _tmp0_ = NULL; - EditingToolsPhotoCanvas* _tmp1_ = NULL; - EditingToolsPhotoCanvas* _tmp2_ = NULL; - EditingToolsPhotoCanvas* _tmp3_ = NULL; - EditingToolsPhotoCanvas* _tmp4_ = NULL; - Photo* _tmp5_ = NULL; - Photo* _tmp6_ = NULL; + EditingToolsPhotoCanvas* _tmp0_; + EditingToolsPhotoCanvas* _tmp1_; + EditingToolsPhotoCanvas* _tmp2_; + EditingToolsPhotoCanvas* _tmp3_; + EditingToolsPhotoCanvas* _tmp4_; + Photo* _tmp5_; + Photo* _tmp6_; Dimensions _tmp7_ = {0}; Box crop_region = {0}; - EditingToolsPhotoCanvas* _tmp8_ = NULL; - Photo* _tmp9_ = NULL; - Photo* _tmp10_ = NULL; + EditingToolsPhotoCanvas* _tmp8_; + Photo* _tmp9_; + Photo* _tmp10_; Box _tmp11_ = {0}; - gboolean _tmp12_ = FALSE; - gboolean _tmp13_ = FALSE; + gboolean _tmp12_; + gboolean _tmp13_; gdouble incoming_angle = 0.0; - EditingToolsPhotoCanvas* _tmp18_ = NULL; - Photo* _tmp19_ = NULL; - Photo* _tmp20_ = NULL; + EditingToolsPhotoCanvas* _tmp18_; + Photo* _tmp19_; + Photo* _tmp20_; gdouble _tmp21_ = 0.0; GdkPoint _tmp22_ = {0}; - Dimensions _tmp23_ = {0}; - gint _tmp24_ = 0; - Dimensions _tmp25_ = {0}; - gint _tmp26_ = 0; - gdouble _tmp27_ = 0.0; + Dimensions _tmp23_; + gint _tmp24_; + Dimensions _tmp25_; + gint _tmp26_; + gdouble _tmp27_; GdkPoint _tmp28_ = {0}; - gint _tmp29_ = 0; - gint _tmp30_ = 0; + gint _tmp29_; + gint _tmp30_; GdkWindow* drawing_window = NULL; - EditingToolsPhotoCanvas* _tmp31_ = NULL; - GdkWindow* _tmp32_ = NULL; + EditingToolsPhotoCanvas* _tmp31_; + GdkWindow* _tmp32_; GdkDisplay* display = NULL; - GdkDisplay* _tmp33_ = NULL; - GdkDisplay* _tmp34_ = NULL; + GdkDisplay* _tmp33_; + GdkDisplay* _tmp34_; GdkCursor* cursor = NULL; - GdkCursor* _tmp35_ = NULL; - EditingToolsPhotoCanvas* _tmp36_ = NULL; - GtkWindow* _tmp37_ = NULL; - GtkWindow* _tmp38_ = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp39_ = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp40_ = NULL; - GtkScale* _tmp41_ = NULL; - gdouble _tmp42_ = 0.0; - gdouble _tmp43_ = 0.0; + GdkCursor* _tmp35_; + EditingToolsPhotoCanvas* _tmp36_; + GtkWindow* _tmp37_; + GtkWindow* _tmp38_; + EditingToolsStraightenToolStraightenToolWindow* _tmp39_; + EditingToolsStraightenToolStraightenToolWindow* _tmp40_; + GtkScale* _tmp41_; + gdouble _tmp42_; + gdouble _tmp43_; gchar* tmp = NULL; - gdouble _tmp44_ = 0.0; - gchar* _tmp45_ = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp46_ = NULL; - GtkLabel* _tmp47_ = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp48_ = NULL; + gdouble _tmp44_; + gchar* _tmp45_; + EditingToolsStraightenToolStraightenToolWindow* _tmp46_; + GtkLabel* _tmp47_; + EditingToolsStraightenToolStraightenToolWindow* _tmp48_; #line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1466,10 +1466,10 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool #line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp13_) { #line 1469 "StraightenTool.c" - Dimensions _tmp14_ = {0}; - gint _tmp15_ = 0; - Dimensions _tmp16_ = {0}; - gint _tmp17_ = 0; + Dimensions _tmp14_; + gint _tmp15_; + Dimensions _tmp16_; + gint _tmp17_; #line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.left = 0; #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1613,8 +1613,8 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool */ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base) { EditingToolsStraightenTool * self; - EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL; - EditingToolsPhotoCanvas* _tmp2_ = NULL; + EditingToolsStraightenToolStraightenToolWindow* _tmp0_; + EditingToolsPhotoCanvas* _tmp2_; #line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1622,7 +1622,7 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo #line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_ != NULL) { #line 1625 "StraightenTool.c" - EditingToolsStraightenToolStraightenToolWindow* _tmp1_ = NULL; + EditingToolsStraightenToolStraightenToolWindow* _tmp1_; #line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_unbind_window_handlers (self); #line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1640,10 +1640,10 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo #line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp2_ != NULL) { #line 1643 "StraightenTool.c" - EditingToolsPhotoCanvas* _tmp3_ = NULL; - EditingToolsPhotoCanvas* _tmp4_ = NULL; - GdkWindow* _tmp5_ = NULL; - GdkWindow* _tmp6_ = NULL; + EditingToolsPhotoCanvas* _tmp3_; + EditingToolsPhotoCanvas* _tmp4_; + GdkWindow* _tmp5_; + GdkWindow* _tmp6_; #line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1674,7 +1674,7 @@ static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_ = NULL; + EditingToolsPhotoCanvas* _tmp0_; #line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1688,8 +1688,8 @@ static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStra static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_ = NULL; - guint _tmp1_ = 0U; + EditingToolsPhotoCanvas* _tmp0_; + guint _tmp1_; #line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1735,13 +1735,13 @@ static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_chan static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self) { - EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp1_ = NULL; - GtkButton* _tmp2_ = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp3_ = NULL; - GtkButton* _tmp4_ = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp5_ = NULL; - GtkScale* _tmp6_ = NULL; + EditingToolsStraightenToolStraightenToolWindow* _tmp0_; + EditingToolsStraightenToolStraightenToolWindow* _tmp1_; + GtkButton* _tmp2_; + EditingToolsStraightenToolStraightenToolWindow* _tmp3_; + GtkButton* _tmp4_; + EditingToolsStraightenToolStraightenToolWindow* _tmp5_; + GtkScale* _tmp6_; #line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1771,17 +1771,17 @@ static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStra static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self) { - EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL; - guint _tmp1_ = 0U; - EditingToolsStraightenToolStraightenToolWindow* _tmp2_ = NULL; - GtkButton* _tmp3_ = NULL; - guint _tmp4_ = 0U; - EditingToolsStraightenToolStraightenToolWindow* _tmp5_ = NULL; - GtkButton* _tmp6_ = NULL; - guint _tmp7_ = 0U; - EditingToolsStraightenToolStraightenToolWindow* _tmp8_ = NULL; - GtkScale* _tmp9_ = NULL; - guint _tmp10_ = 0U; + EditingToolsStraightenToolStraightenToolWindow* _tmp0_; + guint _tmp1_; + EditingToolsStraightenToolStraightenToolWindow* _tmp2_; + GtkButton* _tmp3_; + guint _tmp4_; + EditingToolsStraightenToolStraightenToolWindow* _tmp5_; + GtkButton* _tmp6_; + guint _tmp7_; + EditingToolsStraightenToolStraightenToolWindow* _tmp8_; + GtkScale* _tmp9_; + guint _tmp10_; #line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1826,20 +1826,20 @@ static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_ca static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self) { - EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL; - GtkScale* _tmp1_ = NULL; - gdouble _tmp2_ = 0.0; + EditingToolsStraightenToolStraightenToolWindow* _tmp0_; + GtkScale* _tmp1_; + gdouble _tmp2_; gchar* tmp = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp3_ = NULL; - GtkScale* _tmp4_ = NULL; - gdouble _tmp5_ = 0.0; - gchar* _tmp6_ = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp7_ = NULL; - GtkLabel* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - OneShotScheduler* _tmp10_ = NULL; - OneShotScheduler* _tmp12_ = NULL; - EditingToolsPhotoCanvas* _tmp13_ = NULL; + EditingToolsStraightenToolStraightenToolWindow* _tmp3_; + GtkScale* _tmp4_; + gdouble _tmp5_; + gchar* _tmp6_; + EditingToolsStraightenToolStraightenToolWindow* _tmp7_; + GtkLabel* _tmp8_; + const gchar* _tmp9_; + OneShotScheduler* _tmp10_; + OneShotScheduler* _tmp12_; + EditingToolsPhotoCanvas* _tmp13_; #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1873,7 +1873,7 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight #line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp10_ == NULL) { #line 1876 "StraightenTool.c" - OneShotScheduler* _tmp11_ = NULL; + OneShotScheduler* _tmp11_; #line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self); #line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1927,8 +1927,8 @@ static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraigh static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base) { EditingToolsStraightenTool * self; EditingToolsEditingToolWindow* result = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp0_ = NULL; - EditingToolsEditingToolWindow* _tmp1_ = NULL; + EditingToolsStraightenToolStraightenToolWindow* _tmp0_; + EditingToolsEditingToolWindow* _tmp1_; #line 454 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1947,15 +1947,15 @@ static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_too * Draw the rotated photo and grid. */ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self) { - cairo_surface_t* _tmp0_ = NULL; - cairo_t* _tmp1_ = NULL; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gdouble _tmp4_ = 0.0; - cairo_t* _tmp5_ = NULL; - cairo_t* _tmp6_ = NULL; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + cairo_surface_t* _tmp0_; + cairo_t* _tmp1_; + gint _tmp2_; + gint _tmp3_; + gdouble _tmp4_; + cairo_t* _tmp5_; + cairo_t* _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1996,56 +1996,56 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) { EditingToolsStraightenTool * self; gint w = 0; - EditingToolsPhotoCanvas* _tmp0_ = NULL; - GdkWindow* _tmp1_ = NULL; - GdkWindow* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + EditingToolsPhotoCanvas* _tmp0_; + GdkWindow* _tmp1_; + GdkWindow* _tmp2_; + gint _tmp3_; + gint _tmp4_; gint h = 0; - EditingToolsPhotoCanvas* _tmp5_ = NULL; - GdkWindow* _tmp6_ = NULL; - GdkWindow* _tmp7_ = NULL; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - EditingToolsPhotoCanvas* _tmp10_ = NULL; - cairo_t* _tmp11_ = NULL; - cairo_t* _tmp12_ = NULL; - EditingToolsPhotoCanvas* _tmp13_ = NULL; - cairo_t* _tmp14_ = NULL; - cairo_t* _tmp15_ = NULL; - EditingToolsPhotoCanvas* _tmp16_ = NULL; - cairo_t* _tmp17_ = NULL; - cairo_t* _tmp18_ = NULL; - EditingToolsPhotoCanvas* _tmp19_ = NULL; - cairo_t* _tmp20_ = NULL; - cairo_t* _tmp21_ = NULL; - EditingToolsPhotoCanvas* _tmp22_ = NULL; - cairo_t* _tmp23_ = NULL; - cairo_t* _tmp24_ = NULL; - gint _tmp25_ = 0; - gint _tmp26_ = 0; - EditingToolsPhotoCanvas* _tmp27_ = NULL; - cairo_t* _tmp28_ = NULL; - cairo_t* _tmp29_ = NULL; - cairo_surface_t* _tmp30_ = NULL; - EditingToolsPhotoCanvas* _tmp31_ = NULL; - cairo_t* _tmp32_ = NULL; - cairo_t* _tmp33_ = NULL; - gint _tmp34_ = 0; - gint _tmp35_ = 0; - EditingToolsPhotoCanvas* _tmp36_ = NULL; - cairo_t* _tmp37_ = NULL; - cairo_t* _tmp38_ = NULL; - EditingToolsPhotoCanvas* _tmp39_ = NULL; - cairo_t* _tmp40_ = NULL; - cairo_t* _tmp41_ = NULL; - EditingToolsPhotoCanvas* _tmp42_ = NULL; - cairo_t* _tmp43_ = NULL; - cairo_t* _tmp44_ = NULL; - EditingToolsStraightenToolStraightenGuide* _tmp45_ = NULL; - EditingToolsPhotoCanvas* _tmp46_ = NULL; - cairo_t* _tmp47_ = NULL; - cairo_t* _tmp48_ = NULL; + EditingToolsPhotoCanvas* _tmp5_; + GdkWindow* _tmp6_; + GdkWindow* _tmp7_; + gint _tmp8_; + gint _tmp9_; + EditingToolsPhotoCanvas* _tmp10_; + cairo_t* _tmp11_; + cairo_t* _tmp12_; + EditingToolsPhotoCanvas* _tmp13_; + cairo_t* _tmp14_; + cairo_t* _tmp15_; + EditingToolsPhotoCanvas* _tmp16_; + cairo_t* _tmp17_; + cairo_t* _tmp18_; + EditingToolsPhotoCanvas* _tmp19_; + cairo_t* _tmp20_; + cairo_t* _tmp21_; + EditingToolsPhotoCanvas* _tmp22_; + cairo_t* _tmp23_; + cairo_t* _tmp24_; + gint _tmp25_; + gint _tmp26_; + EditingToolsPhotoCanvas* _tmp27_; + cairo_t* _tmp28_; + cairo_t* _tmp29_; + cairo_surface_t* _tmp30_; + EditingToolsPhotoCanvas* _tmp31_; + cairo_t* _tmp32_; + cairo_t* _tmp33_; + gint _tmp34_; + gint _tmp35_; + EditingToolsPhotoCanvas* _tmp36_; + cairo_t* _tmp37_; + cairo_t* _tmp38_; + EditingToolsPhotoCanvas* _tmp39_; + cairo_t* _tmp40_; + cairo_t* _tmp41_; + EditingToolsPhotoCanvas* _tmp42_; + cairo_t* _tmp43_; + cairo_t* _tmp44_; + EditingToolsStraightenToolStraightenGuide* _tmp45_; + EditingToolsPhotoCanvas* _tmp46_; + cairo_t* _tmp47_; + cairo_t* _tmp48_; #line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); #line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2216,41 +2216,41 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b */ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self, cairo_surface_t* src_surf, cairo_t* dest_ctx, gint src_width, gint src_height, gdouble angle) { gdouble angle_internal = 0.0; - gdouble _tmp0_ = 0.0; - gdouble _tmp1_ = 0.0; - cairo_t* _tmp2_ = NULL; - cairo_t* _tmp3_ = NULL; - cairo_t* _tmp4_ = NULL; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - cairo_t* _tmp7_ = NULL; - cairo_t* _tmp8_ = NULL; - cairo_t* _tmp9_ = NULL; - gint _tmp10_ = 0; - gint _tmp11_ = 0; - cairo_t* _tmp12_ = NULL; - gdouble _tmp13_ = 0.0; - gdouble _tmp14_ = 0.0; - cairo_t* _tmp15_ = NULL; - gdouble _tmp16_ = 0.0; - cairo_t* _tmp17_ = NULL; - GdkPoint _tmp18_ = {0}; - gint _tmp19_ = 0; - gdouble _tmp20_ = 0.0; - GdkPoint _tmp21_ = {0}; - gint _tmp22_ = 0; - gdouble _tmp23_ = 0.0; - cairo_t* _tmp24_ = NULL; - cairo_surface_t* _tmp25_ = NULL; + gdouble _tmp0_; + gdouble _tmp1_; + cairo_t* _tmp2_; + cairo_t* _tmp3_; + cairo_t* _tmp4_; + gint _tmp5_; + gint _tmp6_; + cairo_t* _tmp7_; + cairo_t* _tmp8_; + cairo_t* _tmp9_; + gint _tmp10_; + gint _tmp11_; + cairo_t* _tmp12_; + gdouble _tmp13_; + gdouble _tmp14_; + cairo_t* _tmp15_; + gdouble _tmp16_; + cairo_t* _tmp17_; + GdkPoint _tmp18_; + gint _tmp19_; + gdouble _tmp20_; + GdkPoint _tmp21_; + gint _tmp22_; + gdouble _tmp23_; + cairo_t* _tmp24_; + cairo_surface_t* _tmp25_; cairo_filter_t _tmp26_ = 0; - gboolean _tmp27_ = FALSE; - cairo_t* _tmp28_ = NULL; - cairo_pattern_t* _tmp29_ = NULL; - cairo_t* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; - cairo_t* _tmp33_ = NULL; - cairo_t* _tmp34_ = NULL; + gboolean _tmp27_; + cairo_t* _tmp28_; + cairo_pattern_t* _tmp29_; + cairo_t* _tmp30_; + gint _tmp31_; + gint _tmp32_; + cairo_t* _tmp33_; + cairo_t* _tmp34_; #line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2378,48 +2378,48 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai */ static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, cairo_t* dest_ctx, gint width, gint height) { gint half_width = 0; - gint _tmp0_ = 0; + gint _tmp0_; gint quarter_width = 0; - gint _tmp1_ = 0; + gint _tmp1_; gint half_height = 0; - gint _tmp2_ = 0; + gint _tmp2_; gint quarter_height = 0; - gint _tmp3_ = 0; - cairo_t* _tmp4_ = NULL; - cairo_t* _tmp5_ = NULL; - EditingToolsPhotoCanvas* _tmp6_ = NULL; - cairo_t* _tmp7_ = NULL; - gint _tmp8_ = 0; - EditingToolsPhotoCanvas* _tmp9_ = NULL; - cairo_t* _tmp10_ = NULL; - gint _tmp11_ = 0; - EditingToolsPhotoCanvas* _tmp12_ = NULL; - cairo_t* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; - EditingToolsPhotoCanvas* _tmp16_ = NULL; - cairo_t* _tmp17_ = NULL; - gint _tmp18_ = 0; - EditingToolsPhotoCanvas* _tmp19_ = NULL; - cairo_t* _tmp20_ = NULL; - gint _tmp21_ = 0; - EditingToolsPhotoCanvas* _tmp22_ = NULL; - cairo_t* _tmp23_ = NULL; - gint _tmp24_ = 0; - gint _tmp25_ = 0; - cairo_t* _tmp26_ = NULL; - EditingToolsPhotoCanvas* _tmp27_ = NULL; - cairo_t* _tmp28_ = NULL; - gint _tmp29_ = 0; - EditingToolsPhotoCanvas* _tmp30_ = NULL; - cairo_t* _tmp31_ = NULL; - gint _tmp32_ = 0; - EditingToolsPhotoCanvas* _tmp33_ = NULL; - cairo_t* _tmp34_ = NULL; - gint _tmp35_ = 0; - EditingToolsPhotoCanvas* _tmp36_ = NULL; - cairo_t* _tmp37_ = NULL; - gint _tmp38_ = 0; + gint _tmp3_; + cairo_t* _tmp4_; + cairo_t* _tmp5_; + EditingToolsPhotoCanvas* _tmp6_; + cairo_t* _tmp7_; + gint _tmp8_; + EditingToolsPhotoCanvas* _tmp9_; + cairo_t* _tmp10_; + gint _tmp11_; + EditingToolsPhotoCanvas* _tmp12_; + cairo_t* _tmp13_; + gint _tmp14_; + gint _tmp15_; + EditingToolsPhotoCanvas* _tmp16_; + cairo_t* _tmp17_; + gint _tmp18_; + EditingToolsPhotoCanvas* _tmp19_; + cairo_t* _tmp20_; + gint _tmp21_; + EditingToolsPhotoCanvas* _tmp22_; + cairo_t* _tmp23_; + gint _tmp24_; + gint _tmp25_; + cairo_t* _tmp26_; + EditingToolsPhotoCanvas* _tmp27_; + cairo_t* _tmp28_; + gint _tmp29_; + EditingToolsPhotoCanvas* _tmp30_; + cairo_t* _tmp31_; + gint _tmp32_; + EditingToolsPhotoCanvas* _tmp33_; + cairo_t* _tmp34_; + gint _tmp35_; + EditingToolsPhotoCanvas* _tmp36_; + cairo_t* _tmp37_; + gint _tmp38_; #line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 543 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2541,13 +2541,13 @@ static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsSt static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y, gdouble angle) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; gint _tmp2_[2] = {0}; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + gint _tmp3_; + gint _tmp4_; gint _tmp5_[2] = {0}; - gdouble _tmp6_ = 0.0; + gdouble _tmp6_; #line 31 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self)); #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2582,7 +2582,7 @@ static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsSt static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 38 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self), FALSE); #line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2590,10 +2590,10 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo #line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_) { #line 2593 "StraightenTool.c" - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; #line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = x; #line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2651,19 +2651,19 @@ static gpointer __double_dup0 (gpointer self) { static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self) { gdouble* result = NULL; gdouble dx = 0.0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; gdouble dy = 0.0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gdouble _tmp4_ = 0.0; - gdouble _tmp5_ = 0.0; - gdouble _tmp6_ = 0.0; - gdouble _tmp7_ = 0.0; - gdouble _tmp8_ = 0.0; - gdouble _tmp9_ = 0.0; - gdouble _tmp10_ = 0.0; - gdouble _tmp11_ = 0.0; + gint _tmp2_; + gint _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; + gdouble _tmp6_; + gdouble _tmp7_; + gdouble _tmp8_; + gdouble _tmp9_; + gdouble _tmp10_; + gdouble _tmp11_; #line 52 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self), NULL); #line 53 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2705,12 +2705,12 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp9_ > _tmp11_) { #line 2708 "StraightenTool.c" - gdouble _tmp12_ = 0.0; - gdouble _tmp13_ = 0.0; - gdouble _tmp14_ = 0.0; - gdouble _tmp15_ = 0.0; - gdouble _tmp16_ = 0.0; - gdouble* _tmp17_ = NULL; + gdouble _tmp12_; + gdouble _tmp13_; + gdouble _tmp14_; + gdouble _tmp15_; + gdouble _tmp16_; + gdouble* _tmp17_; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = self->priv->angle0; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2729,12 +2729,12 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin return result; #line 2731 "StraightenTool.c" } else { - gdouble _tmp18_ = 0.0; - gdouble _tmp19_ = 0.0; - gdouble _tmp20_ = 0.0; - gdouble _tmp21_ = 0.0; - gdouble _tmp22_ = 0.0; - gdouble* _tmp23_ = NULL; + gdouble _tmp18_; + gdouble _tmp19_; + gdouble _tmp20_; + gdouble _tmp21_; + gdouble _tmp22_; + gdouble* _tmp23_; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = self->priv->angle0; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2757,39 +2757,39 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, cairo_t* ctx) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; gdouble* _tmp1_ = NULL; - gdouble* _tmp2_ = NULL; + gdouble* _tmp2_; gdouble angle = 0.0; - gdouble* _tmp5_ = NULL; - gdouble* _tmp6_ = NULL; - gdouble _tmp7_ = 0.0; - gdouble _tmp8_ = 0.0; + gdouble* _tmp5_; + gdouble* _tmp6_; + gdouble _tmp7_; + gdouble _tmp8_; gdouble alpha = 0.0; gboolean _tmp9_ = FALSE; - gdouble _tmp10_ = 0.0; - cairo_t* _tmp12_ = NULL; - gdouble _tmp13_ = 0.0; - cairo_t* _tmp14_ = NULL; - gdouble _tmp15_ = 0.0; - cairo_t* _tmp16_ = NULL; - gint _tmp17_ = 0; - gint _tmp18_ = 0; - cairo_t* _tmp19_ = NULL; - gint _tmp20_ = 0; - gint _tmp21_ = 0; - cairo_t* _tmp22_ = NULL; - cairo_t* _tmp23_ = NULL; - gdouble _tmp24_ = 0.0; - cairo_t* _tmp25_ = NULL; - gdouble _tmp26_ = 0.0; - cairo_t* _tmp27_ = NULL; - gint _tmp28_ = 0; - gint _tmp29_ = 0; - cairo_t* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; - cairo_t* _tmp33_ = NULL; + gdouble _tmp10_; + cairo_t* _tmp12_; + gdouble _tmp13_; + cairo_t* _tmp14_; + gdouble _tmp15_; + cairo_t* _tmp16_; + gint _tmp17_; + gint _tmp18_; + cairo_t* _tmp19_; + gint _tmp20_; + gint _tmp21_; + cairo_t* _tmp22_; + cairo_t* _tmp23_; + gdouble _tmp24_; + cairo_t* _tmp25_; + gdouble _tmp26_; + cairo_t* _tmp27_; + gint _tmp28_; + gint _tmp29_; + cairo_t* _tmp30_; + gint _tmp31_; + gint _tmp32_; + cairo_t* _tmp33_; #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self)); #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2809,8 +2809,8 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp1_ == NULL) { #line 2812 "StraightenTool.c" - gdouble _tmp3_ = 0.0; - gdouble* _tmp4_ = NULL; + gdouble _tmp3_; + gdouble* _tmp4_; #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = 0.0; #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2853,7 +2853,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr _tmp9_ = TRUE; #line 2855 "StraightenTool.c" } else { - gdouble _tmp11_ = 0.0; + gdouble _tmp11_; #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = angle; #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2995,7 +2995,7 @@ static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (collect_values[0].v_pointer) { #line 2998 "StraightenTool.c" - EditingToolsStraightenToolStraightenGuide* object; + EditingToolsStraightenToolStraightenGuide * object; object = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (object->parent_instance.g_class == NULL) { @@ -3022,7 +3022,7 @@ static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value static gchar* editing_tools_straighten_tool_value_straighten_guide_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { - EditingToolsStraightenToolStraightenGuide** object_p; + EditingToolsStraightenToolStraightenGuide ** object_p; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (!object_p) { @@ -3074,7 +3074,7 @@ static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, gpointer v_object) { - EditingToolsStraightenToolStraightenGuide* old; + EditingToolsStraightenToolStraightenGuide * old; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE)); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3105,7 +3105,7 @@ static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* va static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, gpointer v_object) { - EditingToolsStraightenToolStraightenGuide* old; + EditingToolsStraightenToolStraightenGuide * old; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE)); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3155,7 +3155,7 @@ static void editing_tools_straighten_tool_straighten_guide_instance_init (Editin } -static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide* obj) { +static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj) { EditingToolsStraightenToolStraightenGuide * self; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuide); @@ -3180,7 +3180,7 @@ static GType editing_tools_straighten_tool_straighten_guide_get_type (void) { static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer instance) { - EditingToolsStraightenToolStraightenGuide* self; + EditingToolsStraightenToolStraightenGuide * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_atomic_int_inc (&self->ref_count); @@ -3191,7 +3191,7 @@ static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer ins static void editing_tools_straighten_tool_straighten_guide_unref (gpointer instance) { - EditingToolsStraightenToolStraightenGuide* self; + EditingToolsStraightenToolStraightenGuide * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (g_atomic_int_dec_and_test (&self->ref_count)) { @@ -3218,36 +3218,36 @@ static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_click static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, GtkWindow* container) { EditingToolsStraightenToolStraightenToolWindow * self = NULL; - GtkWindow* _tmp0_ = NULL; - GtkScale* _tmp1_ = NULL; - GtkScale* _tmp2_ = NULL; - GtkScale* _tmp3_ = NULL; - GtkScale* _tmp4_ = NULL; - GtkLabel* _tmp5_ = NULL; - GtkLabel* _tmp6_ = NULL; - GtkLabel* _tmp7_ = NULL; - GtkLabel* _tmp8_ = NULL; - GtkLabel* _tmp9_ = NULL; - GtkLabel* _tmp10_ = NULL; - GtkLabel* _tmp11_ = NULL; - GtkLabel* _tmp12_ = NULL; - GtkLabel* _tmp13_ = NULL; + GtkWindow* _tmp0_; + GtkScale* _tmp1_; + GtkScale* _tmp2_; + GtkScale* _tmp3_; + GtkScale* _tmp4_; + GtkLabel* _tmp5_; + GtkLabel* _tmp6_; + GtkLabel* _tmp7_; + GtkLabel* _tmp8_; + GtkLabel* _tmp9_; + GtkLabel* _tmp10_; + GtkLabel* _tmp11_; + GtkLabel* _tmp12_; + GtkLabel* _tmp13_; GtkBox* slider_layout = NULL; - GtkBox* _tmp14_ = NULL; - GtkScale* _tmp15_ = NULL; + GtkBox* _tmp14_; + GtkScale* _tmp15_; GtkBox* button_layout = NULL; - GtkBox* _tmp16_ = NULL; - GtkButton* _tmp17_ = NULL; - GtkButton* _tmp18_ = NULL; - GtkButton* _tmp19_ = NULL; - GtkButton* _tmp20_ = NULL; - GtkButton* _tmp21_ = NULL; - GtkButton* _tmp22_ = NULL; + GtkBox* _tmp16_; + GtkButton* _tmp17_; + GtkButton* _tmp18_; + GtkButton* _tmp19_; + GtkButton* _tmp20_; + GtkButton* _tmp21_; + GtkButton* _tmp22_; GtkBox* main_layout = NULL; - GtkBox* _tmp23_ = NULL; - GtkLabel* _tmp24_ = NULL; - GtkLabel* _tmp25_ = NULL; - GtkButton* _tmp26_ = NULL; + GtkBox* _tmp23_; + GtkLabel* _tmp24_; + GtkLabel* _tmp25_; + GtkButton* _tmp26_; #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (GTK_IS_WINDOW (container), NULL); #line 110 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3392,7 +3392,7 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_ static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self) { - GtkScale* _tmp0_ = NULL; + GtkScale* _tmp0_; #line 152 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_TOOL_WINDOW (self)); #line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3413,15 +3413,12 @@ static void editing_tools_straighten_tool_straighten_tool_window_class_init (Edi static void editing_tools_straighten_tool_straighten_tool_window_instance_init (EditingToolsStraightenToolStraightenToolWindow * self) { - GtkScale* _tmp0_ = NULL; - GtkLabel* _tmp1_ = NULL; - const gchar* _tmp2_ = NULL; - GtkLabel* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - GtkButton* _tmp5_ = NULL; - GtkButton* _tmp6_ = NULL; - const gchar* _tmp7_ = NULL; - GtkButton* _tmp8_ = NULL; + GtkScale* _tmp0_; + GtkLabel* _tmp1_; + GtkLabel* _tmp2_; + GtkButton* _tmp3_; + GtkButton* _tmp4_; + GtkButton* _tmp5_; #line 97 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = (GtkScale*) gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE, EDITING_TOOLS_STRAIGHTEN_TOOL_MAX_ANGLE, EDITING_TOOLS_STRAIGHTEN_TOOL_INCREMENT); #line 97 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3435,40 +3432,34 @@ static void editing_tools_straighten_tool_straighten_tool_window_instance_init ( #line 98 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->angle_label = _tmp1_; #line 99 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = _ ("Angle:"); -#line 99 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = (GtkLabel*) gtk_label_new (_tmp2_); + _tmp2_ = (GtkLabel*) gtk_label_new (_ ("Angle:")); #line 99 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp3_); + g_object_ref_sink (_tmp2_); #line 99 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->description_label = _tmp3_; -#line 100 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = _ ("_Straighten"); + self->description_label = _tmp2_; #line 100 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp4_); + _tmp3_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Straighten")); #line 100 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp5_); + g_object_ref_sink (_tmp3_); #line 100 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->ok_button = _tmp5_; + self->ok_button = _tmp3_; #line 101 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL); + _tmp4_ = (GtkButton*) gtk_button_new_with_mnemonic (RESOURCES_CANCEL_LABEL); #line 101 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp6_); + g_object_ref_sink (_tmp4_); #line 101 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->cancel_button = _tmp6_; + self->cancel_button = _tmp4_; #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = _ ("_Reset"); + _tmp5_ = (GtkButton*) gtk_button_new_with_mnemonic (_ ("_Reset")); #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = (GtkButton*) gtk_button_new_with_mnemonic (_tmp7_); -#line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp8_); + g_object_ref_sink (_tmp5_); #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->reset_button = _tmp8_; -#line 3468 "StraightenTool.c" + self->reset_button = _tmp5_; +#line 3459 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject* obj) { +static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj) { EditingToolsStraightenToolStraightenToolWindow * self; #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, EditingToolsStraightenToolStraightenToolWindow); @@ -3486,7 +3477,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObje _g_object_unref0 (self->reset_button); #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" G_OBJECT_CLASS (editing_tools_straighten_tool_straighten_tool_window_parent_class)->finalize (obj); -#line 3490 "StraightenTool.c" +#line 3481 "StraightenTool.c" } @@ -3510,27 +3501,27 @@ static void editing_tools_straighten_tool_class_init (EditingToolsStraightenTool #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_type_class_add_private (klass, sizeof (EditingToolsStraightenToolPrivate)); #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - ((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_straighten_tool_real_on_left_click; + ((EditingToolsEditingToolClass *) klass)->on_left_click = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_straighten_tool_real_on_left_click; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - ((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*)(EditingToolsEditingTool*, gint, gint)) editing_tools_straighten_tool_real_on_left_released; + ((EditingToolsEditingToolClass *) klass)->on_left_released = (void (*) (EditingToolsEditingTool *, gint, gint)) editing_tools_straighten_tool_real_on_left_released; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - ((EditingToolsEditingToolClass *) klass)->on_motion = (void (*)(EditingToolsEditingTool*, gint, gint, GdkModifierType)) editing_tools_straighten_tool_real_on_motion; + ((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_straighten_tool_real_on_motion; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - ((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*)(EditingToolsEditingTool*, GdkEventKey*)) editing_tools_straighten_tool_real_on_keypress; + ((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_straighten_tool_real_on_keypress; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - ((EditingToolsEditingToolClass *) klass)->activate = (void (*)(EditingToolsEditingTool*, EditingToolsPhotoCanvas*)) editing_tools_straighten_tool_real_activate; + ((EditingToolsEditingToolClass *) klass)->activate = (void (*) (EditingToolsEditingTool *, EditingToolsPhotoCanvas*)) editing_tools_straighten_tool_real_activate; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - ((EditingToolsEditingToolClass *) klass)->deactivate = (void (*)(EditingToolsEditingTool*)) editing_tools_straighten_tool_real_deactivate; + ((EditingToolsEditingToolClass *) klass)->deactivate = (void (*) (EditingToolsEditingTool *)) editing_tools_straighten_tool_real_deactivate; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - ((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*)(EditingToolsEditingTool*)) editing_tools_straighten_tool_real_get_tool_window; + ((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_straighten_tool_real_get_tool_window; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - ((EditingToolsEditingToolClass *) klass)->paint = (void (*)(EditingToolsEditingTool*, cairo_t*)) editing_tools_straighten_tool_real_paint; -#line 3529 "StraightenTool.c" + ((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_straighten_tool_real_paint; +#line 3520 "StraightenTool.c" } static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenTool * self) { - EditingToolsStraightenToolStraightenGuide* _tmp0_ = NULL; + EditingToolsStraightenToolStraightenGuide* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE (self); #line 170 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3543,11 +3534,11 @@ static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenT _tmp0_ = editing_tools_straighten_tool_straighten_guide_new (); #line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->guide = _tmp0_; -#line 3547 "StraightenTool.c" +#line 3538 "StraightenTool.c" } -static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool* obj) { +static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj) { EditingToolsStraightenTool * self; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool); @@ -3565,7 +3556,7 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool* obj _editing_tools_straighten_tool_straighten_guide_unref0 (self->priv->guide); #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->finalize (obj); -#line 3569 "StraightenTool.c" +#line 3560 "StraightenTool.c" } -- cgit v1.2.3