Merge branch 'feature/upstream' into develop

1 files changed, 376 insertions, 433 deletions

diff --git a/src/graphics-processor.c b/src/graphics-processor.c
index d0ce76a..da3b2d1 100644
--- a/src/graphics-processor.c
+++ b/src/graphics-processor.c
@@ -1,7 +1,8 @@
-/* graphics-processor.c generated by valac 0.36.6, the Vala compiler
+/* graphics-processor.c generated by valac 0.40.4, the Vala compiler
  * generated from graphics-processor.vala, do not modify */
 
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -39,515 +40,446 @@ extern gint jobs;
 gint jobs = -1;
 
 GeeHashMap* marshall_all_transformations (const gchar* filename);
-gint _vala_main (gchar** args, int args_length1);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+gint _vala_main (gchar** args,
+                 int args_length1);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 
 const GOptionEntry options[7] = {{"input", 'i', 0, G_OPTION_ARG_FILENAME, &input_file, "FILE to process", "FILE"}, {"output", 'o', 0, G_OPTION_ARG_FILENAME, &output_file, "destination FILE", "FILE"}, {"pipeline", 'p', 0, G_OPTION_ARG_FILENAME, &pipeline, "graphics PIPELINE to run", "PIPELINE"}, {"auto-enance", 'a', 0, G_OPTION_ARG_NONE, &auto_enhance, "run auto-enhance on input file", NULL}, {"format", 'f', 0, G_OPTION_ARG_STRING, &format, "Save output file in specific format [png, jpeg (default)]", NULL}, {"jobs", 'j', 0, G_OPTION_ARG_INT, &jobs, "Number of parallel jobs to run on an image", NULL}, {NULL, (gchar) 0, 0, G_OPTION_ARG_NONE, NULL, NULL, NULL}};
 
-static glong string_strnlen (gchar* str, glong maxlen) {
+static glong
+string_strnlen (gchar* str,
+                glong maxlen)
+{
 	glong result = 0L;
 	gchar* end = NULL;
 	gchar* _tmp0_;
-	glong _tmp1_;
-	gchar* _tmp2_;
-	gchar* _tmp3_;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = str;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = maxlen;
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	end = _tmp2_;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp3_ = end;
-#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp3_ == NULL) {
-#line 68 "graphics-processor.c"
-		glong _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = maxlen;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp4_;
-#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar* _tmp1_;
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = memchr (str, 0, (gsize) maxlen);
+#line 1336 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	end = _tmp0_;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp1_ = end;
+#line 1337 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (_tmp1_ == NULL) {
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = maxlen;
+#line 1338 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 76 "graphics-processor.c"
+#line 75 "graphics-processor.c"
 	} else {
-		gchar* _tmp5_;
-		gchar* _tmp6_;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = end;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = str;
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = (glong) (_tmp5_ - _tmp6_);
-#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp2_;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = end;
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = (glong) (_tmp2_ - str);
+#line 1340 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 88 "graphics-processor.c"
+#line 84 "graphics-processor.c"
 	}
 }
 
 
