diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2018-05-01 14:43:08 +0200 |
| commit | 2b3f22361da0c1d8e6ce70d71352821758186db7 (patch) | |
| tree | 5d10633b47369b3aa52a05bf889ede0dbe5ee108 /src/editing_tools/StraightenTool.c | |
| parent | 211da5fc3048ca2b6ccee2166b0aaaade55cb84f (diff) | |
| parent | dc6c76eb04dfe3d4262a1806808f0bc0bf523238 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'src/editing_tools/StraightenTool.c')
| -rw-r--r-- | src/editing_tools/StraightenTool.c | 1212 |
1 files changed, 590 insertions, 622 deletions
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c index 9420cb8..11bf36a 100644 --- a/src/editing_tools/StraightenTool.c +++ b/src/editing_tools/StraightenTool.c @@ -486,6 +486,7 @@ 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); 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); @@ -552,14 +553,14 @@ static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GTyp 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 557 "StraightenTool.c" } 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 564 "StraightenTool.c" } @@ -572,7 +573,7 @@ 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 577 "StraightenTool.c" } @@ -586,7 +587,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 591 "StraightenTool.c" } @@ -692,7 +693,7 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT 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); #line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (command); -#line 696 "StraightenTool.c" +#line 697 "StraightenTool.c" } @@ -708,7 +709,7 @@ 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 713 "StraightenTool.c" } @@ -717,7 +718,7 @@ static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingTool 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 722 "StraightenTool.c" } @@ -739,7 +740,7 @@ static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditin _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" +#line 744 "StraightenTool.c" } @@ -777,7 +778,7 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi _tmp6_ = a; #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp6_ != NULL) { -#line 781 "StraightenTool.c" +#line 782 "StraightenTool.c" EditingToolsStraightenToolStraightenToolWindow* _tmp7_; GtkScale* _tmp8_; gdouble* _tmp9_; @@ -791,11 +792,11 @@ static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEdi gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_range_get_type (), GtkRange), *_tmp9_); #line 247 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_high_qual_repaint (self); -#line 795 "StraightenTool.c" +#line 796 "StraightenTool.c" } #line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (a); -#line 799 "StraightenTool.c" +#line 800 "StraightenTool.c" } @@ -817,13 +818,13 @@ static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingToo _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" +#line 822 "StraightenTool.c" EditingToolsPhotoCanvas* _tmp4_; #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_repaint (_tmp4_); -#line 827 "StraightenTool.c" +#line 828 "StraightenTool.c" } } @@ -855,7 +856,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) { #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = TRUE; -#line 859 "StraightenTool.c" +#line 860 "StraightenTool.c" } else { GdkEventKey* _tmp5_; guint _tmp6_; @@ -868,13 +869,13 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit _tmp7_ = gdk_keyval_name (_tmp6_); #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0; -#line 872 "StraightenTool.c" +#line 873 "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 879 "StraightenTool.c" } else { GdkEventKey* _tmp8_; guint _tmp9_; @@ -887,7 +888,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit _tmp10_ = gdk_keyval_name (_tmp9_); #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0; -#line 891 "StraightenTool.c" +#line 892 "StraightenTool.c" } #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp0_) { @@ -897,7 +898,7 @@ 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 902 "StraightenTool.c" } #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = event; @@ -913,7 +914,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit result = TRUE; #line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 917 "StraightenTool.c" +#line 918 "StraightenTool.c" } #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = event; @@ -923,7 +924,7 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit result = _tmp15_; #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 927 "StraightenTool.c" +#line 928 "StraightenTool.c" } @@ -932,35 +933,35 @@ static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2) if (s1 == s2) { #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return TRUE; -#line 936 "StraightenTool.c" +#line 937 "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 943 "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 949 "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 955 "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 961 "StraightenTool.c" } #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return TRUE; -#line 964 "StraightenTool.c" +#line 965 "StraightenTool.c" } @@ -991,24 +992,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 +1022,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 1026 "StraightenTool.c" } #line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = viewport; @@ -1038,7 +1030,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 1034 "StraightenTool.c" { GdkPixbuf* _tmp6_ = NULL; EditingToolsPhotoCanvas* _tmp7_; @@ -1069,8 +1061,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 1065 "StraightenTool.c" + goto __catch27_g_error; } #line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = _tmp6_; @@ -1082,10 +1074,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 1078 "StraightenTool.c" } - goto __finally23; - __catch23_g_error: + goto __finally27; + __catch27_g_error: { GError* e = NULL; EditingToolsPhotoCanvas* _tmp15_; @@ -1122,9 +1114,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 1118 "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 +1127,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 1131 "StraightenTool.c" } #line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = low_res_tmp; @@ -1178,66 +1170,42 @@ 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 1209 "StraightenTool.c" } @@ -1271,75 +1239,75 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai Dimensions _tmp22_; gint _tmp23_; gint _tmp24_; -#line 309 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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" +#line 311 "/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" +#line 311 "/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" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = self->priv->rotate_scale; -#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = MIN (_tmp10_, 1.0); -#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotate_scale = _tmp11_; -#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = self->priv->crop_center; -#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotated_center = _tmp12_; -#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = self->priv->rotate_scale; -#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 316 "/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" +#line 317 "/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" +#line 317 "/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" +#line 318 "/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" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp16_ = _tmp15_.x; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 318 "/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" +#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = _tmp17_.width; -#line 321 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 318 "/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" +#line 318 "/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" +#line 319 "/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" +#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = _tmp20_.y; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 319 "/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" +#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = _tmp22_.height; -#line 322 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 319 "/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" +#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->rotated_center.y = _tmp24_; -#line 1343 "StraightenTool.c" +#line 1311 "StraightenTool.c" } @@ -1351,16 +1319,16 @@ 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" +#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 1325 "StraightenTool.c" } static gpointer _g_object_ref0 (gpointer self) { -#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return self ? g_object_ref (self) : NULL; -#line 1364 "StraightenTool.c" +#line 1332 "StraightenTool.c" } @@ -1417,194 +1385,194 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool EditingToolsStraightenToolStraightenToolWindow* _tmp46_; GtkLabel* _tmp47_; EditingToolsStraightenToolStraightenToolWindow* _tmp48_; -#line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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" +#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = canvas; -#line 333 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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), _tmp0_); -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = canvas; -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = _editing_tools_photo_canvas_ref0 (_tmp1_); -#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 331 "/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" +#line 332 "/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" +#line 332 "/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" +#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = canvas; -#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 334 "/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" +#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = _tmp5_; -#line 337 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 334 "/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" +#line 334 "/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 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp6_); -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = canvas; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 338 "/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" +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = _tmp9_; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 338 "/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" +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region = _tmp11_; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = !_tmp12_; -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp10_); -#line 341 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp13_) { -#line 1469 "StraightenTool.c" +#line 1437 "StraightenTool.c" Dimensions _tmp14_; gint _tmp15_; Dimensions _tmp16_; gint _tmp17_; -#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.left = 0; -#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = self->priv->image_dims; -#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = _tmp14_.width; -#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.right = _tmp15_; -#line 345 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.top = 0; -#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 343 "/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" +#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = _tmp16_.height; -#line 346 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" crop_region.bottom = _tmp17_; -#line 1490 "StraightenTool.c" +#line 1458 "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 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = canvas; -#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_); -#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp20_ = _tmp19_; -#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" photo_get_straighten (_tmp20_, &_tmp21_); -#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" incoming_angle = _tmp21_; -#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp20_); -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/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" +#line 352 "/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" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = _tmp23_.width; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/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" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = _tmp25_.height; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp27_ = incoming_angle; -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" derotate_point_arb (&_tmp22_, _tmp24_, _tmp26_, _tmp27_, &_tmp28_); -#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->crop_center = _tmp28_; -#line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 354 "/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" +#line 354 "/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" +#line 355 "/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" +#line 355 "/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" +#line 357 "/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" +#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp31_ = canvas; -#line 365 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 362 "/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" +#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" drawing_window = _tmp32_; -#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 363 "/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" +#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp34_ = _g_object_ref0 (_tmp33_); -#line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" display = _tmp34_; -#line 367 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 364 "/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" +#line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cursor = _tmp35_; -#line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 366 "/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" +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp36_ = canvas; -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 368 "/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" +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp38_ = _tmp37_; -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 368 "/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" +#line 368 "/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" _g_object_unref0 (self->priv->window); -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->window = _tmp39_; -#line 371 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 368 "/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 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_straighten_tool_bind_window_handlers (self); -#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp40_ = self->priv->window; -#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp41_ = _tmp40_->angle_slider; -#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp42_ = incoming_angle; -#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 372 "/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_); -#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp43_ = incoming_angle; -#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 373 "/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" +#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp44_ = incoming_angle; -#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp45_ = g_strdup_printf ("%2.1f°", _tmp44_); -#line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" tmp = _tmp45_; -#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp46_ = self->priv->window; -#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp47_ = _tmp46_->angle_label; -#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 376 "/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" +#line 378 "/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" +#line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp48_ = self->priv->window; -#line 382 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 379 "/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" +#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 1576 "StraightenTool.c" } @@ -1615,122 +1583,122 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo 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 1593 "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 1605 "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 1611 "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 1630 "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 1634 "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" +#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 1641 "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" +#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" +#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = canvas; -#line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 403 "/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 1655 "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" +#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" +#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = canvas; -#line 410 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 407 "/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" +#line 407 "/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 1672 "StraightenTool.c" } 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 1681 "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" +#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 1688 "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" +#line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self); -#line 1727 "StraightenTool.c" +#line 1695 "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" +#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 1702 "StraightenTool.c" } @@ -1742,31 +1710,31 @@ 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 1738 "StraightenTool.c" } @@ -1782,46 +1750,46 @@ 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 1786 "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" +#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 1793 "StraightenTool.c" } @@ -1840,65 +1808,65 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight OneShotScheduler* _tmp10_; OneShotScheduler* _tmp12_; EditingToolsPhotoCanvas* _tmp13_; -#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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" +#line 425 "/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" +#line 425 "/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" +#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = self->priv->window; -#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = _tmp3_->angle_slider; -#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 426 "/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 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = g_strdup_printf ("%2.1f°", _tmp5_); -#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" tmp = _tmp6_; -#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = self->priv->window; -#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = _tmp7_->angle_label; -#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = tmp; -#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 427 "/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" +#line 429 "/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" +#line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp10_ == NULL) { -#line 1876 "StraightenTool.c" +#line 1844 "StraightenTool.c" OneShotScheduler* _tmp11_; -#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self); -#line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 430 "/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" +#line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->slider_sched = _tmp11_; -#line 1884 "StraightenTool.c" +#line 1852 "StraightenTool.c" } -#line 434 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 431 "/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" +#line 431 "/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" +#line 433 "/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" +#line 437 "/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" +#line 437 "/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 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (tmp); -#line 1902 "StraightenTool.c" +#line 1870 "StraightenTool.c" } @@ -1906,17 +1874,17 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight * @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" +#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 1888 "StraightenTool.c" } @@ -1929,17 +1897,17 @@ static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_too 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 1911 "StraightenTool.c" } @@ -1956,33 +1924,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 1954 "StraightenTool.c" } @@ -2046,161 +2014,161 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b EditingToolsPhotoCanvas* _tmp46_; cairo_t* _tmp47_; cairo_t* _tmp48_; -#line 474 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#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" +#line 472 "/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" +#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" w = _tmp4_; -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 473 "/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" +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_); -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = _tmp6_; -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = gdk_window_get_height (_tmp7_); -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = _tmp8_; -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_object_unref0 (_tmp7_); -#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" h = _tmp9_; -#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = editing_tools_photo_canvas_get_default_ctx (_tmp10_); -#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = _tmp11_; -#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp12_); -#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp12_); -#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 477 "/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" +#line 477 "/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" +#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = _tmp14_; -#line 480 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 477 "/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" +#line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp15_); -#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 478 "/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" +#line 478 "/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" +#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = _tmp17_; -#line 481 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 478 "/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" +#line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp18_); -#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp20_ = editing_tools_photo_canvas_get_default_ctx (_tmp19_); -#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = _tmp20_; -#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_fill (_tmp21_); -#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp21_); -#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/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" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = editing_tools_photo_canvas_get_default_ctx (_tmp22_); -#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = _tmp23_; -#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp25_ = self->priv->view_width; -#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = self->priv->view_height; -#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_translate (_tmp24_, (w - _tmp25_) / 2.0, (h - _tmp26_) / 2.0); -#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp24_); -#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas; -#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp28_ = editing_tools_photo_canvas_get_default_ctx (_tmp27_); -#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp29_ = _tmp28_; -#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp30_ = self->priv->rotate_surf; -#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_set_source_surface (_tmp29_, _tmp30_, (gdouble) 0, (gdouble) 0); -#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp29_); -#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 484 "/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" +#line 484 "/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" +#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp33_ = _tmp32_; -#line 487 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 484 "/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" +#line 484 "/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" +#line 484 "/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" +#line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp33_); -#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/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" +#line 485 "/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" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp38_ = _tmp37_; -#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_fill (_tmp38_); -#line 488 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp38_); -#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 486 "/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" +#line 486 "/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" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp41_ = _tmp40_; -#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_paint (_tmp41_); -#line 489 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp41_); -#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 490 "/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" +#line 490 "/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" +#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp44_ = _tmp43_; -#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp44_); -#line 493 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp44_); -#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp45_ = self->priv->guide; -#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 492 "/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" +#line 492 "/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" +#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp48_ = _tmp47_; -#line 495 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 492 "/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" +#line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _cairo_destroy0 (_tmp48_); -#line 2204 "StraightenTool.c" +#line 2172 "StraightenTool.c" } @@ -2251,121 +2219,121 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai gint _tmp32_; cairo_t* _tmp33_; cairo_t* _tmp34_; -#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 (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" +#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = angle; -#line 510 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 507 "/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" +#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" angle_internal = _tmp1_; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = dest_ctx; -#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp2_); -#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = dest_ctx; -#line 515 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 512 "/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" +#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = dest_ctx; -#line 516 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 513 "/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" +#line 513 "/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" +#line 513 "/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" +#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = dest_ctx; -#line 517 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_fill (_tmp7_); -#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = dest_ctx; -#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp8_); -#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp9_ = dest_ctx; -#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = self->priv->view_width; -#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = self->priv->view_height; -#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 521 "/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" +#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = dest_ctx; -#line 525 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 522 "/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" +#line 522 "/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" +#line 522 "/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" +#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = dest_ctx; -#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp16_ = angle_internal; -#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_rotate (_tmp15_, _tmp16_); -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = dest_ctx; -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = self->priv->rotated_center; -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp19_ = _tmp18_.x; -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/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" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = self->priv->rotated_center; -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp22_ = _tmp21_.y; -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = self->priv->preview_scale; -#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 524 "/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" +#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = dest_ctx; -#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp25_ = src_surf; -#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 526 "/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" +#line 527 "/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" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp27_) { -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = CAIRO_FILTER_BEST; -#line 2341 "StraightenTool.c" +#line 2309 "StraightenTool.c" } else { -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = CAIRO_FILTER_NEAREST; -#line 2345 "StraightenTool.c" +#line 2313 "StraightenTool.c" } -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp28_ = dest_ctx; -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp29_ = cairo_get_source (_tmp28_); -#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 527 "/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" +#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp30_ = dest_ctx; -#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp31_ = src_width; -#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp32_ = src_height; -#line 531 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 528 "/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" +#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp33_ = dest_ctx; -#line 532 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_fill (_tmp33_); -#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp34_ = dest_ctx; -#line 533 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_paint (_tmp34_); -#line 2369 "StraightenTool.c" +#line 2337 "StraightenTool.c" } @@ -2420,123 +2388,123 @@ static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsSt EditingToolsPhotoCanvas* _tmp36_; cairo_t* _tmp37_; gint _tmp38_; -#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 (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 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp0_ = width; -#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" half_width = _tmp0_ / 2; -#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp1_ = width; -#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" quarter_width = _tmp1_ / 4; -#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp2_ = height; -#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" half_height = _tmp2_ / 2; -#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp3_ = height; -#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" quarter_height = _tmp3_ / 4; -#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp4_ = dest_ctx; -#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" cairo_identity_matrix (_tmp4_); -#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = dest_ctx; -#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 548 "/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" +#line 550 "/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" +#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp7_ = dest_ctx; -#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = width; -#line 553 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 550 "/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" +#line 551 "/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" +#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp10_ = dest_ctx; -#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp11_ = width; -#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 551 "/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" +#line 552 "/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" +#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp13_ = dest_ctx; -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp14_ = self->priv->view_height; -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp15_ = width; -#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 552 "/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" +#line 554 "/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" +#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp17_ = dest_ctx; -#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp18_ = height; -#line 557 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 554 "/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" +#line 555 "/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" +#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp20_ = dest_ctx; -#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp21_ = height; -#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 555 "/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" +#line 556 "/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" +#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp23_ = dest_ctx; -#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp24_ = width; -#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp25_ = height; -#line 559 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" editing_tools_photo_canvas_draw_vertical_line (_tmp22_, _tmp23_, _tmp24_ - 1, 0, _tmp25_ + 1, FALSE); -#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp26_ = dest_ctx; -#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 558 "/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" +#line 560 "/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" +#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp28_ = dest_ctx; -#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp29_ = width; -#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 560 "/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" +#line 561 "/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" +#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp31_ = dest_ctx; -#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp32_ = width; -#line 564 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 561 "/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" +#line 562 "/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" +#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp34_ = dest_ctx; -#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp35_ = height; -#line 565 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 562 "/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" +#line 563 "/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" +#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp37_ = dest_ctx; -#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp38_ = height; -#line 566 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" +#line 563 "/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" +#line 2508 "StraightenTool.c" } @@ -2576,7 +2544,7 @@ static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsSt _tmp6_ = angle; #line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" self->priv->angle0 = _tmp6_; -#line 2580 "StraightenTool.c" +#line 2548 "StraightenTool.c" } @@ -2589,7 +2557,7 @@ 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 2561 "StraightenTool.c" gint _tmp1_; gint _tmp2_; gint _tmp3_; @@ -2610,13 +2578,13 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo result = TRUE; #line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2614 "StraightenTool.c" +#line 2582 "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 2588 "StraightenTool.c" } @@ -2625,7 +2593,7 @@ static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsSt 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 2597 "StraightenTool.c" } @@ -2637,14 +2605,14 @@ 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 2609 "StraightenTool.c" } 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 2616 "StraightenTool.c" } @@ -2692,7 +2660,7 @@ 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 2664 "StraightenTool.c" } #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp8_ = dy; @@ -2704,7 +2672,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin _tmp11_ = fabs (_tmp10_); #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (_tmp9_ > _tmp11_) { -#line 2708 "StraightenTool.c" +#line 2676 "StraightenTool.c" gdouble _tmp12_; gdouble _tmp13_; gdouble _tmp14_; @@ -2727,7 +2695,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin result = _tmp17_; #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2731 "StraightenTool.c" +#line 2699 "StraightenTool.c" } else { gdouble _tmp18_; gdouble _tmp19_; @@ -2751,7 +2719,7 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin result = _tmp23_; #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return result; -#line 2755 "StraightenTool.c" +#line 2723 "StraightenTool.c" } } @@ -2800,7 +2768,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 2772 "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 +2776,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 2780 "StraightenTool.c" gdouble _tmp3_; gdouble* _tmp4_; #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" @@ -2819,7 +2787,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 2791 "StraightenTool.c" } #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp5_ = _tmp1_; @@ -2841,7 +2809,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 2813 "StraightenTool.c" } #line 75 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" alpha = 1.0; @@ -2851,20 +2819,20 @@ 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 2823 "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 2830 "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 2836 "StraightenTool.c" } #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _tmp12_ = ctx; @@ -2932,7 +2900,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr cairo_stroke (_tmp33_); #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" _g_free0 (_tmp1_); -#line 2936 "StraightenTool.c" +#line 2904 "StraightenTool.c" } @@ -2942,21 +2910,21 @@ static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_ 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 2914 "StraightenTool.c" } 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 2921 "StraightenTool.c" } 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 2928 "StraightenTool.c" } @@ -2965,7 +2933,7 @@ static void editing_tools_straighten_tool_value_straighten_guide_free_value (GVa 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 2937 "StraightenTool.c" } } @@ -2975,11 +2943,11 @@ static void editing_tools_straighten_tool_value_straighten_guide_copy_value (con 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 2947 "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 2951 "StraightenTool.c" } } @@ -2987,37 +2955,37 @@ static void editing_tools_straighten_tool_value_straighten_guide_copy_value (con 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 2959 "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) { #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" if (collect_values[0].v_pointer) { -#line 2998 "StraightenTool.c" +#line 2966 "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 2973 "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 2977 "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 2981 "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 2985 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return NULL; -#line 3021 "StraightenTool.c" +#line 2989 "StraightenTool.c" } @@ -3028,25 +2996,25 @@ static gchar* editing_tools_straighten_tool_value_straighten_guide_lcopy_value ( 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 3000 "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 3006 "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 3010 "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 3014 "StraightenTool.c" } #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" return NULL; -#line 3050 "StraightenTool.c" +#line 3018 "StraightenTool.c" } @@ -3060,7 +3028,7 @@ 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 3032 "StraightenTool.c" } @@ -3069,7 +3037,7 @@ static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const 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 3041 "StraightenTool.c" } @@ -3089,17 +3057,17 @@ 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 3061 "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 3065 "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 3071 "StraightenTool.c" } } @@ -3118,17 +3086,17 @@ 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 3090 "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 3094 "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 3100 "StraightenTool.c" } } @@ -3140,7 +3108,7 @@ static void editing_tools_straighten_tool_straighten_guide_class_init (EditingTo ((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 3112 "StraightenTool.c" } @@ -3151,7 +3119,7 @@ static void editing_tools_straighten_tool_straighten_guide_instance_init (Editin 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 3123 "StraightenTool.c" } @@ -3161,7 +3129,7 @@ static void editing_tools_straighten_tool_straighten_guide_finalize (EditingTool 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 3133 "StraightenTool.c" } @@ -3186,7 +3154,7 @@ static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer ins 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 3158 "StraightenTool.c" } @@ -3199,7 +3167,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 3171 "StraightenTool.c" } } @@ -3212,7 +3180,7 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta 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 3184 "StraightenTool.c" } @@ -3380,14 +3348,14 @@ 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 3352 "StraightenTool.c" } 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 3359 "StraightenTool.c" } @@ -3399,7 +3367,7 @@ 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 3371 "StraightenTool.c" } @@ -3408,7 +3376,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_class_init (Edi 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 3380 "StraightenTool.c" } @@ -3455,7 +3423,7 @@ 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 3427 "StraightenTool.c" } @@ -3477,7 +3445,7 @@ static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObje _g_object_unref0 (self->reset_button); #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala" G_OBJECT_CLASS (editing_tools_straighten_tool_straighten_tool_window_parent_class)->finalize (obj); -#line 3481 "StraightenTool.c" +#line 3449 "StraightenTool.c" } @@ -3516,7 +3484,7 @@ 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 3488 "StraightenTool.c" } @@ -3534,7 +3502,7 @@ 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 3506 "StraightenTool.c" } @@ -3556,7 +3524,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 3528 "StraightenTool.c" } |