Merge branch 'release/0.26.4-1'0.26.4-1

1 files changed, 466 insertions, 466 deletions

diff --git a/src/util/image.c b/src/util/image.c
index 1bc543b..d103a3f 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.34.7, the Vala compiler
+/* image.c generated by valac 0.36.6, the Vala compiler
  * generated from image.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -94,8 +94,8 @@ const gchar* fallback_image_missing[103] = {"48 48 54 1 ", "  c #6A6D67", ". c #
 gboolean is_color_parsable (const gchar* spec) {
 	gboolean result = FALSE;
 	GdkRGBA color = {0};
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -113,7 +113,7 @@ gboolean is_color_parsable (const gchar* spec) {
 
 
 void parse_color (const gchar* spec, GdkRGBA* result) {
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	GdkRGBA _tmp1_ = {0};
 #line 122 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (spec != NULL);
@@ -131,8 +131,8 @@ void parse_color (const gchar* spec, GdkRGBA* result) {
 
 void fetch_color (const gchar* spec, GdkRGBA* result) {
 	GdkRGBA rgba = {0};
-	const gchar* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	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"
@@ -144,7 +144,7 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
 #line 128 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (!_tmp1_) {
 #line 147 "image.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = spec;
 #line 129 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -161,17 +161,17 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
 
 void set_source_color_from_string (cairo_t* ctx, const gchar* spec) {
 	GdkRGBA rgba = {0};
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	GdkRGBA _tmp1_ = {0};
-	cairo_t* _tmp2_ = NULL;
-	GdkRGBA _tmp3_ = {0};
-	gdouble _tmp4_ = 0.0;
-	GdkRGBA _tmp5_ = {0};
-	gdouble _tmp6_ = 0.0;
-	GdkRGBA _tmp7_ = {0};
-	gdouble _tmp8_ = 0.0;
-	GdkRGBA _tmp9_ = {0};
-	gdouble _tmp10_ = 0.0;
+	cairo_t* _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"
@@ -222,11 +222,11 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 #line 223 "image.c"
 	{
 		GtkIconTheme* icon_theme = NULL;
-		GtkIconTheme* _tmp0_ = NULL;
-		GtkIconTheme* _tmp1_ = NULL;
+		GtkIconTheme* _tmp0_;
+		GtkIconTheme* _tmp1_;
 		GdkPixbuf* _tmp2_ = NULL;
-		GdkPixbuf* _tmp3_ = NULL;
-		GdkPixbuf* _tmp4_ = NULL;
+		GdkPixbuf* _tmp3_;
+		GdkPixbuf* _tmp4_;
 #line 147 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp0_ = gtk_icon_theme_get_default ();
 #line 147 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -262,9 +262,9 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 	__catch4_g_error:
 	{
 		GError* _error_ = NULL;
-		GdkPixbuf* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		GdkPixbuf* _tmp5_;
+		GError* _tmp6_;
+		const gchar* _tmp7_;
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
 		_error_ = _inner_error_;
 #line 146 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -309,25 +309,25 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
 GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gboolean scale_up) {
 	GdkPixbuf* result = NULL;
 	Dimensions original = {0};
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	Dimensions scaled = {0};
-	gint _tmp2_ = 0;
-	gboolean _tmp3_ = FALSE;
+	gint _tmp2_;
+	gboolean _tmp3_;
 	Dimensions _tmp4_ = {0};
 	gboolean _tmp5_ = FALSE;
-	Dimensions _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	Dimensions _tmp8_ = {0};
-	gint _tmp9_ = 0;
+	Dimensions _tmp6_;
+	gint _tmp7_;
+	Dimensions _tmp8_;
+	gint _tmp9_;
 	Dimensions _tmp16_ = {0};
-	GdkPixbuf* _tmp17_ = NULL;
-	Dimensions _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	Dimensions _tmp20_ = {0};
-	gint _tmp21_ = 0;
-	GdkInterpType _tmp22_ = 0;
-	GdkPixbuf* _tmp23_ = NULL;
+	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"
@@ -355,10 +355,10 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ == _tmp9_) {
 #line 358 "image.c"
-		Dimensions _tmp10_ = {0};
-		gint _tmp11_ = 0;
-		Dimensions _tmp12_ = {0};
-		gint _tmp13_ = 0;
+		Dimensions _tmp10_;
+		gint _tmp11_;
+		Dimensions _tmp12_;
+		gint _tmp13_;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp10_ = original;
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -378,8 +378,8 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 #line 161 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp5_) {
 #line 381 "image.c"
-		GdkPixbuf* _tmp14_ = NULL;
-		GdkPixbuf* _tmp15_ = NULL;
+		GdkPixbuf* _tmp14_;
+		GdkPixbuf* _tmp15_;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = pixbuf;
 #line 162 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -419,21 +419,21 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
 GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType interp) {
 	GdkPixbuf* result = NULL;
 	Dimensions original = {0};
-	GdkPixbuf* _tmp0_ = NULL;
+	GdkPixbuf* _tmp0_;
 	Dimensions _tmp1_ = {0};
 	gboolean _tmp2_ = FALSE;
-	Dimensions _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	Dimensions _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	Dimensions _tmp3_;
+	gint _tmp4_;
+	Dimensions _tmp5_;
+	gint _tmp6_;
 	Dimensions _tmp13_ = {0};
-	GdkPixbuf* _tmp14_ = NULL;
-	Dimensions _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Dimensions _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	GdkInterpType _tmp19_ = 0;
-	GdkPixbuf* _tmp20_ = NULL;
+	GdkPixbuf* _tmp14_;
+	Dimensions _tmp15_;
+	gint _tmp16_;
+	Dimensions _tmp17_;
+	gint _tmp18_;
+	GdkInterpType _tmp19_;
+	GdkPixbuf* _tmp20_;
 #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"
@@ -455,10 +455,10 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
 #line 458 "image.c"
-		Dimensions _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		Dimensions _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		Dimensions _tmp7_;
+		gint _tmp8_;
+		Dimensions _tmp9_;
+		gint _tmp10_;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp7_ = original;
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -478,8 +478,8 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 #line 172 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
 #line 481 "image.c"
-		GdkPixbuf* _tmp11_ = NULL;
-		GdkPixbuf* _tmp12_ = NULL;
+		GdkPixbuf* _tmp11_;
+		GdkPixbuf* _tmp12_;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = pixbuf;
 #line 173 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -517,11 +517,11 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
 
 
 void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) {
-	cairo_t* _tmp0_ = NULL;
-	Dimensions _tmp1_ = {0};
-	GdkPoint _tmp2_ = {0};
-	gdouble _tmp3_ = 0.0;
-	cairo_t* _tmp4_ = NULL;
+	cairo_t* _tmp0_;
+	Dimensions _tmp1_;
+	GdkPoint _tmp2_;
+	gdouble _tmp3_;
+	cairo_t* _tmp4_;
 #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"
@@ -547,33 +547,33 @@ void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origi
 
 
 void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gdouble radius_proportion) {
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
+	gdouble _tmp0_;
+	gdouble _tmp1_;
 	gdouble left = 0.0;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
 	gdouble top = 0.0;
-	GdkPoint _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	GdkPoint _tmp4_;
+	gint _tmp5_;
 	gdouble right = 0.0;
-	GdkPoint _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	Dimensions _tmp8_ = {0};
-	gint _tmp9_ = 0;
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	Dimensions _tmp8_;
+	gint _tmp9_;
 	gdouble bottom = 0.0;
-	GdkPoint _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	Dimensions _tmp12_ = {0};
-	gint _tmp13_ = 0;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	Dimensions _tmp12_;
+	gint _tmp13_;
 	gdouble radius = 0.0;
-	gint _tmp14_ = 0;
-	gdouble _tmp15_ = 0.0;
-	cairo_t* _tmp16_ = NULL;
-	cairo_t* _tmp17_ = NULL;
-	cairo_t* _tmp18_ = NULL;
-	cairo_t* _tmp19_ = NULL;
-	cairo_t* _tmp20_ = NULL;
-	cairo_t* _tmp21_ = NULL;
+	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"
@@ -654,9 +654,9 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
 
 inline guchar shift_color_byte (gint b, gint shift) {
 	guchar result = '\0';
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 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"
@@ -673,33 +673,33 @@ inline guchar shift_color_byte (gint b, gint shift) {
 
 void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha) {
 	gboolean _tmp0_ = FALSE;
-	gint _tmp1_ = 0;
+	gint _tmp1_;
 	gboolean _tmp3_ = FALSE;
-	gint _tmp4_ = 0;
+	gint _tmp4_;
 	gboolean _tmp6_ = FALSE;
-	gint _tmp7_ = 0;
+	gint _tmp7_;
 	gboolean _tmp9_ = FALSE;
-	gint _tmp10_ = 0;
+	gint _tmp10_;
 	gint width = 0;
-	GdkPixbuf* _tmp12_ = NULL;
-	gint _tmp13_ = 0;
+	GdkPixbuf* _tmp12_;
+	gint _tmp13_;
 	gint height = 0;
-	GdkPixbuf* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
+	GdkPixbuf* _tmp14_;
+	gint _tmp15_;
 	gint rowstride = 0;
-	GdkPixbuf* _tmp16_ = NULL;
-	gint _tmp17_ = 0;
+	GdkPixbuf* _tmp16_;
+	gint _tmp17_;
 	gint channels = 0;
-	GdkPixbuf* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
+	GdkPixbuf* _tmp18_;
+	gint _tmp19_;
 	guchar* pixels = NULL;
-	GdkPixbuf* _tmp20_ = NULL;
-	guint8* _tmp21_ = NULL;
-	gint _tmp22_ = 0;
-	GdkPixbuf* _tmp23_ = NULL;
-	GdkColorspace _tmp24_ = 0;
-	GdkPixbuf* _tmp25_ = NULL;
-	gint _tmp26_ = 0;
+	GdkPixbuf* _tmp20_;
+	guint8* _tmp21_;
+	gint _tmp22_;
+	GdkPixbuf* _tmp23_;
+	GdkColorspace _tmp24_;
+	GdkPixbuf* _tmp25_;
+	gint _tmp26_;
 #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"
@@ -707,7 +707,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_ >= -255) {
 #line 710 "image.c"
-		gint _tmp2_ = 0;
+		gint _tmp2_;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp2_ = red;
 #line 217 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -725,7 +725,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ >= -255) {
 #line 728 "image.c"
-		gint _tmp5_ = 0;
+		gint _tmp5_;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp5_ = green;
 #line 218 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -743,7 +743,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp7_ >= -255) {
 #line 746 "image.c"
-		gint _tmp8_ = 0;
+		gint _tmp8_;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp8_ = blue;
 #line 219 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -761,7 +761,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp10_ >= -255) {
 #line 764 "image.c"
-		gint _tmp11_ = 0;
+		gint _tmp11_;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = alpha;
 #line 220 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -833,15 +833,15 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
 #line 836 "image.c"
-				gint _tmp29_ = 0;
-				gint _tmp30_ = 0;
+				gint _tmp29_;
+				gint _tmp30_;
 				gint y_offset = 0;
-				gint _tmp31_ = 0;
-				gint _tmp32_ = 0;
+				gint _tmp31_;
+				gint _tmp32_;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp27_) {
 #line 844 "image.c"
-					gint _tmp28_ = 0;
+					gint _tmp28_;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp28_ = y;
 #line 232 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -879,21 +879,21 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 						while (TRUE) {
 #line 882 "image.c"
-							gint _tmp35_ = 0;
-							gint _tmp36_ = 0;
+							gint _tmp35_;
+							gint _tmp36_;
 							gint offset = 0;
-							gint _tmp37_ = 0;
-							gint _tmp38_ = 0;
-							gint _tmp39_ = 0;
-							gint _tmp40_ = 0;
-							gint _tmp49_ = 0;
-							gint _tmp58_ = 0;
+							gint _tmp37_;
+							gint _tmp38_;
+							gint _tmp39_;
+							gint _tmp40_;
+							gint _tmp49_;
+							gint _tmp58_;
 							gboolean _tmp67_ = FALSE;
-							gint _tmp68_ = 0;
+							gint _tmp68_;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (!_tmp33_) {
 #line 896 "image.c"
-								gint _tmp34_ = 0;
+								gint _tmp34_;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp34_ = x;
 #line 235 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -925,14 +925,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 238 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp40_ != 0) {
 #line 928 "image.c"
-								guchar* _tmp41_ = NULL;
-								gint _tmp42_ = 0;
-								guchar* _tmp43_ = NULL;
-								gint _tmp44_ = 0;
-								guchar _tmp45_ = '\0';
-								gint _tmp46_ = 0;
-								guchar _tmp47_ = '\0';
-								guchar _tmp48_ = '\0';
+								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"
@@ -958,14 +958,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 241 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp49_ != 0) {
 #line 961 "image.c"
-								guchar* _tmp50_ = NULL;
-								gint _tmp51_ = 0;
-								guchar* _tmp52_ = NULL;
-								gint _tmp53_ = 0;
-								guchar _tmp54_ = '\0';
-								gint _tmp55_ = 0;
-								guchar _tmp56_ = '\0';
-								guchar _tmp57_ = '\0';
+								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;
 #line 242 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -991,14 +991,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 244 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp58_ != 0) {
 #line 994 "image.c"
-								guchar* _tmp59_ = NULL;
-								gint _tmp60_ = 0;
-								guchar* _tmp61_ = NULL;
-								gint _tmp62_ = 0;
-								guchar _tmp63_ = '\0';
-								gint _tmp64_ = 0;
-								guchar _tmp65_ = '\0';
-								guchar _tmp66_ = '\0';
+								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"
@@ -1024,7 +1024,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp68_ != 0) {
 #line 1027 "image.c"
-								gint _tmp69_ = 0;
+								gint _tmp69_;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 								_tmp69_ = channels;
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1038,14 +1038,14 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
 #line 247 "/home/jens/Source/shotwell/src/util/image.vala"
 							if (_tmp67_) {
 #line 1041 "image.c"
-								guchar* _tmp70_ = NULL;
-								gint _tmp71_ = 0;
-								guchar* _tmp72_ = NULL;
-								gint _tmp73_ = 0;
-								guchar _tmp74_ = '\0';
-								gint _tmp75_ = 0;
-								guchar _tmp76_ = '\0';
-								guchar _tmp77_ = '\0';
+								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"
@@ -1080,9 +1080,9 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
 #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"
@@ -1094,11 +1094,11 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp3_ >= _tmp5_) {
 #line 1097 "image.c"
-		gint _tmp6_ = 0;
-		GdkRectangle _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		GdkRectangle _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		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"
@@ -1120,9 +1120,9 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
 #line 1123 "image.c"
-		gint _tmp11_ = 0;
-		GdkRectangle _tmp12_ = {0};
-		gint _tmp13_ = 0;
+		gint _tmp11_;
+		GdkRectangle _tmp12_;
+		gint _tmp13_;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = y;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1140,11 +1140,11 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
 #line 1143 "image.c"
-		gint _tmp14_ = 0;
-		GdkRectangle _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		GdkRectangle _tmp17_ = {0};
-		gint _tmp18_ = 0;
+		gint _tmp14_;
+		GdkRectangle _tmp15_;
+		gint _tmp16_;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = y;
 #line 254 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1176,10 +1176,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	GdkRectangle _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
 #line 257 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (a != NULL, FALSE);
 #line 257 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1195,10 +1195,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp4_ == _tmp6_) {
 #line 1198 "image.c"
-		GdkRectangle _tmp7_ = {0};
-		gint _tmp8_ = 0;
-		GdkRectangle _tmp9_ = {0};
-		gint _tmp10_ = 0;
+		GdkRectangle _tmp7_;
+		gint _tmp8_;
+		GdkRectangle _tmp9_;
+		gint _tmp10_;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp7_ = *a;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1218,10 +1218,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp2_) {
 #line 1221 "image.c"
-		GdkRectangle _tmp11_ = {0};
-		gint _tmp12_ = 0;
-		GdkRectangle _tmp13_ = {0};
-		gint _tmp14_ = 0;
+		GdkRectangle _tmp11_;
+		gint _tmp12_;
+		GdkRectangle _tmp13_;
+		gint _tmp14_;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp11_ = *a;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1241,10 +1241,10 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp1_) {
 #line 1244 "image.c"
-		GdkRectangle _tmp15_ = {0};
-		gint _tmp16_ = 0;
-		GdkRectangle _tmp17_ = {0};
-		gint _tmp18_ = 0;
+		GdkRectangle _tmp15_;
+		gint _tmp16_;
+		GdkRectangle _tmp17_;
+		gint _tmp18_;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp15_ = *a;
 #line 258 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1271,15 +1271,15 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
 
 gchar* rectangle_to_string (GdkRectangle* rect) {
 	gchar* result = NULL;
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	GdkRectangle _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	GdkRectangle _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	GdkRectangle _tmp6_ = {0};
-	gint _tmp7_ = 0;
-	gchar* _tmp8_ = NULL;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	gchar* _tmp8_;
 #line 261 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_val_if_fail (rect != NULL, NULL);
 #line 262 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1310,26 +1310,26 @@ gchar* rectangle_to_string (GdkRectangle* rect) {
 
 void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* result) {
 	GdkRectangle rect = {0};
-	GdkRectangle _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	Dimensions _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
-	GdkRectangle _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	Dimensions _tmp7_ = {0};
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	GdkRectangle _tmp10_ = {0};
-	gint _tmp11_ = 0;
-	Dimensions _tmp12_ = {0};
-	gint _tmp13_ = 0;
-	gint _tmp14_ = 0;
-	GdkRectangle _tmp15_ = {0};
-	gint _tmp16_ = 0;
-	Dimensions _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	Dimensions _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	Dimensions _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	Dimensions _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
+	gint _tmp16_;
+	Dimensions _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 #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"
@@ -1395,12 +1395,12 @@ void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* res
 void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp0_ = {0};
-	gdouble _tmp1_ = 0.0;
-	GdkPoint _tmp2_ = {0};
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
+	gdouble _tmp1_;
+	GdkPoint _tmp2_;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
 #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"
@@ -1434,14 +1434,14 @@ void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
 void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp0_ = {0};
-	GdkPoint _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkPoint _tmp7_ = {0};
-	gint _tmp8_ = 0;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	GdkPoint _tmp7_;
+	gint _tmp8_;
 #line 283 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p1 != NULL);
 #line 283 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1481,14 +1481,14 @@ void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 	GdkPoint _result_ = {0};
 	GdkPoint _tmp0_ = {0};
-	GdkPoint _tmp1_ = {0};
-	gint _tmp2_ = 0;
-	GdkPoint _tmp3_ = {0};
-	gint _tmp4_ = 0;
-	GdkPoint _tmp5_ = {0};
-	gint _tmp6_ = 0;
-	GdkPoint _tmp7_ = {0};
-	gint _tmp8_ = 0;
+	GdkPoint _tmp1_;
+	gint _tmp2_;
+	GdkPoint _tmp3_;
+	gint _tmp4_;
+	GdkPoint _tmp5_;
+	gint _tmp6_;
+	GdkPoint _tmp7_;
+	gint _tmp8_;
 #line 291 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (p1 != NULL);
 #line 291 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1527,9 +1527,9 @@ void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
 
 void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 	guchar* gdk_pixels = NULL;
-	GdkPixbuf* _tmp0_ = NULL;
-	void* _tmp1_ = NULL;
-	void* _tmp2_ = NULL;
+	GdkPixbuf* _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"
@@ -1553,25 +1553,25 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 			while (TRUE) {
 #line 1556 "image.c"
-				gint _tmp5_ = 0;
-				GdkPixbuf* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gint _tmp8_ = 0;
+				gint _tmp5_;
+				GdkPixbuf* _tmp6_;
+				gint _tmp7_;
+				gint _tmp8_;
 				guchar* p = NULL;
-				guchar* _tmp9_ = NULL;
+				guchar* _tmp9_;
 				guchar* end = NULL;
-				guchar* _tmp10_ = NULL;
-				GdkPixbuf* _tmp11_ = NULL;
-				gint _tmp12_ = 0;
-				gint _tmp13_ = 0;
-				guchar* _tmp26_ = NULL;
-				GdkPixbuf* _tmp27_ = NULL;
-				gint _tmp28_ = 0;
-				gint _tmp29_ = 0;
+				guchar* _tmp10_;
+				GdkPixbuf* _tmp11_;
+				gint _tmp12_;
+				gint _tmp13_;
+				guchar* _tmp26_;
+				GdkPixbuf* _tmp27_;
+				gint _tmp28_;
+				gint _tmp29_;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 				if (!_tmp3_) {
 #line 1574 "image.c"
-					gint _tmp4_ = 0;
+					gint _tmp4_;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
 					_tmp4_ = j;
 #line 302 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1611,19 +1611,19 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
 #line 306 "/home/jens/Source/shotwell/src/util/image.vala"
 				while (TRUE) {
 #line 1614 "image.c"
-					guchar* _tmp14_ = NULL;
-					guchar* _tmp15_ = NULL;
+					guchar* _tmp14_;
+					guchar* _tmp15_;
 					guchar tmp = '\0';
-					guchar* _tmp16_ = NULL;
-					guchar _tmp17_ = '\0';
-					guchar* _tmp18_ = NULL;
-					guchar* _tmp19_ = NULL;
-					guchar _tmp20_ = '\0';
-					guchar _tmp21_ = '\0';
-					guchar* _tmp22_ = NULL;
-					guchar _tmp23_ = '\0';
-					guchar _tmp24_ = '\0';
-					guchar* _tmp25_ = NULL;
+					guchar* _tmp16_;
+					guchar _tmp17_;
+					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;
 #line 306 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -1694,22 +1694,22 @@ 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) {
 	gdouble _vala_dest_width = 0.0;
 	gdouble _vala_dest_height = 0.0;
-	gdouble _tmp0_ = 0.0;
-	gdouble _tmp1_ = 0.0;
-	gdouble _tmp2_ = 0.0;
-	gdouble _tmp3_ = 0.0;
-	gdouble _tmp4_ = 0.0;
-	gdouble _tmp5_ = 0.0;
-	gdouble _tmp6_ = 0.0;
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
-	gdouble _tmp10_ = 0.0;
-	gdouble _tmp11_ = 0.0;
-	gdouble _tmp12_ = 0.0;
-	gdouble _tmp13_ = 0.0;
-	gdouble _tmp14_ = 0.0;
-	gdouble _tmp15_ = 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"
@@ -1773,77 +1773,77 @@ void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble an
  */
 GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 	GdkPixbuf* result = NULL;