-static gchar* string_substring (const gchar* self, glong offset, glong len) {
+static gchar*
+string_substring (const gchar* self,
+                  glong offset,
+                  glong len)
+{
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_;
-	glong _tmp8_;
-	glong _tmp14_;
-	glong _tmp17_;
-	glong _tmp18_;
-	glong _tmp19_;
-	glong _tmp20_;
-	glong _tmp21_;
-	gchar* _tmp22_;
-#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	glong _tmp6_;
+	gchar* _tmp7_;
+#line 1347 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = offset;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp1_ >= ((glong) 0)) {
-#line 112 "graphics-processor.c"
-		glong _tmp2_;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = len;
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 118 "graphics-processor.c"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (offset >= ((glong) 0)) {
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = len >= ((glong) 0);
+#line 105 "graphics-processor.c"
 	} else {
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 122 "graphics-processor.c"
+#line 109 "graphics-processor.c"
 	}
-#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 126 "graphics-processor.c"
-		glong _tmp3_;
-		glong _tmp4_;
-		glong _tmp5_;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = offset;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = len;
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = _tmp5_;
-#line 138 "graphics-processor.c"
+#line 1351 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		string_length = string_strnlen ((gchar*) self, offset + len);
+#line 115 "graphics-processor.c"
 	} else {
-		gint _tmp6_;
-		gint _tmp7_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = strlen (self);
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = _tmp6_;
-#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		string_length = (glong) _tmp7_;
-#line 148 "graphics-processor.c"
+		gint _tmp1_;
+		gint _tmp2_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = strlen (self);
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = _tmp1_;
+#line 1353 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		string_length = (glong) _tmp2_;
+#line 125 "graphics-processor.c"
 	}
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp8_ = offset;
-#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp8_ < ((glong) 0)) {
-#line 154 "graphics-processor.c"
-		glong _tmp9_;
-		glong _tmp10_;
-		glong _tmp11_;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = string_length;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = offset;
-#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		offset = _tmp9_ + _tmp10_;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = offset;
-#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 168 "graphics-processor.c"
+#line 1356 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (offset < ((glong) 0)) {
+#line 129 "graphics-processor.c"
+		glong _tmp3_;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp3_ = string_length;
+#line 1357 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		offset = _tmp3_ + offset;
+#line 1358 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (offset >= ((glong) 0), NULL);
+#line 137 "graphics-processor.c"
 	} else {
-		glong _tmp12_;
-		glong _tmp13_;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = offset;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = string_length;
-#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 178 "graphics-processor.c"
+		glong _tmp4_;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = string_length;
+#line 1360 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		g_return_val_if_fail (offset <= _tmp4_, NULL);
+#line 144 "graphics-processor.c"
 	}
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp14_ = len;
-#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	if (_tmp14_ < ((glong) 0)) {
-#line 184 "graphics-processor.c"
-		glong _tmp15_;
-		glong _tmp16_;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = string_length;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp16_ = offset;
-#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		len = _tmp15_ - _tmp16_;
-#line 193 "graphics-processor.c"
+#line 1362 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	if (len < ((glong) 0)) {
+#line 148 "graphics-processor.c"
+		glong _tmp5_;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = string_length;
+#line 1363 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		len = _tmp5_ - offset;
+#line 154 "graphics-processor.c"
 	}
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp17_ = offset;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp18_ = len;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp19_ = string_length;
-#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp20_ = offset;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp21_ = len;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp22_;
-#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp6_ = string_length;
+#line 1365 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	g_return_val_if_fail ((offset + len) <= _tmp6_, NULL);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp7_ = g_strndup (((gchar*) self) + offset, (gsize) len);
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp7_;
+#line 1366 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 213 "graphics-processor.c"
+#line 166 "graphics-processor.c"
 }
 
 
