diff options
Diffstat (limited to 'src/editing_tools/StraightenTool.c')
| -rw-r--r-- | src/editing_tools/StraightenTool.c | 2941 |
1 files changed, 1465 insertions, 1476 deletions
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c index 9420cb8..9d00c58 100644 --- a/src/editing_tools/StraightenTool.c +++ b/src/editing_tools/StraightenTool.c @@ -1,4 +1,4 @@ -/* StraightenTool.c generated by valac 0.36.6, the Vala compiler +/* StraightenTool.c generated by valac 0.40.4, the Vala compiler * generated from StraightenTool.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -7,6 +7,7 @@ * (version 2.1 or later). See the COPYING file in this distribution. */ + #include <glib.h> #include <glib-object.h> #include <gtk/gtk.h> @@ -229,6 +230,11 @@ typedef struct _Box Box; #define _editing_tools_photo_canvas_unref0(var) ((var == NULL) ? NULL : (var = (editing_tools_photo_canvas_unref (var), NULL))) typedef struct _EditingToolsStraightenToolStraightenGuidePrivate EditingToolsStraightenToolStraightenGuidePrivate; typedef struct _EditingToolsStraightenToolParamSpecStraightenGuide EditingToolsStraightenToolParamSpecStraightenGuide; +enum { + EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_0_PROPERTY, + EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_NUM_PROPERTIES +}; +static GParamSpec* editing_tools_straighten_tool_straighten_tool_window_properties[EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_NUM_PROPERTIES]; #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg); #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; } #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; } @@ -386,16 +392,28 @@ static gpointer editing_tools_straighten_tool_straighten_tool_window_parent_clas gpointer editing_tools_editing_tool_ref (gpointer instance); void editing_tools_editing_tool_unref (gpointer instance); -GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object); -void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object); +GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void editing_tools_value_set_editing_tool (GValue* value, + gpointer v_object); +void editing_tools_value_take_editing_tool (GValue* value, + gpointer v_object); gpointer editing_tools_value_get_editing_tool (const GValue* value); GType editing_tools_editing_tool_get_type (void) G_GNUC_CONST; gpointer editing_tools_photo_canvas_ref (gpointer instance); void editing_tools_photo_canvas_unref (gpointer instance); -GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object); -void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object); +GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void editing_tools_value_set_photo_canvas (GValue* value, + gpointer v_object); +void editing_tools_value_take_photo_canvas (GValue* value, + gpointer v_object); gpointer editing_tools_value_get_photo_canvas (const GValue* value); GType editing_tools_photo_canvas_get_type (void) G_GNUC_CONST; GType editing_tools_editing_tool_window_get_type (void) G_GNUC_CONST; @@ -416,22 +434,31 @@ GType editing_tools_straighten_tool_get_type (void) G_GNUC_CONST; static GType editing_tools_straighten_tool_straighten_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; gpointer one_shot_scheduler_ref (gpointer instance); void one_shot_scheduler_unref (gpointer instance); -GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags); -void value_set_one_shot_scheduler (GValue* value, gpointer v_object); -void value_take_one_shot_scheduler (GValue* value, gpointer v_object); +GParamSpec* param_spec_one_shot_scheduler (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags); +void value_set_one_shot_scheduler (GValue* value, + gpointer v_object); +void value_take_one_shot_scheduler (GValue* value, + gpointer v_object); gpointer value_get_one_shot_scheduler (const GValue* value); GType one_shot_scheduler_get_type (void) G_GNUC_CONST; static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer instance); static void editing_tools_straighten_tool_straighten_guide_unref (gpointer instance); -static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED; -static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, gpointer v_object) G_GNUC_UNUSED; -static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, gpointer v_object) G_GNUC_UNUSED; +static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) G_GNUC_UNUSED; +static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, + gpointer v_object) G_GNUC_UNUSED; +static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, + gpointer v_object) G_GNUC_UNUSED; static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const GValue* value) G_GNUC_UNUSED; static GType editing_tools_straighten_tool_straighten_guide_get_type (void) G_GNUC_CONST G_GNUC_UNUSED; #define EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenToolPrivate)) -enum { - EDITING_TOOLS_STRAIGHTEN_TOOL_DUMMY_PROPERTY -}; static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_new (void); static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_construct (GType object_type); #define EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE (-15.0) @@ -444,12 +471,19 @@ static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_ #define EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC 100 static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void); static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GType object_type); -EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, const gchar* name); +EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, + const gchar* name); EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void); -gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling); +gboolean editing_tools_straighten_tool_is_available (Photo* photo, + Scaling* scaling); static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self); Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self); -void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result); +void rotate_point_arb (GdkPoint* source_point, + gint img_w, + gint img_h, + gdouble angle, + gboolean invert, + GdkPoint* result); GType command_get_type (void) G_GNUC_CONST; GType page_command_get_type (void) G_GNUC_CONST; GType single_data_source_command_get_type (void) G_GNUC_CONST; @@ -458,112 +492,213 @@ GType straighten_command_get_type (void) G_GNUC_CONST; GType box_get_type (void) G_GNUC_CONST; Box* box_dup (const Box* self); void box_free (Box* self); -void box_from_center (GdkPoint* center, gint width, gint height, Box* result); +void box_from_center (GdkPoint* center, + gint width, + gint height, + Box* result); #define RESOURCES_STRAIGHTEN_LABEL _ ("Straighten") #define RESOURCES_STRAIGHTEN_TOOLTIP _ ("Straighten the photo") -StraightenCommand* straighten_command_new (Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation); -StraightenCommand* straighten_command_construct (GType object_type, Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation); +StraightenCommand* straighten_command_new (Photo* photo, + gdouble theta, + Box* crop, + const gchar* name, + const gchar* explanation); +StraightenCommand* straighten_command_construct (GType object_type, + Photo* photo, + gdouble theta, + Box* crop, + const gchar* name, + const gchar* explanation); static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self); static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self); void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self); static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self); -static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y); -static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y, gdouble angle); -static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y); -static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y); +static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, + gint x, + gint y); +static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, + gint x, + gint y, + gdouble angle); +static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, + gint x, + gint y); +static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, + gint x, + gint y); static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self); static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsStraightenToolStraightenGuide* self); -static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask); -static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event); +static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, + gint x, + gint y, + GdkModifierType mask); +static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event); void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self); -gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event); +gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, + GdkEventKey* event); 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); +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); 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); -void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result); +GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, + Scaling* scaling, + PhotoException exceptions, + BackingFetchMode fetch_mode, + GError** error); +void scaling_for_viewport (Dimensions* viewport, + gboolean scale_up, + Scaling* result); gchar* data_object_to_string (DataObject* self); +void paint_pixmap_with_background (cairo_t* ctx, + GdkPixbuf* pixbuf, + gint x, + gint y); static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self); -void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height); -static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas); -void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas); -static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas); -void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result); -gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions); -gboolean photo_get_straighten (Photo* self, gdouble* theta); -void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result); -void box_get_center (Box *self, GdkPoint* result); +void compute_arb_rotated_size (gdouble src_width, + gdouble src_height, + gdouble angle, + gdouble* dest_width, + gdouble* dest_height); +static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas); +void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, + EditingToolsPhotoCanvas* canvas); +static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, + EditingToolsPhotoCanvas* canvas); +void media_source_get_dimensions (MediaSource* self, + PhotoException disallowed_steps, + Dimensions* result); +gboolean photo_get_crop (Photo* self, + Box* crop, + PhotoException exceptions); +gboolean photo_get_straighten (Photo* self, + gdouble* theta); +void derotate_point_arb (GdkPoint* source_point, + gint img_w, + gint img_h, + gdouble angle, + GdkPoint* result); +void box_get_center (Box *self, + GdkPoint* result); gint box_get_width (Box *self); gint box_get_height (Box *self); GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self); GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self); static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container); -static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, GtkWindow* container); +static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, + GtkWindow* container); static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self); static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base); static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self); -static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas); +static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, + EditingToolsPhotoCanvas* canvas); void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self); -static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position); -static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self); -static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self); -static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self); -static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self); +static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position); +static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self); +static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self); +static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self); +static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, + gpointer self); static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self); -static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self); +static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self); static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self); -OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target); -OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target); -void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule); +OneShotScheduler* one_shot_scheduler_new (const gchar* name, + OneShotCallback callback, + void* callback_target); +OneShotScheduler* one_shot_scheduler_construct (GType object_type, + const gchar* name, + OneShotCallback callback, + void* callback_target); +void one_shot_scheduler_after_timeout (OneShotScheduler* self, + guint msec, + gboolean reschedule); static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base); -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); -static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, cairo_t* dest_ctx, gint width, gint height); -static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx); +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); +static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, + cairo_t* dest_ctx, + gint width, + gint height); +static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* ctx); cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self); -static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, cairo_t* ctx); +static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, + cairo_t* ctx); gdouble degrees_to_radians (gdouble theta); -void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint width, gboolean use_scaled_pos); -void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint height, gboolean use_scaled_pos); +void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint x, + gint y, + gint width, + gboolean use_scaled_pos); +void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, + cairo_t* ctx, + gint x, + gint y, + gint height, + gboolean use_scaled_pos); #define EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuidePrivate)) -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); -enum { - EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_DUMMY_PROPERTY -}; #define RESOURCES_CANCEL_LABEL _ ("_Cancel") #define EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING 8 -EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container); +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_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 const gdouble EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[2] = {(gdouble) 10, (gdouble) 10}; -static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GType object_type) { +static EditingToolsStraightenTool* +editing_tools_straighten_tool_construct (GType object_type) +{ EditingToolsStraightenTool* self = NULL; #line 190 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = (EditingToolsStraightenTool*) editing_tools_editing_tool_construct (object_type, "StraightenTool"); #line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self; -#line 556 "StraightenTool.c" +#line 687 "StraightenTool.c" } -static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) { +static EditingToolsStraightenTool* +editing_tools_straighten_tool_new (void) +{ #line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return editing_tools_straighten_tool_construct (EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL); -#line 563 "StraightenTool.c" +#line 696 "StraightenTool.c" } -EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) { +EditingToolsStraightenTool* +editing_tools_straighten_tool_factory (void) +{ EditingToolsStraightenTool* result = NULL; EditingToolsStraightenTool* _tmp0_; #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -572,11 +707,14 @@ EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) { result = _tmp0_; #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 576 "StraightenTool.c" +#line 711 "StraightenTool.c" } -gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling) { +gboolean +editing_tools_straighten_tool_is_available (Photo* photo, + Scaling* scaling) +{ gboolean result = FALSE; #line 197 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (IS_PHOTO (photo), FALSE); @@ -586,7 +724,7 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal result = TRUE; #line 198 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 590 "StraightenTool.c" +#line 728 "StraightenTool.c" } @@ -598,34 +736,35 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal * case of a previously-uncropped Photo, the crop region will be set to the original dimensions * of the photo and centered at the Photo's center. */ -static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self) +{ EditingToolsPhotoCanvas* _tmp0_; Photo* _tmp1_; Photo* _tmp2_; gdouble slider_val = 0.0; EditingToolsStraightenToolStraightenToolWindow* _tmp3_; GtkScale* _tmp4_; - gdouble _tmp5_; GdkPoint new_crop_center = {0}; - GdkPoint _tmp6_; - Dimensions _tmp7_; - gint _tmp8_; - Dimensions _tmp9_; - gint _tmp10_; - GdkPoint _tmp11_ = {0}; + GdkPoint _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; + Dimensions _tmp8_; + gint _tmp9_; + GdkPoint _tmp10_ = {0}; StraightenCommand* command = NULL; - EditingToolsPhotoCanvas* _tmp12_; + EditingToolsPhotoCanvas* _tmp11_; + Photo* _tmp12_; Photo* _tmp13_; - Photo* _tmp14_; - GdkPoint _tmp15_; - gdouble _tmp16_; - gint _tmp17_; - gdouble _tmp18_; - gint _tmp19_; - Box _tmp20_ = {0}; + GdkPoint _tmp14_; + gdouble _tmp15_; + gint _tmp16_; + gdouble _tmp17_; + gint _tmp18_; + Box _tmp19_ = {0}; + StraightenCommand* _tmp20_; StraightenCommand* _tmp21_; - StraightenCommand* _tmp22_; - Dimensions _tmp23_; + Dimensions _tmp22_; #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" @@ -643,60 +782,60 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT #line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = _tmp3_->angle_slider; #line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange)); -#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - slider_val = _tmp5_; + slider_val = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange)); #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = self->priv->rotated_center; + _tmp5_ = self->priv->rotated_center; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = self->priv->image_dims; + _tmp6_ = self->priv->image_dims; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = _tmp7_.width; + _tmp7_ = _tmp6_.width; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = self->priv->image_dims; + _tmp8_ = self->priv->image_dims; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = _tmp9_.height; + _tmp9_ = _tmp8_.height; #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - rotate_point_arb (&_tmp6_, _tmp8_, _tmp10_, slider_val, FALSE, &_tmp11_); + rotate_point_arb (&_tmp5_, _tmp7_, _tmp9_, slider_val, FALSE, &_tmp10_); #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - new_crop_center = _tmp11_; + new_crop_center = _tmp10_; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_); + _tmp12_ = editing_tools_photo_canvas_get_photo (_tmp11_); #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = _tmp13_; + _tmp13_ = _tmp12_; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = new_crop_center; + _tmp14_ = new_crop_center; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = self->priv->rotate_scale; + _tmp15_ = self->priv->rotate_scale; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = self->priv->crop_width; + _tmp16_ = self->priv->crop_width; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->priv->rotate_scale; + _tmp17_ = self->priv->rotate_scale; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = self->priv->crop_height; + _tmp18_ = self->priv->crop_height; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - box_from_center (&_tmp15_, (gint) (_tmp16_ * _tmp17_), (gint) (_tmp18_ * _tmp19_), &_tmp20_); + box_from_center (&_tmp14_, (gint) (_tmp15_ * _tmp16_), (gint) (_tmp17_ * _tmp18_), &_tmp19_); #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = straighten_command_new (_tmp14_, slider_val, &_tmp20_, RESOURCES_STRAIGHTEN_LABEL, RESOURCES_STRAIGHTEN_TOOLTIP); + _tmp20_ = straighten_command_new (_tmp13_, slider_val, &_tmp19_, RESOURCES_STRAIGHTEN_LABEL, RESOURCES_STRAIGHTEN_TOOLTIP); #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = _tmp21_; + _tmp21_ = _tmp20_; #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp14_); + _g_object_unref0 (_tmp13_); #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - command = _tmp22_; + command = _tmp21_; #line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = self->priv->image_dims; + _tmp22_ = self->priv->image_dims; #line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command), NULL, &_tmp23_, TRUE); + g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command), NULL, &_tmp22_, TRUE); #line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (command); -#line 696 "StraightenTool.c" +#line 833 "StraightenTool.c" } -static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self) +{ EditingToolsPhotoCanvas* _tmp0_; #line 227 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); @@ -708,186 +847,171 @@ static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraigh _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_repaint (_tmp0_); -#line 712 "StraightenTool.c" +#line 851 "StraightenTool.c" } -static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self) +{ #line 233 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); #line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_high_qual_repaint (self); -#line 721 "StraightenTool.c" +#line 862 "StraightenTool.c" } -static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) { +static void +editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, + gint x, + gint y) +{ EditingToolsStraightenTool * self; EditingToolsStraightenToolStraightenGuide* _tmp0_; - gint _tmp1_; - gint _tmp2_; - gdouble _tmp3_; + gdouble _tmp1_; #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" _tmp0_ = self->priv->guide; #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = x; -#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = y; + _tmp1_ = self->priv->photo_angle; #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = self->priv->photo_angle; -#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_straighten_guide_reset (_tmp0_, _tmp1_, _tmp2_, _tmp3_); -#line 743 "StraightenTool.c" + editing_tools_straighten_tool_straighten_guide_reset (_tmp0_, x, y, _tmp1_); +#line 882 "StraightenTool.c" } -static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) { +static void +editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, + gint x, + gint y) +{ EditingToolsStraightenTool * self; EditingToolsStraightenToolStraightenGuide* _tmp0_; - gint _tmp1_; - gint _tmp2_; gdouble* a = NULL; + EditingToolsStraightenToolStraightenGuide* _tmp1_; + gdouble* _tmp2_; 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" _tmp0_ = self->priv->guide; #line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = x; -#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = y; -#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_); + editing_tools_straighten_tool_straighten_guide_update (_tmp0_, x, y); #line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = self->priv->guide; + _tmp1_ = self->priv->guide; #line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = editing_tools_straighten_tool_straighten_guide_get_angle (_tmp3_); + _tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (_tmp1_); #line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - a = _tmp4_; + a = _tmp2_; #line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = self->priv->guide; + _tmp3_ = self->priv->guide; #line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_straighten_guide_clear (_tmp5_); + editing_tools_straighten_tool_straighten_guide_clear (_tmp3_); #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = a; + _tmp4_ = a; #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp6_ != NULL) { -#line 781 "StraightenTool.c" - EditingToolsStraightenToolStraightenToolWindow* _tmp7_; - GtkScale* _tmp8_; - gdouble* _tmp9_; + if (_tmp4_ != NULL) { +#line 918 "StraightenTool.c" + EditingToolsStraightenToolStraightenToolWindow* _tmp5_; + GtkScale* _tmp6_; + gdouble* _tmp7_; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = self->priv->window; + _tmp5_ = self->priv->window; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = _tmp7_->angle_slider; + _tmp6_ = _tmp5_->angle_slider; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = a; + _tmp7_ = a; #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_range_get_type (), GtkRange), *_tmp9_); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), *_tmp7_); #line 247 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_high_qual_repaint (self); -#line 795 "StraightenTool.c" +#line 932 "StraightenTool.c" } #line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (a); -#line 799 "StraightenTool.c" +#line 936 "StraightenTool.c" } -static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) { +static void +editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, + gint x, + gint y, + GdkModifierType mask) +{ EditingToolsStraightenTool * self; 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" _tmp0_ = self->priv->guide; #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = x; -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = y; -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_); -#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp3_) { -#line 821 "StraightenTool.c" - EditingToolsPhotoCanvas* _tmp4_; + if (editing_tools_straighten_tool_straighten_guide_update (_tmp0_, x, y)) { +#line 954 "StraightenTool.c" + EditingToolsPhotoCanvas* _tmp1_; #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; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_repaint (_tmp4_); -#line 827 "StraightenTool.c" + editing_tools_photo_canvas_repaint (_tmp1_); +#line 960 "StraightenTool.c" } } -static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event) { +static gboolean +editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, + GdkEventKey* event) +{ EditingToolsStraightenTool * self; gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - GdkEventKey* _tmp2_; - guint _tmp3_; - const gchar* _tmp4_; - GdkEventKey* _tmp11_; - guint _tmp12_; - const gchar* _tmp13_; - GdkEventKey* _tmp14_; - gboolean _tmp15_; + guint _tmp2_; + const gchar* _tmp3_; + guint _tmp8_; + const gchar* _tmp9_; #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" g_return_val_if_fail (event != NULL, FALSE); #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = event; + _tmp2_ = event->keyval; #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = _tmp2_->keyval; + _tmp3_ = gdk_keyval_name (_tmp2_); #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = gdk_keyval_name (_tmp3_); -#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { + if (g_strcmp0 (_tmp3_, "KP_Enter") == 0) { #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = TRUE; -#line 859 "StraightenTool.c" +#line 989 "StraightenTool.c" } else { - GdkEventKey* _tmp5_; - guint _tmp6_; - const gchar* _tmp7_; -#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = event; + guint _tmp4_; + const gchar* _tmp5_; #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = _tmp5_->keyval; + _tmp4_ = event->keyval; #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = gdk_keyval_name (_tmp6_); + _tmp5_ = gdk_keyval_name (_tmp4_); #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; -#line 872 "StraightenTool.c" + _tmp1_ = g_strcmp0 (_tmp5_, "Enter") == 0; +#line 999 "StraightenTool.c" } #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp1_) { #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = TRUE; -#line 878 "StraightenTool.c" +#line 1005 "StraightenTool.c" } else { - GdkEventKey* _tmp8_; - guint _tmp9_; - const gchar* _tmp10_; -#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = event; + guint _tmp6_; + const gchar* _tmp7_; #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = _tmp8_->keyval; + _tmp6_ = event->keyval; #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = gdk_keyval_name (_tmp9_); + _tmp7_ = gdk_keyval_name (_tmp6_); #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; -#line 891 "StraightenTool.c" + _tmp0_ = g_strcmp0 (_tmp7_, "Return") == 0; +#line 1015 "StraightenTool.c" } #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_) { @@ -897,74 +1021,73 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit result = TRUE; #line 261 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 901 "StraightenTool.c" +#line 1025 "StraightenTool.c" } #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = event; + _tmp8_ = event->keyval; #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = _tmp11_->keyval; + _tmp9_ = gdk_keyval_name (_tmp8_); #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = gdk_keyval_name (_tmp12_); -#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (g_strcmp0 (_tmp13_, "Escape") == 0) { + if (g_strcmp0 (_tmp9_, "Escape") == 0) { #line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_editing_tool_notify_cancel (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); #line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = TRUE; #line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 917 "StraightenTool.c" +#line 1039 "StraightenTool.c" } #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = event; -#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp14_); -#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - result = _tmp15_; + result = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), event); #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 927 "StraightenTool.c" +#line 1045 "StraightenTool.c" } -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" return TRUE; -#line 936 "StraightenTool.c" +#line 1057 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1 == NULL) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; -#line 942 "StraightenTool.c" +#line 1063 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s2 == NULL) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; -#line 948 "StraightenTool.c" +#line 1069 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1->width != s2->width) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; -#line 954 "StraightenTool.c" +#line 1075 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (s1->height != s2->height) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return FALSE; -#line 960 "StraightenTool.c" +#line 1081 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return TRUE; -#line 964 "StraightenTool.c" +#line 1085 "StraightenTool.c" } -static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self) +{ Dimensions canvas_dims = {0}; EditingToolsPhotoCanvas* _tmp0_; Dimensions _tmp1_ = {0}; @@ -991,24 +1114,15 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT cairo_t* _tmp34_; cairo_t* _tmp35_; GdkPixbuf* _tmp36_; - cairo_t* _tmp37_; - GdkPixbuf* _tmp38_; + gint _tmp37_; + gdouble _tmp38_; gint _tmp39_; - gint _tmp40_; - GdkPixbuf* _tmp41_; + gdouble _tmp40_; + gint _tmp41_; gint _tmp42_; - gint _tmp43_; - cairo_t* _tmp44_; + cairo_surface_t* _tmp43_; + cairo_surface_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)); @@ -1030,7 +1144,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT if (_dimensions_equal (&_tmp3_, &_tmp4_) == TRUE) { #line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; -#line 1034 "StraightenTool.c" +#line 1148 "StraightenTool.c" } #line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = viewport; @@ -1038,7 +1152,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT self->priv->last_viewport = _tmp5_; #line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" low_res_tmp = NULL; -#line 1042 "StraightenTool.c" +#line 1156 "StraightenTool.c" { GdkPixbuf* _tmp6_ = NULL; EditingToolsPhotoCanvas* _tmp7_; @@ -1069,8 +1183,8 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT _tmp6_ = _tmp13_; #line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { -#line 1073 "StraightenTool.c" - goto __catch23_g_error; +#line 1187 "StraightenTool.c" + goto __catch27_g_error; } #line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = _tmp6_; @@ -1082,10 +1196,10 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT low_res_tmp = _tmp14_; #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp6_); -#line 1086 "StraightenTool.c" +#line 1200 "StraightenTool.c" } - goto __finally23; - __catch23_g_error: + goto __finally27; + __catch27_g_error: { GError* e = NULL; EditingToolsPhotoCanvas* _tmp15_; @@ -1122,9 +1236,9 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT low_res_tmp = _tmp20_; #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_error_free0 (e); -#line 1126 "StraightenTool.c" +#line 1240 "StraightenTool.c" } - __finally23: + __finally27: #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (G_UNLIKELY (_inner_error_ != NULL)) { #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -1135,7 +1249,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT g_clear_error (&_inner_error_); #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; -#line 1139 "StraightenTool.c" +#line 1253 "StraightenTool.c" } #line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = low_res_tmp; @@ -1178,70 +1292,48 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT #line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp36_ = low_res_tmp; #line 295 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gdk_cairo_set_source_pixbuf (_tmp35_, _tmp36_, (gdouble) 0, (gdouble) 0); -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp37_ = ctx; -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp38_ = low_res_tmp; -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp39_ = gdk_pixbuf_get_width (_tmp38_); -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp40_ = _tmp39_; -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp41_ = low_res_tmp; -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp42_ = gdk_pixbuf_get_height (_tmp41_); -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp43_ = _tmp42_; -#line 296 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rectangle (_tmp37_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp40_, (gdouble) _tmp43_); -#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp44_ = ctx; -#line 297 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_fill (_tmp44_); -#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp45_ = ctx; -#line 298 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_paint (_tmp45_); + paint_pixmap_with_background (_tmp35_, _tmp36_, 0, 0); +#line 299 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp37_ = self->priv->crop_width; +#line 299 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp38_ = self->priv->preview_scale; +#line 299 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->view_width = (gint) (_tmp37_ * _tmp38_); +#line 300 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp39_ = self->priv->crop_height; +#line 300 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp40_ = self->priv->preview_scale; +#line 300 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->view_height = (gint) (_tmp39_ * _tmp40_); +#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp41_ = self->priv->view_width; +#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp42_ = self->priv->view_height; +#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp43_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp41_, _tmp42_); +#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _cairo_surface_destroy0 (self->priv->rotate_surf); +#line 301 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->rotate_surf = _tmp43_; #line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp46_ = self->priv->crop_width; + _tmp44_ = self->priv->rotate_surf; #line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp47_ = self->priv->preview_scale; + _tmp45_ = cairo_create (_tmp44_); #line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->view_width = (gint) (_tmp46_ * _tmp47_); -#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp48_ = self->priv->crop_height; -#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp49_ = self->priv->preview_scale; -#line 303 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->view_height = (gint) (_tmp48_ * _tmp49_); -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp50_ = self->priv->view_width; -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp51_ = self->priv->view_height; -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp52_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp50_, _tmp51_); -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_surface_destroy0 (self->priv->rotate_surf); -#line 304 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotate_surf = _tmp52_; -#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp53_ = self->priv->rotate_surf; -#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp54_ = cairo_create (_tmp53_); -#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (self->priv->rotate_ctx); -#line 305 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotate_ctx = _tmp54_; +#line 302 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->rotate_ctx = _tmp45_; #line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (ctx); #line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (low_res_tmp); -#line 1241 "StraightenTool.c" +#line 1331 "StraightenTool.c" } -static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self) +{ gdouble width = 0.0; gdouble height = 0.0; gint _tmp0_; @@ -1254,92 +1346,80 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai Dimensions _tmp7_; gint _tmp8_; gdouble _tmp9_; - gdouble _tmp10_; - gdouble _tmp11_; - GdkPoint _tmp12_; + GdkPoint _tmp10_; gint radius_x = 0; - gdouble _tmp13_; + gdouble _tmp11_; gint radius_y = 0; - gdouble _tmp14_; - GdkPoint _tmp15_; + gdouble _tmp12_; + GdkPoint _tmp13_; + gint _tmp14_; + Dimensions _tmp15_; gint _tmp16_; - Dimensions _tmp17_; + GdkPoint _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" + Dimensions _tmp19_; + gint _tmp20_; +#line 306 "/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" +#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->crop_width; -#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = self->priv->crop_height; -#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = self->priv->photo_angle; -#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" compute_arb_rotated_size ((gdouble) _tmp0_, (gdouble) _tmp1_, _tmp2_, &_tmp3_, &_tmp4_); -#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" width = _tmp3_; -#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" height = _tmp4_; -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->image_dims; -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_.width; -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = self->priv->image_dims; -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = _tmp7_.height; -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = MIN (_tmp6_ / width, _tmp8_ / height); -#line 314 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotate_scale = _tmp9_; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = self->priv->rotate_scale; +#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->rotate_scale = MIN (_tmp6_ / width, _tmp8_ / height); +#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp9_ = self->priv->rotate_scale; +#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->rotate_scale = MIN (_tmp9_, 1.0); #line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = MIN (_tmp10_, 1.0); + _tmp10_ = self->priv->crop_center; #line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotate_scale = _tmp11_; + self->priv->rotated_center = _tmp10_; +#line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp11_ = self->priv->rotate_scale; +#line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + radius_x = (gint) ((_tmp11_ * width) / 2); +#line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp12_ = self->priv->rotate_scale; +#line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + radius_y = (gint) ((_tmp12_ * height) / 2); +#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp13_ = self->priv->rotated_center; +#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp14_ = _tmp13_.x; +#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp15_ = self->priv->image_dims; #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = self->priv->crop_center; + _tmp16_ = _tmp15_.width; #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotated_center = _tmp12_; + self->priv->rotated_center.x = CLAMP (_tmp14_, radius_x, _tmp16_ - radius_x); #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = self->priv->rotate_scale; + _tmp17_ = self->priv->rotated_center; #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - radius_x = (gint) ((_tmp13_ * width) / 2); -#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = self->priv->rotate_scale; -#line 320 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - radius_y = (gint) ((_tmp14_ * height) / 2); -#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = self->priv->rotated_center; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = _tmp15_.x; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = self->priv->image_dims; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = _tmp17_.width; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = CLAMP (_tmp16_, radius_x, _tmp18_ - radius_x); -#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotated_center.x = _tmp19_; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = self->priv->rotated_center; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = _tmp20_.y; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = self->priv->image_dims; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = _tmp22_.height; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = CLAMP (_tmp21_, radius_y, _tmp23_ - radius_y); -#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->rotated_center.y = _tmp24_; -#line 1343 "StraightenTool.c" + _tmp18_ = _tmp17_.y; +#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp19_ = self->priv->image_dims; +#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp20_ = _tmp19_.height; +#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->rotated_center.y = CLAMP (_tmp18_, radius_y, _tmp20_ - radius_y); +#line 1423 "StraightenTool.c" } @@ -1350,391 +1430,394 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai * * @param canvas The PhotoCanvas the tool's output should be painted to. */ -static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) { -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static gpointer +_editing_tools_photo_canvas_ref0 (gpointer self) +{ +#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self ? editing_tools_photo_canvas_ref (self) : NULL; -#line 1357 "StraightenTool.c" +#line 1439 "StraightenTool.c" } -static gpointer _g_object_ref0 (gpointer self) { -#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static gpointer +_g_object_ref0 (gpointer self) +{ +#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self ? g_object_ref (self) : NULL; -#line 1364 "StraightenTool.c" +#line 1448 "StraightenTool.c" } -static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) { +static void +editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, + EditingToolsPhotoCanvas* canvas) +{ EditingToolsStraightenTool * self; EditingToolsPhotoCanvas* _tmp0_; EditingToolsPhotoCanvas* _tmp1_; - EditingToolsPhotoCanvas* _tmp2_; - EditingToolsPhotoCanvas* _tmp3_; - EditingToolsPhotoCanvas* _tmp4_; + Photo* _tmp2_; + Photo* _tmp3_; + Dimensions _tmp4_ = {0}; + Box crop_region = {0}; Photo* _tmp5_; Photo* _tmp6_; - Dimensions _tmp7_ = {0}; - Box crop_region = {0}; - EditingToolsPhotoCanvas* _tmp8_; - Photo* _tmp9_; - Photo* _tmp10_; - Box _tmp11_ = {0}; - gboolean _tmp12_; - gboolean _tmp13_; + Box _tmp7_ = {0}; + gboolean _tmp8_; + gboolean _tmp9_; gdouble incoming_angle = 0.0; - EditingToolsPhotoCanvas* _tmp18_; - Photo* _tmp19_; - Photo* _tmp20_; - gdouble _tmp21_ = 0.0; - GdkPoint _tmp22_ = {0}; - Dimensions _tmp23_; - gint _tmp24_; - Dimensions _tmp25_; - gint _tmp26_; - gdouble _tmp27_; - GdkPoint _tmp28_ = {0}; - gint _tmp29_; - gint _tmp30_; + Photo* _tmp14_; + Photo* _tmp15_; + gdouble _tmp16_ = 0.0; + GdkPoint _tmp17_ = {0}; + Dimensions _tmp18_; + gint _tmp19_; + Dimensions _tmp20_; + gint _tmp21_; + gdouble _tmp22_; + GdkPoint _tmp23_ = {0}; GdkWindow* drawing_window = NULL; - EditingToolsPhotoCanvas* _tmp31_; - GdkWindow* _tmp32_; + GdkWindow* _tmp24_; GdkDisplay* display = NULL; - GdkDisplay* _tmp33_; - GdkDisplay* _tmp34_; + GdkDisplay* _tmp25_; + GdkDisplay* _tmp26_; GdkCursor* cursor = NULL; - GdkCursor* _tmp35_; - EditingToolsPhotoCanvas* _tmp36_; - GtkWindow* _tmp37_; - GtkWindow* _tmp38_; - EditingToolsStraightenToolStraightenToolWindow* _tmp39_; - EditingToolsStraightenToolStraightenToolWindow* _tmp40_; - GtkScale* _tmp41_; - gdouble _tmp42_; - gdouble _tmp43_; + GdkCursor* _tmp27_; + GtkWindow* _tmp28_; + GtkWindow* _tmp29_; + EditingToolsStraightenToolStraightenToolWindow* _tmp30_; + EditingToolsStraightenToolStraightenToolWindow* _tmp31_; + GtkScale* _tmp32_; + gdouble _tmp33_; + gdouble _tmp34_; gchar* tmp = NULL; - gdouble _tmp44_; - gchar* _tmp45_; - EditingToolsStraightenToolStraightenToolWindow* _tmp46_; - GtkLabel* _tmp47_; - EditingToolsStraightenToolStraightenToolWindow* _tmp48_; -#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gdouble _tmp35_; + gchar* _tmp36_; + EditingToolsStraightenToolStraightenToolWindow* _tmp37_; + GtkLabel* _tmp38_; + EditingToolsStraightenToolStraightenToolWindow* _tmp39_; +#line 329 "/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" +#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = canvas; -#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp0_); +#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), canvas); +#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp0_ = _editing_tools_photo_canvas_ref0 (canvas); +#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _editing_tools_photo_canvas_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas); +#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp0_; +#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp1_); #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = canvas; + _tmp2_ = editing_tools_photo_canvas_get_photo (canvas); #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = _editing_tools_photo_canvas_ref0 (_tmp1_); + _tmp3_ = _tmp2_; #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _editing_tools_photo_canvas_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas); + media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp4_); +#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->image_dims = _tmp4_; #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp2_; -#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 335 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp3_); -#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = canvas; -#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_); -#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _g_object_unref0 (_tmp3_); +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp5_ = editing_tools_photo_canvas_get_photo (canvas); +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_; -#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp7_); -#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->image_dims = _tmp7_; -#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp8_ = photo_get_crop (_tmp6_, &_tmp7_, PHOTO_EXCEPTION_NONE); +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + crop_region = _tmp7_; +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp9_ = !_tmp8_; +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp6_); -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = canvas; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = editing_tools_photo_canvas_get_photo (_tmp8_); -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = _tmp9_; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = photo_get_crop (_tmp10_, &_tmp11_, PHOTO_EXCEPTION_NONE); -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - crop_region = _tmp11_; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = !_tmp12_; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp10_); -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp13_) { -#line 1469 "StraightenTool.c" - Dimensions _tmp14_; - gint _tmp15_; - Dimensions _tmp16_; - gint _tmp17_; -#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + if (_tmp9_) { +#line 1539 "StraightenTool.c" + Dimensions _tmp10_; + gint _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; +#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.left = 0; +#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp10_ = self->priv->image_dims; +#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp11_ = _tmp10_.width; +#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + crop_region.right = _tmp11_; +#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + crop_region.top = 0; #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = self->priv->image_dims; + _tmp12_ = self->priv->image_dims; #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = _tmp14_.width; + _tmp13_ = _tmp12_.height; #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - crop_region.right = _tmp15_; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - crop_region.top = 0; -#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = self->priv->image_dims; -#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = _tmp16_.height; -#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - crop_region.bottom = _tmp17_; -#line 1490 "StraightenTool.c" + crop_region.bottom = _tmp13_; +#line 1560 "StraightenTool.c" } -#line 351 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" incoming_angle = 0.0; +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp14_ = editing_tools_photo_canvas_get_photo (canvas); +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp15_ = _tmp14_; +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + photo_get_straighten (_tmp15_, &_tmp16_); +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + incoming_angle = _tmp16_; +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _g_object_unref0 (_tmp15_); #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = canvas; + box_get_center (&crop_region, &_tmp17_); #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_); + _tmp18_ = self->priv->image_dims; #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = _tmp19_; + _tmp19_ = _tmp18_.width; #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - photo_get_straighten (_tmp20_, &_tmp21_); + _tmp20_ = self->priv->image_dims; #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - incoming_angle = _tmp21_; + _tmp21_ = _tmp20_.height; #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp20_); -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - box_get_center (&crop_region, &_tmp22_); -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = self->priv->image_dims; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = _tmp23_.width; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = self->priv->image_dims; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = _tmp25_.height; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = incoming_angle; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - derotate_point_arb (&_tmp22_, _tmp24_, _tmp26_, _tmp27_, &_tmp28_); + _tmp22_ = incoming_angle; +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + derotate_point_arb (&_tmp17_, _tmp19_, _tmp21_, _tmp22_, &_tmp23_); +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->crop_center = _tmp23_; +#line 354 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->crop_width = box_get_width (&crop_region); #line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->crop_center = _tmp28_; + self->priv->crop_height = box_get_height (&crop_region); #line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = box_get_width (&crop_region); -#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->crop_width = _tmp29_; -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = box_get_height (&crop_region); -#line 358 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->crop_height = _tmp30_; -#line 360 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_adjust_for_rotation (self); -#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 359 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_prepare_image (self); -#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = canvas; -#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = editing_tools_photo_canvas_get_drawing_window (_tmp31_); -#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - drawing_window = _tmp32_; -#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = gdk_window_get_display (drawing_window); -#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp34_ = _g_object_ref0 (_tmp33_); +#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp24_ = editing_tools_photo_canvas_get_drawing_window (canvas); +#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + drawing_window = _tmp24_; +#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp25_ = gdk_window_get_display (drawing_window); +#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp26_ = _g_object_ref0 (_tmp25_); +#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + display = _tmp26_; +#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp27_ = gdk_cursor_new_for_display (display, GDK_CROSSHAIR); +#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cursor = _tmp27_; #line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - display = _tmp34_; -#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp35_ = gdk_cursor_new_for_display (display, GDK_CROSSHAIR); -#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cursor = _tmp35_; -#line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gdk_window_set_cursor (drawing_window, cursor); -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp36_ = canvas; -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp37_ = editing_tools_photo_canvas_get_container (_tmp36_); -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp38_ = _tmp37_; -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp39_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp38_); -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp39_); -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp28_ = editing_tools_photo_canvas_get_container (canvas); +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp29_ = _tmp28_; +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp30_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp29_); +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + g_object_ref_sink (_tmp30_); +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (self->priv->window); -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->window = _tmp39_; -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp38_); -#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->window = _tmp30_; +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _g_object_unref0 (_tmp29_); +#line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_bind_window_handlers (self); +#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp31_ = self->priv->window; +#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp32_ = _tmp31_->angle_slider; +#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp33_ = incoming_angle; +#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_range_get_type (), GtkRange), _tmp33_); +#line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp34_ = incoming_angle; +#line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->photo_angle = _tmp34_; #line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp40_ = self->priv->window; -#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp41_ = _tmp40_->angle_slider; + _tmp35_ = incoming_angle; #line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp42_ = incoming_angle; + _tmp36_ = g_strdup_printf ("%2.1f°", _tmp35_); #line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_range_get_type (), GtkRange), _tmp42_); + tmp = _tmp36_; #line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp43_ = incoming_angle; + _tmp37_ = self->priv->window; #line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->photo_angle = _tmp43_; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp44_ = incoming_angle; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp45_ = g_strdup_printf ("%2.1f°", _tmp44_); + _tmp38_ = _tmp37_->angle_label; +#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_label_set_text (_tmp38_, tmp); #line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - tmp = _tmp45_; -#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp46_ = self->priv->window; + editing_tools_straighten_tool_high_qual_repaint (self); #line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp47_ = _tmp46_->angle_label; + _tmp39_ = self->priv->window; #line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_label_set_text (_tmp47_, tmp); -#line 381 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_high_qual_repaint (self); -#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp48_ = self->priv->window; -#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget)); -#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget)); +#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (tmp); -#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (cursor); -#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (display); -#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (drawing_window); -#line 1608 "StraightenTool.c" +#line 1668 "StraightenTool.c" } /** * Tears down the tool window and frees resources. */ -static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base) { +static void +editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base) +{ EditingToolsStraightenTool * self; EditingToolsStraightenToolStraightenToolWindow* _tmp0_; EditingToolsPhotoCanvas* _tmp2_; -#line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 385 "/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" +#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 389 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_ != NULL) { -#line 1625 "StraightenTool.c" +#line 1687 "StraightenTool.c" EditingToolsStraightenToolStraightenToolWindow* _tmp1_; -#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 388 "/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" +#line 390 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = self->priv->window; -#line 393 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 390 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_widget_hide (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget)); -#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (self->priv->window); -#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->window = NULL; -#line 1637 "StraightenTool.c" +#line 1699 "StraightenTool.c" } -#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 397 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp2_ != NULL) { -#line 1643 "StraightenTool.c" +#line 1705 "StraightenTool.c" EditingToolsPhotoCanvas* _tmp3_; EditingToolsPhotoCanvas* _tmp4_; GdkWindow* _tmp5_; GdkWindow* _tmp6_; -#line 398 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 395 "/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" +#line 395 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_unbind_canvas_handlers (self, _tmp3_); -#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_); -#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_; -#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gdk_window_set_cursor (_tmp6_, NULL); -#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp6_); -#line 1662 "StraightenTool.c" +#line 1724 "StraightenTool.c" } -#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 1666 "StraightenTool.c" +#line 1728 "StraightenTool.c" } -static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) { -#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static void +_editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position, + gpointer self) +{ +#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_resized_pixbuf ((EditingToolsStraightenTool*) self, old_dim, scaled, scaled_position); -#line 1673 "StraightenTool.c" +#line 1741 "StraightenTool.c" } -static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; -#line 405 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static void +editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, + EditingToolsPhotoCanvas* canvas) +{ +#line 402 "/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" +#line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = canvas; -#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 1687 "StraightenTool.c" +#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + g_signal_connect (canvas, "resized-scaled-pixbuf", (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 1755 "StraightenTool.c" } -static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) { - EditingToolsPhotoCanvas* _tmp0_; - guint _tmp1_; -#line 409 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static void +editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, + EditingToolsPhotoCanvas* canvas) +{ + guint _tmp0_; +#line 406 "/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" +#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas)); -#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = canvas; -#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE); -#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); -#line 1704 "StraightenTool.c" +#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp0_, NULL, FALSE); +#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self); +#line 1772 "StraightenTool.c" } -static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) { +static gboolean +_editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, + GdkEventKey* event, + gpointer self) +{ gboolean result; result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event); -#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 1713 "StraightenTool.c" +#line 1785 "StraightenTool.c" } -static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static void +_editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ +#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_ok_clicked ((EditingToolsStraightenTool*) self); -#line 1720 "StraightenTool.c" +#line 1795 "StraightenTool.c" } -static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) { -#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static void +_editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ +#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self); -#line 1727 "StraightenTool.c" +#line 1805 "StraightenTool.c" } -static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) { -#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static void +_editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, + gpointer self) +{ +#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_angle_changed ((EditingToolsStraightenTool*) self); -#line 1734 "StraightenTool.c" +#line 1815 "StraightenTool.c" } -static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self) +{ EditingToolsStraightenToolStraightenToolWindow* _tmp0_; EditingToolsStraightenToolStraightenToolWindow* _tmp1_; GtkButton* _tmp2_; @@ -1742,35 +1825,37 @@ static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStra GtkButton* _tmp4_; EditingToolsStraightenToolStraightenToolWindow* _tmp5_; GtkScale* _tmp6_; -#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 410 "/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" +#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = self->priv->window; -#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = _tmp1_->ok_button; -#line 415 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_connect (_tmp2_, "clicked", (GCallback) _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked, self); -#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = self->priv->window; -#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = _tmp3_->cancel_button; -#line 416 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_connect (_tmp4_, "clicked", (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->window; -#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_->angle_slider; -#line 417 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self); -#line 1770 "StraightenTool.c" +#line 1853 "StraightenTool.c" } -static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self) +{ EditingToolsStraightenToolStraightenToolWindow* _tmp0_; guint _tmp1_; EditingToolsStraightenToolStraightenToolWindow* _tmp2_; @@ -1782,141 +1867,144 @@ static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsSt EditingToolsStraightenToolStraightenToolWindow* _tmp8_; GtkScale* _tmp9_; guint _tmp10_; -#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 417 "/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" +#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_parse_name ("key-press-event", gtk_widget_get_type (), &_tmp1_, NULL, FALSE); -#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 418 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = self->priv->window; -#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = _tmp2_->ok_button; -#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp4_, NULL, FALSE); -#line 422 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 419 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_handlers_disconnect_matched (_tmp3_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked, self); -#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->window; -#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_->cancel_button; -#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_parse_name ("clicked", gtk_button_get_type (), &_tmp7_, NULL, FALSE); -#line 423 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 420 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_tools_editing_tool_notify_cancel_gtk_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)); -#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = self->priv->window; -#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = _tmp8_->angle_slider; -#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp10_, NULL, FALSE); -#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self); -#line 1818 "StraightenTool.c" +#line 1903 "StraightenTool.c" } -static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self) { -#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static void +_editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self) +{ +#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_on_slider_stopped_delayed ((EditingToolsStraightenTool*) self); -#line 1825 "StraightenTool.c" +#line 1912 "StraightenTool.c" } -static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self) +{ EditingToolsStraightenToolStraightenToolWindow* _tmp0_; GtkScale* _tmp1_; - gdouble _tmp2_; gchar* tmp = NULL; - EditingToolsStraightenToolStraightenToolWindow* _tmp3_; - GtkScale* _tmp4_; - gdouble _tmp5_; - gchar* _tmp6_; - EditingToolsStraightenToolStraightenToolWindow* _tmp7_; - GtkLabel* _tmp8_; - const gchar* _tmp9_; + EditingToolsStraightenToolStraightenToolWindow* _tmp2_; + GtkScale* _tmp3_; + gchar* _tmp4_; + EditingToolsStraightenToolStraightenToolWindow* _tmp5_; + GtkLabel* _tmp6_; + const gchar* _tmp7_; + OneShotScheduler* _tmp8_; OneShotScheduler* _tmp10_; - OneShotScheduler* _tmp12_; - EditingToolsPhotoCanvas* _tmp13_; -#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + EditingToolsPhotoCanvas* _tmp11_; +#line 424 "/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" +#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = _tmp0_->angle_slider; -#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); -#line 428 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->photo_angle = _tmp2_; -#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = self->priv->window; -#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = _tmp3_->angle_slider; -#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange)); +#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->photo_angle = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)); +#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp2_ = self->priv->window; +#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp3_ = _tmp2_->angle_slider; +#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp4_ = g_strdup_printf ("%2.1f°", gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange))); +#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + tmp = _tmp4_; +#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp5_ = self->priv->window; +#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp6_ = _tmp5_->angle_label; +#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp7_ = tmp; +#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + gtk_label_set_text (_tmp6_, _tmp7_); #line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = g_strdup_printf ("%2.1f°", _tmp5_); + _tmp8_ = self->priv->slider_sched; #line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - tmp = _tmp6_; + if (_tmp8_ == NULL) { +#line 1959 "StraightenTool.c" + OneShotScheduler* _tmp9_; #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = self->priv->window; + _tmp9_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self); #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = _tmp7_->angle_label; -#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = tmp; + _one_shot_scheduler_unref0 (self->priv->slider_sched); #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_label_set_text (_tmp8_, _tmp9_); -#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + self->priv->slider_sched = _tmp9_; +#line 1967 "StraightenTool.c" + } +#line 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = self->priv->slider_sched; -#line 432 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp10_ == NULL) { -#line 1876 "StraightenTool.c" - 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 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + one_shot_scheduler_after_timeout (_tmp10_, (guint) EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC, TRUE); #line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _one_shot_scheduler_unref0 (self->priv->slider_sched); -#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->slider_sched = _tmp11_; -#line 1884 "StraightenTool.c" - } -#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = self->priv->slider_sched; -#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - one_shot_scheduler_after_timeout (_tmp12_, (guint) EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC, TRUE); -#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->use_high_qual = FALSE; -#line 438 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_adjust_for_rotation (self); -#line 439 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_update_rotated_surface (self); -#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 440 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_repaint (_tmp13_); -#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + editing_tools_photo_canvas_repaint (_tmp11_); +#line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (tmp); -#line 1902 "StraightenTool.c" +#line 1985 "StraightenTool.c" } /** * @brief Called by the EditingHostPage when a resize event occurs. */ -static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) { -#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +static void +editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, + Dimensions* old_dim, + GdkPixbuf* scaled, + GdkRectangle* scaled_position) +{ +#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self)); -#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (old_dim != NULL); -#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (GDK_IS_PIXBUF (scaled)); -#line 446 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (scaled_position != NULL); -#line 447 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_prepare_image (self); -#line 1920 "StraightenTool.c" +#line 2008 "StraightenTool.c" } @@ -1924,29 +2012,33 @@ static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraigh * Returns a reference to the current StraightenTool instance's tool window; * the PhotoPage uses this to control the tool window's positioning, etc. */ -static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base) { +static EditingToolsEditingToolWindow* +editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base) +{ EditingToolsStraightenTool * self; EditingToolsEditingToolWindow* result = NULL; EditingToolsStraightenToolStraightenToolWindow* _tmp0_; EditingToolsEditingToolWindow* _tmp1_; -#line 454 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 451 "/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" +#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->window; -#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow)); -#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = _tmp1_; -#line 455 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 1943 "StraightenTool.c" +#line 2033 "StraightenTool.c" } /** * Draw the rotated photo and grid. */ -static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self) { +static void +editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self) +{ cairo_surface_t* _tmp0_; cairo_t* _tmp1_; gint _tmp2_; @@ -1956,33 +2048,33 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt cairo_t* _tmp6_; gint _tmp7_; gint _tmp8_; -#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 458 "/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" +#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = self->priv->photo_surf; -#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = self->priv->rotate_ctx; -#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = self->priv->view_width; -#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = self->priv->view_height; -#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = self->priv->photo_angle; -#line 462 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 459 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_draw_rotated_source (self, _tmp0_, _tmp1_, _tmp2_, _tmp3_, _tmp4_); -#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 460 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = self->priv->rotate_ctx; -#line 463 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 460 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_set_line_width (_tmp5_, 1.0); -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = self->priv->rotate_ctx; -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = self->priv->view_width; -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = self->priv->view_height; -#line 464 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_draw_superimposed_grid (self, _tmp6_, _tmp7_, _tmp8_); -#line 1986 "StraightenTool.c" +#line 2078 "StraightenTool.c" } @@ -1993,214 +2085,211 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt * surfaces and contexts so it can have things set up exactly like it wants them, so * it's not used. */ -static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) { +static void +editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, + cairo_t* ctx) +{ EditingToolsStraightenTool * self; gint w = 0; EditingToolsPhotoCanvas* _tmp0_; GdkWindow* _tmp1_; GdkWindow* _tmp2_; gint _tmp3_; - gint _tmp4_; gint h = 0; - EditingToolsPhotoCanvas* _tmp5_; + EditingToolsPhotoCanvas* _tmp4_; + GdkWindow* _tmp5_; GdkWindow* _tmp6_; - GdkWindow* _tmp7_; - gint _tmp8_; - gint _tmp9_; - EditingToolsPhotoCanvas* _tmp10_; - cairo_t* _tmp11_; + gint _tmp7_; + EditingToolsPhotoCanvas* _tmp8_; + cairo_t* _tmp9_; + cairo_t* _tmp10_; + EditingToolsPhotoCanvas* _tmp11_; cairo_t* _tmp12_; - EditingToolsPhotoCanvas* _tmp13_; - cairo_t* _tmp14_; + cairo_t* _tmp13_; + EditingToolsPhotoCanvas* _tmp14_; cairo_t* _tmp15_; - EditingToolsPhotoCanvas* _tmp16_; - cairo_t* _tmp17_; + cairo_t* _tmp16_; + EditingToolsPhotoCanvas* _tmp17_; cairo_t* _tmp18_; - EditingToolsPhotoCanvas* _tmp19_; - cairo_t* _tmp20_; + cairo_t* _tmp19_; + EditingToolsPhotoCanvas* _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* _tmp22_; + gint _tmp23_; + gint _tmp24_; + EditingToolsPhotoCanvas* _tmp25_; + cairo_t* _tmp26_; + cairo_t* _tmp27_; + cairo_surface_t* _tmp28_; + EditingToolsPhotoCanvas* _tmp29_; + cairo_t* _tmp30_; + cairo_t* _tmp31_; + gint _tmp32_; + gint _tmp33_; + EditingToolsPhotoCanvas* _tmp34_; + cairo_t* _tmp35_; + cairo_t* _tmp36_; + EditingToolsPhotoCanvas* _tmp37_; cairo_t* _tmp38_; - EditingToolsPhotoCanvas* _tmp39_; - cairo_t* _tmp40_; + cairo_t* _tmp39_; + EditingToolsPhotoCanvas* _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" + cairo_t* _tmp42_; + EditingToolsStraightenToolStraightenGuide* _tmp43_; + EditingToolsPhotoCanvas* _tmp44_; + cairo_t* _tmp45_; + cairo_t* _tmp46_; +#line 471 "/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" +#line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (ctx != NULL); -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = editing_tools_photo_canvas_get_drawing_window (_tmp0_); -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = _tmp1_; -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = gdk_window_get_width (_tmp2_); -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = _tmp3_; -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp2_); -#line 475 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - w = _tmp4_; -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_); +#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + w = _tmp3_; +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_); +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp6_ = _tmp5_; +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp7_ = gdk_window_get_height (_tmp6_); +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _g_object_unref0 (_tmp6_); +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + h = _tmp7_; #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = _tmp6_; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = gdk_window_get_height (_tmp7_); + _tmp9_ = editing_tools_photo_canvas_get_default_ctx (_tmp8_); #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = _tmp8_; + _tmp10_ = _tmp9_; #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _g_object_unref0 (_tmp7_); + cairo_identity_matrix (_tmp10_); #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - h = _tmp9_; + _cairo_destroy0 (_tmp10_); +#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp12_ = editing_tools_photo_canvas_get_default_ctx (_tmp11_); +#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp13_ = _tmp12_; +#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_set_source_rgba (_tmp13_, 0.0, 0.0, 0.0, 1.0); +#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _cairo_destroy0 (_tmp13_); +#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp15_ = editing_tools_photo_canvas_get_default_ctx (_tmp14_); +#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp16_ = _tmp15_; +#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_rectangle (_tmp16_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h); +#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _cairo_destroy0 (_tmp16_); #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = editing_tools_photo_canvas_get_default_ctx (_tmp10_); + _tmp18_ = editing_tools_photo_canvas_get_default_ctx (_tmp17_); #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = _tmp11_; + _tmp19_ = _tmp18_; #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp12_); + cairo_fill (_tmp19_); #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp12_); -#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = editing_tools_photo_canvas_get_default_ctx (_tmp13_); -#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = _tmp14_; -#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp15_, 0.0, 0.0, 0.0, 1.0); -#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp15_); -#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = editing_tools_photo_canvas_get_default_ctx (_tmp16_); -#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = _tmp17_; -#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rectangle (_tmp18_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h); -#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp18_); + _cairo_destroy0 (_tmp19_); #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = editing_tools_photo_canvas_get_default_ctx (_tmp19_); + _tmp21_ = editing_tools_photo_canvas_get_default_ctx (_tmp20_); #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = _tmp20_; + _tmp22_ = _tmp21_; #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_fill (_tmp21_); + _tmp23_ = self->priv->view_width; #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp21_); -#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = editing_tools_photo_canvas_get_default_ctx (_tmp22_); + _tmp24_ = self->priv->view_height; +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_translate (_tmp22_, (w - _tmp23_) / 2.0, (h - _tmp24_) / 2.0); +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _cairo_destroy0 (_tmp22_); +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp26_ = editing_tools_photo_canvas_get_default_ctx (_tmp25_); +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp27_ = _tmp26_; +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp28_ = self->priv->rotate_surf; +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_set_source_surface (_tmp27_, _tmp28_, (gdouble) 0, (gdouble) 0); +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _cairo_destroy0 (_tmp27_); +#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp30_ = editing_tools_photo_canvas_get_default_ctx (_tmp29_); +#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp31_ = _tmp30_; +#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp32_ = self->priv->view_width; +#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp33_ = self->priv->view_height; +#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_rectangle (_tmp31_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp32_, (gdouble) _tmp33_); +#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _cairo_destroy0 (_tmp31_); #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = _tmp23_; + _tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = self->priv->view_width; + _tmp35_ = editing_tools_photo_canvas_get_default_ctx (_tmp34_); #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = self->priv->view_height; + _tmp36_ = _tmp35_; #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_translate (_tmp24_, (w - _tmp25_) / 2.0, (h - _tmp26_) / 2.0); + cairo_fill (_tmp36_); #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp24_); + _cairo_destroy0 (_tmp36_); #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; + _tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp28_ = editing_tools_photo_canvas_get_default_ctx (_tmp27_); + _tmp38_ = editing_tools_photo_canvas_get_default_ctx (_tmp37_); #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = _tmp28_; -#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = self->priv->rotate_surf; + _tmp39_ = _tmp38_; #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_surface (_tmp29_, _tmp30_, (gdouble) 0, (gdouble) 0); + cairo_paint (_tmp39_); #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp29_); -#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = editing_tools_photo_canvas_get_default_ctx (_tmp31_); -#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = _tmp32_; -#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp34_ = self->priv->view_width; -#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp35_ = self->priv->view_height; -#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rectangle (_tmp33_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp34_, (gdouble) _tmp35_); -#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp33_); -#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp37_ = editing_tools_photo_canvas_get_default_ctx (_tmp36_); -#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp38_ = _tmp37_; -#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_fill (_tmp38_); -#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp38_); -#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp40_ = editing_tools_photo_canvas_get_default_ctx (_tmp39_); -#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp41_ = _tmp40_; -#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_paint (_tmp41_); -#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp41_); -#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp43_ = editing_tools_photo_canvas_get_default_ctx (_tmp42_); -#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp44_ = _tmp43_; -#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp44_); -#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp44_); -#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp45_ = self->priv->guide; -#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp47_ = editing_tools_photo_canvas_get_default_ctx (_tmp46_); -#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp48_ = _tmp47_; -#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_straighten_tool_straighten_guide_draw (_tmp45_, _tmp48_); -#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _cairo_destroy0 (_tmp48_); -#line 2204 "StraightenTool.c" + _cairo_destroy0 (_tmp39_); +#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp41_ = editing_tools_photo_canvas_get_default_ctx (_tmp40_); +#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp42_ = _tmp41_; +#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_identity_matrix (_tmp42_); +#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _cairo_destroy0 (_tmp42_); +#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp43_ = self->priv->guide; +#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp45_ = editing_tools_photo_canvas_get_default_ctx (_tmp44_); +#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp46_ = _tmp45_; +#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + editing_tools_straighten_tool_straighten_guide_draw (_tmp43_, _tmp46_); +#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _cairo_destroy0 (_tmp46_); +#line 2293 "StraightenTool.c" } @@ -2214,158 +2303,108 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b * @param src_height The height of the image data in src_surf in pixels. * @param angle The angle the source image should be rotated by, in degrees. */ -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) { +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_; - 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 _tmp0_; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; + gdouble _tmp6_; + GdkPoint _tmp7_; + gint _tmp8_; + gdouble _tmp9_; + GdkPoint _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_; - 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" + gdouble _tmp12_; + cairo_filter_t _tmp13_ = 0; + gboolean _tmp14_; + cairo_pattern_t* _tmp15_; +#line 505 "/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" +#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (src_surf != NULL); -#line 508 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (dest_ctx != NULL); -#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = angle; -#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = degrees_to_radians (_tmp0_); -#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - angle_internal = _tmp1_; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = dest_ctx; +#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + angle_internal = degrees_to_radians (angle); +#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_identity_matrix (dest_ctx); +#line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_set_source_rgba (dest_ctx, 0.0, 0.0, 0.0, 1.0); +#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp0_ = self->priv->view_width; +#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp1_ = self->priv->view_height; +#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_rectangle (dest_ctx, (gdouble) 0, (gdouble) 0, (gdouble) _tmp0_, (gdouble) _tmp1_); #line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp2_); -#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = dest_ctx; -#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp3_, 0.0, 0.0, 0.0, 1.0); -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = dest_ctx; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = self->priv->view_width; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = self->priv->view_height; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_); -#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = dest_ctx; -#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_fill (_tmp7_); + cairo_fill (dest_ctx); +#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_identity_matrix (dest_ctx); +#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp2_ = self->priv->view_width; +#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp3_ = self->priv->view_height; +#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_translate (dest_ctx, (gdouble) (_tmp2_ / 2), (gdouble) (_tmp3_ / 2)); #line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = dest_ctx; + _tmp4_ = self->priv->rotate_scale; #line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp8_); + _tmp5_ = self->priv->rotate_scale; +#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_scale (dest_ctx, 1.0 / _tmp4_, 1.0 / _tmp5_); +#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp6_ = angle_internal; +#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_rotate (dest_ctx, _tmp6_); #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = dest_ctx; + _tmp7_ = self->priv->rotated_center; #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = self->priv->view_width; + _tmp8_ = _tmp7_.x; #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = self->priv->view_height; + _tmp9_ = self->priv->preview_scale; #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_translate (_tmp9_, (gdouble) (_tmp10_ / 2), (gdouble) (_tmp11_ / 2)); -#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = dest_ctx; -#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = self->priv->rotate_scale; -#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = self->priv->rotate_scale; -#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_scale (_tmp12_, 1.0 / _tmp13_, 1.0 / _tmp14_); -#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = dest_ctx; -#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = angle_internal; + _tmp10_ = self->priv->rotated_center; +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp11_ = _tmp10_.y; +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp12_ = self->priv->preview_scale; +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_translate (dest_ctx, (-_tmp8_) * _tmp9_, (-_tmp11_) * _tmp12_); #line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rotate (_tmp15_, _tmp16_); -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = dest_ctx; + cairo_set_source_surface (dest_ctx, src_surf, (gdouble) 0, (gdouble) 0); #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->priv->rotated_center; + _tmp14_ = self->priv->use_high_qual; #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = _tmp18_.x; + if (_tmp14_) { #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = self->priv->preview_scale; -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = self->priv->rotated_center; + _tmp13_ = CAIRO_FILTER_BEST; +#line 2392 "StraightenTool.c" + } else { #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = _tmp21_.y; + _tmp13_ = CAIRO_FILTER_NEAREST; +#line 2396 "StraightenTool.c" + } #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = self->priv->preview_scale; + _tmp15_ = cairo_get_source (dest_ctx); #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_translate (_tmp17_, (-_tmp19_) * _tmp20_, (-_tmp22_) * _tmp23_); -#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = dest_ctx; + cairo_pattern_set_filter (_tmp15_, _tmp13_); +#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + cairo_rectangle (dest_ctx, (gdouble) 0, (gdouble) 0, (gdouble) src_width, (gdouble) src_height); #line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = src_surf; -#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_surface (_tmp24_, _tmp25_, (gdouble) 0, (gdouble) 0); -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = self->priv->use_high_qual; -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp27_) { -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = CAIRO_FILTER_BEST; -#line 2341 "StraightenTool.c" - } else { -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = CAIRO_FILTER_NEAREST; -#line 2345 "StraightenTool.c" - } -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp28_ = dest_ctx; -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = cairo_get_source (_tmp28_); + cairo_fill (dest_ctx); #line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_pattern_set_filter (_tmp29_, _tmp26_); -#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = dest_ctx; -#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = src_width; -#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = src_height; -#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_rectangle (_tmp30_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp31_, (gdouble) _tmp32_); -#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = dest_ctx; -#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_fill (_tmp33_); -#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp34_ = dest_ctx; -#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_paint (_tmp34_); -#line 2369 "StraightenTool.c" + cairo_paint (dest_ctx); +#line 2408 "StraightenTool.c" } @@ -2376,211 +2415,126 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai * @param height The total height the grid should be drawn to. * @param dest_ctx The rendering context of the destination image. */ -static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, cairo_t* dest_ctx, gint width, gint height) { +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_; gint quarter_width = 0; - gint _tmp1_; gint half_height = 0; - gint _tmp2_; gint quarter_height = 0; + EditingToolsPhotoCanvas* _tmp0_; + EditingToolsPhotoCanvas* _tmp1_; + EditingToolsPhotoCanvas* _tmp2_; gint _tmp3_; - cairo_t* _tmp4_; - cairo_t* _tmp5_; + EditingToolsPhotoCanvas* _tmp4_; + EditingToolsPhotoCanvas* _tmp5_; EditingToolsPhotoCanvas* _tmp6_; - cairo_t* _tmp7_; - gint _tmp8_; + EditingToolsPhotoCanvas* _tmp7_; + EditingToolsPhotoCanvas* _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" + EditingToolsPhotoCanvas* _tmp10_; +#line 540 "/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" +#line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (dest_ctx != NULL); +#line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + half_width = width / 2; +#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + quarter_width = width / 4; #line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp0_ = width; -#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - half_width = _tmp0_ / 2; -#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = width; + half_height = height / 2; #line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - quarter_width = _tmp1_ / 4; + quarter_height = height / 4; #line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = height; -#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - half_height = _tmp2_ / 2; -#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = height; + cairo_identity_matrix (dest_ctx); #line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - quarter_height = _tmp3_ / 4; + cairo_set_source_rgba (dest_ctx, 1.0, 1.0, 1.0, 1.0); #line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = dest_ctx; + _tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_identity_matrix (_tmp4_); + editing_tools_photo_canvas_draw_horizontal_line (_tmp0_, dest_ctx, 0, 0, width, FALSE); #line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = dest_ctx; + _tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp5_, 1.0, 1.0, 1.0, 1.0); -#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = dest_ctx; -#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = width; -#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp6_, _tmp7_, 0, 0, _tmp8_, FALSE); -#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = dest_ctx; + editing_tools_photo_canvas_draw_horizontal_line (_tmp1_, dest_ctx, 0, half_height, width, FALSE); +#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp3_ = self->priv->view_height; +#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + editing_tools_photo_canvas_draw_horizontal_line (_tmp2_, dest_ctx, 0, _tmp3_ - 1, width, FALSE); #line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = width; + _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp9_, _tmp10_, 0, half_height, _tmp11_, FALSE); -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = dest_ctx; -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = self->priv->view_height; + editing_tools_photo_canvas_draw_vertical_line (_tmp4_, dest_ctx, 0, 0, height + 1, FALSE); #line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = width; + _tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp12_, _tmp13_, 0, _tmp14_ - 1, _tmp15_, FALSE); -#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = dest_ctx; -#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = height; -#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp16_, _tmp17_, 0, 0, _tmp18_ + 1, FALSE); -#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = dest_ctx; -#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = height; + editing_tools_photo_canvas_draw_vertical_line (_tmp5_, dest_ctx, half_width, 0, height + 1, FALSE); +#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + editing_tools_photo_canvas_draw_vertical_line (_tmp6_, dest_ctx, width - 1, 0, height + 1, FALSE); #line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, half_width, 0, _tmp21_ + 1, FALSE); -#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = dest_ctx; -#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = width; -#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = height; -#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp22_, _tmp23_, _tmp24_ - 1, 0, _tmp25_ + 1, FALSE); + cairo_set_source_rgba (dest_ctx, 1.0, 1.0, 1.0, 0.33); +#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + editing_tools_photo_canvas_draw_horizontal_line (_tmp7_, dest_ctx, 0, quarter_height, width, FALSE); #line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = dest_ctx; + _tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp26_, 1.0, 1.0, 1.0, 0.33); -#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp28_ = dest_ctx; + editing_tools_photo_canvas_draw_horizontal_line (_tmp8_, dest_ctx, 0, half_height + quarter_height, width, FALSE); +#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + _tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; +#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" + editing_tools_photo_canvas_draw_vertical_line (_tmp9_, dest_ctx, quarter_width, 0, height, FALSE); #line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = width; + _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp27_, _tmp28_, 0, quarter_height, _tmp29_, FALSE); -#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = dest_ctx; -#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = width; -#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_horizontal_line (_tmp30_, _tmp31_, 0, half_height + quarter_height, _tmp32_, FALSE); -#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp34_ = dest_ctx; -#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp35_ = height; -#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp33_, _tmp34_, quarter_width, 0, _tmp35_, FALSE); -#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp37_ = dest_ctx; -#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp38_ = height; -#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - editing_tools_photo_canvas_draw_vertical_line (_tmp36_, _tmp37_, half_width + quarter_width, 0, _tmp38_, FALSE); -#line 2540 "StraightenTool.c" -} - - -static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y, gdouble angle) { - gint _tmp0_; - gint _tmp1_; - gint _tmp2_[2] = {0}; - gint _tmp3_; - gint _tmp4_; - gint _tmp5_[2] = {0}; - gdouble _tmp6_; + editing_tools_photo_canvas_draw_vertical_line (_tmp10_, dest_ctx, half_width + quarter_width, 0, height, FALSE); +#line 2500 "StraightenTool.c" +} + + +static void +editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, + gint x, + gint y, + gdouble angle) +{ + gint _tmp0_[2] = {0}; + gint _tmp1_[2] = {0}; #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" - _tmp0_ = x; -#line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = x; + _tmp0_[0] = x; #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_[0] = _tmp0_; + _tmp0_[1] = x; #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_[1] = _tmp1_; -#line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - memcpy (self->priv->x, _tmp2_, 2 * sizeof (gint)); -#line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = y; + memcpy (self->priv->x, _tmp0_, 2 * sizeof (gint)); #line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = y; + _tmp1_[0] = y; #line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_[0] = _tmp3_; + _tmp1_[1] = y; #line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_[1] = _tmp4_; -#line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - memcpy (self->priv->y, _tmp5_, 2 * sizeof (gint)); + memcpy (self->priv->y, _tmp1_, 2 * sizeof (gint)); #line 34 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->is_active = TRUE; #line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = angle; -#line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->angle0 = _tmp6_; -#line 2580 "StraightenTool.c" + self->priv->angle0 = angle; +#line 2530 "StraightenTool.c" } -static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y) { +static gboolean +editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, + gint x, + gint y) +{ gboolean result = FALSE; gboolean _tmp0_; #line 38 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2589,47 +2543,45 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo _tmp0_ = self->priv->is_active; #line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_) { -#line 2593 "StraightenTool.c" +#line 2547 "StraightenTool.c" 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" - self->priv->x[1] = _tmp1_; + self->priv->x[1] = x; #line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = self->priv->x[1]; + _tmp1_ = self->priv->x[1]; #line 41 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = y; + self->priv->y[1] = y; #line 41 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self->priv->y[1] = _tmp3_; -#line 41 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = self->priv->y[1]; + _tmp2_ = self->priv->y[1]; #line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = TRUE; #line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2614 "StraightenTool.c" +#line 2562 "StraightenTool.c" } #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" result = FALSE; #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2620 "StraightenTool.c" +#line 2568 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsStraightenToolStraightenGuide* self) { +static void +editing_tools_straighten_tool_straighten_guide_clear (EditingToolsStraightenToolStraightenGuide* self) +{ #line 48 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self)); #line 49 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->is_active = FALSE; -#line 2629 "StraightenTool.c" +#line 2579 "StraightenTool.c" } -static gdouble* _double_dup (gdouble* self) { +static gdouble* +_double_dup (gdouble* self) +{ gdouble* dup; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" dup = g_new0 (gdouble, 1); @@ -2637,18 +2589,22 @@ static gdouble* _double_dup (gdouble* self) { memcpy (dup, self, sizeof (gdouble)); #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return dup; -#line 2641 "StraightenTool.c" +#line 2593 "StraightenTool.c" } -static gpointer __double_dup0 (gpointer self) { +static gpointer +__double_dup0 (gpointer self) +{ #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self ? _double_dup (self) : NULL; -#line 2648 "StraightenTool.c" +#line 2602 "StraightenTool.c" } -static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self) { +static gdouble* +editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self) +{ gdouble* result = NULL; gdouble dx = 0.0; gint _tmp0_; @@ -2662,8 +2618,6 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin 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" @@ -2692,71 +2646,64 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin result = NULL; #line 58 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2696 "StraightenTool.c" +#line 2650 "StraightenTool.c" } #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = dy; #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = fabs (_tmp8_); + _tmp9_ = dx; #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = dx; -#line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = fabs (_tmp10_); -#line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - if (_tmp9_ > _tmp11_) { -#line 2708 "StraightenTool.c" + if (fabs (_tmp8_) > fabs (_tmp9_)) { +#line 2658 "StraightenTool.c" + gdouble _tmp10_; + gdouble _tmp11_; 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; + gdouble* _tmp14_; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = dx; + _tmp10_ = self->priv->angle0; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = dy; + _tmp11_ = dx; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = atan (_tmp13_ / _tmp14_); + _tmp12_ = dy; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = _tmp12_ + ((_tmp15_ / G_PI) * 180); + _tmp13_ = _tmp10_ + ((atan (_tmp11_ / _tmp12_) / G_PI) * 180); #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = __double_dup0 (&_tmp16_); + _tmp14_ = __double_dup0 (&_tmp13_); #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - result = _tmp17_; + result = _tmp14_; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2731 "StraightenTool.c" +#line 2678 "StraightenTool.c" } else { + gdouble _tmp15_; + gdouble _tmp16_; + gdouble _tmp17_; gdouble _tmp18_; - gdouble _tmp19_; - gdouble _tmp20_; - gdouble _tmp21_; - gdouble _tmp22_; - gdouble* _tmp23_; + gdouble* _tmp19_; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->priv->angle0; + _tmp15_ = self->priv->angle0; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = dy; + _tmp16_ = dy; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = dx; + _tmp17_ = dx; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = atan (_tmp19_ / _tmp20_); + _tmp18_ = _tmp15_ - ((atan (_tmp16_ / _tmp17_) / G_PI) * 180); #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = _tmp18_ - ((_tmp21_ / G_PI) * 180); + _tmp19_ = __double_dup0 (&_tmp18_); #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = __double_dup0 (&_tmp22_); -#line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - result = _tmp23_; + result = _tmp19_; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2755 "StraightenTool.c" +#line 2699 "StraightenTool.c" } } -static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, cairo_t* ctx) { +static void +editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, + cairo_t* ctx) +{ gboolean _tmp0_; gdouble* _tmp1_ = NULL; gdouble* _tmp2_; @@ -2768,28 +2715,18 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr gdouble alpha = 0.0; gboolean _tmp9_ = FALSE; gdouble _tmp10_; - cairo_t* _tmp12_; + gdouble _tmp12_; gdouble _tmp13_; - cairo_t* _tmp14_; - gdouble _tmp15_; - cairo_t* _tmp16_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; gint _tmp17_; - gint _tmp18_; - cairo_t* _tmp19_; + gdouble _tmp18_; + gdouble _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_; + gint _tmp22_; + gint _tmp23_; #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" @@ -2800,7 +2737,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr if (!_tmp0_) { #line 69 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; -#line 2804 "StraightenTool.c" +#line 2741 "StraightenTool.c" } #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (self); @@ -2808,7 +2745,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr _tmp1_ = _tmp2_; #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp1_ == NULL) { -#line 2812 "StraightenTool.c" +#line 2749 "StraightenTool.c" gdouble _tmp3_; gdouble* _tmp4_; #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2819,7 +2756,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr _g_free0 (_tmp1_); #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = _tmp4_; -#line 2823 "StraightenTool.c" +#line 2760 "StraightenTool.c" } #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = _tmp1_; @@ -2841,7 +2778,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr _g_free0 (_tmp1_); #line 73 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return; -#line 2845 "StraightenTool.c" +#line 2782 "StraightenTool.c" } #line 75 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" alpha = 1.0; @@ -2851,206 +2788,215 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr if (_tmp10_ < EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE) { #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = TRUE; -#line 2855 "StraightenTool.c" +#line 2792 "StraightenTool.c" } else { 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" _tmp9_ = _tmp11_ > EDITING_TOOLS_STRAIGHTEN_TOOL_MAX_ANGLE; -#line 2862 "StraightenTool.c" +#line 2799 "StraightenTool.c" } #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp9_) { #line 77 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" alpha = 0.35; -#line 2868 "StraightenTool.c" +#line 2805 "StraightenTool.c" } #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = ctx; -#line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = alpha; + _tmp12_ = alpha; #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp12_, 0.0, 0.0, 0.0, _tmp13_); + cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp12_); #line 82 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = ctx; + _tmp13_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0]; #line 82 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0]; -#line 82 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_dash (_tmp14_, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), _tmp15_ / 2); -#line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = ctx; + cairo_set_dash (ctx, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), _tmp13_ / 2); #line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = self->priv->x[0]; + _tmp14_ = self->priv->x[0]; #line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->priv->y[0]; + _tmp15_ = self->priv->y[0]; #line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_move_to (_tmp16_, _tmp17_ + 0.5, _tmp18_ + 0.5); + cairo_move_to (ctx, _tmp14_ + 0.5, _tmp15_ + 0.5); #line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = ctx; + _tmp16_ = self->priv->x[1]; #line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = self->priv->x[1]; + _tmp17_ = self->priv->y[1]; #line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = self->priv->y[1]; -#line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_line_to (_tmp19_, _tmp20_ + 0.5, _tmp21_ + 0.5); -#line 85 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = ctx; + cairo_line_to (ctx, _tmp16_ + 0.5, _tmp17_ + 0.5); #line 85 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_stroke (_tmp22_); + cairo_stroke (ctx); #line 86 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = ctx; + _tmp18_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0]; #line 86 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0]; -#line 86 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_dash (_tmp23_, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), (-_tmp24_) / 2); -#line 87 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = ctx; + cairo_set_dash (ctx, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), (-_tmp18_) / 2); #line 87 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = alpha; + _tmp19_ = alpha; #line 87 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_set_source_rgba (_tmp25_, 1.0, 1.0, 1.0, _tmp26_); + cairo_set_source_rgba (ctx, 1.0, 1.0, 1.0, _tmp19_); #line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp27_ = ctx; + _tmp20_ = self->priv->x[0]; #line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp28_ = self->priv->x[0]; + _tmp21_ = self->priv->y[0]; #line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp29_ = self->priv->y[0]; -#line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_move_to (_tmp27_, _tmp28_ + 0.5, _tmp29_ + 0.5); -#line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp30_ = ctx; + cairo_move_to (ctx, _tmp20_ + 0.5, _tmp21_ + 0.5); #line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp31_ = self->priv->x[1]; + _tmp22_ = self->priv->x[1]; #line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp32_ = self->priv->y[1]; + _tmp23_ = self->priv->y[1]; #line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_line_to (_tmp30_, _tmp31_ + 0.5, _tmp32_ + 0.5); + cairo_line_to (ctx, _tmp22_ + 0.5, _tmp23_ + 0.5); #line 90 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp33_ = ctx; -#line 90 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - cairo_stroke (_tmp33_); + cairo_stroke (ctx); #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (_tmp1_); -#line 2936 "StraightenTool.c" +#line 2853 "StraightenTool.c" } -static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_construct (GType object_type) { +static EditingToolsStraightenToolStraightenGuide* +editing_tools_straighten_tool_straighten_guide_construct (GType object_type) +{ EditingToolsStraightenToolStraightenGuide* self = NULL; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self = (EditingToolsStraightenToolStraightenGuide*) g_type_create_instance (object_type); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self; -#line 2946 "StraightenTool.c" +#line 2865 "StraightenTool.c" } -static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_new (void) { +static EditingToolsStraightenToolStraightenGuide* +editing_tools_straighten_tool_straighten_guide_new (void) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return editing_tools_straighten_tool_straighten_guide_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE); -#line 2953 "StraightenTool.c" +#line 2874 "StraightenTool.c" } -static void editing_tools_straighten_tool_value_straighten_guide_init (GValue* value) { +static void +editing_tools_straighten_tool_value_straighten_guide_init (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 2960 "StraightenTool.c" +#line 2883 "StraightenTool.c" } -static void editing_tools_straighten_tool_value_straighten_guide_free_value (GValue* value) { +static void +editing_tools_straighten_tool_value_straighten_guide_free_value (GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_unref (value->data[0].v_pointer); -#line 2969 "StraightenTool.c" +#line 2894 "StraightenTool.c" } } -static void editing_tools_straighten_tool_value_straighten_guide_copy_value (const GValue* src_value, GValue* dest_value) { +static void +editing_tools_straighten_tool_value_straighten_guide_copy_value (const GValue* src_value, + GValue* dest_value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (src_value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" dest_value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (src_value->data[0].v_pointer); -#line 2979 "StraightenTool.c" +#line 2907 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" dest_value->data[0].v_pointer = NULL; -#line 2983 "StraightenTool.c" +#line 2911 "StraightenTool.c" } } -static gpointer editing_tools_straighten_tool_value_straighten_guide_peek_pointer (const GValue* value) { +static gpointer +editing_tools_straighten_tool_value_straighten_guide_peek_pointer (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return value->data[0].v_pointer; -#line 2991 "StraightenTool.c" +#line 2921 "StraightenTool.c" } -static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +static gchar* +editing_tools_straighten_tool_value_straighten_guide_collect_value (GValue* value, + guint n_collect_values, + GTypeCValue* collect_values, + guint collect_flags) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (collect_values[0].v_pointer) { -#line 2998 "StraightenTool.c" +#line 2933 "StraightenTool.c" 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) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3005 "StraightenTool.c" +#line 2940 "StraightenTool.c" } else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL); -#line 3009 "StraightenTool.c" +#line 2944 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (object); -#line 3013 "StraightenTool.c" +#line 2948 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 3017 "StraightenTool.c" +#line 2952 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return NULL; -#line 3021 "StraightenTool.c" +#line 2956 "StraightenTool.c" } -static gchar* editing_tools_straighten_tool_value_straighten_guide_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) { +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; object_p = collect_values[0].v_pointer; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (!object_p) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value)); -#line 3032 "StraightenTool.c" +#line 2972 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (!value->data[0].v_pointer) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" *object_p = NULL; -#line 3038 "StraightenTool.c" +#line 2978 "StraightenTool.c" } else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" *object_p = value->data[0].v_pointer; -#line 3042 "StraightenTool.c" +#line 2982 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" *object_p = editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer); -#line 3046 "StraightenTool.c" +#line 2986 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return NULL; -#line 3050 "StraightenTool.c" +#line 2990 "StraightenTool.c" } -static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) { +static GParamSpec* +editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, + const gchar* nick, + const gchar* blurb, + GType object_type, + GParamFlags flags) +{ EditingToolsStraightenToolParamSpecStraightenGuide* spec; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE), NULL); @@ -3060,20 +3006,25 @@ static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (co G_PARAM_SPEC (spec)->value_type = object_type; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return G_PARAM_SPEC (spec); -#line 3064 "StraightenTool.c" +#line 3010 "StraightenTool.c" } -static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const GValue* value) { +static gpointer +editing_tools_straighten_tool_value_get_straighten_guide (const GValue* value) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE), NULL); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return value->data[0].v_pointer; -#line 3073 "StraightenTool.c" +#line 3021 "StraightenTool.c" } -static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, gpointer v_object) { +static void +editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, + gpointer v_object) +{ 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)); @@ -3089,22 +3040,25 @@ static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* va value->data[0].v_pointer = v_object; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer); -#line 3093 "StraightenTool.c" +#line 3044 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 3097 "StraightenTool.c" +#line 3048 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_unref (old); -#line 3103 "StraightenTool.c" +#line 3054 "StraightenTool.c" } } -static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, gpointer v_object) { +static void +editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, + gpointer v_object) +{ 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)); @@ -3118,54 +3072,62 @@ static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* v g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value))); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = v_object; -#line 3122 "StraightenTool.c" +#line 3076 "StraightenTool.c" } else { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" value->data[0].v_pointer = NULL; -#line 3126 "StraightenTool.c" +#line 3080 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (old) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_unref (old); -#line 3132 "StraightenTool.c" +#line 3086 "StraightenTool.c" } } -static void editing_tools_straighten_tool_straighten_guide_class_init (EditingToolsStraightenToolStraightenGuideClass * klass) { +static void +editing_tools_straighten_tool_straighten_guide_class_init (EditingToolsStraightenToolStraightenGuideClass * klass) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_guide_parent_class = g_type_class_peek_parent (klass); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" ((EditingToolsStraightenToolStraightenGuideClass *) klass)->finalize = editing_tools_straighten_tool_straighten_guide_finalize; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_type_class_add_private (klass, sizeof (EditingToolsStraightenToolStraightenGuidePrivate)); -#line 3144 "StraightenTool.c" +#line 3100 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_guide_instance_init (EditingToolsStraightenToolStraightenGuide * self) { +static void +editing_tools_straighten_tool_straighten_guide_instance_init (EditingToolsStraightenToolStraightenGuide * self) +{ #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_PRIVATE (self); #line 26 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->is_active = FALSE; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->ref_count = 1; -#line 3155 "StraightenTool.c" +#line 3113 "StraightenTool.c" } -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); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_signal_handlers_destroy (self); -#line 3165 "StraightenTool.c" +#line 3125 "StraightenTool.c" } -static GType editing_tools_straighten_tool_straighten_guide_get_type (void) { +static GType +editing_tools_straighten_tool_straighten_guide_get_type (void) +{ static volatile gsize editing_tools_straighten_tool_straighten_guide_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_straighten_tool_straighten_guide_type_id__volatile)) { static const GTypeValueTable g_define_type_value_table = { editing_tools_straighten_tool_value_straighten_guide_init, editing_tools_straighten_tool_value_straighten_guide_free_value, editing_tools_straighten_tool_value_straighten_guide_copy_value, editing_tools_straighten_tool_value_straighten_guide_peek_pointer, "p", editing_tools_straighten_tool_value_straighten_guide_collect_value, "p", editing_tools_straighten_tool_value_straighten_guide_lcopy_value }; @@ -3179,18 +3141,22 @@ static GType editing_tools_straighten_tool_straighten_guide_get_type (void) { } -static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer instance) { +static gpointer +editing_tools_straighten_tool_straighten_guide_ref (gpointer instance) +{ EditingToolsStraightenToolStraightenGuide * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_atomic_int_inc (&self->ref_count); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return instance; -#line 3190 "StraightenTool.c" +#line 3154 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_guide_unref (gpointer instance) { +static void +editing_tools_straighten_tool_straighten_guide_unref (gpointer instance) +{ EditingToolsStraightenToolStraightenGuide * self; self = instance; #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3199,7 +3165,7 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_CLASS (self)->finalize (self); #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" g_type_free_instance ((GTypeInstance *) self); -#line 3203 "StraightenTool.c" +#line 3169 "StraightenTool.c" } } @@ -3209,20 +3175,26 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta * * @param container The application's main window. */ -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_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, + gpointer self) +{ #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked ((EditingToolsStraightenToolStraightenToolWindow*) self); -#line 3216 "StraightenTool.c" +#line 3185 "StraightenTool.c" } -static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, GtkWindow* container) { +static EditingToolsStraightenToolStraightenToolWindow* +editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, + GtkWindow* container) +{ EditingToolsStraightenToolStraightenToolWindow * self = NULL; - GtkWindow* _tmp0_; + GtkScale* _tmp0_; GtkScale* _tmp1_; GtkScale* _tmp2_; GtkScale* _tmp3_; - GtkScale* _tmp4_; + GtkLabel* _tmp4_; GtkLabel* _tmp5_; GtkLabel* _tmp6_; GtkLabel* _tmp7_; @@ -3231,145 +3203,142 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_ GtkLabel* _tmp10_; GtkLabel* _tmp11_; GtkLabel* _tmp12_; - GtkLabel* _tmp13_; GtkBox* slider_layout = NULL; - GtkBox* _tmp14_; - GtkScale* _tmp15_; + GtkBox* _tmp13_; + GtkScale* _tmp14_; GtkBox* button_layout = NULL; - GtkBox* _tmp16_; + GtkBox* _tmp15_; + GtkButton* _tmp16_; GtkButton* _tmp17_; GtkButton* _tmp18_; GtkButton* _tmp19_; GtkButton* _tmp20_; GtkButton* _tmp21_; - GtkButton* _tmp22_; GtkBox* main_layout = NULL; - GtkBox* _tmp23_; + GtkBox* _tmp22_; + GtkLabel* _tmp23_; GtkLabel* _tmp24_; - GtkLabel* _tmp25_; - GtkButton* _tmp26_; + GtkButton* _tmp25_; #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" - _tmp0_ = container; -#line 110 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - self = (EditingToolsStraightenToolStraightenToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_); + self = (EditingToolsStraightenToolStraightenToolWindow*) editing_tools_editing_tool_window_construct (object_type, container); #line 112 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp1_ = self->angle_slider; + _tmp0_ = self->angle_slider; #line 112 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_range_set_min_slider_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE); + gtk_range_set_min_slider_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE); #line 113 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp2_ = self->angle_slider; + _tmp1_ = self->angle_slider; #line 113 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE, -1); #line 114 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp3_ = self->angle_slider; + _tmp2_ = self->angle_slider; #line 114 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), 0.0); + gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0); #line 115 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp4_ = self->angle_slider; + _tmp3_ = self->angle_slider; #line 115 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_scale_set_draw_value (_tmp4_, FALSE); + gtk_scale_set_draw_value (_tmp3_, FALSE); #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp5_ = self->description_label; + _tmp4_ = self->description_label; #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp6_ = self->description_label; + _tmp5_ = self->description_label; #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp7_ = self->description_label; + _tmp6_ = self->description_label; #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 0); #line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp8_ = self->description_label; + _tmp7_ = self->description_label; #line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0); #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp9_ = self->angle_label; + _tmp8_ = self->angle_label; #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 0); #line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp10_ = self->angle_label; + _tmp9_ = self->angle_label; #line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 0); #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp11_ = self->angle_label; + _tmp10_ = self->angle_label; #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0); #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp12_ = self->angle_label; + _tmp11_ = self->angle_label; #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 0); + gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0); #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp13_ = self->angle_label; + _tmp12_ = self->angle_label; #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1); #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp14_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); + _tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp14_); + g_object_ref_sink (_tmp13_); #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - slider_layout = _tmp14_; + slider_layout = _tmp13_; #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp15_ = self->angle_slider; + _tmp14_ = self->angle_slider; #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); + _tmp15_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING); #line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp16_); + g_object_ref_sink (_tmp15_); #line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - button_layout = _tmp16_; + button_layout = _tmp15_; #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp17_ = self->cancel_button; + _tmp16_ = self->cancel_button; #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp18_ = self->reset_button; + _tmp17_ = self->reset_button; #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); #line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp19_ = self->ok_button; + _tmp18_ = self->ok_button; #line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); + gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1); #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp20_ = self->cancel_button; + _tmp19_ = self->cancel_button; #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp21_ = self->reset_button; + _tmp20_ = self->reset_button; #line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp22_ = self->ok_button; + _tmp21_ = self->ok_button; #line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + _tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); #line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_object_ref_sink (_tmp23_); + g_object_ref_sink (_tmp22_); #line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - main_layout = _tmp23_; + main_layout = _tmp22_; #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp24_ = self->description_label; + _tmp23_ = self->description_label; #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 141 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (slider_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp25_ = self->angle_label; + _tmp24_ = self->angle_label; #line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); + gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 143 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (button_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0); #line 145 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (main_layout, gtk_widget_get_type (), GtkWidget)); #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - _tmp26_ = self->reset_button; + _tmp25_ = self->reset_button; #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" - g_signal_connect_object (_tmp26_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0); + g_signal_connect_object (_tmp25_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0); #line 149 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GTK_WIN_POS_CENTER_ON_PARENT); #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3380,18 +3349,22 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_ _g_object_unref0 (slider_layout); #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self; -#line 3384 "StraightenTool.c" +#line 3353 "StraightenTool.c" } -static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container) { +static EditingToolsStraightenToolStraightenToolWindow* +editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container) +{ #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return editing_tools_straighten_tool_straighten_tool_window_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, container); -#line 3391 "StraightenTool.c" +#line 3362 "StraightenTool.c" } -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 (EditingToolsStraightenToolStraightenToolWindow* self) +{ 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)); @@ -3399,20 +3372,24 @@ static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicke _tmp0_ = self->angle_slider; #line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0); -#line 3403 "StraightenTool.c" +#line 3376 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_tool_window_class_init (EditingToolsStraightenToolStraightenToolWindowClass * klass) { +static void +editing_tools_straighten_tool_straighten_tool_window_class_init (EditingToolsStraightenToolStraightenToolWindowClass * klass) +{ #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_straighten_tool_window_parent_class = g_type_class_peek_parent (klass); #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" G_OBJECT_CLASS (klass)->finalize = editing_tools_straighten_tool_straighten_tool_window_finalize; -#line 3412 "StraightenTool.c" +#line 3387 "StraightenTool.c" } -static void editing_tools_straighten_tool_straighten_tool_window_instance_init (EditingToolsStraightenToolStraightenToolWindow * self) { +static void +editing_tools_straighten_tool_straighten_tool_window_instance_init (EditingToolsStraightenToolStraightenToolWindow * self) +{ GtkScale* _tmp0_; GtkLabel* _tmp1_; GtkLabel* _tmp2_; @@ -3455,11 +3432,13 @@ static void editing_tools_straighten_tool_straighten_tool_window_instance_init ( g_object_ref_sink (_tmp5_); #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->reset_button = _tmp5_; -#line 3459 "StraightenTool.c" +#line 3436 "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); @@ -3477,11 +3456,13 @@ 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 3481 "StraightenTool.c" +#line 3460 "StraightenTool.c" } -static GType editing_tools_straighten_tool_straighten_tool_window_get_type (void) { +static GType +editing_tools_straighten_tool_straighten_tool_window_get_type (void) +{ static volatile gsize editing_tools_straighten_tool_straighten_tool_window_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_straighten_tool_straighten_tool_window_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsStraightenToolStraightenToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_straighten_tool_straighten_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsStraightenToolStraightenToolWindow), 0, (GInstanceInitFunc) editing_tools_straighten_tool_straighten_tool_window_instance_init, NULL }; @@ -3493,7 +3474,9 @@ static GType editing_tools_straighten_tool_straighten_tool_window_get_type (void } -static void editing_tools_straighten_tool_class_init (EditingToolsStraightenToolClass * klass) { +static void +editing_tools_straighten_tool_class_init (EditingToolsStraightenToolClass * klass) +{ #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_parent_class = g_type_class_peek_parent (klass); #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -3516,11 +3499,13 @@ static void editing_tools_straighten_tool_class_init (EditingToolsStraightenTool ((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 3520 "StraightenTool.c" +#line 3503 "StraightenTool.c" } -static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenTool * self) { +static void +editing_tools_straighten_tool_instance_init (EditingToolsStraightenTool * self) +{ EditingToolsStraightenToolStraightenGuide* _tmp0_; #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE (self); @@ -3534,11 +3519,13 @@ 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 3538 "StraightenTool.c" +#line 3523 "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); @@ -3556,7 +3543,7 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * ob _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 3560 "StraightenTool.c" +#line 3547 "StraightenTool.c" } @@ -3564,7 +3551,9 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * ob * An editing tool that allows one to introduce or remove a Dutch angle from * a photograph. */ -GType editing_tools_straighten_tool_get_type (void) { +GType +editing_tools_straighten_tool_get_type (void) +{ static volatile gsize editing_tools_straighten_tool_type_id__volatile = 0; if (g_once_init_enter (&editing_tools_straighten_tool_type_id__volatile)) { static const GTypeInfo g_define_type_info = { sizeof (EditingToolsStraightenToolClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_straighten_tool_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsStraightenTool), 0, (GInstanceInitFunc) editing_tools_straighten_tool_instance_init, NULL }; |