-	gdouble _tmp0_ = 0.0;
+	gdouble _tmp0_;
 	gdouble x_tmp = 0.0;
 	gdouble y_tmp = 0.0;
-	GdkPixbuf* _tmp3_ = NULL;
-	gint _tmp4_ = 0;
-	gint _tmp5_ = 0;
-	GdkPixbuf* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	gdouble _tmp9_ = 0.0;
+	GdkPixbuf* _tmp3_;
+	gint _tmp4_;
+	gint _tmp5_;
+	GdkPixbuf* _tmp6_;
+	gint _tmp7_;
+	gint _tmp8_;
+	gdouble _tmp9_;
 	gdouble _tmp10_ = 0.0;
 	gdouble _tmp11_ = 0.0;
 	GdkPixbuf* dest_pixbuf = NULL;
-	gdouble _tmp12_ = 0.0;
-	gdouble _tmp13_ = 0.0;
-	gdouble _tmp14_ = 0.0;
-	gdouble _tmp15_ = 0.0;
-	GdkPixbuf* _tmp16_ = NULL;
+	gdouble _tmp12_;
+	gdouble _tmp13_;
+	gdouble _tmp14_;
+	gdouble _tmp15_;
+	GdkPixbuf* _tmp16_;
 	cairo_format_t _tmp17_ = 0;