-static gchar* string_replace (const gchar* self, const gchar* old, const gchar* replacement) {
+static gchar*
+string_replace (const gchar* self,
+                const gchar* old,
+                const gchar* replacement)
+{
 	gchar* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	GError * _inner_error_ = NULL;
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (old != NULL, NULL);
-#line 1407 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1421 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (replacement != NULL, NULL);
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if ((*((gchar*) self)) == '\0') {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
-#line 232 "graphics-processor.c"
+#line 189 "graphics-processor.c"
 	} else {
-		const gchar* _tmp2_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp2_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp1_ = (*((gchar*) _tmp2_)) == '\0';
-#line 239 "graphics-processor.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp1_ = (*((gchar*) old)) == '\0';
+#line 193 "graphics-processor.c"
 	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_tmp0_ = TRUE;
-#line 245 "graphics-processor.c"
+#line 199 "graphics-processor.c"
 	} else {
-		const gchar* _tmp3_;
-		const gchar* _tmp4_;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp3_ = old;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp4_ = replacement;
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp0_ = g_strcmp0 (_tmp3_, _tmp4_) == 0;
-#line 255 "graphics-processor.c"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp0_ = g_strcmp0 (old, replacement) == 0;
+#line 203 "graphics-processor.c"
 	}
-#line 1408 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1422 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 259 "graphics-processor.c"
-		gchar* _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp5_ = g_strdup (self);
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp5_;
-#line 1409 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 207 "graphics-processor.c"
+		gchar* _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp2_ = g_strdup (self);
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp2_;
+#line 1423 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 267 "graphics-processor.c"
+#line 215 "graphics-processor.c"
 	}
 	{
 		GRegex* regex = NULL;
-		const gchar* _tmp6_;
-		gchar* _tmp7_;
-		gchar* _tmp8_;
-		GRegex* _tmp9_;
-		GRegex* _tmp10_;
-		gchar* _tmp11_ = NULL;
-		GRegex* _tmp12_;
-		const gchar* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp6_ = old;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp7_ = g_regex_escape_string (_tmp6_, -1);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp8_ = _tmp7_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp9_ = g_regex_new (_tmp8_, 0, 0, &_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp10_ = _tmp9_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp8_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		regex = _tmp10_;
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+		gchar* _tmp3_;
+		gchar* _tmp4_;
+		GRegex* _tmp5_;
+		GRegex* _tmp6_;
+		gchar* _tmp7_ = NULL;
+		GRegex* _tmp8_;
+		gchar* _tmp9_;
+		gchar* _tmp10_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp3_ = g_regex_escape_string (old, -1);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp4_ = _tmp3_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp5_ = g_regex_new (_tmp4_, 0, 0, &_inner_error_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp6_ = _tmp5_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp4_);
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		regex = _tmp6_;
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 299 "graphics-processor.c"
+#line 243 "graphics-processor.c"
 				goto __catch1_g_regex_error;
 			}
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1412 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1426 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 308 "graphics-processor.c"
+#line 252 "graphics-processor.c"
 		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp12_ = regex;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp13_ = replacement;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp14_ = g_regex_replace_literal (_tmp12_, self, (gssize) -1, 0, _tmp13_, 0, &_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = _tmp14_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp8_ = regex;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp9_ = g_regex_replace_literal (_tmp8_, self, (gssize) -1, 0, replacement, 0, &_inner_error_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = _tmp9_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			if (_inner_error_->domain == G_REGEX_ERROR) {
-#line 324 "graphics-processor.c"
+#line 266 "graphics-processor.c"
 				goto __catch1_g_regex_error;
 			}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_critical ("file %s: line %d: unexpected error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			g_clear_error (&_inner_error_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 			return NULL;
-#line 335 "graphics-processor.c"
+#line 277 "graphics-processor.c"
 		}
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp15_ = _tmp11_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_tmp11_ = NULL;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		result = _tmp15_;
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-		_g_free0 (_tmp11_);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp10_ = _tmp7_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_tmp7_ = NULL;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		result = _tmp10_;
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+		_g_free0 (_tmp7_);
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_g_regex_unref0 (regex);
-#line 1413 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1427 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return result;
-#line 349 "graphics-processor.c"
+#line 291 "graphics-processor.c"
 	}
 	goto __finally1;
 	__catch1_g_regex_error:
 	{
 		GError* e = NULL;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		e = _inner_error_;
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_inner_error_ = NULL;
-#line 1415 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1429 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_assert_not_reached ();
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		_g_error_free0 (e);
-#line 363 "graphics-processor.c"
+#line 305 "graphics-processor.c"
 	}
 	__finally1:
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_critical ("file %s: line %d: uncaught error: %s (%s, %d)", __FILE__, __LINE__, _inner_error_->message, g_quark_to_string (_inner_error_->domain), _inner_error_->code);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		g_clear_error (&_inner_error_);
-#line 1411 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1425 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 		return NULL;
-#line 374 "graphics-processor.c"
+#line 316 "graphics-processor.c"
 	}
 }
 
 
-GeeHashMap* marshall_all_transformations (const gchar* filename) {
+GeeHashMap*
+marshall_all_transformations (const gchar* filename)
+{
 	GeeHashMap* result = NULL;
 	GError * _inner_error_ = NULL;
 #line 18 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	g_return_val_if_fail (filename != NULL, NULL);
-#line 384 "graphics-processor.c"
+#line 328 "graphics-processor.c"
 	{
 		GKeyFile* keyfile = NULL;
 		GKeyFile* _tmp0_;
-		const gchar* _tmp1_;
-		gboolean _tmp2_;
 		GeeHashMap* map = NULL;
-		GeeHashMap* _tmp17_;
+		GeeHashMap* _tmp13_;
 		gchar** objects = NULL;
-		GKeyFile* _tmp18_;
-		gsize _tmp19_;
-		gchar** _tmp20_;
+		GKeyFile* _tmp14_;
+		gsize _tmp15_;
+		gchar** _tmp16_;
 		gint objects_length1;
 		gint _objects_size_;
-		gchar** _tmp21_;
-		gint _tmp21__length1;
+		gchar** _tmp17_;
+		gint _tmp17__length1;
 #line 20 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_tmp0_ = g_key_file_new ();
 #line 20 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		keyfile = _tmp0_;
 #line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		_tmp1_ = filename;
-#line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		_tmp2_ = g_str_has_prefix (_tmp1_, "string:");
-#line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		if (_tmp2_) {
-#line 410 "graphics-processor.c"
+		if (g_str_has_prefix (filename, "string:")) {
+#line 348 "graphics-processor.c"
 			gchar* data = NULL;
-			const gchar* _tmp3_;
+			gchar* _tmp1_;
+			gchar* _tmp2_;
+			gchar* _tmp3_;
 			gchar* _tmp4_;
 			gchar* _tmp5_;
 			gchar* _tmp6_;
-			gchar* _tmp7_;
-			gchar* _tmp8_;
-			gchar* _tmp9_;
-			GKeyFile* _tmp10_;
-			const gchar* _tmp11_;
-			const gchar* _tmp12_;
-			gint _tmp13_;
-			gint _tmp14_;
-#line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp3_ = filename;
+			GKeyFile* _tmp7_;
+			const gchar* _tmp8_;
+			const gchar* _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp4_ = string_substring (_tmp3_, (glong) 7, (glong) -1);
+			_tmp1_ = string_substring (filename, (glong) 7, (glong) -1);
 #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp5_ = _tmp4_;
+			_tmp2_ = _tmp1_;
 #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp6_ = string_replace (_tmp5_, "&", "\n");
+			_tmp3_ = string_replace (_tmp2_, "&", "\n");
 #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp7_ = _tmp6_;
+			_tmp4_ = _tmp3_;
 #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp8_ = g_strconcat ("[adjustments]\n", _tmp7_, NULL);
+			_tmp5_ = g_strconcat ("[adjustments]\n", _tmp4_, NULL);
 #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp9_ = _tmp8_;
+			_tmp6_ = _tmp5_;
 #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_g_free0 (_tmp7_);
+			_g_free0 (_tmp4_);
 #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_g_free0 (_tmp5_);
+			_g_free0 (_tmp2_);
 #line 22 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			data = _tmp9_;
+			data = _tmp6_;
 #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp10_ = keyfile;
+			_tmp7_ = keyfile;
 #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp11_ = data;
+			_tmp8_ = data;
 #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp12_ = data;
+			_tmp9_ = data;
 #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp13_ = strlen (_tmp12_);
+			_tmp10_ = strlen (_tmp9_);
 #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp14_ = _tmp13_;
+			_tmp11_ = _tmp10_;
 #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			g_key_file_load_from_data (_tmp10_, _tmp11_, (gsize) _tmp14_, G_KEY_FILE_NONE, &_inner_error_);
+			g_key_file_load_from_data (_tmp7_, _tmp8_, (gsize) _tmp11_, G_KEY_FILE_NONE, &_inner_error_);
 #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 				_g_free0 (data);
 #line 23 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 				_g_key_file_unref0 (keyfile);
-#line 462 "graphics-processor.c"
+#line 397 "graphics-processor.c"
 				goto __catch0_g_error;
 			}
 #line 21 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 			_g_free0 (data);
-#line 467 "graphics-processor.c"
+#line 402 "graphics-processor.c"
 		} else {
-			GKeyFile* _tmp15_;
-			const gchar* _tmp16_;
+			GKeyFile* _tmp12_;
 #line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp15_ = keyfile;
+			_tmp12_ = keyfile;
 #line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			_tmp16_ = filename;
-#line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			g_key_file_load_from_file (_tmp15_, _tmp16_, G_KEY_FILE_NONE, &_inner_error_);
+			g_key_file_load_from_file (_tmp12_, filename, G_KEY_FILE_NONE, &_inner_error_);
 #line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 25 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 				_g_key_file_unref0 (keyfile);
-#line 481 "graphics-processor.c"
+#line 413 "graphics-processor.c"
 				goto __catch0_g_error;
 			}
 		}
 #line 28 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		_tmp17_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+		_tmp13_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, TYPE_KEY_VALUE_MAP, (GBoxedCopyFunc) key_value_map_ref, (GDestroyNotify) key_value_map_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 28 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		map = _tmp17_;
+		map = _tmp13_;
 #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		_tmp18_ = keyfile;
+		_tmp14_ = keyfile;
 #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		_tmp20_ = g_key_file_get_groups (_tmp18_, &_tmp19_);
+		_tmp16_ = g_key_file_get_groups (_tmp14_, &_tmp15_);
 #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		objects = _tmp20_;
+		objects = _tmp16_;
 #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		objects_length1 = _tmp19_;
+		objects_length1 = _tmp15_;
 #line 30 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_objects_size_ = objects_length1;
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		_tmp21_ = objects;
+		_tmp17_ = objects;
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		_tmp21__length1 = objects_length1;
-#line 503 "graphics-processor.c"
+		_tmp17__length1 = objects_length1;
+#line 435 "graphics-processor.c"
 		{
 			gchar** object_collection = NULL;
 			gint object_collection_length1 = 0;
 			gint _object_collection_size_ = 0;
 			gint object_it = 0;
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			object_collection = _tmp21_;
+			object_collection = _tmp17_;
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			object_collection_length1 = _tmp21__length1;
+			object_collection_length1 = _tmp17__length1;
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-			for (object_it = 0; object_it < _tmp21__length1; object_it = object_it + 1) {
-#line 515 "graphics-processor.c"
-				gchar* _tmp22_;
+			for (object_it = 0; object_it < _tmp17__length1; object_it = object_it + 1) {
+#line 447 "graphics-processor.c"
+				gchar* _tmp18_;
 				gchar* object = NULL;
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-				_tmp22_ = g_strdup (object_collection[object_it]);
+				_tmp18_ = g_strdup (object_collection[object_it]);
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-				object = _tmp22_;
-#line 522 "graphics-processor.c"
+				object = _tmp18_;
+#line 454 "graphics-processor.c"
 				{
 					gchar** keys = NULL;
-					GKeyFile* _tmp23_;
-					const gchar* _tmp24_;
-					gsize _tmp25_;
-					gchar** _tmp26_;
+					GKeyFile* _tmp19_;
+					const gchar* _tmp20_;
+					gsize _tmp21_;
+					gchar** _tmp22_;
 					gint keys_length1;
 					gint _keys_size_;
-					gboolean _tmp27_ = FALSE;
+					gboolean _tmp23_ = FALSE;
+					gchar** _tmp24_;
+					gint _tmp24__length1;
+					KeyValueMap* key_map = NULL;
+					const gchar* _tmp26_;
+					KeyValueMap* _tmp27_;
 					gchar** _tmp28_;
 					gint _tmp28__length1;
-					KeyValueMap* key_map = NULL;
-					const gchar* _tmp30_;
-					KeyValueMap* _tmp31_;
-					gchar** _tmp32_;
-					gint _tmp32__length1;
-					GeeHashMap* _tmp41_;
-					const gchar* _tmp42_;
-					KeyValueMap* _tmp43_;
+					GeeHashMap* _tmp37_;
+					const gchar* _tmp38_;
+					KeyValueMap* _tmp39_;
 #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp23_ = keyfile;
+					_tmp19_ = keyfile;
 #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp24_ = object;
+					_tmp20_ = object;
 #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp26_ = g_key_file_get_keys (_tmp23_, _tmp24_, &_tmp25_, &_inner_error_);
+					_tmp22_ = g_key_file_get_keys (_tmp19_, _tmp20_, &_tmp21_, &_inner_error_);
 #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					keys = _tmp26_;
+					keys = _tmp22_;
 #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					keys_length1 = _tmp25_;
+					keys_length1 = _tmp21_;
 #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 					_keys_size_ = keys_length1;
 #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
@@ -560,87 +492,87 @@ GeeHashMap* marshall_all_transformations (const gchar* filename) {
 						_g_object_unref0 (map);
 #line 32 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 						_g_key_file_unref0 (keyfile);
-#line 564 "graphics-processor.c"
+#line 496 "graphics-processor.c"
 						goto __catch0_g_error;
 					}
 #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp28_ = keys;
+					_tmp24_ = keys;
 #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp28__length1 = keys_length1;
+					_tmp24__length1 = keys_length1;
 #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					if (_tmp28_ == NULL) {
+					if (_tmp24_ == NULL) {
 #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-						_tmp27_ = TRUE;
-#line 575 "graphics-processor.c"
+						_tmp23_ = TRUE;
+#line 507 "graphics-processor.c"
 					} else {
-						gchar** _tmp29_;
-						gint _tmp29__length1;
+						gchar** _tmp25_;
+						gint _tmp25__length1;
 #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-						_tmp29_ = keys;
+						_tmp25_ = keys;
 #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-						_tmp29__length1 = keys_length1;
+						_tmp25__length1 = keys_length1;
 #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-						_tmp27_ = _tmp29__length1 == 0;
-#line 585 "graphics-processor.c"
+						_tmp23_ = _tmp25__length1 == 0;
+#line 517 "graphics-processor.c"
 					}
 #line 33 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					if (_tmp27_) {
+					if (_tmp23_) {
 #line 34 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 						keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
 #line 34 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 						_g_free0 (object);
 #line 34 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 						continue;
-#line 595 "graphics-processor.c"
+#line 527 "graphics-processor.c"
 					}
 #line 37 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp30_ = object;
+					_tmp26_ = object;
 #line 37 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp31_ = key_value_map_new (_tmp30_);
+					_tmp27_ = key_value_map_new (_tmp26_);
 #line 37 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					key_map = _tmp31_;
+					key_map = _tmp27_;
 #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp32_ = keys;
+					_tmp28_ = keys;
 #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp32__length1 = keys_length1;
-#line 607 "graphics-processor.c"
+					_tmp28__length1 = keys_length1;
+#line 539 "graphics-processor.c"
 					{
 						gchar** key_collection = NULL;
 						gint key_collection_length1 = 0;
 						gint _key_collection_size_ = 0;
 						gint key_it = 0;
 #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-						key_collection = _tmp32_;
+						key_collection = _tmp28_;
 #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-						key_collection_length1 = _tmp32__length1;
+						key_collection_length1 = _tmp28__length1;
 #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-						for (key_it = 0; key_it < _tmp32__length1; key_it = key_it + 1) {
-#line 619 "graphics-processor.c"
-							gchar* _tmp33_;
+						for (key_it = 0; key_it < _tmp28__length1; key_it = key_it + 1) {
+#line 551 "graphics-processor.c"
+							gchar* _tmp29_;
 							gchar* key = NULL;
 #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-							_tmp33_ = g_strdup (key_collection[key_it]);
+							_tmp29_ = g_strdup (key_collection[key_it]);
 #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-							key = _tmp33_;
-#line 626 "graphics-processor.c"
+							key = _tmp29_;
+#line 558 "graphics-processor.c"
 							{
-								gchar* _tmp34_ = NULL;
-								GKeyFile* _tmp35_;
+								gchar* _tmp30_ = NULL;
+								GKeyFile* _tmp31_;
+								const gchar* _tmp32_;
+								const gchar* _tmp33_;
+								gchar* _tmp34_;
+								KeyValueMap* _tmp35_;
 								const gchar* _tmp36_;
-								const gchar* _tmp37_;
-								gchar* _tmp38_;
-								KeyValueMap* _tmp39_;
-								const gchar* _tmp40_;
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-								_tmp35_ = keyfile;
+								_tmp31_ = keyfile;
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-								_tmp36_ = object;
+								_tmp32_ = object;
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-								_tmp37_ = key;
+								_tmp33_ = key;
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-								_tmp38_ = g_key_file_get_string (_tmp35_, _tmp36_, _tmp37_, &_inner_error_);
+								_tmp34_ = g_key_file_get_string (_tmp31_, _tmp32_, _tmp33_, &_inner_error_);
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-								_tmp34_ = _tmp38_;
+								_tmp30_ = _tmp34_;
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 								if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
@@ -657,38 +589,38 @@ GeeHashMap* marshall_all_transformations (const gchar* filename) {
 									_g_object_unref0 (map);
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 									_g_key_file_unref0 (keyfile);
-#line 661 "graphics-processor.c"
+#line 593 "graphics-processor.c"
 									goto __catch0_g_error;
 								}
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-								_tmp39_ = key_map;
+								_tmp35_ = key_map;
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-								_tmp40_ = key;
+								_tmp36_ = key;
 #line 39 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-								key_value_map_set_string (_tmp39_, _tmp40_, _tmp34_);
+								key_value_map_set_string (_tmp35_, _tmp36_, _tmp30_);
 #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-								_g_free0 (_tmp34_);
+								_g_free0 (_tmp30_);
 #line 38 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 								_g_free0 (key);
-#line 674 "graphics-processor.c"
+#line 606 "graphics-processor.c"
 							}
 						}
 					}
 #line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp41_ = map;
+					_tmp37_ = map;
 #line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp42_ = object;
+					_tmp38_ = object;
 #line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					_tmp43_ = key_map;
+					_tmp39_ = key_map;
 #line 41 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp42_, _tmp43_);
+					gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp38_, _tmp39_);
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 					_key_value_map_unref0 (key_map);
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 					keys = (_vala_array_free (keys, keys_length1, (GDestroyNotify) g_free), NULL);
 #line 31 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 					_g_free0 (object);
-#line 692 "graphics-processor.c"
+#line 624 "graphics-processor.c"
 				}
 			}
 		}
@@ -700,24 +632,24 @@ GeeHashMap* marshall_all_transformations (const gchar* filename) {
 		_g_key_file_unref0 (keyfile);
 #line 44 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		return result;
-#line 704 "graphics-processor.c"
+#line 636 "graphics-processor.c"
 	}
 	goto __finally0;
 	__catch0_g_error:
 	{
 		GError* err = NULL;
-		const gchar* _tmp44_;
+		const gchar* _tmp40_;
 #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		err = _inner_error_;
 #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_inner_error_ = NULL;
 #line 46 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		_tmp44_ = err->message;
+		_tmp40_ = err->message;
 #line 46 "/home/jens/Source/shotwell/src/graphics-processor.vala"
-		g_error ("graphics-processor.vala:46: %s", _tmp44_);
+		g_error ("graphics-processor.vala:46: %s", _tmp40_);
 #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_g_error_free0 (err);
-#line 721 "graphics-processor.c"
+#line 653 "graphics-processor.c"
 	}
 	__finally0:
 #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
@@ -726,11 +658,14 @@ GeeHashMap* marshall_all_transformations (const gchar* filename) {
 	g_clear_error (&_inner_error_);
 #line 19 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	return NULL;
-#line 730 "graphics-processor.c"
+#line 662 "graphics-processor.c"
 }
 
 
-gint _vala_main (gchar** args, int args_length1) {
+gint
+_vala_main (gchar** args,
+            int args_length1)
+{
 	gint result = 0;
 	GOptionContext* ctx = NULL;
 	GOptionContext* _tmp0_;
@@ -779,7 +714,7 @@ gint _vala_main (gchar** args, int args_length1) {
 	_tmp3_ = ctx;
 #line 54 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	g_option_context_add_main_entries (_tmp3_, options, NULL);
-#line 783 "graphics-processor.c"
+#line 718 "graphics-processor.c"
 	{
 		GOptionContext* _tmp4_;
 #line 57 "/home/jens/Source/shotwell/src/graphics-processor.vala"
@@ -788,7 +723,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		g_option_context_parse (_tmp4_, &args_length1, &args, &_inner_error_);
 #line 57 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 792 "graphics-processor.c"
+#line 727 "graphics-processor.c"
 			goto __catch2_g_error;
 		}
 	}
@@ -821,12 +756,12 @@ gint _vala_main (gchar** args, int args_length1) {
 		_g_option_context_free0 (ctx);
 #line 61 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		return result;
-#line 825 "graphics-processor.c"
+#line 760 "graphics-processor.c"
 	}
 	__finally2:
 #line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 830 "graphics-processor.c"
+#line 765 "graphics-processor.c"
 		gint _tmp8_ = 0;
 #line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_g_option_context_free0 (ctx);
@@ -836,7 +771,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		g_clear_error (&_inner_error_);
 #line 56 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		return _tmp8_;
-#line 840 "graphics-processor.c"
+#line 775 "graphics-processor.c"
 	}
 #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	_tmp10_ = input_file;
@@ -844,18 +779,18 @@ gint _vala_main (gchar** args, int args_length1) {
 	if (_tmp10_ == NULL) {
 #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_tmp9_ = TRUE;
-#line 848 "graphics-processor.c"
+#line 783 "graphics-processor.c"
 	} else {
 		const gchar* _tmp11_;
 #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_tmp11_ = output_file;
 #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_tmp9_ = _tmp11_ == NULL;
-#line 855 "graphics-processor.c"
+#line 790 "graphics-processor.c"
 	}
 #line 64 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	if (_tmp9_) {
-#line 859 "graphics-processor.c"
+#line 794 "graphics-processor.c"
 		GOptionContext* _tmp12_;
 		gchar* _tmp13_;
 		gchar* _tmp14_;
@@ -877,23 +812,23 @@ gint _vala_main (gchar** args, int args_length1) {
 		_g_option_context_free0 (ctx);
 #line 68 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		return result;
-#line 881 "graphics-processor.c"
+#line 816 "graphics-processor.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	_tmp16_ = auto_enhance;
 #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	if (_tmp16_ == FALSE) {
-#line 887 "graphics-processor.c"
+#line 822 "graphics-processor.c"
 		const gchar* _tmp17_;
 #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_tmp17_ = pipeline;
 #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_tmp15_ = _tmp17_ == NULL;
-#line 893 "graphics-processor.c"
+#line 828 "graphics-processor.c"
 	} else {
 #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_tmp15_ = FALSE;
-#line 897 "graphics-processor.c"
+#line 832 "graphics-processor.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	if (_tmp15_) {
@@ -905,11 +840,11 @@ gint _vala_main (gchar** args, int args_length1) {
 		_g_option_context_free0 (ctx);
 #line 74 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		return result;
-#line 909 "graphics-processor.c"
+#line 844 "graphics-processor.c"
 	}
 #line 77 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	src = NULL;
-#line 913 "graphics-processor.c"
+#line 848 "graphics-processor.c"
 	{
 		GdkPixbuf* _tmp18_ = NULL;
 		const gchar* _tmp19_;
@@ -923,7 +858,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		_tmp18_ = _tmp20_;
 #line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 927 "graphics-processor.c"
+#line 862 "graphics-processor.c"
 			goto __catch3_g_error;
 		}
 #line 79 "/home/jens/Source/shotwell/src/graphics-processor.vala"
@@ -936,7 +871,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		src = _tmp21_;
 #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_g_object_unref0 (_tmp18_);
-#line 940 "graphics-processor.c"
+#line 875 "graphics-processor.c"
 	}
 	goto __finally3;
 	__catch3_g_error:
@@ -953,12 +888,12 @@ gint _vala_main (gchar** args, int args_length1) {
 		g_error ("graphics-processor.vala:81: %s", _tmp22_);
 #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_g_error_free0 (err);
-#line 957 "graphics-processor.c"
+#line 892 "graphics-processor.c"
 	}
 	__finally3:
 #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 962 "graphics-processor.c"
+#line 897 "graphics-processor.c"
 		gint _tmp23_ = 0;
 #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_g_object_unref0 (src);
@@ -970,7 +905,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		g_clear_error (&_inner_error_);
 #line 78 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		return _tmp23_;
-#line 974 "graphics-processor.c"
+#line 909 "graphics-processor.c"
 	}
 #line 84 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	_tmp24_ = src;
@@ -984,7 +919,7 @@ gint _vala_main (gchar** args, int args_length1) {
 	_tmp26_ = pipeline;
 #line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	if (_tmp26_ != NULL) {
-#line 988 "graphics-processor.c"
+#line 923 "graphics-processor.c"
 		GeeHashMap* transformations = NULL;
 		const gchar* _tmp27_;
 		GeeHashMap* _tmp28_;
@@ -1015,13 +950,13 @@ gint _vala_main (gchar** args, int args_length1) {
 		_tmp32_ = map;
 #line 92 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		if (_tmp32_ == NULL) {
-#line 1019 "graphics-processor.c"
+#line 954 "graphics-processor.c"
 			PixelTransformationBundle* _tmp33_;
 #line 93 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 			_tmp33_ = adjustments;
 #line 93 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 			pixel_transformation_bundle_set_to_identity (_tmp33_);
-#line 1025 "graphics-processor.c"
+#line 960 "graphics-processor.c"
 		} else {
 			PixelTransformationBundle* _tmp34_;
 			KeyValueMap* _tmp35_;
@@ -1031,19 +966,19 @@ gint _vala_main (gchar** args, int args_length1) {
 			_tmp35_ = map;
 #line 95 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 			pixel_transformation_bundle_load (_tmp34_, _tmp35_);
-#line 1035 "graphics-processor.c"
+#line 970 "graphics-processor.c"
 		}
 #line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_key_value_map_unref0 (map);
 #line 87 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_g_object_unref0 (transformations);
-#line 1041 "graphics-processor.c"
+#line 976 "graphics-processor.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	_tmp36_ = auto_enhance;
 #line 99 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	if (_tmp36_) {
-#line 1047 "graphics-processor.c"
+#line 982 "graphics-processor.c"
 		GdkPixbuf* _tmp37_;
 		PixelTransformationBundle* _tmp38_;
 #line 100 "/home/jens/Source/shotwell/src/graphics-processor.vala"
@@ -1054,7 +989,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		_pixel_transformation_bundle_unref0 (adjustments);
 #line 100 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		adjustments = _tmp38_;
-#line 1058 "graphics-processor.c"
+#line 993 "graphics-processor.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	_tmp39_ = adjustments;
@@ -1090,7 +1025,7 @@ gint _vala_main (gchar** args, int args_length1) {
 	_tmp49_ = format;
 #line 111 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	if (_tmp49_ == NULL) {
-#line 1094 "graphics-processor.c"
+#line 1029 "graphics-processor.c"
 		gchar* content_type = NULL;
 		const gchar* _tmp50_;
 		gchar* _tmp51_;
@@ -1106,7 +1041,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		_tmp52_ = content_type;
 #line 113 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		if (g_strcmp0 (_tmp52_, "image/png") == 0) {
-#line 1110 "graphics-processor.c"
+#line 1045 "graphics-processor.c"
 			gchar* _tmp53_;
 #line 114 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 			_tmp53_ = g_strdup ("png");
@@ -1114,7 +1049,7 @@ gint _vala_main (gchar** args, int args_length1) {
 			_g_free0 (format);
 #line 114 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 			format = _tmp53_;
-#line 1118 "graphics-processor.c"
+#line 1053 "graphics-processor.c"
 		}
 #line 117 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_tmp54_ = g_strdup ("jpeg");
@@ -1124,7 +1059,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		format = _tmp54_;
 #line 111 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_g_free0 (content_type);
-#line 1128 "graphics-processor.c"
+#line 1063 "graphics-processor.c"
 	}
 	{
 		GdkPixbuf* _tmp55_;
@@ -1140,7 +1075,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		gdk_pixbuf_save (_tmp55_, _tmp56_, _tmp57_, &_inner_error_, NULL, NULL);
 #line 121 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1144 "graphics-processor.c"
+#line 1079 "graphics-processor.c"
 			goto __catch4_g_error;
 		}
 	}
@@ -1159,12 +1094,12 @@ gint _vala_main (gchar** args, int args_length1) {
 		g_error ("graphics-processor.vala:123: %s", _tmp58_);
 #line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_g_error_free0 (err);
-#line 1163 "graphics-processor.c"
+#line 1098 "graphics-processor.c"
 	}
 	__finally4:
 #line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1168 "graphics-processor.c"
+#line 1103 "graphics-processor.c"
 		gint _tmp59_ = 0;
 #line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		_g_timer_destroy0 (timer);
@@ -1184,7 +1119,7 @@ gint _vala_main (gchar** args, int args_length1) {
 		g_clear_error (&_inner_error_);
 #line 120 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 		return _tmp59_;
-#line 1188 "graphics-processor.c"
+#line 1123 "graphics-processor.c"
 	}
 #line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	result = 0;
@@ -1202,21 +1137,25 @@ gint _vala_main (gchar** args, int args_length1) {
 	_g_option_context_free0 (ctx);
 #line 126 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	return result;
-#line 1206 "graphics-processor.c"
+#line 1141 "graphics-processor.c"
 }
 
 
-int main (int argc, char ** argv) {
-#if !GLIB_CHECK_VERSION (2,35,0)
-	g_type_init ();
-#endif
+int
+main (int argc,
+      char ** argv)
+{
 #line 50 "/home/jens/Source/shotwell/src/graphics-processor.vala"
 	return _vala_main (argv, argc);
-#line 1216 "graphics-processor.c"
+#line 1151 "graphics-processor.c"
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -1228,7 +1167,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }