diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 15:55:20 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 15:55:20 +0100 |
| commit | f6140ff1c9ec493d947da5b346508846e7a1a06f (patch) | |
| tree | c01b9164ee4b0d46b6670ccee45f6181c6237d7f /src/Dimensions.c | |
| parent | 0f67b3cc674377559e66c5a6729fd499049a992f (diff) | |
| parent | 2492891f112caac6076ce49721d9d5d78a152c3a (diff) | |
Update upstream source from tag 'upstream/0.26.4'
Update to upstream version '0.26.4'
with Debian dir fae3cc48a8ec2f37979206f90dc828cbebee14c4
Diffstat (limited to 'src/Dimensions.c')
| -rw-r--r-- | src/Dimensions.c | 1856 |
1 files changed, 922 insertions, 934 deletions
diff --git a/src/Dimensions.c b/src/Dimensions.c index 9756ad1..cf3daa1 100644 --- a/src/Dimensions.c +++ b/src/Dimensions.c @@ -1,4 +1,4 @@ -/* Dimensions.c generated by valac 0.34.7, the Vala compiler +/* Dimensions.c generated by valac 0.36.6, the Vala compiler * generated from Dimensions.vala, do not modify */ /* Copyright 2016 Software Freedom Conservancy Inc. @@ -159,83 +159,71 @@ gchar* scale_constraint_to_string (ScaleConstraint self) { case SCALE_CONSTRAINT_ORIGINAL: #line 161 "Dimensions.c" { - const gchar* _tmp0_ = NULL; - gchar* _tmp1_ = NULL; + gchar* _tmp0_; #line 17 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp0_ = _ ("Original size"); + _tmp0_ = g_strdup (_ ("Original size")); #line 17 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp1_ = g_strdup (_tmp0_); -#line 17 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp1_; + result = _tmp0_; #line 17 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 173 "Dimensions.c" +#line 170 "Dimensions.c" } #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_DIMENSIONS: -#line 177 "Dimensions.c" +#line 174 "Dimensions.c" { - const gchar* _tmp2_ = NULL; - gchar* _tmp3_ = NULL; -#line 20 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp2_ = _ ("Width or height"); + gchar* _tmp1_; #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp3_ = g_strdup (_tmp2_); + _tmp1_ = g_strdup (_ ("Width or height")); #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp3_; + result = _tmp1_; #line 20 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 189 "Dimensions.c" +#line 183 "Dimensions.c" } #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_WIDTH: -#line 193 "Dimensions.c" +#line 187 "Dimensions.c" { - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + gchar* _tmp2_; #line 23 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp4_ = _ ("Width"); + _tmp2_ = g_strdup (_ ("Width")); #line 23 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp5_ = g_strdup (_tmp4_); -#line 23 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp5_; + result = _tmp2_; #line 23 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 205 "Dimensions.c" +#line 196 "Dimensions.c" } #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_HEIGHT: -#line 209 "Dimensions.c" +#line 200 "Dimensions.c" { - const gchar* _tmp6_ = NULL; - gchar* _tmp7_ = NULL; -#line 26 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp6_ = _ ("Height"); + gchar* _tmp3_; #line 26 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp7_ = g_strdup (_tmp6_); + _tmp3_ = g_strdup (_ ("Height")); #line 26 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp7_; + result = _tmp3_; #line 26 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 221 "Dimensions.c" +#line 209 "Dimensions.c" } #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_FILL_VIEWPORT: -#line 225 "Dimensions.c" +#line 213 "Dimensions.c" { - gchar* _tmp8_ = NULL; + gchar* _tmp4_; #line 30 "/home/jens/Source/shotwell/src/Dimensions.vala" - _tmp8_ = g_strdup ("Fill Viewport"); + _tmp4_ = g_strdup ("Fill Viewport"); #line 30 "/home/jens/Source/shotwell/src/Dimensions.vala" - result = _tmp8_; + result = _tmp4_; #line 30 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 234 "Dimensions.c" +#line 222 "Dimensions.c" } default: #line 15 "/home/jens/Source/shotwell/src/Dimensions.vala" break; -#line 239 "Dimensions.c" +#line 227 "Dimensions.c" } #line 33 "/home/jens/Source/shotwell/src/Dimensions.vala" g_warn_if_reached (); @@ -243,7 +231,7 @@ gchar* scale_constraint_to_string (ScaleConstraint self) { result = NULL; #line 35 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 247 "Dimensions.c" +#line 235 "Dimensions.c" } @@ -261,13 +249,13 @@ GType scale_constraint_get_type (void) { void dimensions_init (Dimensions *self, gint width, gint height) { gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gint _tmp8_ = 0; + gint _tmp1_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; + gint _tmp7_; + gint _tmp8_; #line 43 "/home/jens/Source/shotwell/src/Dimensions.vala" memset (self, 0, sizeof (Dimensions)); #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -276,21 +264,21 @@ void dimensions_init (Dimensions *self, gint width, gint height) { if (_tmp1_ < 0) { #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = TRUE; -#line 280 "Dimensions.c" +#line 268 "Dimensions.c" } else { - gint _tmp2_ = 0; + gint _tmp2_; #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = height; #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp2_ < 0; -#line 287 "Dimensions.c" +#line 275 "Dimensions.c" } #line 44 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp0_) { #line 45 "/home/jens/Source/shotwell/src/Dimensions.vala" g_warning ("Dimensions.vala:45: Tried to construct a Dimensions object with negati" \ "ve width or height - forcing sensible default values."); -#line 293 "Dimensions.c" +#line 281 "Dimensions.c" } #line 47 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = width; @@ -308,15 +296,15 @@ void dimensions_init (Dimensions *self, gint width, gint height) { _tmp8_ = CLAMP (_tmp6_, 0, _tmp7_); #line 48 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).height = _tmp8_; -#line 311 "Dimensions.c" +#line 299 "Dimensions.c" } void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result) { - GdkPixbuf* _tmp0_ = NULL; - gint _tmp1_ = 0; - GdkPixbuf* _tmp2_ = NULL; - gint _tmp3_ = 0; + GdkPixbuf* _tmp0_; + gint _tmp1_; + GdkPixbuf* _tmp2_; + gint _tmp3_; Dimensions _tmp4_ = {0}; #line 51 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GDK_IS_PIXBUF (pixbuf)); @@ -334,15 +322,15 @@ void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result) { *result = _tmp4_; #line 52 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 337 "Dimensions.c" +#line 325 "Dimensions.c" } void dimensions_for_allocation (GtkAllocation* allocation, Dimensions* result) { - GtkAllocation _tmp0_ = {0}; - gint _tmp1_ = 0; - GtkAllocation _tmp2_ = {0}; - gint _tmp3_ = 0; + GtkAllocation _tmp0_; + gint _tmp1_; + GtkAllocation _tmp2_; + gint _tmp3_; Dimensions _tmp4_ = {0}; #line 55 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (allocation != NULL); @@ -360,18 +348,18 @@ void dimensions_for_allocation (GtkAllocation* allocation, Dimensions* result) { *result = _tmp4_; #line 56 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 363 "Dimensions.c" +#line 351 "Dimensions.c" } void dimensions_for_widget_allocation (GtkWidget* widget, Dimensions* result) { GtkAllocation allocation = {0}; - GtkWidget* _tmp0_ = NULL; + GtkWidget* _tmp0_; GtkAllocation _tmp1_ = {0}; - GtkAllocation _tmp2_ = {0}; - gint _tmp3_ = 0; - GtkAllocation _tmp4_ = {0}; - gint _tmp5_ = 0; + GtkAllocation _tmp2_; + gint _tmp3_; + GtkAllocation _tmp4_; + gint _tmp5_; Dimensions _tmp6_ = {0}; #line 59 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); @@ -395,15 +383,15 @@ void dimensions_for_widget_allocation (GtkWidget* widget, Dimensions* result) { *result = _tmp6_; #line 63 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 398 "Dimensions.c" +#line 386 "Dimensions.c" } void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result) { - GdkRectangle _tmp0_ = {0}; - gint _tmp1_ = 0; - GdkRectangle _tmp2_ = {0}; - gint _tmp3_ = 0; + GdkRectangle _tmp0_; + gint _tmp1_; + GdkRectangle _tmp2_; + gint _tmp3_; Dimensions _tmp4_ = {0}; #line 66 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (rect != NULL); @@ -421,47 +409,47 @@ void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result) { *result = _tmp4_; #line 67 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 424 "Dimensions.c" +#line 412 "Dimensions.c" } gboolean dimensions_has_area (Dimensions *self) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; + gint _tmp1_; #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).width; #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_ > 0) { -#line 436 "Dimensions.c" - gint _tmp2_ = 0; +#line 424 "Dimensions.c" + gint _tmp2_; #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = (*self).height; #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp2_ > 0; -#line 442 "Dimensions.c" +#line 430 "Dimensions.c" } else { #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 446 "Dimensions.c" +#line 434 "Dimensions.c" } #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 71 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 452 "Dimensions.c" +#line 440 "Dimensions.c" } void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { gint _tmp0_ = 0; - gint _tmp1_ = 0; - Dimensions _tmp2_ = {0}; - gint _tmp3_ = 0; + gint _tmp1_; + Dimensions _tmp2_; + gint _tmp3_; gint _tmp7_ = 0; - gint _tmp8_ = 0; - Dimensions _tmp9_ = {0}; - gint _tmp10_ = 0; + gint _tmp8_; + Dimensions _tmp9_; + gint _tmp10_; Dimensions _tmp14_ = {0}; #line 74 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (min != NULL); @@ -473,23 +461,23 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { _tmp3_ = _tmp2_.width; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_ > _tmp3_) { -#line 476 "Dimensions.c" - gint _tmp4_ = 0; +#line 464 "Dimensions.c" + gint _tmp4_; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = (*self).width; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp4_; -#line 482 "Dimensions.c" +#line 470 "Dimensions.c" } else { - Dimensions _tmp5_ = {0}; - gint _tmp6_ = 0; + Dimensions _tmp5_; + gint _tmp6_; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = *min; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = _tmp5_.width; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp6_; -#line 492 "Dimensions.c" +#line 480 "Dimensions.c" } #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = (*self).height; @@ -499,23 +487,23 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { _tmp10_ = _tmp9_.height; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp8_ > _tmp10_) { -#line 502 "Dimensions.c" - gint _tmp11_ = 0; +#line 490 "Dimensions.c" + gint _tmp11_; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp11_ = (*self).height; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = _tmp11_; -#line 508 "Dimensions.c" +#line 496 "Dimensions.c" } else { - Dimensions _tmp12_ = {0}; - gint _tmp13_ = 0; + Dimensions _tmp12_; + gint _tmp13_; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp12_ = *min; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp13_ = _tmp12_.height; #line 76 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = _tmp13_; -#line 518 "Dimensions.c" +#line 506 "Dimensions.c" } #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" dimensions_init (&_tmp14_, _tmp0_, _tmp7_); @@ -523,15 +511,15 @@ void dimensions_floor (Dimensions *self, Dimensions* min, Dimensions* result) { *result = _tmp14_; #line 75 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 526 "Dimensions.c" +#line 514 "Dimensions.c" } gchar* dimensions_to_string (Dimensions *self) { gchar* result = NULL; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gchar* _tmp2_ = NULL; + gint _tmp0_; + gint _tmp1_; + gchar* _tmp2_; #line 80 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; #line 80 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -542,16 +530,16 @@ gchar* dimensions_to_string (Dimensions *self) { result = _tmp2_; #line 80 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 545 "Dimensions.c" +#line 533 "Dimensions.c" } gboolean dimensions_equals (Dimensions *self, Dimensions* dim) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - Dimensions _tmp2_ = {0}; - gint _tmp3_ = 0; + gint _tmp1_; + Dimensions _tmp2_; + gint _tmp3_; #line 83 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (dim != NULL, FALSE); #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -562,10 +550,10 @@ gboolean dimensions_equals (Dimensions *self, Dimensions* dim) { _tmp3_ = _tmp2_.width; #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_ == _tmp3_) { -#line 565 "Dimensions.c" - gint _tmp4_ = 0; - Dimensions _tmp5_ = {0}; - gint _tmp6_ = 0; +#line 553 "Dimensions.c" + gint _tmp4_; + Dimensions _tmp5_; + gint _tmp6_; #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = (*self).height; #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -574,28 +562,28 @@ gboolean dimensions_equals (Dimensions *self, Dimensions* dim) { _tmp6_ = _tmp5_.height; #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp4_ == _tmp6_; -#line 577 "Dimensions.c" +#line 565 "Dimensions.c" } else { #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 581 "Dimensions.c" +#line 569 "Dimensions.c" } #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 84 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 587 "Dimensions.c" +#line 575 "Dimensions.c" } gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - Dimensions _tmp2_ = {0}; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + gint _tmp1_; + Dimensions _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 88 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (dim != NULL, FALSE); #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -610,12 +598,12 @@ gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge _tmp5_ = fudge; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp4_ <= _tmp5_) { -#line 613 "Dimensions.c" - gint _tmp6_ = 0; - Dimensions _tmp7_ = {0}; - gint _tmp8_ = 0; - gint _tmp9_ = 0; - gint _tmp10_ = 0; +#line 601 "Dimensions.c" + gint _tmp6_; + Dimensions _tmp7_; + gint _tmp8_; + gint _tmp9_; + gint _tmp10_; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = (*self).height; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -628,26 +616,26 @@ gboolean dimensions_approx_equals (Dimensions *self, Dimensions* dim, gint fudge _tmp10_ = fudge; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp9_ <= _tmp10_; -#line 631 "Dimensions.c" +#line 619 "Dimensions.c" } else { #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 635 "Dimensions.c" +#line 623 "Dimensions.c" } #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 89 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 641 "Dimensions.c" +#line 629 "Dimensions.c" } gboolean dimensions_approx_scaled (Dimensions *self, gint scale, gint fudge) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).width; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -656,10 +644,10 @@ gboolean dimensions_approx_scaled (Dimensions *self, gint scale, gint fudge) { _tmp3_ = fudge; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_ <= (_tmp2_ + _tmp3_)) { -#line 659 "Dimensions.c" - gint _tmp4_ = 0; - gint _tmp5_ = 0; - gint _tmp6_ = 0; +#line 647 "Dimensions.c" + gint _tmp4_; + gint _tmp5_; + gint _tmp6_; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = (*self).height; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -668,25 +656,25 @@ gboolean dimensions_approx_scaled (Dimensions *self, gint scale, gint fudge) { _tmp6_ = fudge; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp4_ <= (_tmp5_ + _tmp6_); -#line 671 "Dimensions.c" +#line 659 "Dimensions.c" } else { #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 675 "Dimensions.c" +#line 663 "Dimensions.c" } #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 93 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 681 "Dimensions.c" +#line 669 "Dimensions.c" } gint dimensions_major_axis (Dimensions *self) { gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -697,15 +685,15 @@ gint dimensions_major_axis (Dimensions *self) { result = _tmp2_; #line 97 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 700 "Dimensions.c" +#line 688 "Dimensions.c" } gint dimensions_minor_axis (Dimensions *self) { gint result = 0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -716,17 +704,17 @@ gint dimensions_minor_axis (Dimensions *self) { result = _tmp2_; #line 101 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 719 "Dimensions.c" +#line 707 "Dimensions.c" } void dimensions_with_min (Dimensions *self, gint min_width, gint min_height, Dimensions* result) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; Dimensions _tmp6_ = {0}; #line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; @@ -746,17 +734,17 @@ void dimensions_with_min (Dimensions *self, gint min_width, gint min_height, Dim *result = _tmp6_; #line 105 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 749 "Dimensions.c" +#line 737 "Dimensions.c" } void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dimensions* result) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + gint _tmp0_; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; + gint _tmp5_; Dimensions _tmp6_ = {0}; #line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; @@ -776,22 +764,22 @@ void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dim *result = _tmp6_; #line 109 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 779 "Dimensions.c" +#line 767 "Dimensions.c" } void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dimensions* result) { - gint _tmp0_ = 0; + gint _tmp0_; gboolean _tmp1_ = FALSE; gboolean _tmp2_ = FALSE; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + gint _tmp3_; + gint _tmp4_; gboolean _tmp15_ = FALSE; - gboolean _tmp16_ = FALSE; - gint _tmp25_ = 0; - gint _tmp26_ = 0; - gint _tmp27_ = 0; - gint _tmp28_ = 0; + gboolean _tmp16_; + gint _tmp25_; + gint _tmp26_; + gint _tmp27_; + gint _tmp28_; #line 113 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = scale; #line 113 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -802,60 +790,60 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim _tmp4_ = scale; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp3_ == _tmp4_) { -#line 805 "Dimensions.c" - gint _tmp5_ = 0; - gint _tmp6_ = 0; +#line 793 "Dimensions.c" + gint _tmp5_; + gint _tmp6_; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = (*self).height; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = scale; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = _tmp5_ < _tmp6_; -#line 814 "Dimensions.c" +#line 802 "Dimensions.c" } else { #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = FALSE; -#line 818 "Dimensions.c" +#line 806 "Dimensions.c" } #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp2_) { #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = TRUE; -#line 824 "Dimensions.c" +#line 812 "Dimensions.c" } else { gboolean _tmp7_ = FALSE; - gint _tmp8_ = 0; - gint _tmp9_ = 0; + gint _tmp8_; + gint _tmp9_; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = (*self).height; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = scale; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp8_ == _tmp9_) { -#line 835 "Dimensions.c" - gint _tmp10_ = 0; - gint _tmp11_ = 0; +#line 823 "Dimensions.c" + gint _tmp10_; + gint _tmp11_; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp10_ = (*self).width; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp11_ = scale; #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = _tmp10_ < _tmp11_; -#line 844 "Dimensions.c" +#line 832 "Dimensions.c" } else { #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = FALSE; -#line 848 "Dimensions.c" +#line 836 "Dimensions.c" } #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = _tmp7_; -#line 852 "Dimensions.c" +#line 840 "Dimensions.c" } #line 116 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_) { -#line 856 "Dimensions.c" - gint _tmp12_ = 0; - gint _tmp13_ = 0; +#line 844 "Dimensions.c" + gint _tmp12_; + gint _tmp13_; Dimensions _tmp14_ = {0}; #line 117 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp12_ = (*self).width; @@ -867,50 +855,50 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim *result = _tmp14_; #line 117 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 870 "Dimensions.c" +#line 858 "Dimensions.c" } #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp16_ = scale_up; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" if (!_tmp16_) { -#line 876 "Dimensions.c" +#line 864 "Dimensions.c" gboolean _tmp17_ = FALSE; - gint _tmp18_ = 0; - gint _tmp19_ = 0; + gint _tmp18_; + gint _tmp19_; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp18_ = (*self).width; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp19_ = scale; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp18_ < _tmp19_) { -#line 886 "Dimensions.c" - gint _tmp20_ = 0; - gint _tmp21_ = 0; +#line 874 "Dimensions.c" + gint _tmp20_; + gint _tmp21_; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp20_ = (*self).height; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp21_ = scale; #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp17_ = _tmp20_ < _tmp21_; -#line 895 "Dimensions.c" +#line 883 "Dimensions.c" } else { #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp17_ = FALSE; -#line 899 "Dimensions.c" +#line 887 "Dimensions.c" } #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp15_ = _tmp17_; -#line 903 "Dimensions.c" +#line 891 "Dimensions.c" } else { #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp15_ = FALSE; -#line 907 "Dimensions.c" +#line 895 "Dimensions.c" } #line 120 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp15_) { -#line 911 "Dimensions.c" - gint _tmp22_ = 0; - gint _tmp23_ = 0; +#line 899 "Dimensions.c" + gint _tmp22_; + gint _tmp23_; Dimensions _tmp24_ = {0}; #line 121 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp22_ = (*self).width; @@ -922,7 +910,7 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim *result = _tmp24_; #line 121 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 925 "Dimensions.c" +#line 913 "Dimensions.c" } #line 123 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp25_ = (*self).width; @@ -934,8 +922,8 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim _tmp28_ = scale; #line 123 "/home/jens/Source/shotwell/src/Dimensions.vala" if ((_tmp25_ - _tmp26_) > (_tmp27_ - _tmp28_)) { -#line 937 "Dimensions.c" - gint _tmp29_ = 0; +#line 925 "Dimensions.c" + gint _tmp29_; Dimensions _tmp30_ = {0}; #line 124 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp29_ = scale; @@ -945,9 +933,9 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim *result = _tmp30_; #line 124 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 948 "Dimensions.c" +#line 936 "Dimensions.c" } else { - gint _tmp31_ = 0; + gint _tmp31_; Dimensions _tmp32_ = {0}; #line 126 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp31_ = scale; @@ -957,7 +945,7 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim *result = _tmp32_; #line 126 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 960 "Dimensions.c" +#line 948 "Dimensions.c" } } @@ -965,12 +953,12 @@ void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dim void dimensions_get_scale_ratios (Dimensions *self, Dimensions* scaled, gdouble* width_ratio, gdouble* height_ratio) { gdouble _vala_width_ratio = 0.0; gdouble _vala_height_ratio = 0.0; - Dimensions _tmp0_ = {0}; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - Dimensions _tmp3_ = {0}; - gint _tmp4_ = 0; - gint _tmp5_ = 0; + Dimensions _tmp0_; + gint _tmp1_; + gint _tmp2_; + Dimensions _tmp3_; + gint _tmp4_; + gint _tmp5_; #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (scaled != NULL); #line 130 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -993,21 +981,21 @@ void dimensions_get_scale_ratios (Dimensions *self, Dimensions* scaled, gdouble* if (width_ratio) { #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala" *width_ratio = _vala_width_ratio; -#line 996 "Dimensions.c" +#line 984 "Dimensions.c" } #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala" if (height_ratio) { #line 129 "/home/jens/Source/shotwell/src/Dimensions.vala" *height_ratio = _vala_height_ratio; -#line 1002 "Dimensions.c" +#line 990 "Dimensions.c" } } gdouble dimensions_get_aspect_ratio (Dimensions *self) { gdouble result = 0.0; - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; #line 135 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).width; #line 135 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1016,36 +1004,36 @@ gdouble dimensions_get_aspect_ratio (Dimensions *self) { result = ((gdouble) _tmp0_) / _tmp1_; #line 135 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 1019 "Dimensions.c" +#line 1007 "Dimensions.c" } void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, Dimensions* result) { gdouble width_ratio = 0.0; gdouble height_ratio = 0.0; - Dimensions _tmp0_ = {0}; + Dimensions _tmp0_; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; gdouble scaled_width = 0.0; gdouble scaled_height = 0.0; - gdouble _tmp3_ = 0.0; - gdouble _tmp4_ = 0.0; + gdouble _tmp3_; + gdouble _tmp4_; Dimensions scaled = {0}; - gdouble _tmp13_ = 0.0; - gdouble _tmp14_ = 0.0; - gdouble _tmp15_ = 0.0; - gdouble _tmp16_ = 0.0; + gdouble _tmp13_; + gdouble _tmp14_; + gdouble _tmp15_; + gdouble _tmp16_; Dimensions _tmp17_ = {0}; Dimensions _tmp18_ = {0}; Dimensions _tmp19_ = {0}; - Dimensions _tmp20_ = {0}; - gint _tmp21_ = 0; - Dimensions _tmp22_ = {0}; - gint _tmp23_ = 0; - Dimensions _tmp24_ = {0}; - gint _tmp25_ = 0; - Dimensions _tmp26_ = {0}; - gint _tmp27_ = 0; + Dimensions _tmp20_; + gint _tmp21_; + Dimensions _tmp22_; + gint _tmp23_; + Dimensions _tmp24_; + gint _tmp25_; + Dimensions _tmp26_; + gint _tmp27_; #line 138 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (viewport != NULL); #line 140 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1062,11 +1050,11 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, _tmp4_ = height_ratio; #line 143 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp3_ < _tmp4_) { -#line 1065 "Dimensions.c" - Dimensions _tmp5_ = {0}; - gint _tmp6_ = 0; - gint _tmp7_ = 0; - gdouble _tmp8_ = 0.0; +#line 1053 "Dimensions.c" + Dimensions _tmp5_; + gint _tmp6_; + gint _tmp7_; + gdouble _tmp8_; #line 144 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = *viewport; #line 144 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1079,12 +1067,12 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, _tmp8_ = width_ratio; #line 145 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_height = ((gdouble) _tmp7_) * _tmp8_; -#line 1082 "Dimensions.c" +#line 1070 "Dimensions.c" } else { - gint _tmp9_ = 0; - gdouble _tmp10_ = 0.0; - Dimensions _tmp11_ = {0}; - gint _tmp12_ = 0; + gint _tmp9_; + gdouble _tmp10_; + Dimensions _tmp11_; + gint _tmp12_; #line 147 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = (*self).width; #line 147 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1097,7 +1085,7 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, _tmp12_ = _tmp11_.height; #line 148 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_height = (gdouble) _tmp12_; -#line 1100 "Dimensions.c" +#line 1088 "Dimensions.c" } #line 151 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp13_ = scaled_width; @@ -1139,26 +1127,26 @@ void dimensions_get_scaled_proportional (Dimensions *self, Dimensions* viewport, *result = scaled; #line 156 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1142 "Dimensions.c" +#line 1130 "Dimensions.c" } void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewport, Dimensions* result) { gdouble width_ratio = 0.0; gdouble height_ratio = 0.0; - Dimensions _tmp0_ = {0}; + Dimensions _tmp0_; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; gdouble scaled_width = 0.0; gdouble scaled_height = 0.0; gboolean _tmp3_ = FALSE; - gint _tmp4_ = 0; - Dimensions _tmp5_ = {0}; - gint _tmp6_ = 0; - gdouble _tmp32_ = 0.0; - gdouble _tmp33_ = 0.0; - gdouble _tmp34_ = 0.0; - gdouble _tmp35_ = 0.0; + gint _tmp4_; + Dimensions _tmp5_; + gint _tmp6_; + gdouble _tmp32_; + gdouble _tmp33_; + gdouble _tmp34_; + gdouble _tmp35_; Dimensions _tmp36_ = {0}; Dimensions _tmp37_ = {0}; Dimensions _tmp38_ = {0}; @@ -1180,10 +1168,10 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp6_ = _tmp5_.width; #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp4_ < _tmp6_) { -#line 1183 "Dimensions.c" - gint _tmp7_ = 0; - Dimensions _tmp8_ = {0}; - gint _tmp9_ = 0; +#line 1171 "Dimensions.c" + gint _tmp7_; + Dimensions _tmp8_; + gint _tmp9_; #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = (*self).height; #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1192,19 +1180,19 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp9_ = _tmp8_.height; #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = _tmp7_ >= _tmp9_; -#line 1195 "Dimensions.c" +#line 1183 "Dimensions.c" } else { #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = FALSE; -#line 1199 "Dimensions.c" +#line 1187 "Dimensions.c" } #line 164 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp3_) { -#line 1203 "Dimensions.c" - Dimensions _tmp10_ = {0}; - gint _tmp11_ = 0; - gint _tmp12_ = 0; - gdouble _tmp13_ = 0.0; +#line 1191 "Dimensions.c" + Dimensions _tmp10_; + gint _tmp11_; + gint _tmp12_; + gdouble _tmp13_; #line 166 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp10_ = *viewport; #line 166 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1217,12 +1205,12 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp13_ = width_ratio; #line 167 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_height = ((gdouble) _tmp12_) * _tmp13_; -#line 1220 "Dimensions.c" +#line 1208 "Dimensions.c" } else { gboolean _tmp14_ = FALSE; - gint _tmp15_ = 0; - Dimensions _tmp16_ = {0}; - gint _tmp17_ = 0; + gint _tmp15_; + Dimensions _tmp16_; + gint _tmp17_; #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp15_ = (*self).width; #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1231,10 +1219,10 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp17_ = _tmp16_.width; #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp15_ >= _tmp17_) { -#line 1234 "Dimensions.c" - gint _tmp18_ = 0; - Dimensions _tmp19_ = {0}; - gint _tmp20_ = 0; +#line 1222 "Dimensions.c" + gint _tmp18_; + Dimensions _tmp19_; + gint _tmp20_; #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp18_ = (*self).height; #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1243,19 +1231,19 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp20_ = _tmp19_.height; #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp14_ = _tmp18_ < _tmp20_; -#line 1246 "Dimensions.c" +#line 1234 "Dimensions.c" } else { #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp14_ = FALSE; -#line 1250 "Dimensions.c" +#line 1238 "Dimensions.c" } #line 168 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp14_) { -#line 1254 "Dimensions.c" - gint _tmp21_ = 0; - gdouble _tmp22_ = 0.0; - Dimensions _tmp23_ = {0}; - gint _tmp24_ = 0; +#line 1242 "Dimensions.c" + gint _tmp21_; + gdouble _tmp22_; + Dimensions _tmp23_; + gint _tmp24_; #line 170 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp21_ = (*self).width; #line 170 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1268,16 +1256,16 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp24_ = _tmp23_.height; #line 171 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_height = (gdouble) _tmp24_; -#line 1271 "Dimensions.c" +#line 1259 "Dimensions.c" } else { gdouble ratio = 0.0; - gdouble _tmp25_ = 0.0; - gdouble _tmp26_ = 0.0; - gdouble _tmp27_ = 0.0; - gint _tmp28_ = 0; - gdouble _tmp29_ = 0.0; - gint _tmp30_ = 0; - gdouble _tmp31_ = 0.0; + gdouble _tmp25_; + gdouble _tmp26_; + gdouble _tmp27_; + gint _tmp28_; + gdouble _tmp29_; + gint _tmp30_; + gdouble _tmp31_; #line 174 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp25_ = width_ratio; #line 174 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1298,7 +1286,7 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp _tmp31_ = ratio; #line 177 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_height = ((gdouble) _tmp30_) * _tmp31_; -#line 1301 "Dimensions.c" +#line 1289 "Dimensions.c" } } #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1319,37 +1307,37 @@ void dimensions_get_scaled_to_fill_viewport (Dimensions *self, Dimensions* viewp *result = _tmp38_; #line 180 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1322 "Dimensions.c" +#line 1310 "Dimensions.c" } void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkRectangle* rect, GdkRectangle* result) { gdouble x_scale = 0.0; gdouble y_scale = 0.0; - Dimensions _tmp0_ = {0}; + Dimensions _tmp0_; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; GdkRectangle scaled_rect = {0}; - GdkRectangle _tmp3_ = {0}; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; - gdouble _tmp6_ = 0.0; - GdkRectangle _tmp7_ = {0}; - gint _tmp8_ = 0; - gdouble _tmp9_ = 0.0; - gdouble _tmp10_ = 0.0; - GdkRectangle _tmp11_ = {0}; - gint _tmp12_ = 0; - gdouble _tmp13_ = 0.0; - gdouble _tmp14_ = 0.0; - GdkRectangle _tmp15_ = {0}; - gint _tmp16_ = 0; - gdouble _tmp17_ = 0.0; - gdouble _tmp18_ = 0.0; - GdkRectangle _tmp19_ = {0}; - gint _tmp20_ = 0; - GdkRectangle _tmp21_ = {0}; - gint _tmp22_ = 0; + GdkRectangle _tmp3_; + gint _tmp4_; + gdouble _tmp5_; + gdouble _tmp6_; + GdkRectangle _tmp7_; + gint _tmp8_; + gdouble _tmp9_; + gdouble _tmp10_; + GdkRectangle _tmp11_; + gint _tmp12_; + gdouble _tmp13_; + gdouble _tmp14_; + GdkRectangle _tmp15_; + gint _tmp16_; + gdouble _tmp17_; + gdouble _tmp18_; + GdkRectangle _tmp19_; + gint _tmp20_; + GdkRectangle _tmp21_; + gint _tmp22_; #line 183 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (scaled != NULL); #line 183 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1412,7 +1400,7 @@ void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkR if (_tmp20_ <= 0) { #line 194 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_rect.width = 1; -#line 1415 "Dimensions.c" +#line 1403 "Dimensions.c" } #line 196 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp21_ = scaled_rect; @@ -1422,28 +1410,28 @@ void dimensions_get_scaled_rectangle (Dimensions *self, Dimensions* scaled, GdkR if (_tmp22_ <= 0) { #line 197 "/home/jens/Source/shotwell/src/Dimensions.vala" scaled_rect.height = 1; -#line 1425 "Dimensions.c" +#line 1413 "Dimensions.c" } #line 199 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = scaled_rect; #line 199 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1431 "Dimensions.c" +#line 1419 "Dimensions.c" } void dimensions_get_scaled_similar (Dimensions *self, Dimensions* original, Dimensions* scaled, Dimensions* result) { gdouble x_scale = 0.0; gdouble y_scale = 0.0; - Dimensions _tmp0_ = {0}; + Dimensions _tmp0_; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; gdouble scale = 0.0; - gdouble _tmp3_ = 0.0; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; - gint _tmp6_ = 0; - gdouble _tmp7_ = 0.0; + gdouble _tmp3_; + gint _tmp4_; + gdouble _tmp5_; + gint _tmp6_; + gdouble _tmp7_; Dimensions _tmp8_ = {0}; Dimensions _tmp9_ = {0}; Dimensions _tmp10_ = {0}; @@ -1481,18 +1469,18 @@ void dimensions_get_scaled_similar (Dimensions *self, Dimensions* original, Dime *result = _tmp10_; #line 209 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1484 "Dimensions.c" +#line 1472 "Dimensions.c" } void dimensions_get_scaled_by_width (Dimensions *self, gint scale, Dimensions* result) { - gint _tmp0_ = 0; + gint _tmp0_; gdouble ratio = 0.0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - gdouble _tmp5_ = 0.0; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; + gdouble _tmp5_; Dimensions _tmp6_ = {0}; Dimensions _tmp7_ = {0}; Dimensions _tmp8_ = {0}; @@ -1522,18 +1510,18 @@ void dimensions_get_scaled_by_width (Dimensions *self, gint scale, Dimensions* r *result = _tmp8_; #line 218 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1525 "Dimensions.c" +#line 1513 "Dimensions.c" } void dimensions_get_scaled_by_height (Dimensions *self, gint scale, Dimensions* result) { - gint _tmp0_ = 0; + gint _tmp0_; gdouble ratio = 0.0; - gint _tmp1_ = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gdouble _tmp4_ = 0.0; - gint _tmp5_ = 0; + gint _tmp1_; + gint _tmp2_; + gint _tmp3_; + gdouble _tmp4_; + gint _tmp5_; Dimensions _tmp6_ = {0}; Dimensions _tmp7_ = {0}; Dimensions _tmp8_ = {0}; @@ -1563,22 +1551,22 @@ void dimensions_get_scaled_by_height (Dimensions *self, gint scale, Dimensions* *result = _tmp8_; #line 226 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1566 "Dimensions.c" +#line 1554 "Dimensions.c" } void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleConstraint constraint, Dimensions* result) { - ScaleConstraint _tmp0_ = 0; + ScaleConstraint _tmp0_; #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = constraint; #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" switch (_tmp0_) { #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_ORIGINAL: -#line 1578 "Dimensions.c" +#line 1566 "Dimensions.c" { - gint _tmp1_ = 0; - gint _tmp2_ = 0; + gint _tmp1_; + gint _tmp2_; Dimensions _tmp3_ = {0}; #line 232 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).width; @@ -1590,23 +1578,23 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon *result = _tmp3_; #line 232 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1593 "Dimensions.c" +#line 1581 "Dimensions.c" } #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_DIMENSIONS: -#line 1597 "Dimensions.c" +#line 1585 "Dimensions.c" { Dimensions _tmp4_ = {0}; - gint _tmp5_ = 0; - gint _tmp6_ = 0; + gint _tmp5_; + gint _tmp6_; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = (*self).width; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = (*self).height; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp5_ >= _tmp6_) { -#line 1608 "Dimensions.c" - gint _tmp7_ = 0; +#line 1596 "Dimensions.c" + gint _tmp7_; Dimensions _tmp8_ = {0}; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = scale; @@ -1614,9 +1602,9 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon dimensions_get_scaled_by_width (&(*self), _tmp7_, &_tmp8_); #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = _tmp8_; -#line 1617 "Dimensions.c" +#line 1605 "Dimensions.c" } else { - gint _tmp9_ = 0; + gint _tmp9_; Dimensions _tmp10_ = {0}; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = scale; @@ -1624,19 +1612,19 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon dimensions_get_scaled_by_height (&(*self), _tmp9_, &_tmp10_); #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = _tmp10_; -#line 1627 "Dimensions.c" +#line 1615 "Dimensions.c" } #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = _tmp4_; #line 235 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1633 "Dimensions.c" +#line 1621 "Dimensions.c" } #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_WIDTH: -#line 1637 "Dimensions.c" +#line 1625 "Dimensions.c" { - gint _tmp11_ = 0; + gint _tmp11_; Dimensions _tmp12_ = {0}; #line 238 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp11_ = scale; @@ -1646,13 +1634,13 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon *result = _tmp12_; #line 238 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1649 "Dimensions.c" +#line 1637 "Dimensions.c" } #line 230 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_HEIGHT: -#line 1653 "Dimensions.c" +#line 1641 "Dimensions.c" { - gint _tmp13_ = 0; + gint _tmp13_; Dimensions _tmp14_ = {0}; #line 241 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp13_ = scale; @@ -1662,16 +1650,16 @@ void dimensions_get_scaled_by_constraint (Dimensions *self, gint scale, ScaleCon *result = _tmp14_; #line 241 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1665 "Dimensions.c" +#line 1653 "Dimensions.c" } default: { - ScaleConstraint _tmp15_ = 0; + ScaleConstraint _tmp15_; #line 244 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp15_ = constraint; #line 244 "/home/jens/Source/shotwell/src/Dimensions.vala" g_error ("Dimensions.vala:244: Bad constraint: %d", (gint) _tmp15_); -#line 1674 "Dimensions.c" +#line 1662 "Dimensions.c" } } } @@ -1685,14 +1673,14 @@ Dimensions* dimensions_dup (const Dimensions* self) { memcpy (dup, self, sizeof (Dimensions)); #line 39 "/home/jens/Source/shotwell/src/Dimensions.vala" return dup; -#line 1688 "Dimensions.c" +#line 1676 "Dimensions.c" } void dimensions_free (Dimensions* self) { #line 39 "/home/jens/Source/shotwell/src/Dimensions.vala" g_free (self); -#line 1695 "Dimensions.c" +#line 1683 "Dimensions.c" } @@ -1708,10 +1696,10 @@ GType dimensions_get_type (void) { static void scaling_init (Scaling *self, ScaleConstraint constraint, gint scale, Dimensions* viewport, gboolean scale_up) { - ScaleConstraint _tmp0_ = 0; - gint _tmp1_ = 0; - Dimensions _tmp2_ = {0}; - gboolean _tmp3_ = FALSE; + ScaleConstraint _tmp0_; + gint _tmp1_; + Dimensions _tmp2_; + gboolean _tmp3_; #line 257 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (viewport != NULL); #line 257 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1732,7 +1720,7 @@ static void scaling_init (Scaling *self, ScaleConstraint constraint, gint scale, _tmp3_ = scale_up; #line 261 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).scale_up = _tmp3_; -#line 1735 "Dimensions.c" +#line 1723 "Dimensions.c" } @@ -1747,14 +1735,14 @@ void scaling_for_original (Scaling* result) { *result = _tmp1_; #line 265 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1750 "Dimensions.c" +#line 1738 "Dimensions.c" } void scaling_for_screen (GtkWindow* window, gboolean scale_up, Scaling* result) { - GtkWindow* _tmp0_ = NULL; + GtkWindow* _tmp0_; Dimensions _tmp1_ = {0}; - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; Scaling _tmp3_ = {0}; #line 268 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GTK_IS_WINDOW (window)); @@ -1770,15 +1758,15 @@ void scaling_for_screen (GtkWindow* window, gboolean scale_up, Scaling* result) *result = _tmp3_; #line 269 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1773 "Dimensions.c" +#line 1761 "Dimensions.c" } void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; Dimensions _tmp2_ = {0}; - gboolean _tmp3_ = FALSE; + gboolean _tmp3_; Scaling _tmp4_ = {0}; #line 273 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = pixels; @@ -1796,14 +1784,14 @@ void scaling_for_best_fit (gint pixels, gboolean scale_up, Scaling* result) { *result = _tmp4_; #line 275 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1799 "Dimensions.c" +#line 1787 "Dimensions.c" } void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result) { - gboolean _tmp0_ = FALSE; - Dimensions _tmp1_ = {0}; - gboolean _tmp2_ = FALSE; + gboolean _tmp0_; + Dimensions _tmp1_; + gboolean _tmp2_; Scaling _tmp3_ = {0}; #line 278 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (viewport != NULL); @@ -1821,19 +1809,19 @@ void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* res *result = _tmp3_; #line 281 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1824 "Dimensions.c" +#line 1812 "Dimensions.c" } void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result) { Dimensions viewport = {0}; - GtkWidget* _tmp0_ = NULL; + GtkWidget* _tmp0_; Dimensions _tmp1_ = {0}; gboolean _tmp2_ = FALSE; - Dimensions _tmp3_ = {0}; - gint _tmp4_ = 0; - Dimensions _tmp8_ = {0}; - gboolean _tmp9_ = FALSE; + Dimensions _tmp3_; + gint _tmp4_; + Dimensions _tmp8_; + gboolean _tmp9_; Scaling _tmp10_ = {0}; #line 284 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GTK_IS_WIDGET (widget)); @@ -1851,21 +1839,21 @@ void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result) if (_tmp4_ <= 1) { #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = TRUE; -#line 1854 "Dimensions.c" +#line 1842 "Dimensions.c" } else { - Dimensions _tmp5_ = {0}; - gint _tmp6_ = 0; + Dimensions _tmp5_; + gint _tmp6_; #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = viewport; #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = _tmp5_.height; #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = _tmp6_ <= 1; -#line 1864 "Dimensions.c" +#line 1852 "Dimensions.c" } #line 295 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp2_) { -#line 1868 "Dimensions.c" +#line 1856 "Dimensions.c" Scaling _tmp7_ = {0}; #line 296 "/home/jens/Source/shotwell/src/Dimensions.vala" scaling_for_original (&_tmp7_); @@ -1873,7 +1861,7 @@ void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result) *result = _tmp7_; #line 296 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1876 "Dimensions.c" +#line 1864 "Dimensions.c" } #line 298 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = viewport; @@ -1885,15 +1873,15 @@ void scaling_for_widget (GtkWidget* widget, gboolean scale_up, Scaling* result) *result = _tmp10_; #line 298 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1888 "Dimensions.c" +#line 1876 "Dimensions.c" } void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) { gboolean _tmp0_ = FALSE; - Dimensions _tmp1_ = {0}; - gint _tmp2_ = 0; - Dimensions _tmp6_ = {0}; + Dimensions _tmp1_; + gint _tmp2_; + Dimensions _tmp6_; Scaling _tmp7_ = {0}; #line 301 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (viewport != NULL); @@ -1905,21 +1893,21 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) { if (_tmp2_ <= 1) { #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = TRUE; -#line 1908 "Dimensions.c" +#line 1896 "Dimensions.c" } else { - Dimensions _tmp3_ = {0}; - gint _tmp4_ = 0; + Dimensions _tmp3_; + gint _tmp4_; #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = *viewport; #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = _tmp3_.height; #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp4_ <= 1; -#line 1918 "Dimensions.c" +#line 1906 "Dimensions.c" } #line 304 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp0_) { -#line 1922 "Dimensions.c" +#line 1910 "Dimensions.c" Scaling _tmp5_ = {0}; #line 305 "/home/jens/Source/shotwell/src/Dimensions.vala" scaling_for_original (&_tmp5_); @@ -1927,7 +1915,7 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) { *result = _tmp5_; #line 305 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1930 "Dimensions.c" +#line 1918 "Dimensions.c" } #line 307 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = *viewport; @@ -1937,12 +1925,12 @@ void scaling_to_fill_viewport (Dimensions* viewport, Scaling* result) { *result = _tmp7_; #line 307 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1940 "Dimensions.c" +#line 1928 "Dimensions.c" } void scaling_to_fill_screen (GtkWindow* window, Scaling* result) { - GtkWindow* _tmp0_ = NULL; + GtkWindow* _tmp0_; Dimensions _tmp1_ = {0}; Scaling _tmp2_ = {0}; #line 310 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -1957,15 +1945,15 @@ void scaling_to_fill_screen (GtkWindow* window, Scaling* result) { *result = _tmp2_; #line 311 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1960 "Dimensions.c" +#line 1948 "Dimensions.c" } void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result) { - ScaleConstraint _tmp0_ = 0; - gint _tmp1_ = 0; + ScaleConstraint _tmp0_; + gint _tmp1_; Dimensions _tmp2_ = {0}; - gboolean _tmp3_ = FALSE; + gboolean _tmp3_; Scaling _tmp4_ = {0}; #line 315 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = constraint; @@ -1981,24 +1969,24 @@ void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean sc *result = _tmp4_; #line 315 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 1984 "Dimensions.c" +#line 1972 "Dimensions.c" } static gpointer _g_object_ref0 (gpointer self) { #line 319 "/home/jens/Source/shotwell/src/Dimensions.vala" return self ? g_object_ref (self) : NULL; -#line 1991 "Dimensions.c" +#line 1979 "Dimensions.c" } static void scaling_get_screen_dimensions (GtkWindow* window, Dimensions* result) { GdkScreen* screen = NULL; - GtkWindow* _tmp0_ = NULL; - GdkScreen* _tmp1_ = NULL; - GdkScreen* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GtkWindow* _tmp0_; + GdkScreen* _tmp1_; + GdkScreen* _tmp2_; + gint _tmp3_; + gint _tmp4_; Dimensions _tmp5_ = {0}; #line 318 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GTK_IS_WINDOW (window)); @@ -2022,56 +2010,56 @@ static void scaling_get_screen_dimensions (GtkWindow* window, Dimensions* result _g_object_unref0 (screen); #line 321 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2025 "Dimensions.c" +#line 2013 "Dimensions.c" } static gint scaling_scale_to_pixels (Scaling *self) { gint result = 0; gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp1_; #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).scale; #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_ >= 0) { -#line 2037 "Dimensions.c" - gint _tmp2_ = 0; +#line 2025 "Dimensions.c" + gint _tmp2_; #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = (*self).scale; #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp2_; -#line 2043 "Dimensions.c" +#line 2031 "Dimensions.c" } else { #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = 0; -#line 2047 "Dimensions.c" +#line 2035 "Dimensions.c" } #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 325 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2053 "Dimensions.c" +#line 2041 "Dimensions.c" } gboolean scaling_is_unscaled (Scaling *self) { gboolean result = FALSE; - ScaleConstraint _tmp0_ = 0; + ScaleConstraint _tmp0_; #line 329 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).constraint; #line 329 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_ == SCALE_CONSTRAINT_ORIGINAL; #line 329 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2066 "Dimensions.c" +#line 2054 "Dimensions.c" } gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) { gint _vala_pixels = 0; gboolean result = FALSE; - gint _tmp0_ = 0; - ScaleConstraint _tmp1_ = 0; + gint _tmp0_; + ScaleConstraint _tmp1_; #line 332 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (original != NULL, FALSE); #line 333 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2086,11 +2074,11 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) if (pixels) { #line 336 "/home/jens/Source/shotwell/src/Dimensions.vala" *pixels = _vala_pixels; -#line 2089 "Dimensions.c" +#line 2077 "Dimensions.c" } #line 336 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2093 "Dimensions.c" +#line 2081 "Dimensions.c" } #line 338 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).constraint; @@ -2100,7 +2088,7 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) case SCALE_CONSTRAINT_ORIGINAL: #line 338 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_FILL_VIEWPORT: -#line 2103 "Dimensions.c" +#line 2091 "Dimensions.c" { #line 341 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; @@ -2108,16 +2096,16 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) if (pixels) { #line 341 "/home/jens/Source/shotwell/src/Dimensions.vala" *pixels = _vala_pixels; -#line 2111 "Dimensions.c" +#line 2099 "Dimensions.c" } #line 341 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2115 "Dimensions.c" +#line 2103 "Dimensions.c" } default: { - gint _tmp2_ = 0; - gint _tmp3_ = 0; + gint _tmp2_; + gint _tmp3_; #line 344 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = scaling_scale_to_pixels (&(*self)); #line 344 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2132,18 +2120,18 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) if (pixels) { #line 347 "/home/jens/Source/shotwell/src/Dimensions.vala" *pixels = _vala_pixels; -#line 2135 "Dimensions.c" +#line 2123 "Dimensions.c" } #line 347 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2139 "Dimensions.c" +#line 2127 "Dimensions.c" } } #line 332 "/home/jens/Source/shotwell/src/Dimensions.vala" if (pixels) { #line 332 "/home/jens/Source/shotwell/src/Dimensions.vala" *pixels = _vala_pixels; -#line 2146 "Dimensions.c" +#line 2134 "Dimensions.c" } } @@ -2151,8 +2139,8 @@ gboolean scaling_is_best_fit (Scaling *self, Dimensions* original, gint* pixels) gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Dimensions* scaled) { Dimensions _vala_scaled = {0}; gboolean result = FALSE; - gint _tmp0_ = 0; - ScaleConstraint _tmp1_ = 0; + gint _tmp0_; + ScaleConstraint _tmp1_; #line 351 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (original != NULL, FALSE); #line 352 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2167,11 +2155,11 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di if (scaled) { #line 355 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2170 "Dimensions.c" +#line 2158 "Dimensions.c" } #line 355 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2174 "Dimensions.c" +#line 2162 "Dimensions.c" } #line 357 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).constraint; @@ -2181,7 +2169,7 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di case SCALE_CONSTRAINT_ORIGINAL: #line 357 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_FILL_VIEWPORT: -#line 2184 "Dimensions.c" +#line 2172 "Dimensions.c" { #line 360 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; @@ -2189,19 +2177,19 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di if (scaled) { #line 360 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2192 "Dimensions.c" +#line 2180 "Dimensions.c" } #line 360 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2196 "Dimensions.c" +#line 2184 "Dimensions.c" } default: { gint pixels = 0; - gint _tmp2_ = 0; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - ScaleConstraint _tmp5_ = 0; + gint _tmp2_; + gint _tmp3_; + gint _tmp4_; + ScaleConstraint _tmp5_; Dimensions _tmp6_ = {0}; #line 363 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = scaling_scale_to_pixels (&(*self)); @@ -2225,18 +2213,18 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di if (scaled) { #line 368 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2228 "Dimensions.c" +#line 2216 "Dimensions.c" } #line 368 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2232 "Dimensions.c" +#line 2220 "Dimensions.c" } } #line 351 "/home/jens/Source/shotwell/src/Dimensions.vala" if (scaled) { #line 351 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2239 "Dimensions.c" +#line 2227 "Dimensions.c" } } @@ -2244,8 +2232,8 @@ gboolean scaling_is_best_fit_dimensions (Scaling *self, Dimensions* original, Di gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimensions* scaled) { Dimensions _vala_scaled = {0}; gboolean result = FALSE; - gint _tmp0_ = 0; - ScaleConstraint _tmp1_ = 0; + gint _tmp0_; + ScaleConstraint _tmp1_; #line 372 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (original != NULL, FALSE); #line 373 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2260,11 +2248,11 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension if (scaled) { #line 376 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2263 "Dimensions.c" +#line 2251 "Dimensions.c" } #line 376 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2267 "Dimensions.c" +#line 2255 "Dimensions.c" } #line 378 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = (*self).constraint; @@ -2274,7 +2262,7 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension case SCALE_CONSTRAINT_ORIGINAL: #line 378 "/home/jens/Source/shotwell/src/Dimensions.vala" case SCALE_CONSTRAINT_FILL_VIEWPORT: -#line 2277 "Dimensions.c" +#line 2265 "Dimensions.c" { #line 381 "/home/jens/Source/shotwell/src/Dimensions.vala" result = FALSE; @@ -2282,18 +2270,18 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension if (scaled) { #line 381 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2285 "Dimensions.c" +#line 2273 "Dimensions.c" } #line 381 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2289 "Dimensions.c" +#line 2277 "Dimensions.c" } default: { - gboolean _tmp2_ = FALSE; + gboolean _tmp2_; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; - gboolean _tmp5_ = FALSE; + gboolean _tmp5_; #line 384 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = dimensions_has_area (&(*self).viewport); #line 384 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2302,11 +2290,11 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension _tmp5_ = (*self).scale_up; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" if (!_tmp5_) { -#line 2305 "Dimensions.c" - Dimensions _tmp6_ = {0}; - gint _tmp7_ = 0; - Dimensions _tmp8_ = {0}; - gint _tmp9_ = 0; +#line 2293 "Dimensions.c" + Dimensions _tmp6_; + gint _tmp7_; + Dimensions _tmp8_; + gint _tmp9_; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = *original; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2317,19 +2305,19 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension _tmp9_ = _tmp8_.width; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = _tmp7_ < _tmp9_; -#line 2320 "Dimensions.c" +#line 2308 "Dimensions.c" } else { #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = FALSE; -#line 2324 "Dimensions.c" +#line 2312 "Dimensions.c" } #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp4_) { -#line 2328 "Dimensions.c" - Dimensions _tmp10_ = {0}; - gint _tmp11_ = 0; - Dimensions _tmp12_ = {0}; - gint _tmp13_ = 0; +#line 2316 "Dimensions.c" + Dimensions _tmp10_; + gint _tmp11_; + Dimensions _tmp12_; + gint _tmp13_; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp10_ = *original; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2340,23 +2328,23 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension _tmp13_ = _tmp12_.height; #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = _tmp11_ < _tmp13_; -#line 2343 "Dimensions.c" +#line 2331 "Dimensions.c" } else { #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = FALSE; -#line 2347 "Dimensions.c" +#line 2335 "Dimensions.c" } #line 386 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp3_) { -#line 2351 "Dimensions.c" - Dimensions _tmp14_ = {0}; +#line 2339 "Dimensions.c" + Dimensions _tmp14_; #line 387 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp14_ = *original; #line 387 "/home/jens/Source/shotwell/src/Dimensions.vala" _vala_scaled = _tmp14_; -#line 2357 "Dimensions.c" +#line 2345 "Dimensions.c" } else { - Dimensions _tmp15_ = {0}; + Dimensions _tmp15_; Dimensions _tmp16_ = {0}; #line 389 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp15_ = (*self).viewport; @@ -2364,7 +2352,7 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension dimensions_get_scaled_proportional (original, &_tmp15_, &_tmp16_); #line 389 "/home/jens/Source/shotwell/src/Dimensions.vala" _vala_scaled = _tmp16_; -#line 2367 "Dimensions.c" +#line 2355 "Dimensions.c" } #line 391 "/home/jens/Source/shotwell/src/Dimensions.vala" result = TRUE; @@ -2372,18 +2360,18 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension if (scaled) { #line 391 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2375 "Dimensions.c" +#line 2363 "Dimensions.c" } #line 391 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2379 "Dimensions.c" +#line 2367 "Dimensions.c" } } #line 372 "/home/jens/Source/shotwell/src/Dimensions.vala" if (scaled) { #line 372 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2386 "Dimensions.c" +#line 2374 "Dimensions.c" } } @@ -2391,9 +2379,9 @@ gboolean scaling_is_for_viewport (Scaling *self, Dimensions* original, Dimension gboolean scaling_is_fill_viewport (Scaling *self, Dimensions* original, Dimensions* scaled) { Dimensions _vala_scaled = {0}; gboolean result = FALSE; - ScaleConstraint _tmp0_ = 0; - gboolean _tmp1_ = FALSE; - Dimensions _tmp2_ = {0}; + ScaleConstraint _tmp0_; + gboolean _tmp1_; + Dimensions _tmp2_; Dimensions _tmp3_ = {0}; #line 395 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (original != NULL, FALSE); @@ -2409,11 +2397,11 @@ gboolean scaling_is_fill_viewport (Scaling *self, Dimensions* original, Dimensio if (scaled) { #line 399 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2412 "Dimensions.c" +#line 2400 "Dimensions.c" } #line 399 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2416 "Dimensions.c" +#line 2404 "Dimensions.c" } #line 401 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = dimensions_has_area (&(*self).viewport); @@ -2431,43 +2419,43 @@ gboolean scaling_is_fill_viewport (Scaling *self, Dimensions* original, Dimensio if (scaled) { #line 404 "/home/jens/Source/shotwell/src/Dimensions.vala" *scaled = _vala_scaled; -#line 2434 "Dimensions.c" +#line 2422 "Dimensions.c" } #line 404 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2438 "Dimensions.c" +#line 2426 "Dimensions.c" } void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result) { - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; Dimensions scaled = {0}; - Dimensions _tmp2_ = {0}; + Dimensions _tmp2_; Dimensions _tmp3_ = {0}; - gboolean _tmp4_ = FALSE; - Dimensions _tmp5_ = {0}; + gboolean _tmp4_; + Dimensions _tmp5_; Dimensions _tmp6_ = {0}; - gboolean _tmp7_ = FALSE; + gboolean _tmp7_; gboolean is_viewport = FALSE; - Dimensions _tmp8_ = {0}; + Dimensions _tmp8_; Dimensions _tmp9_ = {0}; - gboolean _tmp10_ = FALSE; - gboolean _tmp11_ = FALSE; + gboolean _tmp10_; + gboolean _tmp11_; #line 407 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (original != NULL); #line 408 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = scaling_is_unscaled (&(*self)); #line 408 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp0_) { -#line 2462 "Dimensions.c" - Dimensions _tmp1_ = {0}; +#line 2450 "Dimensions.c" + Dimensions _tmp1_; #line 409 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = *original; #line 409 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = _tmp1_; #line 409 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2470 "Dimensions.c" +#line 2458 "Dimensions.c" } #line 412 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = *original; @@ -2481,7 +2469,7 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi *result = scaled; #line 413 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2484 "Dimensions.c" +#line 2472 "Dimensions.c" } #line 415 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = *original; @@ -2495,7 +2483,7 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi *result = scaled; #line 416 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2498 "Dimensions.c" +#line 2486 "Dimensions.c" } #line 418 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = *original; @@ -2513,42 +2501,42 @@ void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensi *result = scaled; #line 421 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 2516 "Dimensions.c" +#line 2504 "Dimensions.c" } GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up) { GdkPixbuf* result = NULL; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; Dimensions pixbuf_dim = {0}; - GdkPixbuf* _tmp3_ = NULL; + GdkPixbuf* _tmp3_; Dimensions _tmp4_ = {0}; gint pixels = 0; - Dimensions _tmp5_ = {0}; + Dimensions _tmp5_; gint _tmp6_ = 0; - gboolean _tmp7_ = FALSE; + gboolean _tmp7_; Dimensions scaled = {0}; - Dimensions _tmp13_ = {0}; + Dimensions _tmp13_; Dimensions _tmp14_ = {0}; - gboolean _tmp15_ = FALSE; + gboolean _tmp15_; gboolean is_viewport = FALSE; - Dimensions _tmp20_ = {0}; + Dimensions _tmp20_; Dimensions _tmp21_ = {0}; - gboolean _tmp22_ = FALSE; - gboolean _tmp23_ = FALSE; - GdkPixbuf* _tmp24_ = NULL; - Dimensions _tmp25_ = {0}; - GdkInterpType _tmp26_ = 0; - GdkPixbuf* _tmp27_ = NULL; + gboolean _tmp22_; + gboolean _tmp23_; + GdkPixbuf* _tmp24_; + Dimensions _tmp25_; + GdkInterpType _tmp26_; + GdkPixbuf* _tmp27_; #line 424 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL); #line 425 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = scaling_is_unscaled (&(*self)); #line 425 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp0_) { -#line 2549 "Dimensions.c" - GdkPixbuf* _tmp1_ = NULL; - GdkPixbuf* _tmp2_ = NULL; +#line 2537 "Dimensions.c" + GdkPixbuf* _tmp1_; + GdkPixbuf* _tmp2_; #line 426 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = pixbuf; #line 426 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2557,7 +2545,7 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter result = _tmp2_; #line 426 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2560 "Dimensions.c" +#line 2548 "Dimensions.c" } #line 428 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = pixbuf; @@ -2573,12 +2561,12 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter pixels = _tmp6_; #line 431 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp7_) { -#line 2576 "Dimensions.c" - GdkPixbuf* _tmp8_ = NULL; - gint _tmp9_ = 0; - GdkInterpType _tmp10_ = 0; - gboolean _tmp11_ = FALSE; - GdkPixbuf* _tmp12_ = NULL; +#line 2564 "Dimensions.c" + GdkPixbuf* _tmp8_; + gint _tmp9_; + GdkInterpType _tmp10_; + gboolean _tmp11_; + GdkPixbuf* _tmp12_; #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = pixbuf; #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2593,7 +2581,7 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter result = _tmp12_; #line 432 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2596 "Dimensions.c" +#line 2584 "Dimensions.c" } #line 435 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp13_ = pixbuf_dim; @@ -2603,11 +2591,11 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter scaled = _tmp14_; #line 435 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp15_) { -#line 2606 "Dimensions.c" - GdkPixbuf* _tmp16_ = NULL; - Dimensions _tmp17_ = {0}; - GdkInterpType _tmp18_ = 0; - GdkPixbuf* _tmp19_ = NULL; +#line 2594 "Dimensions.c" + GdkPixbuf* _tmp16_; + Dimensions _tmp17_; + GdkInterpType _tmp18_; + GdkPixbuf* _tmp19_; #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp16_ = pixbuf; #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2620,7 +2608,7 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter result = _tmp19_; #line 436 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2623 "Dimensions.c" +#line 2611 "Dimensions.c" } #line 438 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp20_ = pixbuf_dim; @@ -2646,37 +2634,37 @@ GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInter result = _tmp27_; #line 441 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2649 "Dimensions.c" +#line 2637 "Dimensions.c" } gchar* scaling_to_string (Scaling *self) { gchar* result = NULL; - ScaleConstraint _tmp0_ = 0; + ScaleConstraint _tmp0_; #line 445 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).constraint; #line 445 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp0_ == SCALE_CONSTRAINT_ORIGINAL) { -#line 2660 "Dimensions.c" - gchar* _tmp1_ = NULL; +#line 2648 "Dimensions.c" + gchar* _tmp1_; #line 446 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = g_strdup ("scaling: UNSCALED"); #line 446 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp1_; #line 446 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2668 "Dimensions.c" +#line 2656 "Dimensions.c" } else { - ScaleConstraint _tmp2_ = 0; + ScaleConstraint _tmp2_; #line 447 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = (*self).constraint; #line 447 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp2_ == SCALE_CONSTRAINT_FILL_VIEWPORT) { -#line 2675 "Dimensions.c" - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; - gchar* _tmp6_ = NULL; +#line 2663 "Dimensions.c" + gchar* _tmp3_; + gchar* _tmp4_; + gchar* _tmp5_; + gchar* _tmp6_; #line 448 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = dimensions_to_string (&(*self).viewport); #line 448 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2691,33 +2679,33 @@ gchar* scaling_to_string (Scaling *self) { result = _tmp6_; #line 448 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2694 "Dimensions.c" +#line 2682 "Dimensions.c" } else { - gint _tmp7_ = 0; + gint _tmp7_; #line 449 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = (*self).scale; #line 449 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp7_ != SCALING_NO_SCALE) { -#line 2701 "Dimensions.c" +#line 2689 "Dimensions.c" const gchar* _tmp8_ = NULL; - gboolean _tmp9_ = FALSE; - ScaleConstraint _tmp10_ = 0; - gchar* _tmp11_ = NULL; - gchar* _tmp12_ = NULL; - gint _tmp13_ = 0; - gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + gboolean _tmp9_; + ScaleConstraint _tmp10_; + gchar* _tmp11_; + gchar* _tmp12_; + gint _tmp13_; + gchar* _tmp14_; + gchar* _tmp15_; #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = (*self).scale_up; #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp9_) { #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = "scaled up"; -#line 2716 "Dimensions.c" +#line 2704 "Dimensions.c" } else { #line 451 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = "not scaled up"; -#line 2720 "Dimensions.c" +#line 2708 "Dimensions.c" } #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp10_ = (*self).constraint; @@ -2737,25 +2725,25 @@ gchar* scaling_to_string (Scaling *self) { result = _tmp15_; #line 450 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2740 "Dimensions.c" +#line 2728 "Dimensions.c" } else { const gchar* _tmp16_ = NULL; - gboolean _tmp17_ = FALSE; - gchar* _tmp18_ = NULL; - gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; - gchar* _tmp21_ = NULL; + gboolean _tmp17_; + gchar* _tmp18_; + gchar* _tmp19_; + gchar* _tmp20_; + gchar* _tmp21_; #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp17_ = (*self).scale_up; #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp17_) { #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp16_ = "scaled up"; -#line 2754 "Dimensions.c" +#line 2742 "Dimensions.c" } else { #line 454 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp16_ = "not scaled up"; -#line 2758 "Dimensions.c" +#line 2746 "Dimensions.c" } #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp18_ = dimensions_to_string (&(*self).viewport); @@ -2771,7 +2759,7 @@ gchar* scaling_to_string (Scaling *self) { result = _tmp21_; #line 453 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2774 "Dimensions.c" +#line 2762 "Dimensions.c" } } } @@ -2782,9 +2770,9 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) { gboolean result = FALSE; gboolean _tmp0_ = FALSE; gboolean _tmp1_ = FALSE; - ScaleConstraint _tmp2_ = 0; - Scaling _tmp3_ = {0}; - ScaleConstraint _tmp4_ = 0; + ScaleConstraint _tmp2_; + Scaling _tmp3_; + ScaleConstraint _tmp4_; #line 457 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (scaling != NULL, FALSE); #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2795,10 +2783,10 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) { _tmp4_ = _tmp3_.constraint; #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp2_ == _tmp4_) { -#line 2798 "Dimensions.c" - gint _tmp5_ = 0; - Scaling _tmp6_ = {0}; - gint _tmp7_ = 0; +#line 2786 "Dimensions.c" + gint _tmp5_; + Scaling _tmp6_; + gint _tmp7_; #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = (*self).scale; #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2807,18 +2795,18 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) { _tmp7_ = _tmp6_.scale; #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = _tmp5_ == _tmp7_; -#line 2810 "Dimensions.c" +#line 2798 "Dimensions.c" } else { #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp1_ = FALSE; -#line 2814 "Dimensions.c" +#line 2802 "Dimensions.c" } #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_) { -#line 2818 "Dimensions.c" - Scaling _tmp8_ = {0}; - Dimensions _tmp9_ = {0}; - gboolean _tmp10_ = FALSE; +#line 2806 "Dimensions.c" + Scaling _tmp8_; + Dimensions _tmp9_; + gboolean _tmp10_; #line 459 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = *scaling; #line 459 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2827,17 +2815,17 @@ gboolean scaling_equals (Scaling *self, Scaling* scaling) { _tmp10_ = dimensions_equals (&(*self).viewport, &_tmp9_); #line 459 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = _tmp10_; -#line 2830 "Dimensions.c" +#line 2818 "Dimensions.c" } else { #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = FALSE; -#line 2834 "Dimensions.c" +#line 2822 "Dimensions.c" } #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 458 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 2840 "Dimensions.c" +#line 2828 "Dimensions.c" } @@ -2849,14 +2837,14 @@ Scaling* scaling_dup (const Scaling* self) { memcpy (dup, self, sizeof (Scaling)); #line 249 "/home/jens/Source/shotwell/src/Dimensions.vala" return dup; -#line 2852 "Dimensions.c" +#line 2840 "Dimensions.c" } void scaling_free (Scaling* self) { #line 249 "/home/jens/Source/shotwell/src/Dimensions.vala" g_free (self); -#line 2859 "Dimensions.c" +#line 2847 "Dimensions.c" } @@ -2872,12 +2860,12 @@ GType scaling_get_type (void) { void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimensions* viewport_dimensions, gdouble slider_val, GdkPoint* viewport_center) { - Dimensions _tmp0_ = {0}; - Dimensions _tmp1_ = {0}; - gdouble _tmp2_ = 0.0; + Dimensions _tmp0_; + Dimensions _tmp1_; + gdouble _tmp2_; gboolean _tmp3_ = FALSE; gboolean _tmp4_ = FALSE; - GdkPoint* _tmp5_ = NULL; + GdkPoint* _tmp5_; #line 472 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (content_dimensions != NULL); #line 472 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -2904,74 +2892,74 @@ void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimension if (_tmp5_ == NULL) { #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = TRUE; -#line 2907 "Dimensions.c" +#line 2895 "Dimensions.c" } else { gboolean _tmp6_ = FALSE; - GdkPoint* _tmp7_ = NULL; - gint _tmp8_ = 0; + GdkPoint* _tmp7_; + gint _tmp8_; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = viewport_center; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = (*_tmp7_).x; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp8_ == 0) { -#line 2918 "Dimensions.c" - GdkPoint* _tmp9_ = NULL; - gint _tmp10_ = 0; +#line 2906 "Dimensions.c" + GdkPoint* _tmp9_; + gint _tmp10_; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = viewport_center; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp10_ = (*_tmp9_).y; #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = _tmp10_ == 0; -#line 2927 "Dimensions.c" +#line 2915 "Dimensions.c" } else { #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = FALSE; -#line 2931 "Dimensions.c" +#line 2919 "Dimensions.c" } #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = _tmp6_; -#line 2935 "Dimensions.c" +#line 2923 "Dimensions.c" } #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp4_) { #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = TRUE; -#line 2941 "Dimensions.c" +#line 2929 "Dimensions.c" } else { - gdouble _tmp11_ = 0.0; + gdouble _tmp11_; #line 481 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp11_ = slider_val; #line 481 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = _tmp11_ == 0.0; -#line 2948 "Dimensions.c" +#line 2936 "Dimensions.c" } #line 480 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp3_) { #line 482 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_center_viewport (&(*self)); -#line 2954 "Dimensions.c" +#line 2942 "Dimensions.c" } else { - GdkPoint* _tmp12_ = NULL; + GdkPoint* _tmp12_; #line 484 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp12_ = viewport_center; #line 484 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).viewport_center = *_tmp12_; #line 485 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_clamp_viewport_center (&(*self)); -#line 2963 "Dimensions.c" +#line 2951 "Dimensions.c" } } void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_slider_val) { - ZoomState _tmp0_ = {0}; - Dimensions _tmp1_ = {0}; - ZoomState _tmp2_ = {0}; - Dimensions _tmp3_ = {0}; - gdouble _tmp4_ = 0.0; - gdouble _tmp5_ = 0.0; + ZoomState _tmp0_; + Dimensions _tmp1_; + ZoomState _tmp2_; + Dimensions _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; #line 489 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (existing != NULL); #line 489 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3000,20 +2988,20 @@ void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_ if (_tmp5_ == 0.0) { #line 497 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_center_viewport (&(*self)); -#line 3003 "Dimensions.c" +#line 2991 "Dimensions.c" } else { - gdouble _tmp6_ = 0.0; - ZoomState _tmp7_ = {0}; - GdkPoint _tmp8_ = {0}; - gint _tmp9_ = 0; - ZoomState _tmp10_ = {0}; - gdouble _tmp11_ = 0.0; - gdouble _tmp12_ = 0.0; - ZoomState _tmp13_ = {0}; - GdkPoint _tmp14_ = {0}; - gint _tmp15_ = 0; - ZoomState _tmp16_ = {0}; - gdouble _tmp17_ = 0.0; + gdouble _tmp6_; + ZoomState _tmp7_; + GdkPoint _tmp8_; + gint _tmp9_; + ZoomState _tmp10_; + gdouble _tmp11_; + gdouble _tmp12_; + ZoomState _tmp13_; + GdkPoint _tmp14_; + gint _tmp15_; + ZoomState _tmp16_; + gdouble _tmp17_; #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = (*self).zoom_factor; #line 499 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3044,25 +3032,25 @@ void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_ (*self).viewport_center.y = (gint) (_tmp12_ * (_tmp15_ / _tmp17_)); #line 503 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_clamp_viewport_center (&(*self)); -#line 3047 "Dimensions.c" +#line 3035 "Dimensions.c" } } void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing) { - ZoomState _tmp0_ = {0}; - Dimensions _tmp1_ = {0}; - ZoomState _tmp2_ = {0}; - Dimensions _tmp3_ = {0}; - ZoomState _tmp4_ = {0}; - gdouble _tmp5_ = 0.0; - gdouble _tmp6_ = 0.0; - ZoomState _tmp7_ = {0}; - gdouble _tmp8_ = 0.0; - ZoomState _tmp9_ = {0}; - gdouble _tmp10_ = 0.0; - gdouble _tmp11_ = 0.0; - gdouble _tmp12_ = 0.0; + ZoomState _tmp0_; + Dimensions _tmp1_; + ZoomState _tmp2_; + Dimensions _tmp3_; + ZoomState _tmp4_; + gdouble _tmp5_; + gdouble _tmp6_; + ZoomState _tmp7_; + gdouble _tmp8_; + ZoomState _tmp9_; + gdouble _tmp10_; + gdouble _tmp11_; + gdouble _tmp12_; #line 507 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (existing != NULL); #line 507 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3105,20 +3093,20 @@ void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing if (_tmp12_ == 0.0) { #line 516 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_center_viewport (&(*self)); -#line 3108 "Dimensions.c" +#line 3096 "Dimensions.c" } else { - gdouble _tmp13_ = 0.0; - ZoomState _tmp14_ = {0}; - GdkPoint _tmp15_ = {0}; - gint _tmp16_ = 0; - ZoomState _tmp17_ = {0}; - gdouble _tmp18_ = 0.0; - gdouble _tmp19_ = 0.0; - ZoomState _tmp20_ = {0}; - GdkPoint _tmp21_ = {0}; - gint _tmp22_ = 0; - ZoomState _tmp23_ = {0}; - gdouble _tmp24_ = 0.0; + gdouble _tmp13_; + ZoomState _tmp14_; + GdkPoint _tmp15_; + gint _tmp16_; + ZoomState _tmp17_; + gdouble _tmp18_; + gdouble _tmp19_; + ZoomState _tmp20_; + GdkPoint _tmp21_; + gint _tmp22_; + ZoomState _tmp23_; + gdouble _tmp24_; #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp13_ = (*self).zoom_factor; #line 518 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3149,19 +3137,19 @@ void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing (*self).viewport_center.y = (gint) (_tmp19_ * (_tmp22_ / _tmp24_)); #line 522 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_clamp_viewport_center (&(*self)); -#line 3152 "Dimensions.c" +#line 3140 "Dimensions.c" } } void zoom_state_init_pan (ZoomState *self, ZoomState* existing, GdkPoint* new_viewport_center) { - ZoomState _tmp0_ = {0}; - Dimensions _tmp1_ = {0}; - ZoomState _tmp2_ = {0}; - Dimensions _tmp3_ = {0}; - ZoomState _tmp4_ = {0}; - gdouble _tmp5_ = 0.0; - GdkPoint _tmp6_ = {0}; + ZoomState _tmp0_; + Dimensions _tmp1_; + ZoomState _tmp2_; + Dimensions _tmp3_; + ZoomState _tmp4_; + gdouble _tmp5_; + GdkPoint _tmp6_; #line 526 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (existing != NULL); #line 526 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3194,29 +3182,29 @@ void zoom_state_init_pan (ZoomState *self, ZoomState* existing, GdkPoint* new_vi (*self).viewport_center = _tmp6_; #line 535 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_clamp_viewport_center (&(*self)); -#line 3197 "Dimensions.c" +#line 3185 "Dimensions.c" } static void zoom_state_clamp_viewport_center (ZoomState *self) { gint zoomed_width = 0; - gint _tmp0_ = 0; + gint _tmp0_; gint zoomed_height = 0; - gint _tmp1_ = 0; - GdkPoint _tmp2_ = {0}; - gint _tmp3_ = 0; - Dimensions _tmp4_ = {0}; - gint _tmp5_ = 0; - Dimensions _tmp6_ = {0}; - gint _tmp7_ = 0; - gint _tmp8_ = 0; - GdkPoint _tmp9_ = {0}; - gint _tmp10_ = 0; - Dimensions _tmp11_ = {0}; - gint _tmp12_ = 0; - Dimensions _tmp13_ = {0}; - gint _tmp14_ = 0; - gint _tmp15_ = 0; + gint _tmp1_; + GdkPoint _tmp2_; + gint _tmp3_; + Dimensions _tmp4_; + gint _tmp5_; + Dimensions _tmp6_; + gint _tmp7_; + gint _tmp8_; + GdkPoint _tmp9_; + gint _tmp10_; + Dimensions _tmp11_; + gint _tmp12_; + Dimensions _tmp13_; + gint _tmp14_; + gint _tmp15_; #line 539 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = zoom_state_get_zoomed_width (&(*self)); #line 539 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3257,13 +3245,13 @@ static void zoom_state_clamp_viewport_center (ZoomState *self) { _tmp15_ = CLAMP (_tmp10_, _tmp12_ / 2, (zoomed_height - (_tmp14_ / 2)) - 1); #line 544 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).viewport_center.y = _tmp15_; -#line 3260 "Dimensions.c" +#line 3248 "Dimensions.c" } static void zoom_state_center_viewport (ZoomState *self) { - gint _tmp0_ = 0; - gint _tmp1_ = 0; + gint _tmp0_; + gint _tmp1_; #line 549 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = zoom_state_get_zoomed_width (&(*self)); #line 549 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3272,25 +3260,25 @@ static void zoom_state_center_viewport (ZoomState *self) { _tmp1_ = zoom_state_get_zoomed_height (&(*self)); #line 550 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).viewport_center.y = _tmp1_ / 2; -#line 3275 "Dimensions.c" +#line 3263 "Dimensions.c" } static void zoom_state_compute_zoom_factors (ZoomState *self) { gdouble viewport_to_content_x = 0.0; gdouble viewport_to_content_y = 0.0; - Dimensions _tmp0_ = {0}; + Dimensions _tmp0_; gdouble _tmp1_ = 0.0; gdouble _tmp2_ = 0.0; - gdouble _tmp3_ = 0.0; - gdouble _tmp4_ = 0.0; - gdouble _tmp5_ = 0.0; - gdouble _tmp6_ = 0.0; - gdouble _tmp7_ = 0.0; - gdouble _tmp8_ = 0.0; - gdouble _tmp9_ = 0.0; - gdouble _tmp10_ = 0.0; - gdouble _tmp11_ = 0.0; + gdouble _tmp3_; + gdouble _tmp4_; + gdouble _tmp5_; + gdouble _tmp6_; + gdouble _tmp7_; + gdouble _tmp8_; + gdouble _tmp9_; + gdouble _tmp10_; + gdouble _tmp11_; #line 554 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).max_factor = 2.0; #line 558 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3315,7 +3303,7 @@ static void zoom_state_compute_zoom_factors (ZoomState *self) { if (_tmp6_ > 1.0) { #line 562 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).min_factor = 1.0; -#line 3318 "Dimensions.c" +#line 3306 "Dimensions.c" } #line 564 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = (*self).min_factor; @@ -3329,65 +3317,65 @@ static void zoom_state_compute_zoom_factors (ZoomState *self) { _tmp11_ = pow (_tmp8_ / _tmp9_, _tmp10_); #line 564 "/home/jens/Source/shotwell/src/Dimensions.vala" (*self).zoom_factor = _tmp7_ * _tmp11_; -#line 3332 "Dimensions.c" +#line 3320 "Dimensions.c" } gdouble zoom_state_get_interpolation_factor (ZoomState *self) { gdouble result = 0.0; - gdouble _tmp0_ = 0.0; + gdouble _tmp0_; #line 568 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).interpolation_factor; #line 568 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 568 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 3345 "Dimensions.c" +#line 3333 "Dimensions.c" } void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle* result) { gint zoomed_width = 0; - gint _tmp0_ = 0; + gint _tmp0_; gint zoomed_height = 0; - gint _tmp1_ = 0; + gint _tmp1_; GdkRectangle _result_ = {0}; - Dimensions _tmp2_ = {0}; - gint _tmp3_ = 0; - gint _tmp4_ = 0; - GdkRectangle _tmp12_ = {0}; - gint _tmp13_ = 0; - Dimensions _tmp14_ = {0}; - gint _tmp15_ = 0; - gint _tmp16_ = 0; - GdkRectangle _tmp24_ = {0}; - gint _tmp25_ = 0; + Dimensions _tmp2_; + gint _tmp3_; + gint _tmp4_; + GdkRectangle _tmp12_; + gint _tmp13_; + Dimensions _tmp14_; + gint _tmp15_; + gint _tmp16_; + GdkRectangle _tmp24_; + gint _tmp25_; gint right = 0; - GdkRectangle _tmp26_ = {0}; - gint _tmp27_ = 0; - Dimensions _tmp28_ = {0}; - gint _tmp29_ = 0; - gint _tmp30_ = 0; - gint _tmp31_ = 0; - gint _tmp33_ = 0; - GdkRectangle _tmp34_ = {0}; - gint _tmp35_ = 0; + GdkRectangle _tmp26_; + gint _tmp27_; + Dimensions _tmp28_; + gint _tmp29_; + gint _tmp30_; + gint _tmp31_; + gint _tmp33_; + GdkRectangle _tmp34_; + gint _tmp35_; gint bottom = 0; - GdkRectangle _tmp36_ = {0}; - gint _tmp37_ = 0; - Dimensions _tmp38_ = {0}; - gint _tmp39_ = 0; - gint _tmp40_ = 0; - gint _tmp41_ = 0; - gint _tmp43_ = 0; - GdkRectangle _tmp44_ = {0}; - gint _tmp45_ = 0; - GdkRectangle _tmp46_ = {0}; - gint _tmp47_ = 0; - gint _tmp48_ = 0; - GdkRectangle _tmp49_ = {0}; - gint _tmp50_ = 0; - gint _tmp51_ = 0; + GdkRectangle _tmp36_; + gint _tmp37_; + Dimensions _tmp38_; + gint _tmp39_; + gint _tmp40_; + gint _tmp41_; + gint _tmp43_; + GdkRectangle _tmp44_; + gint _tmp45_; + GdkRectangle _tmp46_; + gint _tmp47_; + gint _tmp48_; + GdkRectangle _tmp49_; + gint _tmp50_; + gint _tmp51_; #line 573 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = zoom_state_get_zoomed_width (&(*self)); #line 573 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3406,11 +3394,11 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle _tmp4_ = zoomed_width; #line 578 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp3_ < _tmp4_) { -#line 3409 "Dimensions.c" - GdkPoint _tmp5_ = {0}; - gint _tmp6_ = 0; - Dimensions _tmp7_ = {0}; - gint _tmp8_ = 0; +#line 3397 "Dimensions.c" + GdkPoint _tmp5_; + gint _tmp6_; + Dimensions _tmp7_; + gint _tmp8_; #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp5_ = (*self).viewport_center; #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3421,11 +3409,11 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle _tmp8_ = _tmp7_.width; #line 579 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.x = _tmp6_ - (_tmp8_ / 2); -#line 3424 "Dimensions.c" +#line 3412 "Dimensions.c" } else { - gint _tmp9_ = 0; - Dimensions _tmp10_ = {0}; - gint _tmp11_ = 0; + gint _tmp9_; + Dimensions _tmp10_; + gint _tmp11_; #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = zoomed_width; #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3434,7 +3422,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle _tmp11_ = _tmp10_.width; #line 581 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.x = (_tmp9_ - _tmp11_) / 2; -#line 3437 "Dimensions.c" +#line 3425 "Dimensions.c" } #line 583 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp12_ = _result_; @@ -3444,7 +3432,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle if (_tmp13_ < 0) { #line 584 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.x = 0; -#line 3447 "Dimensions.c" +#line 3435 "Dimensions.c" } #line 586 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp14_ = (*self).viewport_dimensions; @@ -3454,11 +3442,11 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle _tmp16_ = zoomed_height; #line 586 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp15_ < _tmp16_) { -#line 3457 "Dimensions.c" - GdkPoint _tmp17_ = {0}; - gint _tmp18_ = 0; - Dimensions _tmp19_ = {0}; - gint _tmp20_ = 0; +#line 3445 "Dimensions.c" + GdkPoint _tmp17_; + gint _tmp18_; + Dimensions _tmp19_; + gint _tmp20_; #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp17_ = (*self).viewport_center; #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3469,11 +3457,11 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle _tmp20_ = _tmp19_.height; #line 587 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.y = _tmp18_ - (_tmp20_ / 2); -#line 3472 "Dimensions.c" +#line 3460 "Dimensions.c" } else { - gint _tmp21_ = 0; - Dimensions _tmp22_ = {0}; - gint _tmp23_ = 0; + gint _tmp21_; + Dimensions _tmp22_; + gint _tmp23_; #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp21_ = zoomed_height; #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3482,7 +3470,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle _tmp23_ = _tmp22_.height; #line 589 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.y = (_tmp21_ - _tmp23_) / 2; -#line 3485 "Dimensions.c" +#line 3473 "Dimensions.c" } #line 591 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp24_ = _result_; @@ -3492,7 +3480,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle if (_tmp25_ < 0) { #line 592 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.y = 0; -#line 3495 "Dimensions.c" +#line 3483 "Dimensions.c" } #line 594 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp26_ = _result_; @@ -3510,13 +3498,13 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle _tmp31_ = zoomed_width; #line 595 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp30_ > _tmp31_) { -#line 3513 "Dimensions.c" - gint _tmp32_ = 0; +#line 3501 "Dimensions.c" + gint _tmp32_; #line 596 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp32_ = zoomed_width; #line 596 "/home/jens/Source/shotwell/src/Dimensions.vala" right = _tmp32_; -#line 3519 "Dimensions.c" +#line 3507 "Dimensions.c" } #line 597 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp33_ = right; @@ -3542,13 +3530,13 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle _tmp41_ = zoomed_height; #line 600 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp40_ > _tmp41_) { -#line 3545 "Dimensions.c" - gint _tmp42_ = 0; +#line 3533 "Dimensions.c" + gint _tmp42_; #line 601 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp42_ = zoomed_height; #line 601 "/home/jens/Source/shotwell/src/Dimensions.vala" bottom = _tmp42_; -#line 3551 "Dimensions.c" +#line 3539 "Dimensions.c" } #line 602 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp43_ = bottom; @@ -3578,7 +3566,7 @@ void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle *result = _result_; #line 607 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 3581 "Dimensions.c" +#line 3569 "Dimensions.c" } @@ -3586,22 +3574,22 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* GdkRectangle wrt_content = {0}; GdkRectangle _tmp0_ = {0}; GdkRectangle _result_ = {0}; - Dimensions _tmp1_ = {0}; - gint _tmp2_ = 0; - GdkRectangle _tmp3_ = {0}; - gint _tmp4_ = 0; - GdkRectangle _tmp5_ = {0}; - gint _tmp6_ = 0; - Dimensions _tmp7_ = {0}; - gint _tmp8_ = 0; - GdkRectangle _tmp9_ = {0}; - gint _tmp10_ = 0; - GdkRectangle _tmp11_ = {0}; - gint _tmp12_ = 0; - GdkRectangle _tmp13_ = {0}; - gint _tmp14_ = 0; - GdkRectangle _tmp15_ = {0}; - gint _tmp16_ = 0; + Dimensions _tmp1_; + gint _tmp2_; + GdkRectangle _tmp3_; + gint _tmp4_; + GdkRectangle _tmp5_; + gint _tmp6_; + Dimensions _tmp7_; + gint _tmp8_; + GdkRectangle _tmp9_; + gint _tmp10_; + GdkRectangle _tmp11_; + gint _tmp12_; + GdkRectangle _tmp13_; + gint _tmp14_; + GdkRectangle _tmp15_; + gint _tmp16_; #line 613 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_get_viewing_rectangle_wrt_content (&(*self), &_tmp0_); #line 613 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3626,7 +3614,7 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* if (_tmp6_ < 0) { #line 618 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.x = 0; -#line 3629 "Dimensions.c" +#line 3617 "Dimensions.c" } #line 619 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = (*self).viewport_dimensions; @@ -3646,7 +3634,7 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* if (_tmp12_ < 0) { #line 621 "/home/jens/Source/shotwell/src/Dimensions.vala" _result_.y = 0; -#line 3649 "Dimensions.c" +#line 3637 "Dimensions.c" } #line 622 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp13_ = wrt_content; @@ -3664,69 +3652,69 @@ void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* *result = _result_; #line 625 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 3667 "Dimensions.c" +#line 3655 "Dimensions.c" } void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* for_pixbuf, GdkRectangle* result) { gdouble zoomed_width = 0.0; - gint _tmp0_ = 0; + gint _tmp0_; gdouble zoomed_height = 0.0; - gint _tmp1_ = 0; + gint _tmp1_; gdouble horiz_scale = 0.0; - GdkPixbuf* _tmp2_ = NULL; - gint _tmp3_ = 0; - gint _tmp4_ = 0; + GdkPixbuf* _tmp2_; + gint _tmp3_; + gint _tmp4_; gdouble vert_scale = 0.0; - GdkPixbuf* _tmp5_ = NULL; - gint _tmp6_ = 0; - gint _tmp7_ = 0; + GdkPixbuf* _tmp5_; + gint _tmp6_; + gint _tmp7_; gdouble scale = 0.0; GdkRectangle viewing_rectangle = {0}; GdkRectangle _tmp8_ = {0}; GdkRectangle _result_ = {0}; - GdkRectangle _tmp9_ = {0}; - gint _tmp10_ = 0; - GdkRectangle _tmp11_ = {0}; - gint _tmp12_ = 0; - GdkPixbuf* _tmp13_ = NULL; - gint _tmp14_ = 0; - gint _tmp15_ = 0; - gint _tmp16_ = 0; - GdkRectangle _tmp17_ = {0}; - gint _tmp18_ = 0; - GdkRectangle _tmp19_ = {0}; - gint _tmp20_ = 0; - GdkPixbuf* _tmp21_ = NULL; - gint _tmp22_ = 0; - gint _tmp23_ = 0; - gint _tmp24_ = 0; + GdkRectangle _tmp9_; + gint _tmp10_; + GdkRectangle _tmp11_; + gint _tmp12_; + GdkPixbuf* _tmp13_; + gint _tmp14_; + gint _tmp15_; + gint _tmp16_; + GdkRectangle _tmp17_; + gint _tmp18_; + GdkRectangle _tmp19_; + gint _tmp20_; + GdkPixbuf* _tmp21_; + gint _tmp22_; + gint _tmp23_; + gint _tmp24_; gint right = 0; - GdkRectangle _tmp25_ = {0}; - gint _tmp26_ = 0; - GdkRectangle _tmp27_ = {0}; - gint _tmp28_ = 0; - gint _tmp29_ = 0; - GdkPixbuf* _tmp30_ = NULL; - gint _tmp31_ = 0; - gint _tmp32_ = 0; - gint _tmp33_ = 0; + GdkRectangle _tmp25_; + gint _tmp26_; + GdkRectangle _tmp27_; + gint _tmp28_; + gint _tmp29_; + GdkPixbuf* _tmp30_; + gint _tmp31_; + gint _tmp32_; + gint _tmp33_; gint bottom = 0; - GdkRectangle _tmp34_ = {0}; - gint _tmp35_ = 0; - GdkRectangle _tmp36_ = {0}; - gint _tmp37_ = 0; - gint _tmp38_ = 0; - GdkPixbuf* _tmp39_ = NULL; - gint _tmp40_ = 0; - gint _tmp41_ = 0; - gint _tmp42_ = 0; - gint _tmp43_ = 0; - GdkRectangle _tmp44_ = {0}; - gint _tmp45_ = 0; - gint _tmp46_ = 0; - GdkRectangle _tmp47_ = {0}; - gint _tmp48_ = 0; + GdkRectangle _tmp34_; + gint _tmp35_; + GdkRectangle _tmp36_; + gint _tmp37_; + gint _tmp38_; + GdkPixbuf* _tmp39_; + gint _tmp40_; + gint _tmp41_; + gint _tmp42_; + gint _tmp43_; + GdkRectangle _tmp44_; + gint _tmp45_; + gint _tmp46_; + GdkRectangle _tmp47_; + gint _tmp48_; #line 629 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_if_fail (GDK_IS_PIXBUF (for_pixbuf)); #line 630 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3865,28 +3853,28 @@ void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* fo *result = _result_; #line 651 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 3868 "Dimensions.c" +#line 3856 "Dimensions.c" } gdouble zoom_state_get_zoom_factor (ZoomState *self) { gdouble result = 0.0; - gdouble _tmp0_ = 0.0; + gdouble _tmp0_; #line 656 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).zoom_factor; #line 656 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 656 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 3881 "Dimensions.c" +#line 3869 "Dimensions.c" } gint zoom_state_get_zoomed_width (ZoomState *self) { gint result = 0; - Dimensions _tmp0_ = {0}; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; + Dimensions _tmp0_; + gint _tmp1_; + gdouble _tmp2_; #line 660 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).content_dimensions; #line 660 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3897,15 +3885,15 @@ gint zoom_state_get_zoomed_width (ZoomState *self) { result = (gint) (_tmp1_ * _tmp2_); #line 660 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 3900 "Dimensions.c" +#line 3888 "Dimensions.c" } gint zoom_state_get_zoomed_height (ZoomState *self) { gint result = 0; - Dimensions _tmp0_ = {0}; - gint _tmp1_ = 0; - gdouble _tmp2_ = 0.0; + Dimensions _tmp0_; + gint _tmp1_; + gdouble _tmp2_; #line 664 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).content_dimensions; #line 664 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3916,60 +3904,60 @@ gint zoom_state_get_zoomed_height (ZoomState *self) { result = (gint) (_tmp1_ * _tmp2_); #line 664 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 3919 "Dimensions.c" +#line 3907 "Dimensions.c" } void zoom_state_get_viewport_center (ZoomState *self, GdkPoint* result) { - GdkPoint _tmp0_ = {0}; + GdkPoint _tmp0_; #line 668 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).viewport_center; #line 668 "/home/jens/Source/shotwell/src/Dimensions.vala" *result = _tmp0_; #line 668 "/home/jens/Source/shotwell/src/Dimensions.vala" return; -#line 3931 "Dimensions.c" +#line 3919 "Dimensions.c" } gchar* zoom_state_to_string (ZoomState *self) { gchar* result = NULL; gchar* named_modes = NULL; - gchar* _tmp0_ = NULL; - gboolean _tmp1_ = FALSE; - gboolean _tmp6_ = FALSE; - gboolean _tmp11_ = FALSE; - gboolean _tmp16_ = FALSE; - const gchar* _tmp21_ = NULL; + gchar* _tmp0_; + gboolean _tmp1_; + gboolean _tmp6_; + gboolean _tmp11_; + gboolean _tmp16_; + const gchar* _tmp21_; GdkRectangle viewing_rect = {0}; GdkRectangle _tmp23_ = {0}; - Dimensions _tmp24_ = {0}; - gint _tmp25_ = 0; - Dimensions _tmp26_ = {0}; - gint _tmp27_ = 0; - Dimensions _tmp28_ = {0}; - gint _tmp29_ = 0; - Dimensions _tmp30_ = {0}; - gint _tmp31_ = 0; - gdouble _tmp32_ = 0.0; - gdouble _tmp33_ = 0.0; - gdouble _tmp34_ = 0.0; - gint _tmp35_ = 0; - gint _tmp36_ = 0; - const gchar* _tmp37_ = NULL; - GdkRectangle _tmp38_ = {0}; - gint _tmp39_ = 0; - GdkRectangle _tmp40_ = {0}; - gint _tmp41_ = 0; - GdkRectangle _tmp42_ = {0}; - gint _tmp43_ = 0; - GdkRectangle _tmp44_ = {0}; - gint _tmp45_ = 0; - GdkPoint _tmp46_ = {0}; - gint _tmp47_ = 0; - GdkPoint _tmp48_ = {0}; - gint _tmp49_ = 0; - gchar* _tmp50_ = NULL; + Dimensions _tmp24_; + gint _tmp25_; + Dimensions _tmp26_; + gint _tmp27_; + Dimensions _tmp28_; + gint _tmp29_; + Dimensions _tmp30_; + gint _tmp31_; + gdouble _tmp32_; + gdouble _tmp33_; + gdouble _tmp34_; + gint _tmp35_; + gint _tmp36_; + const gchar* _tmp37_; + GdkRectangle _tmp38_; + gint _tmp39_; + GdkRectangle _tmp40_; + gint _tmp41_; + GdkRectangle _tmp42_; + gint _tmp43_; + GdkRectangle _tmp44_; + gint _tmp45_; + GdkPoint _tmp46_; + gint _tmp47_; + GdkPoint _tmp48_; + gint _tmp49_; + gchar* _tmp50_; #line 672 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = g_strdup (""); #line 672 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -3978,22 +3966,22 @@ gchar* zoom_state_to_string (ZoomState *self) { _tmp1_ = zoom_state_is_min (&(*self)); #line 673 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp1_) { -#line 3981 "Dimensions.c" +#line 3969 "Dimensions.c" const gchar* _tmp2_ = NULL; - const gchar* _tmp3_ = NULL; - const gchar* _tmp4_ = NULL; - gchar* _tmp5_ = NULL; + const gchar* _tmp3_; + const gchar* _tmp4_; + gchar* _tmp5_; #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = named_modes; #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" if (g_strcmp0 (_tmp3_, "") == 0) { #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = "MIN"; -#line 3992 "Dimensions.c" +#line 3980 "Dimensions.c" } else { #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp2_ = ", MIN"; -#line 3996 "Dimensions.c" +#line 3984 "Dimensions.c" } #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp4_ = named_modes; @@ -4003,28 +3991,28 @@ gchar* zoom_state_to_string (ZoomState *self) { _g_free0 (named_modes); #line 674 "/home/jens/Source/shotwell/src/Dimensions.vala" named_modes = _tmp5_; -#line 4006 "Dimensions.c" +#line 3994 "Dimensions.c" } #line 675 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = zoom_state_is_default (&(*self)); #line 675 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp6_) { -#line 4012 "Dimensions.c" +#line 4000 "Dimensions.c" const gchar* _tmp7_ = NULL; - const gchar* _tmp8_ = NULL; - const gchar* _tmp9_ = NULL; - gchar* _tmp10_ = NULL; + const gchar* _tmp8_; + const gchar* _tmp9_; + gchar* _tmp10_; #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp8_ = named_modes; #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" if (g_strcmp0 (_tmp8_, "") == 0) { #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = "DEFAULT"; -#line 4023 "Dimensions.c" +#line 4011 "Dimensions.c" } else { #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp7_ = ", DEFAULT"; -#line 4027 "Dimensions.c" +#line 4015 "Dimensions.c" } #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = named_modes; @@ -4034,28 +4022,28 @@ gchar* zoom_state_to_string (ZoomState *self) { _g_free0 (named_modes); #line 676 "/home/jens/Source/shotwell/src/Dimensions.vala" named_modes = _tmp10_; -#line 4037 "Dimensions.c" +#line 4025 "Dimensions.c" } #line 677 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp11_ = zoom_state_is_isomorphic (&(*self)); #line 677 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp11_) { -#line 4043 "Dimensions.c" +#line 4031 "Dimensions.c" const gchar* _tmp12_ = NULL; - const gchar* _tmp13_ = NULL; - const gchar* _tmp14_ = NULL; - gchar* _tmp15_ = NULL; + const gchar* _tmp13_; + const gchar* _tmp14_; + gchar* _tmp15_; #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp13_ = named_modes; #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" if (g_strcmp0 (_tmp13_, "") == 0) { #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp12_ = "ISOMORPHIC"; -#line 4054 "Dimensions.c" +#line 4042 "Dimensions.c" } else { #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp12_ = ", ISOMORPHIC"; -#line 4058 "Dimensions.c" +#line 4046 "Dimensions.c" } #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp14_ = named_modes; @@ -4065,28 +4053,28 @@ gchar* zoom_state_to_string (ZoomState *self) { _g_free0 (named_modes); #line 678 "/home/jens/Source/shotwell/src/Dimensions.vala" named_modes = _tmp15_; -#line 4068 "Dimensions.c" +#line 4056 "Dimensions.c" } #line 679 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp16_ = zoom_state_is_max (&(*self)); #line 679 "/home/jens/Source/shotwell/src/Dimensions.vala" if (_tmp16_) { -#line 4074 "Dimensions.c" +#line 4062 "Dimensions.c" const gchar* _tmp17_ = NULL; - const gchar* _tmp18_ = NULL; - const gchar* _tmp19_ = NULL; - gchar* _tmp20_ = NULL; + const gchar* _tmp18_; + const gchar* _tmp19_; + gchar* _tmp20_; #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp18_ = named_modes; #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" if (g_strcmp0 (_tmp18_, "") == 0) { #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp17_ = "MAX"; -#line 4085 "Dimensions.c" +#line 4073 "Dimensions.c" } else { #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp17_ = ", MAX"; -#line 4089 "Dimensions.c" +#line 4077 "Dimensions.c" } #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp19_ = named_modes; @@ -4096,21 +4084,21 @@ gchar* zoom_state_to_string (ZoomState *self) { _g_free0 (named_modes); #line 680 "/home/jens/Source/shotwell/src/Dimensions.vala" named_modes = _tmp20_; -#line 4099 "Dimensions.c" +#line 4087 "Dimensions.c" } #line 681 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp21_ = named_modes; #line 681 "/home/jens/Source/shotwell/src/Dimensions.vala" if (g_strcmp0 (_tmp21_, "") == 0) { -#line 4105 "Dimensions.c" - gchar* _tmp22_ = NULL; +#line 4093 "Dimensions.c" + gchar* _tmp22_; #line 682 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp22_ = g_strdup ("(none)"); #line 682 "/home/jens/Source/shotwell/src/Dimensions.vala" _g_free0 (named_modes); #line 682 "/home/jens/Source/shotwell/src/Dimensions.vala" named_modes = _tmp22_; -#line 4113 "Dimensions.c" +#line 4101 "Dimensions.c" } #line 684 "/home/jens/Source/shotwell/src/Dimensions.vala" zoom_state_get_viewing_rectangle_wrt_content (&(*self), &_tmp23_); @@ -4184,14 +4172,14 @@ gchar* zoom_state_to_string (ZoomState *self) { _g_free0 (named_modes); #line 686 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4179 "Dimensions.c" +#line 4167 "Dimensions.c" } gboolean zoom_state_is_min (ZoomState *self) { gboolean result = FALSE; - gdouble _tmp0_ = 0.0; - gdouble _tmp1_ = 0.0; + gdouble _tmp0_; + gdouble _tmp1_; #line 698 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).zoom_factor; #line 698 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -4200,27 +4188,27 @@ gboolean zoom_state_is_min (ZoomState *self) { result = _tmp0_ == _tmp1_; #line 698 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4195 "Dimensions.c" +#line 4183 "Dimensions.c" } gboolean zoom_state_is_default (ZoomState *self) { gboolean result = FALSE; - gboolean _tmp0_ = FALSE; + gboolean _tmp0_; #line 702 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = zoom_state_is_min (&(*self)); #line 702 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_; #line 702 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4208 "Dimensions.c" +#line 4196 "Dimensions.c" } gboolean zoom_state_is_max (ZoomState *self) { gboolean result = FALSE; - gdouble _tmp0_ = 0.0; - gdouble _tmp1_ = 0.0; + gdouble _tmp0_; + gdouble _tmp1_; #line 706 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).zoom_factor; #line 706 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -4229,50 +4217,50 @@ gboolean zoom_state_is_max (ZoomState *self) { result = _tmp0_ == _tmp1_; #line 706 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4224 "Dimensions.c" +#line 4212 "Dimensions.c" } gboolean zoom_state_is_isomorphic (ZoomState *self) { gboolean result = FALSE; - gdouble _tmp0_ = 0.0; + gdouble _tmp0_; #line 710 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp0_ = (*self).zoom_factor; #line 710 "/home/jens/Source/shotwell/src/Dimensions.vala" result = _tmp0_ == 1.0; #line 710 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4237 "Dimensions.c" +#line 4225 "Dimensions.c" } gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { gboolean result = FALSE; - ZoomState _tmp0_ = {0}; - Dimensions _tmp1_ = {0}; - gboolean _tmp2_ = FALSE; - ZoomState _tmp3_ = {0}; - Dimensions _tmp4_ = {0}; - gboolean _tmp5_ = FALSE; - gdouble _tmp6_ = 0.0; - ZoomState _tmp7_ = {0}; - gdouble _tmp8_ = 0.0; - gdouble _tmp9_ = 0.0; - ZoomState _tmp10_ = {0}; - gdouble _tmp11_ = 0.0; - gdouble _tmp12_ = 0.0; - ZoomState _tmp13_ = {0}; - gdouble _tmp14_ = 0.0; - GdkPoint _tmp15_ = {0}; - gint _tmp16_ = 0; - ZoomState _tmp17_ = {0}; - GdkPoint _tmp18_ = {0}; - gint _tmp19_ = 0; - GdkPoint _tmp20_ = {0}; - gint _tmp21_ = 0; - ZoomState _tmp22_ = {0}; - GdkPoint _tmp23_ = {0}; - gint _tmp24_ = 0; + ZoomState _tmp0_; + Dimensions _tmp1_; + gboolean _tmp2_; + ZoomState _tmp3_; + Dimensions _tmp4_; + gboolean _tmp5_; + gdouble _tmp6_; + ZoomState _tmp7_; + gdouble _tmp8_; + gdouble _tmp9_; + ZoomState _tmp10_; + gdouble _tmp11_; + gdouble _tmp12_; + ZoomState _tmp13_; + gdouble _tmp14_; + GdkPoint _tmp15_; + gint _tmp16_; + ZoomState _tmp17_; + GdkPoint _tmp18_; + gint _tmp19_; + GdkPoint _tmp20_; + gint _tmp21_; + ZoomState _tmp22_; + GdkPoint _tmp23_; + gint _tmp24_; #line 713 "/home/jens/Source/shotwell/src/Dimensions.vala" g_return_val_if_fail (other != NULL, FALSE); #line 714 "/home/jens/Source/shotwell/src/Dimensions.vala" @@ -4287,7 +4275,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { result = FALSE; #line 715 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4282 "Dimensions.c" +#line 4270 "Dimensions.c" } #line 716 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp3_ = *other; @@ -4301,7 +4289,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { result = FALSE; #line 717 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4296 "Dimensions.c" +#line 4284 "Dimensions.c" } #line 718 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp6_ = (*self).zoom_factor; @@ -4315,7 +4303,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { result = FALSE; #line 719 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4310 "Dimensions.c" +#line 4298 "Dimensions.c" } #line 720 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp9_ = (*self).min_factor; @@ -4329,7 +4317,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { result = FALSE; #line 721 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4324 "Dimensions.c" +#line 4312 "Dimensions.c" } #line 722 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp12_ = (*self).max_factor; @@ -4343,7 +4331,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { result = FALSE; #line 723 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4338 "Dimensions.c" +#line 4326 "Dimensions.c" } #line 724 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp15_ = (*self).viewport_center; @@ -4361,7 +4349,7 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { result = FALSE; #line 725 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4356 "Dimensions.c" +#line 4344 "Dimensions.c" } #line 726 "/home/jens/Source/shotwell/src/Dimensions.vala" _tmp20_ = (*self).viewport_center; @@ -4379,13 +4367,13 @@ gboolean zoom_state_equals (ZoomState *self, ZoomState* other) { result = FALSE; #line 727 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4374 "Dimensions.c" +#line 4362 "Dimensions.c" } #line 729 "/home/jens/Source/shotwell/src/Dimensions.vala" result = TRUE; #line 729 "/home/jens/Source/shotwell/src/Dimensions.vala" return result; -#line 4380 "Dimensions.c" +#line 4368 "Dimensions.c" } @@ -4397,14 +4385,14 @@ ZoomState* zoom_state_dup (const ZoomState* self) { memcpy (dup, self, sizeof (ZoomState)); #line 463 "/home/jens/Source/shotwell/src/Dimensions.vala" return dup; -#line 4392 "Dimensions.c" +#line 4380 "Dimensions.c" } void zoom_state_free (ZoomState* self) { #line 463 "/home/jens/Source/shotwell/src/Dimensions.vala" g_free (self); -#line 4399 "Dimensions.c" +#line 4387 "Dimensions.c" } |