-	GdkPixbuf* _tmp18_ = NULL;
-	gboolean _tmp19_ = FALSE;
-	gboolean _tmp20_ = FALSE;
+	GdkPixbuf* _tmp18_;
+	gboolean _tmp19_;
+	gboolean _tmp20_;
 	cairo_surface_t* surface = NULL;
-	GdkPixbuf* _tmp21_ = NULL;
-	void* _tmp22_ = NULL;
-	void* _tmp23_ = NULL;
-	GdkPixbuf* _tmp24_ = NULL;
-	gint _tmp25_ = 0;
-	gint _tmp26_ = 0;
-	GdkPixbuf* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
-	GdkPixbuf* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
-	cairo_surface_t* _tmp33_ = NULL;
+	GdkPixbuf* _tmp21_;
+	void* _tmp22_;
+	void* _tmp23_;
+	GdkPixbuf* _tmp24_;
+	gint _tmp25_;
+	gint _tmp26_;
+	GdkPixbuf* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
+	GdkPixbuf* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
+	cairo_surface_t* _tmp33_;
 	cairo_t* context = NULL;
-	cairo_surface_t* _tmp34_ = NULL;
-	cairo_t* _tmp35_ = NULL;
-	cairo_t* _tmp36_ = NULL;
-	cairo_t* _tmp37_ = NULL;
-	GdkPixbuf* _tmp38_ = NULL;
-	gint _tmp39_ = 0;
-	gint _tmp40_ = 0;
-	GdkPixbuf* _tmp41_ = NULL;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
-	cairo_t* _tmp44_ = NULL;
-	cairo_t* _tmp45_ = NULL;
-	GdkPixbuf* _tmp46_ = NULL;
-	gint _tmp47_ = 0;
-	gint _tmp48_ = 0;
-	GdkPixbuf* _tmp49_ = NULL;
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	cairo_t* _tmp52_ = NULL;
-	gdouble _tmp53_ = 0.0;
-	gdouble _tmp54_ = 0.0;
-	cairo_t* _tmp55_ = NULL;
-	GdkPixbuf* _tmp56_ = NULL;
-	gint _tmp57_ = 0;
-	gint _tmp58_ = 0;
-	GdkPixbuf* _tmp59_ = NULL;
-	gint _tmp60_ = 0;
-	gint _tmp61_ = 0;
-	cairo_t* _tmp62_ = NULL;
-	GdkPixbuf* _tmp63_ = NULL;
-	cairo_t* _tmp64_ = NULL;
-	cairo_pattern_t* _tmp65_ = NULL;
-	cairo_t* _tmp66_ = NULL;
-	GdkPixbuf* _tmp67_ = NULL;
+	cairo_surface_t* _tmp34_;
+	cairo_t* _tmp35_;
+	cairo_t* _tmp36_;
+	cairo_t* _tmp37_;
+	GdkPixbuf* _tmp38_;
+	gint _tmp39_;
+	gint _tmp40_;
+	GdkPixbuf* _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
+	cairo_t* _tmp44_;
+	cairo_t* _tmp45_;
+	GdkPixbuf* _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_;
 #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"
