summaryrefslogtreecommitdiff
path: root/src/util/image.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/util/image.c')
-rw-r--r--src/util/image.c2464
1 files changed, 1070 insertions, 1394 deletions
diff --git a/src/util/image.c b/src/util/image.c
index 324464c..5f3cbd0 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.36.6, the Vala compiler
+/* image.c generated by valac 0.40.4, the Vala compiler
* generated from image.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -8,6 +8,7 @@
*/
/* XPM */
+
#include <glib.h>
#include <glib-object.h>
#include <stdlib.h>
@@ -72,39 +73,90 @@ extern cairo_surface_t* background_surface;
cairo_surface_t* background_surface = NULL;
gboolean is_color_parsable (const gchar* spec);
-void parse_color (const gchar* spec, GdkRGBA* result);
-void fetch_color (const gchar* spec, GdkRGBA* result);
-void set_source_color_from_string (cairo_t* ctx, const gchar* spec);
+void parse_color (const gchar* spec,
+ GdkRGBA* result);
+void fetch_color (const gchar* spec,
+ GdkRGBA* result);
+void set_source_color_from_string (cairo_t* ctx,
+ const gchar* spec);
#define MIN_SCALED_WIDTH 10
#define MIN_SCALED_HEIGHT 10
GdkPixbuf* get_placeholder_pixbuf (void);
-GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up);
+GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf,
+ gint scale,
+ GdkInterpType interp,
+ gboolean scale_up);
GType dimensions_get_type (void) G_GNUC_CONST;
Dimensions* dimensions_dup (const Dimensions* self);
void dimensions_free (Dimensions* self);
-void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
-void dimensions_get_scaled (Dimensions *self, gint scale, gboolean scale_up, Dimensions* result);
-void dimensions_with_min (Dimensions *self, gint min_width, gint min_height, Dimensions* result);
-GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp);
+void dimensions_for_pixbuf (GdkPixbuf* pixbuf,
+ Dimensions* result);
+void dimensions_get_scaled (Dimensions *self,
+ gint scale,
+ gboolean scale_up,
+ Dimensions* result);
+void dimensions_with_min (Dimensions *self,
+ gint min_width,
+ gint min_height,
+ Dimensions* result);
+GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf,
+ Dimensions* resized,
+ GdkInterpType interp);
#define DEGREE (G_PI / 180.0)
-void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion);
-void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion);
+void draw_rounded_corners_filled (cairo_t* ctx,
+ Dimensions* dim,
+ GdkPoint* origin,
+ gdouble radius_proportion);
+void context_rounded_corners (cairo_t* cx,
+ Dimensions* dim,
+ GdkPoint* origin,
+ gdouble radius_proportion);
gint dimensions_minor_axis (Dimensions *self);
-guchar shift_color_byte (gint b, gint shift);
-void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha);
-gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect);
-gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b);
+guchar shift_color_byte (gint b,
+ gint shift);
+void shift_colors (GdkPixbuf* pixbuf,
+ gint red,
+ gint green,
+ gint blue,
+ gint alpha);
+gboolean coord_in_rectangle (gint x,
+ gint y,
+ GdkRectangle* rect);
+gboolean rectangles_equal (GdkRectangle* a,
+ GdkRectangle* b);
gchar* rectangle_to_string (GdkRectangle* rect);
-void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result);
-void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result);
-void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result);
-void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result);
+void clamp_rectangle (GdkRectangle* original,
+ Dimensions* max,
+ GdkRectangle* result);
+void scale_point (GdkPoint* p,
+ gdouble factor,
+ GdkPoint* result);
+void add_points (GdkPoint* p1,
+ GdkPoint* p2,
+ GdkPoint* result);
+void subtract_points (GdkPoint* p1,
+ GdkPoint* p2,
+ GdkPoint* result);
void fix_cairo_pixbuf (GdkPixbuf* pixbuf);
-void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height);
+void compute_arb_rotated_size (gdouble src_width,
+ gdouble src_height,
+ gdouble angle,
+ gdouble* dest_width,
+ gdouble* dest_height);
gdouble degrees_to_radians (gdouble theta);
-GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle);
-void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result);
-void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result);
+GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf,
+ gdouble angle);
+void rotate_point_arb (GdkPoint* source_point,
+ gint img_w,
+ gint img_h,
+ gdouble angle,
+ gboolean invert,
+ GdkPoint* result);
+void derotate_point_arb (GdkPoint* source_point,
+ gint img_w,
+ gint img_h,
+ gdouble angle,
+ GdkPoint* result);
cairo_surface_t* get_background_surface (void);
GType configuration_facade_get_type (void) G_GNUC_CONST;
GType config_facade_get_type (void) G_GNUC_CONST;
@@ -112,145 +164,150 @@ ConfigFacade* config_facade_get_instance (void);
gchar* configuration_facade_get_transparent_background_type (ConfigurationFacade* self);
gchar* configuration_facade_get_transparent_background_color (ConfigurationFacade* self);
void invalidate_transparent_background (void);
-void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
+void paint_pixmap_with_background (cairo_t* ctx,
+ GdkPixbuf* pixbuf,
+ gint x,
+ gint y);
GType box_get_type (void) G_GNUC_CONST;
Box* box_dup (const Box* self);
void box_free (Box* self);
-void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle_deg, gboolean preserve_geom, Box* result);
-void box_get_offset (Box *self, gint xofs, gint yofs, Box* result);
-void box_init (Box *self, gint left, gint top, gint right, gint bottom);
+void clamp_inside_rotated_image (Box* src,
+ gint img_w,
+ gint img_h,
+ gdouble angle_deg,
+ gboolean preserve_geom,
+ Box* result);
+void box_get_offset (Box *self,
+ gint xofs,
+ gint yofs,
+ Box* result);
+void box_init (Box *self,
+ gint left,
+ gint top,
+ gint right,
+ gint bottom);
const gchar* fallback_image_missing[103] = {"48 48 54 1 ", " c #6A6D67", ". c #6C6E69", "X c #72746F", "o c #747672", "O c #777974", "+ c #797B77", "@ c #7C7E7A", "# c #7F817C", "$ c #81837F", "% c #848682", "& c #878984", "* c #888A86", "= c #8C8D8A", "- c #8F908C", "; c #90928E", ": c #949591", "> c #969894", ", c #999B96", "< c #9C9E9A", "1 c #9FA09C", "2 c #A1A39E", "3 c #A4A6A2", "4 c #A6A9A4", "5 c #A9ABA6", "6 c #ACADA9", "7 c #AEB1AB", "8 c #B1B2AF", "9 c #B3B4B1", "0 c #B6B9B3", "q c #B9BCB6", "w c #BDBEBA", "e c #BEC2BB", "r c #C1C4BE", "t c #C5C5C2", "y c #C6C9C3", "u c #C9CCC6", "i c #CCCDCB", "p c #CED2CA", "a c #D2D6CE", "s c #D5D5D3", "d c #D7D8D5", "f c #D9D9D6", "g c #DCDCDA", "h c #DFE0DD", "j c #E0E0DE", "k c #E4E4E2", "l c #E7E8E5", "z c #E9E9E7", "x c #EDEDEC", "c c #EFF0EE", "v c #F1F1EF", "b c #F2F2F1", "n c #FFFFFF", "m c None", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmaaaaaaaaaasaisaaaaaaaaaaaaaaaaaaapppiipuuuuumm", "mannnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnym", "manbbbbbbbbbvbbvvvvxvvvbvvvvvvvvccccccxxvxvxxnym", "manbt89898888988888888888999999999999999999txnrm", "manb6======================-;;=;;;;;;;;;;=:7znrm", "manv6&%%**%*%%%%*%%****=======;==;;;;=;=;==7znem", "manv4%%%%$%%%%%%%%%%%=****=======;==-======6znwm", "manx3%%#$$$$##%#$%%%*%**==========-=--=====6znqm", "manx1$@%#$@$###%%%%=****=*===--;;----====*=5lnqm", "manx<@@@@@@@@##%$%%%%****========-==-======5kn0m", "manz<@@@+@+@@@#$%%%%%=%=%===;=:=--------=-*4kn8m", "manz>O+O+O+@@@#$$%%%%========;;=--------=*=3kn9m", "mpnl:OOOOO+@@$##%%%%%=%=====;=;;--;-----===3kn8m", "munl;OooOOO@@@#$%%%%%======;;;;;:;;;;;---==1hn7m", "munl;oXoOO+@###$%%=%=======;::;::::;;---&#+-gn7m", "mynk*XXooOO+$$#$%%%%=%===;;:;:::::;:-$#XooX-fn5m", "mynk*XXOOO@@$$$$%%=%====;::::>::;*#OXXXXXXX*dn5m", "mrnk*oOO@@@#$$$$%=====::::>>>=%@OXOooXXXooo&dn3m", "mrnj*++@$$$$**$===-;;::>>:=@Ooo@XOOoo#o#OOO=fn3m", "menj*@#$$$$$**===;;:::=%@@@@@@O@#O#Oo#o#++@;gn2m", "menj*$$$$&**===;:;=*#@@@@@@@@@@@#######o##%>gn2m", "menh*$$%**===;=*%###########%@@@###$####$%=,gn1m", "m0nj=%***=**&$$$%$$$%$$%$$$$%$$$$$$$$$$%*;:2hn<m", "m0nj****&&&$$&&$%%%%%%%%%%%%%%%%$$*$%%%*;>13gn,m", "m0ng****&&&&&&&&&&&&*%*%*%%*%******%**-:,136kz;m", "m0nh***$&&&&&&&&&&&&%**********%*$***;:,1358r7*m", "m8ng*&&&&&&&&&*$&*&&&&$=$=$=&&&&&&**=:,<11>$65mm", "m7ng*&&&&&&&&&**&&&&&&**=$-$&&&&&&*-:,1..&1wi:mm", "m7ng&&&&&&&&=$*$&&&&&***$$$$&&&***=>,1<onxsi6*mm", "m6nf*&&&&&*&$***&&&&*$*$--$-&&&%*=;,13,:ztw9%mmm", "m5nf*%&&&&&&=$=$%*&&**%*$$&&&&**=>,225;5srw%mmmm", "m4nf3*&&**&&$-$-*******%$;&&*&*->,2365+ui7$mmmmm", "m3nsfffdddsddaffssssdassgaaaassddfgjg4wu;ommmmmm", "m3nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnvq3<$.mmmmmmm", "mm2211111,<,,,,,,>>>>:::;::;----=====@mmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm", "mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm"};
-gboolean is_color_parsable (const gchar* spec) {
+gboolean
+is_color_parsable (const gchar* spec)
+{
gboolean result = FALSE;
GdkRGBA color = {0};
- const gchar* _tmp0_;
- gboolean _tmp1_;
#line 117 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (spec != NULL, FALSE);
#line 118 "/home/jens/Source/shotwell/src/util/image.vala"
memset (&color, 0, sizeof (GdkRGBA));
#line 119 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = spec;
-#line 119 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = gdk_rgba_parse (&color, _tmp0_);
-#line 119 "/home/jens/Source/shotwell/src/util/image.vala"
- result = _tmp1_;
+ result = gdk_rgba_parse (&color, spec);
#line 119 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 143 "image.c"
+#line 206 "image.c"
}
-void parse_color (const gchar* spec, GdkRGBA* result) {
- const gchar* _tmp0_;
- GdkRGBA _tmp1_ = {0};
+void
+parse_color (const gchar* spec,
+ GdkRGBA* result)
+{
+ GdkRGBA _tmp0_ = {0};
#line 122 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (spec != NULL);
#line 123 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = spec;
+ fetch_color (spec, &_tmp0_);
#line 123 "/home/jens/Source/shotwell/src/util/image.vala"
- fetch_color (_tmp0_, &_tmp1_);
-#line 123 "/home/jens/Source/shotwell/src/util/image.vala"
- *result = _tmp1_;
+ *result = _tmp0_;
#line 123 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 160 "image.c"
+#line 223 "image.c"
}
-void fetch_color (const gchar* spec, GdkRGBA* result) {
+void
+fetch_color (const gchar* spec,
+ GdkRGBA* result)
+{
GdkRGBA rgba = {0};
- const gchar* _tmp0_;
- gboolean _tmp1_;
#line 126 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (spec != NULL);
#line 127 "/home/jens/Source/shotwell/src/util/image.vala"
memset (&rgba, 0, sizeof (GdkRGBA));
#line 128 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = spec;
-#line 128 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = gdk_rgba_parse (&rgba, _tmp0_);
-#line 128 "/home/jens/Source/shotwell/src/util/image.vala"
- if (!_tmp1_) {
-#line 178 "image.c"
- const gchar* _tmp2_;
+ if (!gdk_rgba_parse (&rgba, spec)) {
#line 129 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = spec;
-#line 129 "/home/jens/Source/shotwell/src/util/image.vala"
- g_error ("image.vala:129: Can't parse color %s", _tmp2_);
-#line 184 "image.c"
+ g_error ("image.vala:129: Can't parse color %s", spec);
+#line 240 "image.c"
}
#line 131 "/home/jens/Source/shotwell/src/util/image.vala"
*result = rgba;
#line 131 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 190 "image.c"
+#line 246 "image.c"
}
-void set_source_color_from_string (cairo_t* ctx, const gchar* spec) {
+void
+set_source_color_from_string (cairo_t* ctx,
+ const gchar* spec)
+{
GdkRGBA rgba = {0};
- const gchar* _tmp0_;
- GdkRGBA _tmp1_ = {0};
- cairo_t* _tmp2_;
+ GdkRGBA _tmp0_ = {0};
+ GdkRGBA _tmp1_;
+ gdouble _tmp2_;
GdkRGBA _tmp3_;
gdouble _tmp4_;
GdkRGBA _tmp5_;
gdouble _tmp6_;
GdkRGBA _tmp7_;
gdouble _tmp8_;
- GdkRGBA _tmp9_;
- gdouble _tmp10_;
#line 134 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (ctx != NULL);
#line 134 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (spec != NULL);
#line 135 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = spec;
-#line 135 "/home/jens/Source/shotwell/src/util/image.vala"
- fetch_color (_tmp0_, &_tmp1_);
+ fetch_color (spec, &_tmp0_);
#line 135 "/home/jens/Source/shotwell/src/util/image.vala"
- rgba = _tmp1_;
+ rgba = _tmp0_;
#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = ctx;
+ _tmp1_ = rgba;
+#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
+ _tmp2_ = _tmp1_.red;
#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = rgba;
#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = _tmp3_.red;
+ _tmp4_ = _tmp3_.green;
#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = rgba;
#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = _tmp5_.green;
+ _tmp6_ = _tmp5_.blue;
#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = rgba;
#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = _tmp7_.blue;
-#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = rgba;
+ _tmp8_ = _tmp7_.alpha;
#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = _tmp9_.alpha;
-#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_set_source_rgba (_tmp2_, _tmp4_, _tmp6_, _tmp8_, _tmp10_);
-#line 237 "image.c"
+ cairo_set_source_rgba (ctx, _tmp2_, _tmp4_, _tmp6_, _tmp8_);
+#line 290 "image.c"
}
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
#line 147 "/home/jens/Source/shotwell/src/util/image.vala"
return self ? g_object_ref (self) : NULL;
-#line 244 "image.c"
+#line 299 "image.c"
}
-GdkPixbuf* get_placeholder_pixbuf (void) {
+GdkPixbuf*
+get_placeholder_pixbuf (void)
+{
GdkPixbuf* result = NULL;
GdkPixbuf* pixbuf = NULL;
GError * _inner_error_ = NULL;
#line 144 "/home/jens/Source/shotwell/src/util/image.vala"
pixbuf = NULL;
-#line 254 "image.c"
+#line 311 "image.c"
{
GtkIconTheme* icon_theme = NULL;
GtkIconTheme* _tmp0_;
@@ -272,7 +329,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 148 "/home/jens/Source/shotwell/src/util/image.vala"
_g_object_unref0 (icon_theme);
-#line 276 "image.c"
+#line 333 "image.c"
goto __catch4_g_error;
}
#line 148 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -287,7 +344,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
_g_object_unref0 (_tmp2_);
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
_g_object_unref0 (icon_theme);
-#line 291 "image.c"
+#line 348 "image.c"
}
goto __finally4;
__catch4_g_error:
@@ -314,7 +371,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
g_warning ("image.vala:152: Could not load icon from theme: %s", _tmp7_);
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
_g_error_free0 (_error_);
-#line 318 "image.c"
+#line 375 "image.c"
}
__finally4:
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -327,232 +384,213 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
g_clear_error (&_inner_error_);
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
return NULL;
-#line 331 "image.c"
+#line 388 "image.c"
}
#line 155 "/home/jens/Source/shotwell/src/util/image.vala"
result = pixbuf;
#line 155 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 337 "image.c"
+#line 394 "image.c"
}
-GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up) {
+GdkPixbuf*
+scale_pixbuf (GdkPixbuf* pixbuf,
+ gint scale,
+ GdkInterpType interp,
+ gboolean scale_up)
+{
GdkPixbuf* result = NULL;
Dimensions original = {0};
- GdkPixbuf* _tmp0_;
- Dimensions _tmp1_ = {0};
+ Dimensions _tmp0_ = {0};
Dimensions scaled = {0};
- gint _tmp2_;
- gboolean _tmp3_;
- Dimensions _tmp4_ = {0};
- gboolean _tmp5_ = FALSE;
- Dimensions _tmp6_;
- gint _tmp7_;
- Dimensions _tmp8_;
- gint _tmp9_;
- Dimensions _tmp16_ = {0};
+ Dimensions _tmp1_ = {0};
+ gboolean _tmp2_ = FALSE;
+ Dimensions _tmp3_;
+ gint _tmp4_;
+ Dimensions _tmp5_;
+ gint _tmp6_;
+ Dimensions _tmp12_ = {0};
+ Dimensions _tmp13_;
+ gint _tmp14_;
+ Dimensions _tmp15_;
+ gint _tmp16_;
GdkPixbuf* _tmp17_;
- Dimensions _tmp18_;
- gint _tmp19_;
- Dimensions _tmp20_;
- gint _tmp21_;
- GdkInterpType _tmp22_;
- GdkPixbuf* _tmp23_;
#line 158 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
#line 159 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = pixbuf;
-#line 159 "/home/jens/Source/shotwell/src/util/image.vala"
- dimensions_for_pixbuf (_tmp0_, &_tmp1_);
+ dimensions_for_pixbuf (pixbuf, &_tmp0_);
#line 159 "/home/jens/Source/shotwell/src/util/image.vala"
- original = _tmp1_;
-#line 160 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = scale;
-#line 160 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = scale_up;
+ original = _tmp0_;
#line 160 "/home/jens/Source/shotwell/src/util/image.vala"
- dimensions_get_scaled (&original, _tmp2_, _tmp3_, &_tmp4_);
+ dimensions_get_scaled (&original, scale, scale_up, &_tmp1_);
#line 160 "/home/jens/Source/shotwell/src/util/image.vala"
- scaled = _tmp4_;
+ scaled = _tmp1_;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = original;
+ _tmp3_ = original;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = _tmp6_.width;
+ _tmp4_ = _tmp3_.width;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = scaled;
+ _tmp5_ = scaled;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = _tmp8_.width;
+ _tmp6_ = _tmp5_.width;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp7_ == _tmp9_) {
-#line 389 "image.c"
- Dimensions _tmp10_;
- gint _tmp11_;
- Dimensions _tmp12_;
- gint _tmp13_;
+ if (_tmp4_ == _tmp6_) {
+#line 440 "image.c"
+ Dimensions _tmp7_;
+ gint _tmp8_;
+ Dimensions _tmp9_;
+ gint _tmp10_;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = original;
+ _tmp7_ = original;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = _tmp10_.height;
+ _tmp8_ = _tmp7_.height;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = scaled;
+ _tmp9_ = scaled;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = _tmp12_.height;
+ _tmp10_ = _tmp9_.height;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = _tmp11_ == _tmp13_;
-#line 404 "image.c"
+ _tmp2_ = _tmp8_ == _tmp10_;
+#line 455 "image.c"
} else {
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = FALSE;
-#line 408 "image.c"
+ _tmp2_ = FALSE;
+#line 459 "image.c"
}
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp5_) {
-#line 412 "image.c"
- GdkPixbuf* _tmp14_;
- GdkPixbuf* _tmp15_;
-#line 162 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = pixbuf;
+ if (_tmp2_) {
+#line 463 "image.c"
+ GdkPixbuf* _tmp11_;
#line 162 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = _g_object_ref0 (_tmp14_);
+ _tmp11_ = _g_object_ref0 (pixbuf);
#line 162 "/home/jens/Source/shotwell/src/util/image.vala"
- result = _tmp15_;
+ result = _tmp11_;
#line 162 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 423 "image.c"
+#line 471 "image.c"
}
#line 165 "/home/jens/Source/shotwell/src/util/image.vala"
- dimensions_with_min (&scaled, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp16_);
+ dimensions_with_min (&scaled, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp12_);
#line 165 "/home/jens/Source/shotwell/src/util/image.vala"
- scaled = _tmp16_;
-#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = pixbuf;
+ scaled = _tmp12_;
#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = scaled;
+ _tmp13_ = scaled;
#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = _tmp18_.width;
+ _tmp14_ = _tmp13_.width;
#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp20_ = scaled;
+ _tmp15_ = scaled;
#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp21_ = _tmp20_.height;
-#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp22_ = interp;
+ _tmp16_ = _tmp15_.height;
#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp23_ = gdk_pixbuf_scale_simple (_tmp17_, _tmp19_, _tmp21_, _tmp22_);
+ _tmp17_ = gdk_pixbuf_scale_simple (pixbuf, _tmp14_, _tmp16_, interp);
#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
- result = _tmp23_;
+ result = _tmp17_;
#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 447 "image.c"
+#line 491 "image.c"
}
-GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp) {
+GdkPixbuf*
+resize_pixbuf (GdkPixbuf* pixbuf,
+ Dimensions* resized,
+ GdkInterpType interp)
+{
GdkPixbuf* result = NULL;
Dimensions original = {0};
- GdkPixbuf* _tmp0_;
- Dimensions _tmp1_ = {0};
- gboolean _tmp2_ = FALSE;
- Dimensions _tmp3_;
- gint _tmp4_;
- Dimensions _tmp5_;
- gint _tmp6_;
- Dimensions _tmp13_ = {0};
- GdkPixbuf* _tmp14_;
- Dimensions _tmp15_;
- gint _tmp16_;
- Dimensions _tmp17_;
- gint _tmp18_;
- GdkInterpType _tmp19_;
- GdkPixbuf* _tmp20_;
+ Dimensions _tmp0_ = {0};
+ gboolean _tmp1_ = FALSE;
+ Dimensions _tmp2_;
+ gint _tmp3_;
+ Dimensions _tmp4_;
+ gint _tmp5_;
+ Dimensions _tmp11_ = {0};
+ Dimensions _tmp12_;
+ gint _tmp13_;
+ Dimensions _tmp14_;
+ gint _tmp15_;
+ GdkPixbuf* _tmp16_;
#line 170 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (GDK_IS_PIXBUF (pixbuf), NULL);
#line 170 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (resized != NULL, NULL);
#line 171 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = pixbuf;
+ dimensions_for_pixbuf (pixbuf, &_tmp0_);
#line 171 "/home/jens/Source/shotwell/src/util/image.vala"
- dimensions_for_pixbuf (_tmp0_, &_tmp1_);
-#line 171 "/home/jens/Source/shotwell/src/util/image.vala"
- original = _tmp1_;
+ original = _tmp0_;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = original;
+ _tmp2_ = original;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = _tmp3_.width;
+ _tmp3_ = _tmp2_.width;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = *resized;
+ _tmp4_ = *resized;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = _tmp5_.width;
+ _tmp5_ = _tmp4_.width;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp4_ == _tmp6_) {
-#line 489 "image.c"
- Dimensions _tmp7_;
- gint _tmp8_;
- Dimensions _tmp9_;
- gint _tmp10_;
+ if (_tmp3_ == _tmp5_) {
+#line 532 "image.c"
+ Dimensions _tmp6_;
+ gint _tmp7_;
+ Dimensions _tmp8_;
+ gint _tmp9_;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = original;
+ _tmp6_ = original;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = _tmp7_.height;
+ _tmp7_ = _tmp6_.height;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = *resized;
+ _tmp8_ = *resized;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = _tmp9_.height;
+ _tmp9_ = _tmp8_.height;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = _tmp8_ == _tmp10_;
-#line 504 "image.c"
+ _tmp1_ = _tmp7_ == _tmp9_;
+#line 547 "image.c"
} else {
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = FALSE;
-#line 508 "image.c"
+ _tmp1_ = FALSE;
+#line 551 "image.c"
}
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp2_) {
-#line 512 "image.c"
- GdkPixbuf* _tmp11_;
- GdkPixbuf* _tmp12_;
-#line 173 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = pixbuf;
+ if (_tmp1_) {
+#line 555 "image.c"
+ GdkPixbuf* _tmp10_;
#line 173 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = _g_object_ref0 (_tmp11_);
+ _tmp10_ = _g_object_ref0 (pixbuf);
#line 173 "/home/jens/Source/shotwell/src/util/image.vala"
- result = _tmp12_;
+ result = _tmp10_;
#line 173 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 523 "image.c"
+#line 563 "image.c"
}
#line 176 "/home/jens/Source/shotwell/src/util/image.vala"
- dimensions_with_min (resized, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp13_);
+ dimensions_with_min (resized, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp11_);
#line 176 "/home/jens/Source/shotwell/src/util/image.vala"
- *resized = _tmp13_;
+ *resized = _tmp11_;
#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = pixbuf;
+ _tmp12_ = *resized;
#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = *resized;
-#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = _tmp15_.width;
-#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = *resized;
+ _tmp13_ = _tmp12_.width;
#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = _tmp17_.height;
+ _tmp14_ = *resized;
#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = interp;
+ _tmp15_ = _tmp14_.height;
#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp20_ = gdk_pixbuf_scale_simple (_tmp14_, _tmp16_, _tmp18_, _tmp19_);
+ _tmp16_ = gdk_pixbuf_scale_simple (pixbuf, _tmp13_, _tmp15_, interp);
#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
- result = _tmp20_;
+ result = _tmp16_;
#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 547 "image.c"
+#line 583 "image.c"
}
-void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) {
- cairo_t* _tmp0_;
- Dimensions _tmp1_;
- GdkPoint _tmp2_;
- gdouble _tmp3_;
- cairo_t* _tmp4_;
+void
+draw_rounded_corners_filled (cairo_t* ctx,
+ Dimensions* dim,
+ GdkPoint* origin,
+ gdouble radius_proportion)
+{
+ Dimensions _tmp0_;
+ GdkPoint _tmp1_;
#line 183 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (ctx != NULL);
#line 183 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -560,51 +598,40 @@ void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origi
#line 183 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (origin != NULL);
#line 185 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = ctx;
+ _tmp0_ = *dim;
#line 185 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = *dim;
-#line 185 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = *origin;
+ _tmp1_ = *origin;
#line 185 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = radius_proportion;
-#line 185 "/home/jens/Source/shotwell/src/util/image.vala"
- context_rounded_corners (_tmp0_, &_tmp1_, &_tmp2_, _tmp3_);
-#line 186 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = ctx;
+ context_rounded_corners (ctx, &_tmp0_, &_tmp1_, radius_proportion);
#line 186 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_paint (_tmp4_);
-#line 577 "image.c"
+ cairo_paint (ctx);
+#line 609 "image.c"
}
-void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) {
- gdouble _tmp0_;
- gdouble _tmp1_;
+void
+context_rounded_corners (cairo_t* cx,
+ Dimensions* dim,
+ GdkPoint* origin,
+ gdouble radius_proportion)
+{
gdouble left = 0.0;
+ GdkPoint _tmp0_;
+ gint _tmp1_;
+ gdouble top = 0.0;
GdkPoint _tmp2_;
gint _tmp3_;
- gdouble top = 0.0;
+ gdouble right = 0.0;
GdkPoint _tmp4_;
gint _tmp5_;
- gdouble right = 0.0;
- GdkPoint _tmp6_;
+ Dimensions _tmp6_;
gint _tmp7_;
- Dimensions _tmp8_;
- gint _tmp9_;
gdouble bottom = 0.0;
- GdkPoint _tmp10_;
+ GdkPoint _tmp8_;
+ gint _tmp9_;
+ Dimensions _tmp10_;
gint _tmp11_;
- Dimensions _tmp12_;
- gint _tmp13_;
gdouble radius = 0.0;
- gint _tmp14_;
- gdouble _tmp15_;
- cairo_t* _tmp16_;
- cairo_t* _tmp17_;
- cairo_t* _tmp18_;
- cairo_t* _tmp19_;
- cairo_t* _tmp20_;
- cairo_t* _tmp21_;
#line 189 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (cx != NULL);
#line 189 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -612,490 +639,367 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
#line 189 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (origin != NULL);
#line 192 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = radius_proportion;
-#line 192 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = CLAMP (_tmp0_, 2.0, 100.0);
-#line 192 "/home/jens/Source/shotwell/src/util/image.vala"
- radius_proportion = _tmp1_;
+ radius_proportion = CLAMP (radius_proportion, 2.0, 100.0);
#line 194 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = *origin;
+ _tmp0_ = *origin;
#line 194 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = _tmp2_.x;
+ _tmp1_ = _tmp0_.x;
#line 194 "/home/jens/Source/shotwell/src/util/image.vala"
- left = (gdouble) _tmp3_;
+ left = (gdouble) _tmp1_;
#line 195 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = *origin;
+ _tmp2_ = *origin;
#line 195 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = _tmp4_.y;
+ _tmp3_ = _tmp2_.y;
#line 195 "/home/jens/Source/shotwell/src/util/image.vala"
- top = (gdouble) _tmp5_;
+ top = (gdouble) _tmp3_;
#line 196 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = *origin;
+ _tmp4_ = *origin;
#line 196 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = _tmp6_.x;
+ _tmp5_ = _tmp4_.x;
#line 196 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = *dim;
+ _tmp6_ = *dim;
#line 196 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = _tmp8_.width;
+ _tmp7_ = _tmp6_.width;
#line 196 "/home/jens/Source/shotwell/src/util/image.vala"
- right = (gdouble) (_tmp7_ + _tmp9_);
+ right = (gdouble) (_tmp5_ + _tmp7_);
#line 197 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = *origin;
+ _tmp8_ = *origin;
#line 197 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = _tmp10_.y;
+ _tmp9_ = _tmp8_.y;
#line 197 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = *dim;
+ _tmp10_ = *dim;
#line 197 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = _tmp12_.height;
+ _tmp11_ = _tmp10_.height;
#line 197 "/home/jens/Source/shotwell/src/util/image.vala"
- bottom = (gdouble) (_tmp11_ + _tmp13_);
-#line 200 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = dimensions_minor_axis (dim);
+ bottom = (gdouble) (_tmp9_ + _tmp11_);
#line 200 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = radius_proportion;
-#line 200 "/home/jens/Source/shotwell/src/util/image.vala"
- radius = ((gdouble) _tmp14_) / _tmp15_;
-#line 204 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = cx;
+ radius = ((gdouble) dimensions_minor_axis (dim)) / radius_proportion;
#line 204 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_move_to (_tmp16_, left, top);
-#line 205 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = cx;
+ cairo_move_to (cx, left, top);
#line 205 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_arc (_tmp17_, right - radius, top + radius, radius, -90 * DEGREE, 0 * DEGREE);
+ cairo_arc (cx, right - radius, top + radius, radius, -90 * DEGREE, 0 * DEGREE);
#line 206 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = cx;
-#line 206 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_arc (_tmp18_, right - radius, bottom - radius, radius, 0 * DEGREE, 90 * DEGREE);
-#line 207 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = cx;
+ cairo_arc (cx, right - radius, bottom - radius, radius, 0 * DEGREE, 90 * DEGREE);
#line 207 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_arc (_tmp19_, left + radius, bottom - radius, radius, 90 * DEGREE, 180 * DEGREE);
+ cairo_arc (cx, left + radius, bottom - radius, radius, 90 * DEGREE, 180 * DEGREE);
#line 208 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp20_ = cx;
-#line 208 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_arc (_tmp20_, left + radius, top + radius, radius, 180 * DEGREE, 270 * DEGREE);
-#line 209 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp21_ = cx;
+ cairo_arc (cx, left + radius, top + radius, radius, 180 * DEGREE, 270 * DEGREE);
#line 209 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_clip (_tmp21_);
-#line 683 "image.c"
+ cairo_clip (cx);
+#line 690 "image.c"
}
-inline guchar shift_color_byte (gint b, gint shift) {
+inline guchar
+shift_color_byte (gint b,
+ gint shift)
+{
guchar result = '\0';
- gint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
#line 213 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = b;
-#line 213 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = shift;
-#line 213 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = CLAMP (_tmp0_ + _tmp1_, 0, 255);
-#line 213 "/home/jens/Source/shotwell/src/util/image.vala"
- result = (guchar) _tmp2_;
+ result = (guchar) CLAMP (b + shift, 0, 255);
#line 213 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 702 "image.c"
+#line 703 "image.c"
}
-void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha) {
+void
+shift_colors (GdkPixbuf* pixbuf,
+ gint red,
+ gint green,
+ gint blue,
+ gint alpha)
+{
gboolean _tmp0_ = FALSE;
- gint _tmp1_;
+ gboolean _tmp1_ = FALSE;
+ gboolean _tmp2_ = FALSE;
gboolean _tmp3_ = FALSE;
- gint _tmp4_;
- gboolean _tmp6_ = FALSE;
- gint _tmp7_;
- gboolean _tmp9_ = FALSE;
- gint _tmp10_;
gint width = 0;
- GdkPixbuf* _tmp12_;
- gint _tmp13_;
gint height = 0;
- GdkPixbuf* _tmp14_;
- gint _tmp15_;
gint rowstride = 0;
- GdkPixbuf* _tmp16_;
- gint _tmp17_;
gint channels = 0;
- GdkPixbuf* _tmp18_;
- gint _tmp19_;
guchar* pixels = NULL;
- GdkPixbuf* _tmp20_;
- guint8* _tmp21_;
- gint _tmp22_;
- GdkPixbuf* _tmp23_;
- GdkColorspace _tmp24_;
- GdkPixbuf* _tmp25_;
- gint _tmp26_;
+ guint8* _tmp4_;
+ gint _tmp5_;
#line 216 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = red;
-#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp1_ >= -255) {
-#line 741 "image.c"
- gint _tmp2_;
-#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = red;
+ if (red >= -255) {
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = _tmp2_ <= 255;
-#line 747 "image.c"
+ _tmp0_ = red <= 255;
+#line 731 "image.c"
} else {
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = FALSE;
-#line 751 "image.c"
+#line 735 "image.c"
}
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_assert (_tmp0_, "red >= -255 && red <= 255");
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = green;
-#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp4_ >= -255) {
-#line 759 "image.c"
- gint _tmp5_;
-#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = green;
+ if (green >= -255) {
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = _tmp5_ <= 255;
-#line 765 "image.c"
+ _tmp1_ = green <= 255;
+#line 743 "image.c"
} else {
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = FALSE;
-#line 769 "image.c"
+ _tmp1_ = FALSE;
+#line 747 "image.c"
}
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_assert (_tmp3_, "green >= -255 && green <= 255");
+ _vala_assert (_tmp1_, "green >= -255 && green <= 255");
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = blue;
+ if (blue >= -255) {
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp7_ >= -255) {
-#line 777 "image.c"
- gint _tmp8_;
-#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = blue;
-#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = _tmp8_ <= 255;
-#line 783 "image.c"
+ _tmp2_ = blue <= 255;
+#line 755 "image.c"
} else {
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = FALSE;
-#line 787 "image.c"
+ _tmp2_ = FALSE;
+#line 759 "image.c"
}
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_assert (_tmp6_, "blue >= -255 && blue <= 255");
+ _vala_assert (_tmp2_, "blue >= -255 && blue <= 255");
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = alpha;
+ if (alpha >= -255) {
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp10_ >= -255) {
-#line 795 "image.c"
- gint _tmp11_;
-#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = alpha;
-#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = _tmp11_ <= 255;
-#line 801 "image.c"
+ _tmp3_ = alpha <= 255;
+#line 767 "image.c"
} else {
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = FALSE;
-#line 805 "image.c"
+ _tmp3_ = FALSE;
+#line 771 "image.c"
}
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_assert (_tmp9_, "alpha >= -255 && alpha <= 255");
+ _vala_assert (_tmp3_, "alpha >= -255 && alpha <= 255");
#line 222 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = pixbuf;
-#line 222 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = gdk_pixbuf_get_width (_tmp12_);
-#line 222 "/home/jens/Source/shotwell/src/util/image.vala"
- width = _tmp13_;
-#line 223 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = pixbuf;
-#line 223 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = gdk_pixbuf_get_height (_tmp14_);
+ width = gdk_pixbuf_get_width (pixbuf);
#line 223 "/home/jens/Source/shotwell/src/util/image.vala"
- height = _tmp15_;
+ height = gdk_pixbuf_get_height (pixbuf);
#line 224 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = pixbuf;
-#line 224 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = gdk_pixbuf_get_rowstride (_tmp16_);
-#line 224 "/home/jens/Source/shotwell/src/util/image.vala"
- rowstride = _tmp17_;
-#line 225 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = pixbuf;
-#line 225 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = gdk_pixbuf_get_n_channels (_tmp18_);
+ rowstride = gdk_pixbuf_get_rowstride (pixbuf);
#line 225 "/home/jens/Source/shotwell/src/util/image.vala"
- channels = _tmp19_;
+ channels = gdk_pixbuf_get_n_channels (pixbuf);
#line 226 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp20_ = pixbuf;
+ _tmp4_ = gdk_pixbuf_get_pixels (pixbuf);
#line 226 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp21_ = gdk_pixbuf_get_pixels (_tmp20_);
-#line 226 "/home/jens/Source/shotwell/src/util/image.vala"
- pixels = _tmp21_;
+ pixels = _tmp4_;
#line 228 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp22_ = channels;
+ _tmp5_ = channels;
#line 228 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_assert (_tmp22_ >= 3, "channels >= 3");
-#line 229 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp23_ = pixbuf;
+ _vala_assert (_tmp5_ >= 3, "channels >= 3");
#line 229 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp24_ = gdk_pixbuf_get_colorspace (_tmp23_);
-#line 229 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_assert (_tmp24_ == GDK_COLORSPACE_RGB, "pixbuf.get_colorspace() == Gdk.Colorspace.RGB");
-#line 230 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp25_ = pixbuf;
+ _vala_assert (gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB, "pixbuf.get_colorspace() == Gdk.Colorspace.RGB");
#line 230 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp26_ = gdk_pixbuf_get_bits_per_sample (_tmp25_);
-#line 230 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_assert (_tmp26_ == 8, "pixbuf.get_bits_per_sample() == 8");
-#line 855 "image.c"
+ _vala_assert (gdk_pixbuf_get_bits_per_sample (pixbuf) == 8, "pixbuf.get_bits_per_sample() == 8");
+#line 795 "image.c"
{
gint y = 0;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
y = 0;
-#line 860 "image.c"
+#line 800 "image.c"
{
- gboolean _tmp27_ = FALSE;
+ gboolean _tmp6_ = FALSE;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp27_ = TRUE;
+ _tmp6_ = TRUE;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
-#line 867 "image.c"
- gint _tmp29_;
- gint _tmp30_;
+#line 807 "image.c"
+ gint _tmp8_;
+ gint _tmp9_;
gint y_offset = 0;
- gint _tmp31_;
- gint _tmp32_;
+ gint _tmp10_;
+ gint _tmp11_;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
- if (!_tmp27_) {
-#line 875 "image.c"
- gint _tmp28_;
+ if (!_tmp6_) {
+#line 815 "image.c"
+ gint _tmp7_;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp28_ = y;
+ _tmp7_ = y;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
- y = _tmp28_ + 1;
-#line 881 "image.c"
+ y = _tmp7_ + 1;
+#line 821 "image.c"
}
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp27_ = FALSE;
+ _tmp6_ = FALSE;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp29_ = y;
+ _tmp8_ = y;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp30_ = height;
+ _tmp9_ = height;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
- if (!(_tmp29_ < _tmp30_)) {
+ if (!(_tmp8_ < _tmp9_)) {
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 893 "image.c"
+#line 833 "image.c"
}
#line 233 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp31_ = y;
+ _tmp10_ = y;
#line 233 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp32_ = rowstride;
+ _tmp11_ = rowstride;
#line 233 "/home/jens/Source/shotwell/src/util/image.vala"
- y_offset = _tmp31_ * _tmp32_;
-#line 901 "image.c"
+ y_offset = _tmp10_ * _tmp11_;
+#line 841 "image.c"
{
gint x = 0;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
x = 0;
-#line 906 "image.c"
+#line 846 "image.c"
{
- gboolean _tmp33_ = FALSE;
+ gboolean _tmp12_ = FALSE;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp33_ = TRUE;
+ _tmp12_ = TRUE;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
-#line 913 "image.c"
- gint _tmp35_;
- gint _tmp36_;
+#line 853 "image.c"
+ gint _tmp14_;
+ gint _tmp15_;
gint offset = 0;
- gint _tmp37_;
- gint _tmp38_;
- gint _tmp39_;
- gint _tmp40_;
- gint _tmp49_;
- gint _tmp58_;
- gboolean _tmp67_ = FALSE;
- gint _tmp68_;
+ gint _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+ gboolean _tmp37_ = FALSE;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
- if (!_tmp33_) {
-#line 927 "image.c"
- gint _tmp34_;
+ if (!_tmp12_) {
+#line 863 "image.c"
+ gint _tmp13_;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp34_ = x;
+ _tmp13_ = x;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
- x = _tmp34_ + 1;
-#line 933 "image.c"
+ x = _tmp13_ + 1;
+#line 869 "image.c"
}
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp33_ = FALSE;
+ _tmp12_ = FALSE;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp35_ = x;
+ _tmp14_ = x;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp36_ = width;
+ _tmp15_ = width;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
- if (!(_tmp35_ < _tmp36_)) {
+ if (!(_tmp14_ < _tmp15_)) {
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 945 "image.c"
+#line 881 "image.c"
}
#line 236 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp37_ = y_offset;
+ _tmp16_ = y_offset;
#line 236 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp38_ = x;
+ _tmp17_ = x;
#line 236 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp39_ = channels;
+ _tmp18_ = channels;
#line 236 "/home/jens/Source/shotwell/src/util/image.vala"
- offset = _tmp37_ + (_tmp38_ * _tmp39_);
-#line 238 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp40_ = red;
+ offset = _tmp16_ + (_tmp17_ * _tmp18_);
#line 238 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp40_ != 0) {
-#line 959 "image.c"
- guchar* _tmp41_;
- gint _tmp42_;
- guchar* _tmp43_;
- gint _tmp44_;
- guchar _tmp45_;
- gint _tmp46_;
- guchar _tmp47_;
- guchar _tmp48_;
-#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp41_ = pixels;
-#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp42_ = offset;
+ if (red != 0) {
+#line 893 "image.c"
+ guchar* _tmp19_;
+ gint _tmp20_;
+ guchar* _tmp21_;
+ gint _tmp22_;
+ guchar _tmp23_;
+ guchar _tmp24_;
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp43_ = pixels;
+ _tmp19_ = pixels;
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp44_ = offset;
+ _tmp20_ = offset;
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp45_ = _tmp43_[_tmp44_];
+ _tmp21_ = pixels;
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp46_ = red;
+ _tmp22_ = offset;
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp47_ = shift_color_byte ((gint) _tmp45_, _tmp46_);
+ _tmp23_ = _tmp21_[_tmp22_];
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp41_[_tmp42_] = _tmp47_;
+ _tmp19_[_tmp20_] = shift_color_byte ((gint) _tmp23_, red);
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp48_ = _tmp41_[_tmp42_];
-#line 986 "image.c"
+ _tmp24_ = _tmp19_[_tmp20_];
+#line 914 "image.c"
}
#line 241 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp49_ = green;
-#line 241 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp49_ != 0) {
-#line 992 "image.c"
- guchar* _tmp50_;
- gint _tmp51_;
- guchar* _tmp52_;
- gint _tmp53_;
- guchar _tmp54_;
- gint _tmp55_;
- guchar _tmp56_;
- guchar _tmp57_;
-#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp50_ = pixels;
+ if (green != 0) {
+#line 918 "image.c"
+ guchar* _tmp25_;
+ gint _tmp26_;
+ guchar* _tmp27_;
+ gint _tmp28_;
+ guchar _tmp29_;
+ guchar _tmp30_;
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp51_ = offset;
+ _tmp25_ = pixels;
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp52_ = pixels;
+ _tmp26_ = offset;
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp53_ = offset;
+ _tmp27_ = pixels;
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp54_ = _tmp52_[_tmp53_ + 1];
+ _tmp28_ = offset;
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp55_ = green;
+ _tmp29_ = _tmp27_[_tmp28_ + 1];
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp56_ = shift_color_byte ((gint) _tmp54_, _tmp55_);
+ _tmp25_[_tmp26_ + 1] = shift_color_byte ((gint) _tmp29_, green);
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp50_[_tmp51_ + 1] = _tmp56_;
-#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp57_ = _tmp50_[_tmp51_ + 1];
-#line 1019 "image.c"
+ _tmp30_ = _tmp25_[_tmp26_ + 1];
+#line 939 "image.c"
}
#line 244 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp58_ = blue;
-#line 244 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp58_ != 0) {
-#line 1025 "image.c"
- guchar* _tmp59_;
- gint _tmp60_;
- guchar* _tmp61_;
- gint _tmp62_;
- guchar _tmp63_;
- gint _tmp64_;
- guchar _tmp65_;
- guchar _tmp66_;
-#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp59_ = pixels;
-#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp60_ = offset;
+ if (blue != 0) {
+#line 943 "image.c"
+ guchar* _tmp31_;
+ gint _tmp32_;
+ guchar* _tmp33_;
+ gint _tmp34_;
+ guchar _tmp35_;
+ guchar _tmp36_;
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp61_ = pixels;
+ _tmp31_ = pixels;
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp62_ = offset;
+ _tmp32_ = offset;
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp63_ = _tmp61_[_tmp62_ + 2];
+ _tmp33_ = pixels;
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp64_ = blue;
+ _tmp34_ = offset;
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp65_ = shift_color_byte ((gint) _tmp63_, _tmp64_);
+ _tmp35_ = _tmp33_[_tmp34_ + 2];
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp59_[_tmp60_ + 2] = _tmp65_;
+ _tmp31_[_tmp32_ + 2] = shift_color_byte ((gint) _tmp35_, blue);
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp66_ = _tmp59_[_tmp60_ + 2];
-#line 1052 "image.c"
+ _tmp36_ = _tmp31_[_tmp32_ + 2];
+#line 964 "image.c"
}
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp68_ = alpha;
+ if (alpha != 0) {
+#line 968 "image.c"
+ gint _tmp38_;
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp68_ != 0) {
-#line 1058 "image.c"
- gint _tmp69_;
+ _tmp38_ = channels;
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp69_ = channels;
-#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp67_ = _tmp69_ >= 4;
-#line 1064 "image.c"
+ _tmp37_ = _tmp38_ >= 4;
+#line 974 "image.c"
} else {
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp67_ = FALSE;
-#line 1068 "image.c"
+ _tmp37_ = FALSE;
+#line 978 "image.c"
}
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp67_) {
-#line 1072 "image.c"
- guchar* _tmp70_;
- gint _tmp71_;
- guchar* _tmp72_;
- gint _tmp73_;
- guchar _tmp74_;
- gint _tmp75_;
- guchar _tmp76_;
- guchar _tmp77_;
-#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp70_ = pixels;
-#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp71_ = offset;
+ if (_tmp37_) {
+#line 982 "image.c"
+ guchar* _tmp39_;
+ gint _tmp40_;
+ guchar* _tmp41_;
+ gint _tmp42_;
+ guchar _tmp43_;
+ guchar _tmp44_;
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp72_ = pixels;
+ _tmp39_ = pixels;
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp73_ = offset;
+ _tmp40_ = offset;
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp74_ = _tmp72_[_tmp73_ + 3];
+ _tmp41_ = pixels;
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp75_ = alpha;
+ _tmp42_ = offset;
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp76_ = shift_color_byte ((gint) _tmp74_, _tmp75_);
+ _tmp43_ = _tmp41_[_tmp42_ + 3];
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp70_[_tmp71_ + 3] = _tmp76_;
+ _tmp39_[_tmp40_ + 3] = shift_color_byte ((gint) _tmp43_, alpha);
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp77_ = _tmp70_[_tmp71_ + 3];
-#line 1099 "image.c"
+ _tmp44_ = _tmp39_[_tmp40_ + 3];
+#line 1003 "image.c"
}
}
}
@@ -1106,103 +1010,98 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
}
-gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
+gboolean
+coord_in_rectangle (gint x,
+ gint y,
+ GdkRectangle* rect)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
gboolean _tmp2_ = FALSE;
- gint _tmp3_;
- GdkRectangle _tmp4_;
- gint _tmp5_;
+ GdkRectangle _tmp3_;
+ gint _tmp4_;
#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (rect != NULL, FALSE);
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = x;
-#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = *rect;
+ _tmp3_ = *rect;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = _tmp4_.x;
+ _tmp4_ = _tmp3_.x;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp3_ >= _tmp5_) {
-#line 1128 "image.c"
+ if (x >= _tmp4_) {
+#line 1033 "image.c"
+ GdkRectangle _tmp5_;
gint _tmp6_;
GdkRectangle _tmp7_;
gint _tmp8_;
- GdkRectangle _tmp9_;
- gint _tmp10_;
-#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = x;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = *rect;
+ _tmp5_ = *rect;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = _tmp7_.x;
+ _tmp6_ = _tmp5_.x;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = *rect;
+ _tmp7_ = *rect;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = _tmp9_.width;
+ _tmp8_ = _tmp7_.width;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = _tmp6_ < (_tmp8_ + _tmp10_);
-#line 1146 "image.c"
+ _tmp2_ = x < (_tmp6_ + _tmp8_);
+#line 1048 "image.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = FALSE;
-#line 1150 "image.c"
+#line 1052 "image.c"
}
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp2_) {
-#line 1154 "image.c"
- gint _tmp11_;
- GdkRectangle _tmp12_;
- gint _tmp13_;
-#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = y;
+#line 1056 "image.c"
+ GdkRectangle _tmp9_;
+ gint _tmp10_;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = *rect;
+ _tmp9_ = *rect;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = _tmp12_.y;
+ _tmp10_ = _tmp9_.y;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = _tmp11_ >= _tmp13_;
-#line 1166 "image.c"
+ _tmp1_ = y >= _tmp10_;
+#line 1065 "image.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = FALSE;
-#line 1170 "image.c"
+#line 1069 "image.c"
}
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp1_) {
-#line 1174 "image.c"
+#line 1073 "image.c"
+ GdkRectangle _tmp11_;
+ gint _tmp12_;
+ GdkRectangle _tmp13_;
gint _tmp14_;
- GdkRectangle _tmp15_;
- gint _tmp16_;
- GdkRectangle _tmp17_;
- gint _tmp18_;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = y;
+ _tmp11_ = *rect;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = *rect;
+ _tmp12_ = _tmp11_.y;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = _tmp15_.y;
+ _tmp13_ = *rect;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = *rect;
+ _tmp14_ = _tmp13_.height;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = _tmp17_.height;
-#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = _tmp14_ <= (_tmp16_ + _tmp18_);
-#line 1192 "image.c"
+ _tmp0_ = y <= (_tmp12_ + _tmp14_);
+#line 1088 "image.c"
} else {
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = FALSE;
-#line 1196 "image.c"
+#line 1092 "image.c"
}
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
result = _tmp0_;
#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 1202 "image.c"
+#line 1098 "image.c"
}
-gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
+gboolean
+rectangles_equal (GdkRectangle* a,
+ GdkRectangle* b)
+{
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
gboolean _tmp1_ = FALSE;
@@ -1225,7 +1124,7 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
_tmp6_ = _tmp5_.x;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp4_ == _tmp6_) {
-#line 1229 "image.c"
+#line 1128 "image.c"
GdkRectangle _tmp7_;
gint _tmp8_;
GdkRectangle _tmp9_;
@@ -1240,15 +1139,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
_tmp10_ = _tmp9_.y;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = _tmp8_ == _tmp10_;
-#line 1244 "image.c"
+#line 1143 "image.c"
} else {
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = FALSE;
-#line 1248 "image.c"
+#line 1147 "image.c"
}
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp2_) {
-#line 1252 "image.c"
+#line 1151 "image.c"
GdkRectangle _tmp11_;
gint _tmp12_;
GdkRectangle _tmp13_;
@@ -1263,15 +1162,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
_tmp14_ = _tmp13_.width;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = _tmp12_ == _tmp14_;
-#line 1267 "image.c"
+#line 1166 "image.c"
} else {
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = FALSE;
-#line 1271 "image.c"
+#line 1170 "image.c"
}
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp1_) {
-#line 1275 "image.c"
+#line 1174 "image.c"
GdkRectangle _tmp15_;
gint _tmp16_;
GdkRectangle _tmp17_;
@@ -1286,21 +1185,23 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
_tmp18_ = _tmp17_.height;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = _tmp16_ == _tmp18_;
-#line 1290 "image.c"
+#line 1189 "image.c"
} else {
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = FALSE;
-#line 1294 "image.c"
+#line 1193 "image.c"
}
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
result = _tmp0_;
#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 1300 "image.c"
+#line 1199 "image.c"
}
-gchar* rectangle_to_string (GdkRectangle* rect) {
+gchar*
+rectangle_to_string (GdkRectangle* rect)
+{
gchar* result = NULL;
GdkRectangle _tmp0_;
gint _tmp1_;
@@ -1335,32 +1236,32 @@ gchar* rectangle_to_string (GdkRectangle* rect) {
result = _tmp8_;
#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 1339 "image.c"
+#line 1240 "image.c"
}
-void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result) {
+void
+clamp_rectangle (GdkRectangle* original,
+ Dimensions* max,
+ GdkRectangle* result)
+{
GdkRectangle rect = {0};
GdkRectangle _tmp0_;
gint _tmp1_;
Dimensions _tmp2_;
gint _tmp3_;
- gint _tmp4_;
- GdkRectangle _tmp5_;
- gint _tmp6_;
- Dimensions _tmp7_;
- gint _tmp8_;
+ GdkRectangle _tmp4_;
+ gint _tmp5_;
+ Dimensions _tmp6_;
+ gint _tmp7_;
+ GdkRectangle _tmp8_;
gint _tmp9_;
- GdkRectangle _tmp10_;
+ Dimensions _tmp10_;
gint _tmp11_;
- Dimensions _tmp12_;
+ GdkRectangle _tmp12_;
gint _tmp13_;
- gint _tmp14_;
- GdkRectangle _tmp15_;
- gint _tmp16_;
- Dimensions _tmp17_;
- gint _tmp18_;
- gint _tmp19_;
+ Dimensions _tmp14_;
+ gint _tmp15_;
#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (original != NULL);
#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1376,62 +1277,56 @@ void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* res
#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = _tmp2_.width;
#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = CLAMP (_tmp1_, 0, _tmp3_);
-#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
- rect.x = _tmp4_;
+ rect.x = CLAMP (_tmp1_, 0, _tmp3_);
#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = *original;
+ _tmp4_ = *original;
#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = _tmp5_.y;
-#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = *max;
+ _tmp5_ = _tmp4_.y;
#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = _tmp7_.height;
+ _tmp6_ = *max;
#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = CLAMP (_tmp6_, 0, _tmp8_);
+ _tmp7_ = _tmp6_.height;
#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
- rect.y = _tmp9_;
+ rect.y = CLAMP (_tmp5_, 0, _tmp7_);
#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = *original;
+ _tmp8_ = *original;
#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = _tmp10_.width;
-#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = *max;
+ _tmp9_ = _tmp8_.width;
#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = _tmp12_.width;
+ _tmp10_ = *max;
#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = CLAMP (_tmp11_, 0, _tmp13_);
+ _tmp11_ = _tmp10_.width;
#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
- rect.width = _tmp14_;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = *original;
+ rect.width = CLAMP (_tmp9_, 0, _tmp11_);
#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = _tmp15_.height;
+ _tmp12_ = *original;
#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = *max;
+ _tmp13_ = _tmp12_.height;
#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = _tmp17_.height;
+ _tmp14_ = *max;
#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = CLAMP (_tmp16_, 0, _tmp18_);
+ _tmp15_ = _tmp14_.height;
#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
- rect.height = _tmp19_;
+ rect.height = CLAMP (_tmp13_, 0, _tmp15_);
#line 272 "/home/jens/Source/shotwell/src/util/image.vala"
*result = rect;
#line 272 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 1423 "image.c"
+#line 1316 "image.c"
}
-void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
+void
+scale_point (GdkPoint* p,
+ gdouble factor,
+ GdkPoint* result)
+{
GdkPoint _result_ = {0};
GdkPoint _tmp0_ = {0};
- gdouble _tmp1_;
- GdkPoint _tmp2_;
- gint _tmp3_;
- gdouble _tmp4_;
- GdkPoint _tmp5_;
- gint _tmp6_;
+ GdkPoint _tmp1_;
+ gint _tmp2_;
+ GdkPoint _tmp3_;
+ gint _tmp4_;
#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (p != NULL);
#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1439,30 +1334,30 @@ void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
_result_ = _tmp0_;
#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = factor;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = *p;
+ _tmp1_ = *p;
#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = _tmp2_.x;
+ _tmp2_ = _tmp1_.x;
#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
- _result_.x = (gint) ((_tmp1_ * _tmp3_) + 0.5);
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = factor;
+ _result_.x = (gint) ((factor * _tmp2_) + 0.5);
#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = *p;
+ _tmp3_ = *p;
#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = _tmp5_.y;
+ _tmp4_ = _tmp3_.y;
#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
- _result_.y = (gint) ((_tmp4_ * _tmp6_) + 0.5);
+ _result_.y = (gint) ((factor * _tmp4_) + 0.5);
#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
*result = _result_;
#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 1462 "image.c"
+#line 1353 "image.c"
}
-void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
+void
+add_points (GdkPoint* p1,
+ GdkPoint* p2,
+ GdkPoint* result)
+{
GdkPoint _result_ = {0};
GdkPoint _tmp0_ = {0};
GdkPoint _tmp1_;
@@ -1505,11 +1400,15 @@ void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
*result = _result_;
#line 288 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 1509 "image.c"
+#line 1404 "image.c"
}
-void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
+void
+subtract_points (GdkPoint* p1,
+ GdkPoint* p2,
+ GdkPoint* result)
+{
GdkPoint _result_ = {0};
GdkPoint _tmp0_ = {0};
GdkPoint _tmp1_;
@@ -1552,160 +1451,150 @@ void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
*result = _result_;
#line 296 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 1556 "image.c"
+#line 1455 "image.c"
}
-void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
+void
+fix_cairo_pixbuf (GdkPixbuf* pixbuf)
+{
guchar* gdk_pixels = NULL;
- GdkPixbuf* _tmp0_;
+ void* _tmp0_;
void* _tmp1_;
- void* _tmp2_;
#line 300 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = pixbuf;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = gdk_pixbuf_get_pixels (_tmp0_);
+ _tmp0_ = gdk_pixbuf_get_pixels (pixbuf);
#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = _tmp1_;
+ _tmp1_ = _tmp0_;
#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
- gdk_pixels = _tmp2_;
-#line 1575 "image.c"
+ gdk_pixels = _tmp1_;
+#line 1473 "image.c"
{
gint j = 0;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
j = 0;
-#line 1580 "image.c"
+#line 1478 "image.c"
{
- gboolean _tmp3_ = FALSE;
+ gboolean _tmp2_ = FALSE;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = TRUE;
+ _tmp2_ = TRUE;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
-#line 1587 "image.c"
+#line 1485 "image.c"
+ gint _tmp4_;
gint _tmp5_;
- GdkPixbuf* _tmp6_;
- gint _tmp7_;
- gint _tmp8_;
+ gint _tmp6_;
guchar* p = NULL;
- guchar* _tmp9_;
+ guchar* _tmp7_;
guchar* end = NULL;
- guchar* _tmp10_;
- GdkPixbuf* _tmp11_;
- gint _tmp12_;
- gint _tmp13_;
- guchar* _tmp26_;
- GdkPixbuf* _tmp27_;
- gint _tmp28_;
- gint _tmp29_;
+ guchar* _tmp8_;
+ gint _tmp9_;
+ gint _tmp10_;
+ guchar* _tmp23_;
+ gint _tmp24_;
+ gint _tmp25_;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- if (!_tmp3_) {
-#line 1605 "image.c"
- gint _tmp4_;
+ if (!_tmp2_) {
+#line 1500 "image.c"
+ gint _tmp3_;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = j;
+ _tmp3_ = j;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- j = _tmp4_ + 1;
-#line 1611 "image.c"
+ j = _tmp3_ + 1;
+#line 1506 "image.c"
}
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = FALSE;
+ _tmp2_ = FALSE;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = j;
+ _tmp4_ = j;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = pixbuf;
+ _tmp5_ = gdk_pixbuf_get_height (pixbuf);
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = gdk_pixbuf_get_height (_tmp6_);
+ _tmp6_ = _tmp5_;
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = _tmp7_;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
- if (!(_tmp5_ < _tmp8_)) {
+ if (!(_tmp4_ < _tmp6_)) {
#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 1627 "image.c"
+#line 1520 "image.c"
}
#line 303 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = gdk_pixels;
+ _tmp7_ = gdk_pixels;
#line 303 "/home/jens/Source/shotwell/src/util/image.vala"
- p = _tmp9_;
-#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = p;
+ p = _tmp7_;
#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = pixbuf;
+ _tmp8_ = p;
#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = gdk_pixbuf_get_width (_tmp11_);
+ _tmp9_ = gdk_pixbuf_get_width (pixbuf);
#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = _tmp12_;
+ _tmp10_ = _tmp9_;
#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
- end = _tmp10_ + (4 * _tmp13_);
+ end = _tmp8_ + (4 * _tmp10_);
#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
-#line 1645 "image.c"
- guchar* _tmp14_;
- guchar* _tmp15_;
+#line 1536 "image.c"
+ guchar* _tmp11_;
+ guchar* _tmp12_;
guchar tmp = '\0';
+ guchar* _tmp13_;
+ guchar _tmp14_;
+ guchar* _tmp15_;
guchar* _tmp16_;
guchar _tmp17_;
- guchar* _tmp18_;
+ guchar _tmp18_;
guchar* _tmp19_;
guchar _tmp20_;
guchar _tmp21_;
guchar* _tmp22_;
- guchar _tmp23_;
- guchar _tmp24_;
- guchar* _tmp25_;
#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = p;
+ _tmp11_ = p;
#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = end;
+ _tmp12_ = end;
#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
- if (!(_tmp14_ < _tmp15_)) {
+ if (!(_tmp11_ < _tmp12_)) {
#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 1667 "image.c"
+#line 1558 "image.c"
}
#line 307 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = p;
+ _tmp13_ = p;
#line 307 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = _tmp16_[0];
+ _tmp14_ = _tmp13_[0];
#line 307 "/home/jens/Source/shotwell/src/util/image.vala"
- tmp = _tmp17_;
+ tmp = _tmp14_;
#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = p;
+ _tmp15_ = p;
#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = p;
+ _tmp16_ = p;
#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp20_ = _tmp19_[2];
+ _tmp17_ = _tmp16_[2];
#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_[0] = _tmp20_;
+ _tmp15_[0] = _tmp17_;
#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp21_ = _tmp18_[0];
+ _tmp18_ = _tmp15_[0];
#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp22_ = p;
+ _tmp19_ = p;
#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp23_ = tmp;
+ _tmp20_ = tmp;
#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp22_[2] = _tmp23_;
+ _tmp19_[2] = _tmp20_;
#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp24_ = _tmp22_[2];
+ _tmp21_ = _tmp19_[2];
#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp25_ = p;
+ _tmp22_ = p;
#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
- p = _tmp25_ + 4;
-#line 1697 "image.c"
+ p = _tmp22_ + 4;
+#line 1588 "image.c"
}
#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp26_ = gdk_pixels;
-#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp27_ = pixbuf;
+ _tmp23_ = gdk_pixels;
#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp28_ = gdk_pixbuf_get_rowstride (_tmp27_);
+ _tmp24_ = gdk_pixbuf_get_rowstride (pixbuf);
#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp29_ = _tmp28_;
+ _tmp25_ = _tmp24_;
#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
- gdk_pixels = _tmp26_ + _tmp29_;
-#line 1709 "image.c"
+ gdk_pixels = _tmp23_ + _tmp25_;
+#line 1598 "image.c"
}
}
}
@@ -1722,76 +1611,34 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
* @param dest_width The width of the computed rectangle.
* @param dest_height The height of the computed rectangle.
*/
-void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height) {
+void
+compute_arb_rotated_size (gdouble src_width,
+ gdouble src_height,
+ gdouble angle,
+ gdouble* dest_width,
+ gdouble* dest_height)
+{
gdouble _vala_dest_width = 0.0;
gdouble _vala_dest_height = 0.0;
- gdouble _tmp0_;
- gdouble _tmp1_;
- gdouble _tmp2_;
- gdouble _tmp3_;
- gdouble _tmp4_;
- gdouble _tmp5_;
- gdouble _tmp6_;
- gdouble _tmp7_;
- gdouble _tmp8_;
- gdouble _tmp9_;
- gdouble _tmp10_;
- gdouble _tmp11_;
- gdouble _tmp12_;
- gdouble _tmp13_;
- gdouble _tmp14_;
- gdouble _tmp15_;
-#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = angle;
-#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = degrees_to_radians (_tmp0_);
#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = fabs (_tmp1_);
-#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
- angle = _tmp2_;
-#line 338 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = angle;
+ angle = fabs (degrees_to_radians (angle));
#line 338 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_assert (_tmp3_ <= G_PI_2, "angle <= Math.PI_2");
-#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = src_width;
-#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = angle;
+ _vala_assert (angle <= G_PI_2, "angle <= Math.PI_2");
#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = cos (_tmp5_);
-#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = src_height;
-#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = angle;
-#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = sin (_tmp8_);
-#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_dest_width = (_tmp4_ * _tmp6_) + (_tmp7_ * _tmp9_);
-#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = src_height;
-#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = angle;
-#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = cos (_tmp11_);
-#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = src_width;
+ _vala_dest_width = (src_width * cos (angle)) + (src_height * sin (angle));
#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = angle;
-#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = sin (_tmp14_);
-#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_dest_height = (_tmp10_ * _tmp12_) + (_tmp13_ * _tmp15_);
+ _vala_dest_height = (src_height * cos (angle)) + (src_width * sin (angle));
#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
if (dest_width) {
#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
*dest_width = _vala_dest_width;
-#line 1789 "image.c"
+#line 1636 "image.c"
}
#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
if (dest_height) {
#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
*dest_height = _vala_dest_height;
-#line 1795 "image.c"
+#line 1642 "image.c"
}
}
@@ -1802,47 +1649,51 @@ void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble an
* @param source_pixbuf The source image that needs to be angled.
* @param angle The angle the source image should be rotated by.
*/
-GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
+GdkPixbuf*
+rotate_arb (GdkPixbuf* source_pixbuf,
+ gdouble angle)
+{
GdkPixbuf* result = NULL;
- gdouble _tmp0_;
gdouble x_tmp = 0.0;
gdouble y_tmp = 0.0;
- GdkPixbuf* _tmp3_;
+ gint _tmp1_;
+ gint _tmp2_;
+ gint _tmp3_;
gint _tmp4_;
- gint _tmp5_;
- GdkPixbuf* _tmp6_;
- gint _tmp7_;
- gint _tmp8_;
- gdouble _tmp9_;
- gdouble _tmp10_ = 0.0;
- gdouble _tmp11_ = 0.0;
+ gdouble _tmp5_ = 0.0;
+ gdouble _tmp6_ = 0.0;
GdkPixbuf* dest_pixbuf = NULL;
- gdouble _tmp12_;
- gdouble _tmp13_;
- gdouble _tmp14_;
- gdouble _tmp15_;
- GdkPixbuf* _tmp16_;
- cairo_format_t _tmp17_ = 0;
- GdkPixbuf* _tmp18_;
- gboolean _tmp19_;
- gboolean _tmp20_;
+ gdouble _tmp7_;
+ gdouble _tmp8_;
+ GdkPixbuf* _tmp9_;
+ cairo_format_t _tmp10_ = 0;
+ gboolean _tmp11_;
+ gboolean _tmp12_;
cairo_surface_t* surface = NULL;
- GdkPixbuf* _tmp21_;
- void* _tmp22_;
- void* _tmp23_;
- GdkPixbuf* _tmp24_;
- gint _tmp25_;
- gint _tmp26_;
- GdkPixbuf* _tmp27_;
- gint _tmp28_;
- gint _tmp29_;
+ GdkPixbuf* _tmp13_;
+ void* _tmp14_;
+ void* _tmp15_;
+ GdkPixbuf* _tmp16_;
+ gint _tmp17_;
+ gint _tmp18_;
+ GdkPixbuf* _tmp19_;
+ gint _tmp20_;
+ gint _tmp21_;
+ GdkPixbuf* _tmp22_;
+ gint _tmp23_;
+ gint _tmp24_;
+ cairo_surface_t* _tmp25_;
+ cairo_t* context = NULL;
+ cairo_surface_t* _tmp26_;
+ cairo_t* _tmp27_;
+ cairo_t* _tmp28_;
+ cairo_t* _tmp29_;
GdkPixbuf* _tmp30_;
gint _tmp31_;
gint _tmp32_;
- cairo_surface_t* _tmp33_;
- cairo_t* context = NULL;
- cairo_surface_t* _tmp34_;
- cairo_t* _tmp35_;
+ GdkPixbuf* _tmp33_;
+ gint _tmp34_;
+ gint _tmp35_;
cairo_t* _tmp36_;
cairo_t* _tmp37_;
GdkPixbuf* _tmp38_;
@@ -1853,213 +1704,173 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
gint _tmp43_;
cairo_t* _tmp44_;
cairo_t* _tmp45_;
- GdkPixbuf* _tmp46_;
+ gint _tmp46_;
gint _tmp47_;
gint _tmp48_;
- GdkPixbuf* _tmp49_;
- gint _tmp50_;
- gint _tmp51_;
- cairo_t* _tmp52_;
- gdouble _tmp53_;
- gdouble _tmp54_;
- cairo_t* _tmp55_;
- GdkPixbuf* _tmp56_;
- gint _tmp57_;
- gint _tmp58_;
- GdkPixbuf* _tmp59_;
- gint _tmp60_;
- gint _tmp61_;
- cairo_t* _tmp62_;
- GdkPixbuf* _tmp63_;
- cairo_t* _tmp64_;
- cairo_pattern_t* _tmp65_;
- cairo_t* _tmp66_;
- GdkPixbuf* _tmp67_;
+ gint _tmp49_;
+ cairo_t* _tmp50_;
+ cairo_t* _tmp51_;
+ cairo_pattern_t* _tmp52_;
+ cairo_t* _tmp53_;
+ GdkPixbuf* _tmp54_;
#line 349 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (GDK_IS_PIXBUF (source_pixbuf), NULL);
#line 353 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = angle;
-#line 353 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp0_ == 0.0) {
-#line 1885 "image.c"
- GdkPixbuf* _tmp1_;
- GdkPixbuf* _tmp2_;
-#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = source_pixbuf;
+ if (angle == 0.0) {
+#line 1721 "image.c"
+ GdkPixbuf* _tmp0_;
#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = _g_object_ref0 (_tmp1_);
+ _tmp0_ = _g_object_ref0 (source_pixbuf);
#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
- result = _tmp2_;
+ result = _tmp0_;
#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 1896 "image.c"
+#line 1729 "image.c"
}
#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = source_pixbuf;
-#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = gdk_pixbuf_get_width (_tmp3_);
-#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = _tmp4_;
+ _tmp1_ = gdk_pixbuf_get_width (source_pixbuf);
#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = source_pixbuf;
-#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = gdk_pixbuf_get_height (_tmp6_);
+ _tmp2_ = _tmp1_;
#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = _tmp7_;
+ _tmp3_ = gdk_pixbuf_get_height (source_pixbuf);
#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = angle;
+ _tmp4_ = _tmp3_;
#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- compute_arb_rotated_size ((gdouble) _tmp5_, (gdouble) _tmp8_, _tmp9_, &_tmp10_, &_tmp11_);
+ compute_arb_rotated_size ((gdouble) _tmp2_, (gdouble) _tmp4_, angle, &_tmp5_, &_tmp6_);
#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- x_tmp = _tmp10_;
+ x_tmp = _tmp5_;
#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
- y_tmp = _tmp11_;
-#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = x_tmp;
-#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = round (_tmp12_);
+ y_tmp = _tmp6_;
#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = y_tmp;
+ _tmp7_ = x_tmp;
#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = round (_tmp14_);
+ _tmp8_ = y_tmp;
#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, (gint) _tmp13_, (gint) _tmp15_);
+ _tmp9_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, (gint) round (_tmp7_), (gint) round (_tmp8_));
#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
- dest_pixbuf = _tmp16_;
+ dest_pixbuf = _tmp9_;
#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = source_pixbuf;
+ _tmp11_ = gdk_pixbuf_get_has_alpha (source_pixbuf);
#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = gdk_pixbuf_get_has_alpha (_tmp18_);
+ _tmp12_ = _tmp11_;
#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp20_ = _tmp19_;
+ if (_tmp12_) {
#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp20_) {
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = CAIRO_FORMAT_ARGB32;
-#line 1940 "image.c"
+ _tmp10_ = CAIRO_FORMAT_ARGB32;
+#line 1761 "image.c"
} else {
#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = CAIRO_FORMAT_RGB24;
-#line 1944 "image.c"
+ _tmp10_ = CAIRO_FORMAT_RGB24;
+#line 1765 "image.c"
}
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp21_ = dest_pixbuf;
+ _tmp13_ = dest_pixbuf;
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp22_ = gdk_pixbuf_get_pixels (_tmp21_);
+ _tmp14_ = gdk_pixbuf_get_pixels (_tmp13_);
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp23_ = _tmp22_;
+ _tmp15_ = _tmp14_;
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp24_ = dest_pixbuf;
+ _tmp16_ = dest_pixbuf;
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp25_ = gdk_pixbuf_get_width (_tmp24_);
+ _tmp17_ = gdk_pixbuf_get_width (_tmp16_);
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp26_ = _tmp25_;
+ _tmp18_ = _tmp17_;
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp27_ = dest_pixbuf;
+ _tmp19_ = dest_pixbuf;
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp28_ = gdk_pixbuf_get_height (_tmp27_);
+ _tmp20_ = gdk_pixbuf_get_height (_tmp19_);
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp29_ = _tmp28_;
+ _tmp21_ = _tmp20_;
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp30_ = dest_pixbuf;
+ _tmp22_ = dest_pixbuf;
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp31_ = gdk_pixbuf_get_rowstride (_tmp30_);
+ _tmp23_ = gdk_pixbuf_get_rowstride (_tmp22_);
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp32_ = _tmp31_;
+ _tmp24_ = _tmp23_;
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp33_ = cairo_image_surface_create_for_data ((guchar*) _tmp23_, _tmp17_, _tmp26_, _tmp29_, _tmp32_);
+ _tmp25_ = cairo_image_surface_create_for_data ((guchar*) _tmp15_, _tmp10_, _tmp18_, _tmp21_, _tmp24_);
#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
- surface = _tmp33_;
+ surface = _tmp25_;
#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp34_ = surface;
+ _tmp26_ = surface;
#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp35_ = cairo_create (_tmp34_);
+ _tmp27_ = cairo_create (_tmp26_);
#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
- context = _tmp35_;
+ context = _tmp27_;
#line 374 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp36_ = context;
+ _tmp28_ = context;
#line 374 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_set_source_rgb (_tmp36_, (gdouble) 0, (gdouble) 0, (gdouble) 0);
+ cairo_set_source_rgb (_tmp28_, (gdouble) 0, (gdouble) 0, (gdouble) 0);
#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp37_ = context;
+ _tmp29_ = context;
#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp38_ = dest_pixbuf;
+ _tmp30_ = dest_pixbuf;
#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp39_ = gdk_pixbuf_get_width (_tmp38_);
+ _tmp31_ = gdk_pixbuf_get_width (_tmp30_);
#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp40_ = _tmp39_;
+ _tmp32_ = _tmp31_;
#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp41_ = dest_pixbuf;
+ _tmp33_ = dest_pixbuf;
#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp42_ = gdk_pixbuf_get_height (_tmp41_);
+ _tmp34_ = gdk_pixbuf_get_height (_tmp33_);
#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp43_ = _tmp42_;
+ _tmp35_ = _tmp34_;
#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_rectangle (_tmp37_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp40_, (gdouble) _tmp43_);
+ cairo_rectangle (_tmp29_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp32_, (gdouble) _tmp35_);
#line 376 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp44_ = context;
+ _tmp36_ = context;
#line 376 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_fill (_tmp44_);
+ cairo_fill (_tmp36_);
#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp45_ = context;
+ _tmp37_ = context;
#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp46_ = dest_pixbuf;
+ _tmp38_ = dest_pixbuf;
#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp47_ = gdk_pixbuf_get_width (_tmp46_);
+ _tmp39_ = gdk_pixbuf_get_width (_tmp38_);
#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp48_ = _tmp47_;
+ _tmp40_ = _tmp39_;
#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp49_ = dest_pixbuf;
+ _tmp41_ = dest_pixbuf;
#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp50_ = gdk_pixbuf_get_height (_tmp49_);
+ _tmp42_ = gdk_pixbuf_get_height (_tmp41_);
#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp51_ = _tmp50_;
+ _tmp43_ = _tmp42_;
#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_translate (_tmp45_, (gdouble) (_tmp48_ / 2), (gdouble) (_tmp51_ / 2));
-#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp52_ = context;
-#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp53_ = angle;
+ cairo_translate (_tmp37_, (gdouble) (_tmp40_ / 2), (gdouble) (_tmp43_ / 2));
#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp54_ = degrees_to_radians (_tmp53_);
+ _tmp44_ = context;
#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_rotate (_tmp52_, _tmp54_);
-#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp55_ = context;
+ cairo_rotate (_tmp44_, degrees_to_radians (angle));
#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp56_ = source_pixbuf;
-#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp57_ = gdk_pixbuf_get_width (_tmp56_);
+ _tmp45_ = context;
#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp58_ = _tmp57_;
+ _tmp46_ = gdk_pixbuf_get_width (source_pixbuf);
#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp59_ = source_pixbuf;
+ _tmp47_ = _tmp46_;
#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp60_ = gdk_pixbuf_get_height (_tmp59_);
+ _tmp48_ = gdk_pixbuf_get_height (source_pixbuf);
#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp61_ = _tmp60_;
+ _tmp49_ = _tmp48_;
#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_translate (_tmp55_, (gdouble) ((-_tmp58_) / 2), (gdouble) ((-_tmp61_) / 2));
+ cairo_translate (_tmp45_, (gdouble) ((-_tmp47_) / 2), (gdouble) ((-_tmp49_) / 2));
#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp62_ = context;
+ _tmp50_ = context;
#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp63_ = source_pixbuf;
-#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
- gdk_cairo_set_source_pixbuf (_tmp62_, _tmp63_, (gdouble) 0, (gdouble) 0);
+ gdk_cairo_set_source_pixbuf (_tmp50_, source_pixbuf, (gdouble) 0, (gdouble) 0);
#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp64_ = context;
+ _tmp51_ = context;
#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp65_ = cairo_get_source (_tmp64_);
+ _tmp52_ = cairo_get_source (_tmp51_);
#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_pattern_set_filter (_tmp65_, CAIRO_FILTER_BEST);
+ cairo_pattern_set_filter (_tmp52_, CAIRO_FILTER_BEST);
#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp66_ = context;
+ _tmp53_ = context;
#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_paint (_tmp66_);
+ cairo_paint (_tmp53_);
#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp67_ = dest_pixbuf;
+ _tmp54_ = dest_pixbuf;
#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
- fix_cairo_pixbuf (_tmp67_);
+ fix_cairo_pixbuf (_tmp54_);
#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
result = dest_pixbuf;
#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2068,7 +1879,7 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
_cairo_surface_destroy0 (surface);
#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 2072 "image.c"
+#line 1883 "image.c"
}
@@ -2085,119 +1896,95 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
* @param img_h The height of the source image (unrotated).
* @param angle The angle the source image is to be rotated by to straighten it.
*/
-void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result) {
- gdouble _tmp0_;
+void
+rotate_point_arb (GdkPoint* source_point,
+ gint img_w,
+ gint img_h,
+ gdouble angle,
+ gboolean invert,
+ GdkPoint* result)
+{
gdouble dest_width = 0.0;
gdouble dest_height = 0.0;
- gint _tmp2_;
- gint _tmp3_;
- gdouble _tmp4_;
- gdouble _tmp5_ = 0.0;
- gdouble _tmp6_ = 0.0;
+ gdouble _tmp1_ = 0.0;
+ gdouble _tmp2_ = 0.0;
cairo_matrix_t matrix = {0};
- gdouble _tmp7_;
- gdouble _tmp8_;
- gdouble _tmp9_;
- gdouble _tmp10_;
- gint _tmp11_;
- gint _tmp12_;
- gboolean _tmp13_;
+ gdouble _tmp3_;
+ gdouble _tmp4_;
gdouble dest_x = 0.0;
- GdkPoint _tmp15_;
- gint _tmp16_;
+ GdkPoint _tmp5_;
+ gint _tmp6_;
gdouble dest_y = 0.0;
- GdkPoint _tmp17_;
- gint _tmp18_;
- gdouble _tmp19_;
- gdouble _tmp20_;
- GdkPoint _tmp21_ = {0};
+ GdkPoint _tmp7_;
+ gint _tmp8_;
+ gdouble _tmp9_;
+ gdouble _tmp10_;
+ GdkPoint _tmp11_ = {0};
#line 406 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (source_point != NULL);
#line 409 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = angle;
-#line 409 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp0_ == 0.0) {
-#line 2121 "image.c"
- GdkPoint _tmp1_;
+ if (angle == 0.0) {
+#line 1928 "image.c"
+ GdkPoint _tmp0_;
#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = *source_point;
+ _tmp0_ = *source_point;
#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
- *result = _tmp1_;
+ *result = _tmp0_;
#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 2129 "image.c"
+#line 1936 "image.c"
}
#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = img_w;
-#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = img_h;
-#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = angle;
-#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
- compute_arb_rotated_size ((gdouble) _tmp2_, (gdouble) _tmp3_, _tmp4_, &_tmp5_, &_tmp6_);
+ compute_arb_rotated_size ((gdouble) img_w, (gdouble) img_h, angle, &_tmp1_, &_tmp2_);
#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
- dest_width = _tmp5_;
+ dest_width = _tmp1_;
#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
- dest_height = _tmp6_;
+ dest_height = _tmp2_;
#line 418 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_matrix_init_identity (&matrix);
#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = dest_width;
+ _tmp3_ = dest_width;
#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = dest_height;
+ _tmp4_ = dest_height;
#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_matrix_translate (&matrix, _tmp7_ / 2, _tmp8_ / 2);
+ cairo_matrix_translate (&matrix, _tmp3_ / 2, _tmp4_ / 2);
#line 420 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = angle;
-#line 420 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = degrees_to_radians (_tmp9_);
-#line 420 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_matrix_rotate (&matrix, _tmp10_);
-#line 421 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = img_w;
-#line 421 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = img_h;
+ cairo_matrix_rotate (&matrix, degrees_to_radians (angle));
#line 421 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_matrix_translate (&matrix, (gdouble) ((-_tmp11_) / 2), (gdouble) ((-_tmp12_) / 2));
+ cairo_matrix_translate (&matrix, (gdouble) ((-img_w) / 2), (gdouble) ((-img_h) / 2));
#line 422 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = invert;
-#line 422 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp13_) {
-#line 2167 "image.c"
- cairo_status_t _tmp14_;
-#line 423 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = cairo_matrix_invert (&matrix);
+ if (invert) {
#line 423 "/home/jens/Source/shotwell/src/util/image.vala"
- _vala_assert (_tmp14_ == CAIRO_STATUS_SUCCESS, "matrix.invert() == Cairo.Status.SUCCESS");
-#line 2173 "image.c"
+ _vala_assert (cairo_matrix_invert (&matrix) == CAIRO_STATUS_SUCCESS, "matrix.invert() == Cairo.Status.SUCCESS");
+#line 1960 "image.c"
}
#line 425 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = *source_point;
+ _tmp5_ = *source_point;
#line 425 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = _tmp15_.x;
+ _tmp6_ = _tmp5_.x;
#line 425 "/home/jens/Source/shotwell/src/util/image.vala"
- dest_x = (gdouble) _tmp16_;
+ dest_x = (gdouble) _tmp6_;
#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = *source_point;
+ _tmp7_ = *source_point;
#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = _tmp17_.y;
+ _tmp8_ = _tmp7_.y;
#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
- dest_y = (gdouble) _tmp18_;
+ dest_y = (gdouble) _tmp8_;
#line 427 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_matrix_transform_point (&matrix, &dest_x, &dest_y);
#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = dest_x;
+ _tmp9_ = dest_x;
#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp20_ = dest_y;
+ _tmp10_ = dest_y;
#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp21_.x = (gint) _tmp19_;
+ _tmp11_.x = (gint) _tmp9_;
#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp21_.y = (gint) _tmp20_;
+ _tmp11_.y = (gint) _tmp10_;
#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
- *result = _tmp21_;
+ *result = _tmp11_;
#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 2201 "image.c"
+#line 1988 "image.c"
}
@@ -2214,40 +2001,41 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
* @param img_h The height of the source image (unrotated).
* @param angle The angle the source image is to be rotated by to straighten it.
*/
-void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result) {
+void
+derotate_point_arb (GdkPoint* source_point,
+ gint img_w,
+ gint img_h,
+ gdouble angle,
+ GdkPoint* result)
+{
GdkPoint _tmp0_;
- gint _tmp1_;
- gint _tmp2_;
- gdouble _tmp3_;
- GdkPoint _tmp4_ = {0};
+ GdkPoint _tmp1_ = {0};
#line 445 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (source_point != NULL);
#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = *source_point;
#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = img_w;
+ rotate_point_arb (&_tmp0_, img_w, img_h, angle, TRUE, &_tmp1_);
#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = img_h;
-#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = angle;
-#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
- rotate_point_arb (&_tmp0_, _tmp1_, _tmp2_, _tmp3_, TRUE, &_tmp4_);
-#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
- *result = _tmp4_;
+ *result = _tmp1_;
#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 2240 "image.c"
+#line 2024 "image.c"
}
-static gpointer _cairo_surface_reference0 (gpointer self) {
+static gpointer
+_cairo_surface_reference0 (gpointer self)
+{
#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
return self ? cairo_surface_reference (self) : NULL;
-#line 2247 "image.c"
+#line 2033 "image.c"
}
-cairo_surface_t* get_background_surface (void) {
+cairo_surface_t*
+get_background_surface (void)
+{
cairo_surface_t* result = NULL;
cairo_surface_t* _tmp0_;
cairo_surface_t* _tmp31_;
@@ -2256,7 +2044,7 @@ cairo_surface_t* get_background_surface (void) {
_tmp0_ = background_surface;
#line 452 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp0_ == NULL) {
-#line 2260 "image.c"
+#line 2048 "image.c"
gchar* color_a = NULL;
gchar* color_b = NULL;
ConfigFacade* config = NULL;
@@ -2271,7 +2059,7 @@ cairo_surface_t* get_background_surface (void) {
static GQuark _tmp6_label0 = 0;
#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
static GQuark _tmp6_label1 = 0;
-#line 2275 "image.c"
+#line 2063 "image.c"
cairo_surface_t* _tmp17_;
cairo_t* ctx = NULL;
cairo_surface_t* _tmp18_;
@@ -2307,7 +2095,7 @@ cairo_surface_t* get_background_surface (void) {
if (_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("checkered")))) {
#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
switch (0) {
-#line 2311 "image.c"
+#line 2099 "image.c"
default:
{
gchar* _tmp8_;
@@ -2326,13 +2114,13 @@ cairo_surface_t* get_background_surface (void) {
color_b = _tmp9_;
#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 2330 "image.c"
+#line 2118 "image.c"
}
}
} else if (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("solid")))) {
#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
switch (0) {
-#line 2336 "image.c"
+#line 2124 "image.c"
default:
{
ConfigFacade* _tmp10_;
@@ -2357,13 +2145,13 @@ cairo_surface_t* get_background_surface (void) {
color_a = _tmp13_;
#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 2361 "image.c"
+#line 2149 "image.c"
}
}
} else {
#line 458 "/home/jens/Source/shotwell/src/util/image.vala"
switch (0) {
-#line 2367 "image.c"
+#line 2155 "image.c"
default:
{
gchar* _tmp14_;
@@ -2385,7 +2173,7 @@ cairo_surface_t* get_background_surface (void) {
color_a = _tmp16_;
#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 2389 "image.c"
+#line 2177 "image.c"
}
}
}
@@ -2451,7 +2239,7 @@ cairo_surface_t* get_background_surface (void) {
_g_free0 (color_b);
#line 452 "/home/jens/Source/shotwell/src/util/image.vala"
_g_free0 (color_a);
-#line 2455 "image.c"
+#line 2243 "image.c"
}
#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp31_ = background_surface;
@@ -2461,193 +2249,141 @@ cairo_surface_t* get_background_surface (void) {
result = _tmp32_;
#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 2465 "image.c"
+#line 2253 "image.c"
}
-void invalidate_transparent_background (void) {
+void
+invalidate_transparent_background (void)
+{
#line 488 "/home/jens/Source/shotwell/src/util/image.vala"
_cairo_surface_destroy0 (background_surface);
#line 488 "/home/jens/Source/shotwell/src/util/image.vala"
background_surface = NULL;
-#line 2474 "image.c"
+#line 2264 "image.c"
}
-void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y) {
- GdkPixbuf* _tmp0_;
- gboolean _tmp1_;
- cairo_t* _tmp17_;
- GdkPixbuf* _tmp18_;
- gint _tmp19_;
- gint _tmp20_;
- cairo_t* _tmp21_;
+void
+paint_pixmap_with_background (cairo_t* ctx,
+ GdkPixbuf* pixbuf,
+ gint x,
+ gint y)
+{
#line 491 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (ctx != NULL);
#line 491 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
#line 492 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = pixbuf;
-#line 492 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = gdk_pixbuf_get_has_alpha (_tmp0_);
-#line 492 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp1_) {
-#line 2496 "image.c"
- cairo_t* _tmp2_;
- cairo_surface_t* _tmp3_;
- cairo_surface_t* _tmp4_;
- cairo_t* _tmp5_;
- cairo_pattern_t* _tmp6_;
- cairo_t* _tmp7_;
- gint _tmp8_;
- gint _tmp9_;
- GdkPixbuf* _tmp10_;
- gint _tmp11_;
- gint _tmp12_;
- GdkPixbuf* _tmp13_;
- gint _tmp14_;
- gint _tmp15_;
- cairo_t* _tmp16_;
+ if (gdk_pixbuf_get_has_alpha (pixbuf)) {
+#line 2280 "image.c"
+ cairo_surface_t* _tmp0_;
+ cairo_surface_t* _tmp1_;
+ cairo_pattern_t* _tmp2_;
+ gint _tmp3_;
+ gint _tmp4_;
+ gint _tmp5_;
+ gint _tmp6_;
#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = ctx;
+ _tmp0_ = get_background_surface ();
#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = get_background_surface ();
+ _tmp1_ = _tmp0_;
#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp4_ = _tmp3_;
+ cairo_set_source_surface (ctx, _tmp1_, (gdouble) 0, (gdouble) 0);
#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_set_source_surface (_tmp2_, _tmp4_, (gdouble) 0, (gdouble) 0);
-#line 493 "/home/jens/Source/shotwell/src/util/image.vala"
- _cairo_surface_destroy0 (_tmp4_);
-#line 494 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = ctx;
+ _cairo_surface_destroy0 (_tmp1_);
#line 494 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = cairo_get_source (_tmp5_);
+ _tmp2_ = cairo_get_source (ctx);
#line 494 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_pattern_set_extend (_tmp6_, CAIRO_EXTEND_REPEAT);
-#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = ctx;
-#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp8_ = x;
+ cairo_pattern_set_extend (_tmp2_, CAIRO_EXTEND_REPEAT);
#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = y;
+ _tmp3_ = gdk_pixbuf_get_width (pixbuf);
#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = pixbuf;
-#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = gdk_pixbuf_get_width (_tmp10_);
-#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = _tmp11_;
-#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_ = pixbuf;
+ _tmp4_ = _tmp3_;
#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = gdk_pixbuf_get_height (_tmp13_);
+ _tmp5_ = gdk_pixbuf_get_height (pixbuf);
#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = _tmp14_;
+ _tmp6_ = _tmp5_;
#line 495 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_rectangle (_tmp7_, (gdouble) _tmp8_, (gdouble) _tmp9_, (gdouble) _tmp12_, (gdouble) _tmp15_);
+ cairo_rectangle (ctx, (gdouble) x, (gdouble) y, (gdouble) _tmp4_, (gdouble) _tmp6_);
#line 496 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = ctx;
-#line 496 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_fill (_tmp16_);
-#line 2552 "image.c"
+ cairo_fill (ctx);
+#line 2312 "image.c"
}
#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp17_ = ctx;
-#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = pixbuf;
-#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = x;
-#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp20_ = y;
-#line 499 "/home/jens/Source/shotwell/src/util/image.vala"
- gdk_cairo_set_source_pixbuf (_tmp17_, _tmp18_, (gdouble) _tmp19_, (gdouble) _tmp20_);
-#line 500 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp21_ = ctx;
+ gdk_cairo_set_source_pixbuf (ctx, pixbuf, (gdouble) x, (gdouble) y);
#line 500 "/home/jens/Source/shotwell/src/util/image.vala"
- cairo_paint (_tmp21_);
-#line 2568 "image.c"
+ cairo_paint (ctx);
+#line 2318 "image.c"
}
-void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle_deg, gboolean preserve_geom, Box* result) {
+void
+clamp_inside_rotated_image (Box* src,
+ gint img_w,
+ gint img_h,
+ gdouble angle_deg,
+ gboolean preserve_geom,
+ Box* result)
+{
GdkPoint top_left = {0};
Box _tmp0_;
gint _tmp1_;
Box _tmp2_;
gint _tmp3_;
GdkPoint _tmp4_ = {0};
- gint _tmp5_;
- gint _tmp6_;
- gdouble _tmp7_;
- GdkPoint _tmp8_ = {0};
+ GdkPoint _tmp5_ = {0};
GdkPoint top_right = {0};
- Box _tmp9_;
- gint _tmp10_;
- Box _tmp11_;
- gint _tmp12_;
- GdkPoint _tmp13_ = {0};
- gint _tmp14_;
+ Box _tmp6_;
+ gint _tmp7_;
+ Box _tmp8_;
+ gint _tmp9_;
+ GdkPoint _tmp10_ = {0};
+ GdkPoint _tmp11_ = {0};
+ GdkPoint bottom_left = {0};
+ Box _tmp12_;
+ gint _tmp13_;
+ Box _tmp14_;
gint _tmp15_;
- gdouble _tmp16_;
+ GdkPoint _tmp16_ = {0};
GdkPoint _tmp17_ = {0};
- GdkPoint bottom_left = {0};
+ GdkPoint bottom_right = {0};
Box _tmp18_;
gint _tmp19_;
Box _tmp20_;
gint _tmp21_;
GdkPoint _tmp22_ = {0};
- gint _tmp23_;
- gint _tmp24_;
- gdouble _tmp25_;
- GdkPoint _tmp26_ = {0};
- GdkPoint bottom_right = {0};
- Box _tmp27_;
- gint _tmp28_;
- Box _tmp29_;
- gint _tmp30_;
- GdkPoint _tmp31_ = {0};
- gint _tmp32_;
- gint _tmp33_;
- gdouble _tmp34_;
- GdkPoint _tmp35_ = {0};
+ GdkPoint _tmp23_ = {0};
gdouble angle = 0.0;
- gdouble _tmp36_;
- gdouble _tmp37_;
gint top_offset = 0;
gint bottom_offset = 0;
gint left_offset = 0;
gint right_offset = 0;
gint top = 0;
+ GdkPoint _tmp24_;
+ gint _tmp25_;
+ GdkPoint _tmp26_;
+ gint _tmp27_;
+ gint _tmp28_;
+ gint bottom = 0;
+ GdkPoint _tmp31_;
+ gint _tmp32_;
+ GdkPoint _tmp33_;
+ gint _tmp34_;
+ gint _tmp35_;
+ gint left = 0;
GdkPoint _tmp38_;
gint _tmp39_;
GdkPoint _tmp40_;
gint _tmp41_;
gint _tmp42_;
- gint _tmp43_;
- gint bottom = 0;
+ gint right = 0;
+ GdkPoint _tmp45_;
+ gint _tmp46_;
GdkPoint _tmp47_;
gint _tmp48_;
- GdkPoint _tmp49_;
- gint _tmp50_;
- gint _tmp51_;
- gint _tmp52_;
- gint _tmp53_;
- gint left = 0;
- GdkPoint _tmp58_;
- gint _tmp59_;
- GdkPoint _tmp60_;
- gint _tmp61_;
- gint _tmp62_;
- gint _tmp63_;
- gint right = 0;
- GdkPoint _tmp67_;
- gint _tmp68_;
- GdkPoint _tmp69_;
- gint _tmp70_;
- gint _tmp71_;
- gint _tmp72_;
- gint _tmp73_;
- Box _tmp78_ = {0};
- gboolean _tmp79_;
+ gint _tmp49_;
+ Box _tmp52_ = {0};
#line 504 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (src != NULL);
#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2663,87 +2399,59 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_.y = _tmp3_;
#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp5_ = img_w;
-#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp6_ = img_h;
-#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp7_ = angle_deg;
+ derotate_point_arb (&_tmp4_, img_w, img_h, angle_deg, &_tmp5_);
#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
- derotate_point_arb (&_tmp4_, _tmp5_, _tmp6_, _tmp7_, &_tmp8_);
-#line 507 "/home/jens/Source/shotwell/src/util/image.vala"
- top_left = _tmp8_;
-#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp9_ = *src;
-#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp10_ = _tmp9_.right;
-#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp11_ = *src;
+ top_left = _tmp5_;
#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp12_ = _tmp11_.top;
+ _tmp6_ = *src;
#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_.x = _tmp10_;
+ _tmp7_ = _tmp6_.right;
#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp13_.y = _tmp12_;
+ _tmp8_ = *src;
#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp14_ = img_w;
+ _tmp9_ = _tmp8_.top;
#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp15_ = img_h;
+ _tmp10_.x = _tmp7_;
#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp16_ = angle_deg;
+ _tmp10_.y = _tmp9_;
#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- derotate_point_arb (&_tmp13_, _tmp14_, _tmp15_, _tmp16_, &_tmp17_);
+ derotate_point_arb (&_tmp10_, img_w, img_h, angle_deg, &_tmp11_);
#line 508 "/home/jens/Source/shotwell/src/util/image.vala"
- top_right = _tmp17_;
-#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp18_ = *src;
-#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp19_ = _tmp18_.left;
-#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp20_ = *src;
+ top_right = _tmp11_;
#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp21_ = _tmp20_.bottom;
+ _tmp12_ = *src;
#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp22_.x = _tmp19_;
+ _tmp13_ = _tmp12_.left;
#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp22_.y = _tmp21_;
+ _tmp14_ = *src;
#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp23_ = img_w;
+ _tmp15_ = _tmp14_.bottom;
#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp24_ = img_h;
+ _tmp16_.x = _tmp13_;
#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp25_ = angle_deg;
+ _tmp16_.y = _tmp15_;
#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- derotate_point_arb (&_tmp22_, _tmp23_, _tmp24_, _tmp25_, &_tmp26_);
+ derotate_point_arb (&_tmp16_, img_w, img_h, angle_deg, &_tmp17_);
#line 509 "/home/jens/Source/shotwell/src/util/image.vala"
- bottom_left = _tmp26_;
-#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp27_ = *src;
+ bottom_left = _tmp17_;
#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp28_ = _tmp27_.right;
-#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp29_ = *src;
-#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp30_ = _tmp29_.bottom;
+ _tmp18_ = *src;
#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp31_.x = _tmp28_;
+ _tmp19_ = _tmp18_.right;
#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp31_.y = _tmp30_;
+ _tmp20_ = *src;
#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp32_ = img_w;
+ _tmp21_ = _tmp20_.bottom;
#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp33_ = img_h;
+ _tmp22_.x = _tmp19_;
#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp34_ = angle_deg;
+ _tmp22_.y = _tmp21_;
#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- derotate_point_arb (&_tmp31_, _tmp32_, _tmp33_, _tmp34_, &_tmp35_);
+ derotate_point_arb (&_tmp22_, img_w, img_h, angle_deg, &_tmp23_);
#line 510 "/home/jens/Source/shotwell/src/util/image.vala"
- bottom_right = _tmp35_;
-#line 512 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp36_ = angle_deg;
+ bottom_right = _tmp23_;
#line 512 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp37_ = degrees_to_radians (_tmp36_);
-#line 512 "/home/jens/Source/shotwell/src/util/image.vala"
- angle = _tmp37_;
+ angle = degrees_to_radians (angle_deg);
#line 513 "/home/jens/Source/shotwell/src/util/image.vala"
top_offset = 0;
#line 513 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2753,204 +2461,172 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
#line 513 "/home/jens/Source/shotwell/src/util/image.vala"
right_offset = 0;
#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp38_ = top_left;
-#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp39_ = _tmp38_.y;
+ _tmp24_ = top_left;
#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp40_ = top_right;
+ _tmp25_ = _tmp24_.y;
#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp41_ = _tmp40_.y;
+ _tmp26_ = top_right;
#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp42_ = MIN (_tmp39_, _tmp41_);
+ _tmp27_ = _tmp26_.y;
#line 515 "/home/jens/Source/shotwell/src/util/image.vala"
- top = _tmp42_;
+ top = MIN (_tmp25_, _tmp27_);
#line 516 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp43_ = top;
+ _tmp28_ = top;
#line 516 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp43_ < 0) {
-#line 2772 "image.c"
- gint _tmp44_;
- gdouble _tmp45_;
- gdouble _tmp46_;
-#line 517 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp44_ = top;
+ if (_tmp28_ < 0) {
+#line 2478 "image.c"
+ gint _tmp29_;
+ gdouble _tmp30_;
#line 517 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp45_ = angle;
+ _tmp29_ = top;
#line 517 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp46_ = cos (_tmp45_);
+ _tmp30_ = angle;
#line 517 "/home/jens/Source/shotwell/src/util/image.vala"
- top_offset = (gint) ((0 - _tmp44_) * _tmp46_);
-#line 2784 "image.c"
+ top_offset = (gint) ((0 - _tmp29_) * cos (_tmp30_));
+#line 2487 "image.c"
}
#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp47_ = bottom_left;
+ _tmp31_ = bottom_left;
#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp48_ = _tmp47_.y;
+ _tmp32_ = _tmp31_.y;
#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp49_ = bottom_right;
+ _tmp33_ = bottom_right;
#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp50_ = _tmp49_.y;
+ _tmp34_ = _tmp33_.y;
#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp51_ = MAX (_tmp48_, _tmp50_);
-#line 519 "/home/jens/Source/shotwell/src/util/image.vala"
- bottom = _tmp51_;
-#line 520 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp52_ = bottom;
+ bottom = MAX (_tmp32_, _tmp34_);
#line 520 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp53_ = img_h;
+ _tmp35_ = bottom;
#line 520 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp52_ > _tmp53_) {
-#line 2804 "image.c"
- gint _tmp54_;
- gint _tmp55_;
- gdouble _tmp56_;
- gdouble _tmp57_;
+ if (_tmp35_ > img_h) {
+#line 2503 "image.c"
+ gint _tmp36_;
+ gdouble _tmp37_;
#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp54_ = img_h;
+ _tmp36_ = bottom;
#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp55_ = bottom;
+ _tmp37_ = angle;
#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp56_ = angle;
-#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp57_ = cos (_tmp56_);
-#line 521 "/home/jens/Source/shotwell/src/util/image.vala"
- bottom_offset = (gint) ((_tmp54_ - _tmp55_) * _tmp57_);
-#line 2819 "image.c"
+ bottom_offset = (gint) ((img_h - _tmp36_) * cos (_tmp37_));
+#line 2512 "image.c"
}
#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp58_ = top_left;
-#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp59_ = _tmp58_.x;
+ _tmp38_ = top_left;
#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp60_ = bottom_left;
+ _tmp39_ = _tmp38_.x;
#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp61_ = _tmp60_.x;
+ _tmp40_ = bottom_left;
#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp62_ = MIN (_tmp59_, _tmp61_);
+ _tmp41_ = _tmp40_.x;
#line 523 "/home/jens/Source/shotwell/src/util/image.vala"
- left = _tmp62_;
+ left = MIN (_tmp39_, _tmp41_);
#line 524 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp63_ = left;
+ _tmp42_ = left;
#line 524 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp63_ < 0) {
-#line 2837 "image.c"
- gint _tmp64_;
- gdouble _tmp65_;
- gdouble _tmp66_;
+ if (_tmp42_ < 0) {
+#line 2528 "image.c"
+ gint _tmp43_;
+ gdouble _tmp44_;
#line 525 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp64_ = left;
+ _tmp43_ = left;
#line 525 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp65_ = angle;
+ _tmp44_ = angle;
#line 525 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp66_ = cos (_tmp65_);
-#line 525 "/home/jens/Source/shotwell/src/util/image.vala"
- left_offset = (gint) ((0 - _tmp64_) * _tmp66_);
-#line 2849 "image.c"
+ left_offset = (gint) ((0 - _tmp43_) * cos (_tmp44_));
+#line 2537 "image.c"
}
#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp67_ = top_right;
-#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp68_ = _tmp67_.x;
+ _tmp45_ = top_right;
#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp69_ = bottom_right;
+ _tmp46_ = _tmp45_.x;
#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp70_ = _tmp69_.x;
+ _tmp47_ = bottom_right;
#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp71_ = MAX (_tmp68_, _tmp70_);
+ _tmp48_ = _tmp47_.x;
#line 527 "/home/jens/Source/shotwell/src/util/image.vala"
- right = _tmp71_;
+ right = MAX (_tmp46_, _tmp48_);
#line 528 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp72_ = right;
+ _tmp49_ = right;
#line 528 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp73_ = img_w;
-#line 528 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp72_ > _tmp73_) {
-#line 2869 "image.c"
- gint _tmp74_;
- gint _tmp75_;
- gdouble _tmp76_;
- gdouble _tmp77_;
-#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp74_ = img_w;
+ if (_tmp49_ > img_w) {
+#line 2553 "image.c"
+ gint _tmp50_;
+ gdouble _tmp51_;
#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp75_ = right;
+ _tmp50_ = right;
#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp76_ = angle;
+ _tmp51_ = angle;
#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp77_ = cos (_tmp76_);
-#line 529 "/home/jens/Source/shotwell/src/util/image.vala"
- right_offset = (gint) ((_tmp74_ - _tmp75_) * _tmp77_);
-#line 2884 "image.c"
+ right_offset = (gint) ((img_w - _tmp50_) * cos (_tmp51_));
+#line 2562 "image.c"
}
#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp79_ = preserve_geom;
-#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
- if (_tmp79_) {
-#line 2890 "image.c"
- gint _tmp80_;
- gint _tmp81_;
- gint _tmp82_;
- gint _tmp83_;
- Box _tmp84_ = {0};
+ if (preserve_geom) {
+#line 2566 "image.c"
+ gint _tmp53_;
+ gint _tmp54_;
+ gint _tmp55_;
+ gint _tmp56_;
+ Box _tmp57_ = {0};
#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp80_ = left_offset;
+ _tmp53_ = left_offset;
#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp81_ = right_offset;
+ _tmp54_ = right_offset;
#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp82_ = top_offset;
+ _tmp55_ = top_offset;
#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp83_ = bottom_offset;
+ _tmp56_ = bottom_offset;
#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
- box_get_offset (src, _tmp80_ + _tmp81_, _tmp82_ + _tmp83_, &_tmp84_);
+ box_get_offset (src, _tmp53_ + _tmp54_, _tmp55_ + _tmp56_, &_tmp57_);
#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp78_ = _tmp84_;
-#line 2908 "image.c"
+ _tmp52_ = _tmp57_;
+#line 2584 "image.c"
} else {
- Box _tmp85_;
- gint _tmp86_;
- gint _tmp87_;
- Box _tmp88_;
- gint _tmp89_;
- gint _tmp90_;
- Box _tmp91_;
- gint _tmp92_;
- gint _tmp93_;
- Box _tmp94_;
- gint _tmp95_;
- gint _tmp96_;
+ Box _tmp58_;
+ gint _tmp59_;
+ gint _tmp60_;
+ Box _tmp61_;
+ gint _tmp62_;
+ gint _tmp63_;
+ Box _tmp64_;
+ gint _tmp65_;
+ gint _tmp66_;
+ Box _tmp67_;
+ gint _tmp68_;
+ gint _tmp69_;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp85_ = *src;
+ _tmp58_ = *src;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp86_ = _tmp85_.left;
+ _tmp59_ = _tmp58_.left;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp87_ = left_offset;
+ _tmp60_ = left_offset;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp88_ = *src;
+ _tmp61_ = *src;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp89_ = _tmp88_.top;
+ _tmp62_ = _tmp61_.top;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp90_ = top_offset;
+ _tmp63_ = top_offset;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp91_ = *src;
+ _tmp64_ = *src;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp92_ = _tmp91_.right;
+ _tmp65_ = _tmp64_.right;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp93_ = right_offset;
+ _tmp66_ = right_offset;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp94_ = *src;
+ _tmp67_ = *src;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp95_ = _tmp94_.bottom;
+ _tmp68_ = _tmp67_.bottom;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp96_ = bottom_offset;
+ _tmp69_ = bottom_offset;
#line 532 "/home/jens/Source/shotwell/src/util/image.vala"
- box_init (&_tmp78_, _tmp86_ + _tmp87_, _tmp89_ + _tmp90_, _tmp92_ + _tmp93_, _tmp95_ + _tmp96_);
-#line 2948 "image.c"
+ box_init (&_tmp52_, _tmp59_ + _tmp60_, _tmp62_ + _tmp63_, _tmp65_ + _tmp66_, _tmp68_ + _tmp69_);
+#line 2624 "image.c"
}
#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
- *result = _tmp78_;
+ *result = _tmp52_;
#line 531 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 2954 "image.c"
+#line 2630 "image.c"
}