@@ -1851,8 +1851,8 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
 #line 353 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
 #line 1854 "image.c"
-		GdkPixbuf* _tmp1_ = NULL;
-		GdkPixbuf* _tmp2_ = NULL;
+		GdkPixbuf* _tmp1_;
+		GdkPixbuf* _tmp2_;
 #line 354 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = source_pixbuf;
 #line 354 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2055,30 +2055,30 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
  * @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_ = 0.0;
+	gdouble _tmp0_;
 	gdouble dest_width = 0.0;
 	gdouble dest_height = 0.0;
-	gint _tmp2_ = 0;
-	gint _tmp3_ = 0;
-	gdouble _tmp4_ = 0.0;
+	gint _tmp2_;
+	gint _tmp3_;
+	gdouble _tmp4_;
 	gdouble _tmp5_ = 0.0;
 	gdouble _tmp6_ = 0.0;
 	cairo_matrix_t matrix = {0};
-	gdouble _tmp7_ = 0.0;
-	gdouble _tmp8_ = 0.0;
-	gdouble _tmp9_ = 0.0;
-	gdouble _tmp10_ = 0.0;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	gboolean _tmp13_ = FALSE;
+	gdouble _tmp7_;
+	gdouble _tmp8_;
+	gdouble _tmp9_;
+	gdouble _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	gboolean _tmp13_;
 	gdouble dest_x = 0.0;
-	GdkPoint _tmp15_ = {0};
-	gint _tmp16_ = 0;
+	GdkPoint _tmp15_;
+	gint _tmp16_;
 	gdouble dest_y = 0.0;
-	GdkPoint _tmp17_ = {0};
-	gint _tmp18_ = 0;
-	gdouble _tmp19_ = 0.0;
-	gdouble _tmp20_ = 0.0;
+	GdkPoint _tmp17_;
+	gint _tmp18_;
+	gdouble _tmp19_;
+	gdouble _tmp20_;
 	GdkPoint _tmp21_ = {0};
 #line 406 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (source_point != NULL);
@@ -2087,7 +2087,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 #line 409 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp0_ == 0.0) {
 #line 2090 "image.c"
-		GdkPoint _tmp1_ = {0};
+		GdkPoint _tmp1_;
 #line 411 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp1_ = *source_point;
 #line 411 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2133,7 +2133,7 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
 #line 422 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp13_) {
 #line 2136 "image.c"
-		cairo_status_t _tmp14_ = 0;
+		cairo_status_t _tmp14_;
 #line 423 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp14_ = cairo_matrix_invert (&matrix);
 #line 423 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2184,10 +2184,10 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
  * @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) {
-	GdkPoint _tmp0_ = {0};
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
-	gdouble _tmp3_ = 0.0;
+	GdkPoint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gdouble _tmp3_;
 	GdkPoint _tmp4_ = {0};
 #line 445 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (source_point != NULL);
@@ -2211,84 +2211,84 @@ void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble
 
 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_ = {0};
-	gint _tmp1_ = 0;
-	Box _tmp2_ = {0};
-	gint _tmp3_ = 0;
+	Box _tmp0_;
+	gint _tmp1_;
+	Box _tmp2_;
+	gint _tmp3_;
 	GdkPoint _tmp4_ = {0};
-	gint _tmp5_ = 0;
-	gint _tmp6_ = 0;
-	gdouble _tmp7_ = 0.0;
+	gint _tmp5_;
+	gint _tmp6_;
+	gdouble _tmp7_;
 	GdkPoint _tmp8_ = {0};
 	GdkPoint top_right = {0};
-	Box _tmp9_ = {0};
-	gint _tmp10_ = 0;
-	Box _tmp11_ = {0};
-	gint _tmp12_ = 0;
+	Box _tmp9_;
+	gint _tmp10_;
+	Box _tmp11_;
+	gint _tmp12_;
 	GdkPoint _tmp13_ = {0};
-	gint _tmp14_ = 0;
-	gint _tmp15_ = 0;
-	gdouble _tmp16_ = 0.0;
+	gint _tmp14_;
+	gint _tmp15_;
+	gdouble _tmp16_;
 	GdkPoint _tmp17_ = {0};
 	GdkPoint bottom_left = {0};
-	Box _tmp18_ = {0};
-	gint _tmp19_ = 0;
-	Box _tmp20_ = {0};
-	gint _tmp21_ = 0;
+	Box _tmp18_;
+	gint _tmp19_;
+	Box _tmp20_;
+	gint _tmp21_;
 	GdkPoint _tmp22_ = {0};
-	gint _tmp23_ = 0;
-	gint _tmp24_ = 0;
-	gdouble _tmp25_ = 0.0;
+	gint _tmp23_;
+	gint _tmp24_;
+	gdouble _tmp25_;
 	GdkPoint _tmp26_ = {0};
 	GdkPoint bottom_right = {0};
-	Box _tmp27_ = {0};
-	gint _tmp28_ = 0;
-	Box _tmp29_ = {0};
-	gint _tmp30_ = 0;
+	Box _tmp27_;
+	gint _tmp28_;
+	Box _tmp29_;
+	gint _tmp30_;
 	GdkPoint _tmp31_ = {0};
-	gint _tmp32_ = 0;
-	gint _tmp33_ = 0;
-	gdouble _tmp34_ = 0.0;
+	gint _tmp32_;
+	gint _tmp33_;
+	gdouble _tmp34_;
 	GdkPoint _tmp35_ = {0};
 	gdouble angle = 0.0;
-	gdouble _tmp36_ = 0.0;
-	gdouble _tmp37_ = 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 _tmp38_ = {0};
-	gint _tmp39_ = 0;
-	GdkPoint _tmp40_ = {0};
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	gint _tmp43_ = 0;
+	GdkPoint _tmp38_;
+	gint _tmp39_;
+	GdkPoint _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	gint _tmp43_;
 	gint bottom = 0;
-	GdkPoint _tmp47_ = {0};
-	gint _tmp48_ = 0;
-	GdkPoint _tmp49_ = {0};
-	gint _tmp50_ = 0;
-	gint _tmp51_ = 0;
-	gint _tmp52_ = 0;
-	gint _tmp53_ = 0;
+	GdkPoint _tmp47_;
+	gint _tmp48_;
+	GdkPoint _tmp49_;
+	gint _tmp50_;
+	gint _tmp51_;
+	gint _tmp52_;
+	gint _tmp53_;
 	gint left = 0;
-	GdkPoint _tmp58_ = {0};
-	gint _tmp59_ = 0;
-	GdkPoint _tmp60_ = {0};
-	gint _tmp61_ = 0;
-	gint _tmp62_ = 0;
-	gint _tmp63_ = 0;
+	GdkPoint _tmp58_;
+	gint _tmp59_;
+	GdkPoint _tmp60_;
+	gint _tmp61_;
+	gint _tmp62_;
+	gint _tmp63_;
 	gint right = 0;
-	GdkPoint _tmp67_ = {0};
-	gint _tmp68_ = 0;
-	GdkPoint _tmp69_ = {0};
-	gint _tmp70_ = 0;
-	gint _tmp71_ = 0;
-	gint _tmp72_ = 0;
-	gint _tmp73_ = 0;
+	GdkPoint _tmp67_;
+	gint _tmp68_;
+	GdkPoint _tmp69_;
+	gint _tmp70_;
+	gint _tmp71_;
+	gint _tmp72_;
+	gint _tmp73_;
 	Box _tmp78_ = {0};
-	gboolean _tmp79_ = FALSE;
+	gboolean _tmp79_;
 #line 451 "/home/jens/Source/shotwell/src/util/image.vala"
 	g_return_if_fail (src != NULL);
 #line 454 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2410,9 +2410,9 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 463 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp43_ < 0) {
 #line 2413 "image.c"
-		gint _tmp44_ = 0;
-		gdouble _tmp45_ = 0.0;
-		gdouble _tmp46_ = 0.0;
+		gint _tmp44_;
+		gdouble _tmp45_;
+		gdouble _tmp46_;
 #line 464 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp44_ = top;
 #line 464 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2442,10 +2442,10 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 467 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp52_ > _tmp53_) {
 #line 2445 "image.c"
-		gint _tmp54_ = 0;
-		gint _tmp55_ = 0;
-		gdouble _tmp56_ = 0.0;
-		gdouble _tmp57_ = 0.0;
+		gint _tmp54_;
+		gint _tmp55_;
+		gdouble _tmp56_;
+		gdouble _tmp57_;
 #line 468 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp54_ = img_h;
 #line 468 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2475,9 +2475,9 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 471 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp63_ < 0) {
 #line 2478 "image.c"
-		gint _tmp64_ = 0;
-		gdouble _tmp65_ = 0.0;
-		gdouble _tmp66_ = 0.0;
+		gint _tmp64_;
+		gdouble _tmp65_;
+		gdouble _tmp66_;
 #line 472 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp64_ = left;
 #line 472 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2507,10 +2507,10 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 475 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp72_ > _tmp73_) {
 #line 2510 "image.c"
-		gint _tmp74_ = 0;
-		gint _tmp75_ = 0;
-		gdouble _tmp76_ = 0.0;
-		gdouble _tmp77_ = 0.0;
+		gint _tmp74_;
+		gint _tmp75_;
+		gdouble _tmp76_;
+		gdouble _tmp77_;
 #line 476 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp74_ = img_w;
 #line 476 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -2528,10 +2528,10 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 #line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 	if (_tmp79_) {
 #line 2531 "image.c"
-		gint _tmp80_ = 0;
-		gint _tmp81_ = 0;
-		gint _tmp82_ = 0;
-		gint _tmp83_ = 0;
+		gint _tmp80_;
+		gint _tmp81_;
+		gint _tmp82_;
+		gint _tmp83_;
 		Box _tmp84_ = {0};
 #line 478 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp80_ = left_offset;
@@ -2547,18 +2547,18 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
 		_tmp78_ = _tmp84_;
 #line 2549 "image.c"
 	} else {
-		Box _tmp85_ = {0};
-		gint _tmp86_ = 0;
-		gint _tmp87_ = 0;
-		Box _tmp88_ = {0};
-		gint _tmp89_ = 0;
-		gint _tmp90_ = 0;
-		Box _tmp91_ = {0};
-		gint _tmp92_ = 0;
-		gint _tmp93_ = 0;
-		Box _tmp94_ = {0};
-		gint _tmp95_ = 0;
-		gint _tmp96_ = 0;
+		Box _tmp85_;
+		gint _tmp86_;
+		gint _tmp87_;
+		Box _tmp88_;
+		gint _tmp89_;
+		gint _tmp90_;
+		Box _tmp91_;
+		gint _tmp92_;
+		gint _tmp93_;
+		Box _tmp94_;
+		gint _tmp95_;
+		gint _tmp96_;
 #line 479 "/home/jens/Source/shotwell/src/util/image.vala"
 		_tmp85_ = *src;
 #line 479 "/home/jens/Source/shotwell/src/util/image.vala"