summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:24:12 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-01-02 11:24:12 +0100
commit66f6a7bd3f7e00022191f16cb0e82a39e7333a76 (patch)
tree8b5b7c598d87518696e151621988eafee18ffa06 /src/util
parent4a3f1fdfe1eb3743564adcee35d5513224339260 (diff)
New upstream version 0.25.2upstream/0.25.2
Diffstat (limited to 'src/util')
-rw-r--r--src/util/KeyValueMap.c58
-rw-r--r--src/util/Util.c2
-rw-r--r--src/util/file.c104
-rw-r--r--src/util/image.c1314
-rw-r--r--src/util/image.vala8
-rw-r--r--src/util/misc.c548
-rw-r--r--src/util/misc.vala15
-rw-r--r--src/util/string.c268
-rw-r--r--src/util/system.c2
-rw-r--r--src/util/ui.c2
10 files changed, 1072 insertions, 1249 deletions
diff --git a/src/util/KeyValueMap.c b/src/util/KeyValueMap.c
index 180a69a..003f0ca 100644
--- a/src/util/KeyValueMap.c
+++ b/src/util/KeyValueMap.c
@@ -1,4 +1,4 @@
-/* KeyValueMap.c generated by valac 0.34.2, the Vala compiler
+/* KeyValueMap.c generated by valac 0.32.1, the Vala compiler
* generated from KeyValueMap.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -355,23 +355,23 @@ static gchar* double_to_string (gdouble self) {
const gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
gchar* _tmp4_ = NULL;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, G_ASCII_DTOSTR_BUF_SIZE);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1__length1 = G_ASCII_DTOSTR_BUF_SIZE;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = g_ascii_dtostr (_tmp1_, G_ASCII_DTOSTR_BUF_SIZE, self);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = g_strdup (_tmp2_);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = _tmp3_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = (g_free (_tmp1_), NULL);
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 863 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 863 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 377 "KeyValueMap.c"
}
@@ -445,24 +445,24 @@ void key_value_map_set_float (KeyValueMap* self, const gchar* key, gfloat value)
static gchar* bool_to_string (gboolean self) {
gchar* result = NULL;
-#line 37 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 37 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (self) {
#line 451 "KeyValueMap.c"
gchar* _tmp0_ = NULL;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup ("true");
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp0_;
-#line 38 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 38 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 459 "KeyValueMap.c"
} else {
gchar* _tmp1_ = NULL;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = g_strdup ("false");
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 40 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 40 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 468 "KeyValueMap.c"
}
@@ -610,15 +610,15 @@ static gdouble double_parse (const gchar* str) {
gdouble result = 0.0;
const gchar* _tmp0_ = NULL;
gdouble _tmp1_ = 0.0;
-#line 869 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 869 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (str != NULL, 0.0);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = g_ascii_strtod (_tmp0_, NULL);
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 870 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 870 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 624 "KeyValueMap.c"
}
@@ -731,21 +731,21 @@ gfloat key_value_map_get_float (KeyValueMap* self, const gchar* key, gfloat def)
static gboolean bool_parse (const gchar* str) {
gboolean result = FALSE;
const gchar* _tmp0_ = NULL;
-#line 44 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 44 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (str != NULL, FALSE);
-#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 45 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 45 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (g_strcmp0 (_tmp0_, "true") == 0) {
-#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = TRUE;
-#line 46 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 46 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 745 "KeyValueMap.c"
} else {
-#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = FALSE;
-#line 48 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 48 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 751 "KeyValueMap.c"
}
diff --git a/src/util/Util.c b/src/util/Util.c
index 33aa26e..ec9f4ff 100644
--- a/src/util/Util.c
+++ b/src/util/Util.c
@@ -1,4 +1,4 @@
-/* Util.c generated by valac 0.34.2, the Vala compiler
+/* Util.c generated by valac 0.32.1, the Vala compiler
* generated from Util.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/file.c b/src/util/file.c
index 9baf18c..b219fd2 100644
--- a/src/util/file.c
+++ b/src/util/file.c
@@ -1,4 +1,4 @@
-/* file.c generated by valac 0.34.2, the Vala compiler
+/* file.c generated by valac 0.32.1, the Vala compiler
* generated from file.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -411,37 +411,37 @@ static glong string_strnlen (gchar* str, glong maxlen) {
glong _tmp1_ = 0L;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1295 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1296 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp3_ == NULL) {
#line 427 "file.c"
glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1297 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 435 "file.c"
} else {
gchar* _tmp5_ = NULL;
gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1299 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 447 "file.c"
}
@@ -461,112 +461,112 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
glong _tmp20_ = 0L;
glong _tmp21_ = 0L;
gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1306 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp1_ >= ((glong) 0)) {
#line 471 "file.c"
glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = _tmp2_ >= ((glong) 0);
#line 477 "file.c"
} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = FALSE;
#line 481 "file.c"
}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1308 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp0_) {
#line 485 "file.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1310 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
string_length = _tmp5_;
#line 497 "file.c"
} else {
gint _tmp6_ = 0;
gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1312 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
string_length = (glong) _tmp7_;
#line 507 "file.c"
}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1315 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp8_ < ((glong) 0)) {
#line 513 "file.c"
glong _tmp9_ = 0L;
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1316 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1317 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
#line 527 "file.c"
} else {
glong _tmp12_ = 0L;
glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1319 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
#line 537 "file.c"
}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1321 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp14_ < ((glong) 0)) {
#line 543 "file.c"
glong _tmp15_ = 0L;
glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
len = _tmp15_ - _tmp16_;
#line 552 "file.c"
}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1325 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 572 "file.c"
}
diff --git a/src/util/image.c b/src/util/image.c
index 9e1bb80..a68553e 100644
--- a/src/util/image.c
+++ b/src/util/image.c
@@ -1,4 +1,4 @@
-/* image.c generated by valac 0.34.2, the Vala compiler
+/* image.c generated by valac 0.32.1, the Vala compiler
* generated from image.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -18,55 +18,12 @@
#include <gtk/gtk.h>
#include <float.h>
#include <math.h>
-#include <gio/gio.h>
#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
#define _g_error_free0(var) ((var == NULL) ? NULL : (var = (g_error_free (var), NULL)))
#define TYPE_DIMENSIONS (dimensions_get_type ())
typedef struct _Dimensions Dimensions;
-
-#define TYPE_PIXEL_TRANSFORMER (pixel_transformer_get_type ())
-#define PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformer))
-#define PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-#define IS_PIXEL_TRANSFORMER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMER))
-#define IS_PIXEL_TRANSFORMER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMER))
-#define PIXEL_TRANSFORMER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMER, PixelTransformerClass))
-
-typedef struct _PixelTransformer PixelTransformer;
-typedef struct _PixelTransformerClass PixelTransformerClass;
-
-#define TYPE_PIXEL_TRANSFORMATION (pixel_transformation_get_type ())
-#define PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformation))
-#define PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-#define IS_PIXEL_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_PIXEL_TRANSFORMATION))
-#define IS_PIXEL_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_PIXEL_TRANSFORMATION))
-#define PIXEL_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_PIXEL_TRANSFORMATION, PixelTransformationClass))
-
-typedef struct _PixelTransformation PixelTransformation;
-typedef struct _PixelTransformationClass PixelTransformationClass;
-
-#define TYPE_RGB_TRANSFORMATION (rgb_transformation_get_type ())
-#define RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformation))
-#define RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
-#define IS_RGB_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_RGB_TRANSFORMATION))
-#define IS_RGB_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_RGB_TRANSFORMATION))
-#define RGB_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_RGB_TRANSFORMATION, RGBTransformationClass))
-
-typedef struct _RGBTransformation RGBTransformation;
-typedef struct _RGBTransformationClass RGBTransformationClass;
-
-#define TYPE_SATURATION_TRANSFORMATION (saturation_transformation_get_type ())
-#define SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformation))
-#define SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
-#define IS_SATURATION_TRANSFORMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_SATURATION_TRANSFORMATION))
-#define IS_SATURATION_TRANSFORMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_SATURATION_TRANSFORMATION))
-#define SATURATION_TRANSFORMATION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_SATURATION_TRANSFORMATION, SaturationTransformationClass))
-
-typedef struct _SaturationTransformation SaturationTransformation;
-typedef struct _SaturationTransformationClass SaturationTransformationClass;
-#define _pixel_transformation_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformation_unref (var), NULL)))
-#define _pixel_transformer_unref0(var) ((var == NULL) ? NULL : (var = (pixel_transformer_unref (var), NULL)))
#define _cairo_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_destroy (var), NULL)))
#define _cairo_surface_destroy0(var) ((var == NULL) ? NULL : (var = (cairo_surface_destroy (var), NULL)))
@@ -112,30 +69,6 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
gint dimensions_minor_axis (Dimensions *self);
guchar shift_color_byte (gint b, gint shift);
void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alpha);
-void dim_pixbuf (GdkPixbuf* pixbuf);
-gpointer pixel_transformer_ref (gpointer instance);
-void pixel_transformer_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformer (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformer (GValue* value, gpointer v_object);
-void value_take_pixel_transformer (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformer (const GValue* value);
-GType pixel_transformer_get_type (void) G_GNUC_CONST;
-PixelTransformer* pixel_transformer_new (void);
-PixelTransformer* pixel_transformer_construct (GType object_type);
-gpointer pixel_transformation_ref (gpointer instance);
-void pixel_transformation_unref (gpointer instance);
-GParamSpec* param_spec_pixel_transformation (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_pixel_transformation (GValue* value, gpointer v_object);
-void value_take_pixel_transformation (GValue* value, gpointer v_object);
-gpointer value_get_pixel_transformation (const GValue* value);
-GType pixel_transformation_get_type (void) G_GNUC_CONST;
-GType rgb_transformation_get_type (void) G_GNUC_CONST;
-GType saturation_transformation_get_type (void) G_GNUC_CONST;
-#define SATURATION_TRANSFORMATION_MIN_PARAMETER (-16.0f)
-SaturationTransformation* saturation_transformation_new (gfloat client_parameter);
-SaturationTransformation* saturation_transformation_construct (GType object_type, gfloat client_parameter);
-void pixel_transformer_attach_transformation (PixelTransformer* self, PixelTransformation* trans);
-void pixel_transformer_transform_pixbuf (PixelTransformer* self, GdkPixbuf* pixbuf, GCancellable* cancellable);
gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect);
gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b);
gchar* rectangle_to_string (GdkRectangle* rect);
@@ -175,7 +108,7 @@ gboolean is_color_parsable (const gchar* spec) {
result = _tmp1_;
#line 119 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 179 "image.c"
+#line 112 "image.c"
}
@@ -192,7 +125,7 @@ void parse_color (const gchar* spec, GdkRGBA* result) {
*result = _tmp1_;
#line 123 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 196 "image.c"
+#line 129 "image.c"
}
@@ -210,19 +143,19 @@ void fetch_color (const gchar* spec, GdkRGBA* result) {
_tmp1_ = gdk_rgba_parse (&rgba, _tmp0_);
#line 128 "/home/jens/Source/shotwell/src/util/image.vala"
if (!_tmp1_) {
-#line 214 "image.c"
+#line 147 "image.c"
const gchar* _tmp2_ = NULL;
#line 129 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = spec;
#line 129 "/home/jens/Source/shotwell/src/util/image.vala"
g_error ("image.vala:129: Can't parse color %s", _tmp2_);
-#line 220 "image.c"
+#line 153 "image.c"
}
#line 131 "/home/jens/Source/shotwell/src/util/image.vala"
*result = rgba;
#line 131 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 226 "image.c"
+#line 159 "image.c"
}
@@ -269,14 +202,14 @@ void set_source_color_from_string (cairo_t* ctx, const gchar* spec) {
_tmp10_ = _tmp9_.alpha;
#line 136 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_set_source_rgba (_tmp2_, _tmp4_, _tmp6_, _tmp8_, _tmp10_);
-#line 273 "image.c"
+#line 206 "image.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 147 "/home/jens/Source/shotwell/src/util/image.vala"
return self ? g_object_ref (self) : NULL;
-#line 280 "image.c"
+#line 213 "image.c"
}
@@ -286,7 +219,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
GError * _inner_error_ = NULL;
#line 144 "/home/jens/Source/shotwell/src/util/image.vala"
pixbuf = NULL;
-#line 290 "image.c"
+#line 223 "image.c"
{
GtkIconTheme* icon_theme = NULL;
GtkIconTheme* _tmp0_ = NULL;
@@ -308,7 +241,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
if (G_UNLIKELY (_inner_error_ != NULL)) {
#line 148 "/home/jens/Source/shotwell/src/util/image.vala"
_g_object_unref0 (icon_theme);
-#line 312 "image.c"
+#line 245 "image.c"
goto __catch4_g_error;
}
#line 148 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -323,7 +256,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
_g_object_unref0 (_tmp2_);
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
_g_object_unref0 (icon_theme);
-#line 327 "image.c"
+#line 260 "image.c"
}
goto __finally4;
__catch4_g_error:
@@ -350,7 +283,7 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
g_warning ("image.vala:152: Could not load icon from theme: %s", _tmp7_);
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
_g_error_free0 (_error_);
-#line 354 "image.c"
+#line 287 "image.c"
}
__finally4:
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -363,13 +296,13 @@ GdkPixbuf* get_placeholder_pixbuf (void) {
g_clear_error (&_inner_error_);
#line 146 "/home/jens/Source/shotwell/src/util/image.vala"
return NULL;
-#line 367 "image.c"
+#line 300 "image.c"
}
#line 155 "/home/jens/Source/shotwell/src/util/image.vala"
result = pixbuf;
#line 155 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 373 "image.c"
+#line 306 "image.c"
}
@@ -421,7 +354,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
_tmp9_ = _tmp8_.width;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp7_ == _tmp9_) {
-#line 425 "image.c"
+#line 358 "image.c"
Dimensions _tmp10_ = {0};
gint _tmp11_ = 0;
Dimensions _tmp12_ = {0};
@@ -436,15 +369,15 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
_tmp13_ = _tmp12_.height;
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = _tmp11_ == _tmp13_;
-#line 440 "image.c"
+#line 373 "image.c"
} else {
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = FALSE;
-#line 444 "image.c"
+#line 377 "image.c"
}
#line 161 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp5_) {
-#line 448 "image.c"
+#line 381 "image.c"
GdkPixbuf* _tmp14_ = NULL;
GdkPixbuf* _tmp15_ = NULL;
#line 162 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -455,7 +388,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
result = _tmp15_;
#line 162 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 459 "image.c"
+#line 392 "image.c"
}
#line 165 "/home/jens/Source/shotwell/src/util/image.vala"
dimensions_with_min (&scaled, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp16_);
@@ -479,7 +412,7 @@ GdkPixbuf* scale_pixbuf (GdkPixbuf* pixbuf, gint scale, GdkInterpType interp, gb
result = _tmp23_;
#line 167 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 483 "image.c"
+#line 416 "image.c"
}
@@ -521,7 +454,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
_tmp6_ = _tmp5_.width;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp4_ == _tmp6_) {
-#line 525 "image.c"
+#line 458 "image.c"
Dimensions _tmp7_ = {0};
gint _tmp8_ = 0;
Dimensions _tmp9_ = {0};
@@ -536,15 +469,15 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
_tmp10_ = _tmp9_.height;
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = _tmp8_ == _tmp10_;
-#line 540 "image.c"
+#line 473 "image.c"
} else {
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = FALSE;
-#line 544 "image.c"
+#line 477 "image.c"
}
#line 172 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp2_) {
-#line 548 "image.c"
+#line 481 "image.c"
GdkPixbuf* _tmp11_ = NULL;
GdkPixbuf* _tmp12_ = NULL;
#line 173 "/home/jens/Source/shotwell/src/util/image.vala"
@@ -555,7 +488,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
result = _tmp12_;
#line 173 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 559 "image.c"
+#line 492 "image.c"
}
#line 176 "/home/jens/Source/shotwell/src/util/image.vala"
dimensions_with_min (resized, MIN_SCALED_WIDTH, MIN_SCALED_HEIGHT, &_tmp13_);
@@ -579,7 +512,7 @@ GdkPixbuf* resize_pixbuf (GdkPixbuf* pixbuf, Dimensions* resized, GdkInterpType
result = _tmp20_;
#line 178 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 583 "image.c"
+#line 516 "image.c"
}
@@ -609,7 +542,7 @@ void draw_rounded_corners_filled (cairo_t* ctx, Dimensions* dim, GdkPoint* origi
_tmp4_ = ctx;
#line 186 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_paint (_tmp4_);
-#line 613 "image.c"
+#line 546 "image.c"
}
@@ -715,7 +648,7 @@ void context_rounded_corners (cairo_t* cx, Dimensions* dim, GdkPoint* origin, gd
_tmp21_ = cx;
#line 209 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_clip (_tmp21_);
-#line 719 "image.c"
+#line 652 "image.c"
}
@@ -734,7 +667,7 @@ inline guchar shift_color_byte (gint b, gint shift) {
result = (guchar) _tmp2_;
#line 213 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 738 "image.c"
+#line 671 "image.c"
}
@@ -773,17 +706,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp1_ = red;
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp1_ >= -255) {
-#line 777 "image.c"
+#line 710 "image.c"
gint _tmp2_ = 0;
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = red;
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = _tmp2_ <= 255;
-#line 783 "image.c"
+#line 716 "image.c"
} else {
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = FALSE;
-#line 787 "image.c"
+#line 720 "image.c"
}
#line 217 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_assert (_tmp0_, "red >= -255 && red <= 255");
@@ -791,17 +724,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp4_ = green;
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp4_ >= -255) {
-#line 795 "image.c"
+#line 728 "image.c"
gint _tmp5_ = 0;
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = green;
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = _tmp5_ <= 255;
-#line 801 "image.c"
+#line 734 "image.c"
} else {
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = FALSE;
-#line 805 "image.c"
+#line 738 "image.c"
}
#line 218 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_assert (_tmp3_, "green >= -255 && green <= 255");
@@ -809,17 +742,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp7_ = blue;
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp7_ >= -255) {
-#line 813 "image.c"
+#line 746 "image.c"
gint _tmp8_ = 0;
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = blue;
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = _tmp8_ <= 255;
-#line 819 "image.c"
+#line 752 "image.c"
} else {
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = FALSE;
-#line 823 "image.c"
+#line 756 "image.c"
}
#line 219 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_assert (_tmp6_, "blue >= -255 && blue <= 255");
@@ -827,17 +760,17 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp10_ = alpha;
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp10_ >= -255) {
-#line 831 "image.c"
+#line 764 "image.c"
gint _tmp11_ = 0;
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = alpha;
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = _tmp11_ <= 255;
-#line 837 "image.c"
+#line 770 "image.c"
} else {
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = FALSE;
-#line 841 "image.c"
+#line 774 "image.c"
}
#line 220 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_assert (_tmp9_, "alpha >= -255 && alpha <= 255");
@@ -887,19 +820,19 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp26_ = gdk_pixbuf_get_bits_per_sample (_tmp25_);
#line 230 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_assert (_tmp26_ == 8, "pixbuf.get_bits_per_sample() == 8");
-#line 891 "image.c"
+#line 824 "image.c"
{
gint y = 0;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
y = 0;
-#line 896 "image.c"
+#line 829 "image.c"
{
gboolean _tmp27_ = FALSE;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp27_ = TRUE;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
-#line 903 "image.c"
+#line 836 "image.c"
gint _tmp29_ = 0;
gint _tmp30_ = 0;
gint y_offset = 0;
@@ -907,13 +840,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
gint _tmp32_ = 0;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
if (!_tmp27_) {
-#line 911 "image.c"
+#line 844 "image.c"
gint _tmp28_ = 0;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp28_ = y;
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
y = _tmp28_ + 1;
-#line 917 "image.c"
+#line 850 "image.c"
}
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp27_ = FALSE;
@@ -925,7 +858,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
if (!(_tmp29_ < _tmp30_)) {
#line 232 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 929 "image.c"
+#line 862 "image.c"
}
#line 233 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp31_ = y;
@@ -933,19 +866,19 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp32_ = rowstride;
#line 233 "/home/jens/Source/shotwell/src/util/image.vala"
y_offset = _tmp31_ * _tmp32_;
-#line 937 "image.c"
+#line 870 "image.c"
{
gint x = 0;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
x = 0;
-#line 942 "image.c"
+#line 875 "image.c"
{
gboolean _tmp33_ = FALSE;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp33_ = TRUE;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
-#line 949 "image.c"
+#line 882 "image.c"
gint _tmp35_ = 0;
gint _tmp36_ = 0;
gint offset = 0;
@@ -959,13 +892,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
gint _tmp68_ = 0;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
if (!_tmp33_) {
-#line 963 "image.c"
+#line 896 "image.c"
gint _tmp34_ = 0;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp34_ = x;
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
x = _tmp34_ + 1;
-#line 969 "image.c"
+#line 902 "image.c"
}
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp33_ = FALSE;
@@ -977,7 +910,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
if (!(_tmp35_ < _tmp36_)) {
#line 235 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 981 "image.c"
+#line 914 "image.c"
}
#line 236 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp37_ = y_offset;
@@ -991,7 +924,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp40_ = red;
#line 238 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp40_ != 0) {
-#line 995 "image.c"
+#line 928 "image.c"
guchar* _tmp41_ = NULL;
gint _tmp42_ = 0;
guchar* _tmp43_ = NULL;
@@ -1018,13 +951,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp41_[_tmp42_] = _tmp47_;
#line 239 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp48_ = _tmp41_[_tmp42_];
-#line 1022 "image.c"
+#line 955 "image.c"
}
#line 241 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp49_ = green;
#line 241 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp49_ != 0) {
-#line 1028 "image.c"
+#line 961 "image.c"
guchar* _tmp50_ = NULL;
gint _tmp51_ = 0;
guchar* _tmp52_ = NULL;
@@ -1051,13 +984,13 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp50_[_tmp51_ + 1] = _tmp56_;
#line 242 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp57_ = _tmp50_[_tmp51_ + 1];
-#line 1055 "image.c"
+#line 988 "image.c"
}
#line 244 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp58_ = blue;
#line 244 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp58_ != 0) {
-#line 1061 "image.c"
+#line 994 "image.c"
guchar* _tmp59_ = NULL;
gint _tmp60_ = 0;
guchar* _tmp61_ = NULL;
@@ -1084,27 +1017,27 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp59_[_tmp60_ + 2] = _tmp65_;
#line 245 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp66_ = _tmp59_[_tmp60_ + 2];
-#line 1088 "image.c"
+#line 1021 "image.c"
}
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp68_ = alpha;
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp68_ != 0) {
-#line 1094 "image.c"
+#line 1027 "image.c"
gint _tmp69_ = 0;
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp69_ = channels;
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp67_ = _tmp69_ >= 4;
-#line 1100 "image.c"
+#line 1033 "image.c"
} else {
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp67_ = FALSE;
-#line 1104 "image.c"
+#line 1037 "image.c"
}
#line 247 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp67_) {
-#line 1108 "image.c"
+#line 1041 "image.c"
guchar* _tmp70_ = NULL;
gint _tmp71_ = 0;
guchar* _tmp72_ = NULL;
@@ -1131,7 +1064,7 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
_tmp70_[_tmp71_ + 3] = _tmp76_;
#line 248 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp77_ = _tmp70_[_tmp71_ + 3];
-#line 1135 "image.c"
+#line 1068 "image.c"
}
}
}
@@ -1142,41 +1075,6 @@ void shift_colors (GdkPixbuf* pixbuf, gint red, gint green, gint blue, gint alph
}
-void dim_pixbuf (GdkPixbuf* pixbuf) {
- PixelTransformer* transformer = NULL;
- PixelTransformer* _tmp0_ = NULL;
- SaturationTransformation* sat = NULL;
- SaturationTransformation* _tmp1_ = NULL;
- GdkPixbuf* _tmp2_ = NULL;
- GdkPixbuf* _tmp3_ = NULL;
-#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
- g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp0_ = pixel_transformer_new ();
-#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
- transformer = _tmp0_;
-#line 255 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp1_ = saturation_transformation_new (SATURATION_TRANSFORMATION_MIN_PARAMETER);
-#line 255 "/home/jens/Source/shotwell/src/util/image.vala"
- sat = _tmp1_;
-#line 256 "/home/jens/Source/shotwell/src/util/image.vala"
- pixel_transformer_attach_transformation (transformer, G_TYPE_CHECK_INSTANCE_CAST (sat, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp2_ = pixbuf;
-#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
- pixel_transformer_transform_pixbuf (transformer, _tmp2_, NULL);
-#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
- _tmp3_ = pixbuf;
-#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
- shift_colors (_tmp3_, 0, 0, 0, -100);
-#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
- _pixel_transformation_unref0 (sat);
-#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
- _pixel_transformer_unref0 (transformer);
-#line 1177 "image.c"
-}
-
-
gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
gboolean result = FALSE;
gboolean _tmp0_ = FALSE;
@@ -1185,91 +1083,91 @@ gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect) {
gint _tmp3_ = 0;
GdkRectangle _tmp4_ = {0};
gint _tmp5_ = 0;
-#line 261 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 253 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (rect != NULL, FALSE);
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = x;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = _tmp4_.x;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp3_ >= _tmp5_) {
-#line 1199 "image.c"
+#line 1097 "image.c"
gint _tmp6_ = 0;
GdkRectangle _tmp7_ = {0};
gint _tmp8_ = 0;
GdkRectangle _tmp9_ = {0};
gint _tmp10_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = x;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = _tmp7_.x;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp10_ = _tmp9_.width;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = _tmp6_ < (_tmp8_ + _tmp10_);
-#line 1217 "image.c"
+#line 1115 "image.c"
} else {
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = FALSE;
-#line 1221 "image.c"
+#line 1119 "image.c"
}
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp2_) {
-#line 1225 "image.c"
+#line 1123 "image.c"
gint _tmp11_ = 0;
GdkRectangle _tmp12_ = {0};
gint _tmp13_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = y;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp12_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp13_ = _tmp12_.y;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = _tmp11_ >= _tmp13_;
-#line 1237 "image.c"
+#line 1135 "image.c"
} else {
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = FALSE;
-#line 1241 "image.c"
+#line 1139 "image.c"
}
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp1_) {
-#line 1245 "image.c"
+#line 1143 "image.c"
gint _tmp14_ = 0;
GdkRectangle _tmp15_ = {0};
gint _tmp16_ = 0;
GdkRectangle _tmp17_ = {0};
gint _tmp18_ = 0;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = y;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp15_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp16_ = _tmp15_.y;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp17_ = *rect;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp18_ = _tmp17_.height;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = _tmp14_ <= (_tmp16_ + _tmp18_);
-#line 1263 "image.c"
+#line 1161 "image.c"
} else {
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = FALSE;
-#line 1267 "image.c"
+#line 1165 "image.c"
}
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
result = _tmp0_;
-#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 254 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 1273 "image.c"
+#line 1171 "image.c"
}
@@ -1282,92 +1180,92 @@ gboolean rectangles_equal (GdkRectangle* a, GdkRectangle* b) {
gint _tmp4_ = 0;
GdkRectangle _tmp5_ = {0};
gint _tmp6_ = 0;
-#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (a != NULL, FALSE);
-#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 257 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (b != NULL, FALSE);
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = *a;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = _tmp3_.x;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = *b;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = _tmp5_.x;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp4_ == _tmp6_) {
-#line 1300 "image.c"
+#line 1198 "image.c"
GdkRectangle _tmp7_ = {0};
gint _tmp8_ = 0;
GdkRectangle _tmp9_ = {0};
gint _tmp10_ = 0;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = *a;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = _tmp7_.y;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = *b;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp10_ = _tmp9_.y;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = _tmp8_ == _tmp10_;
-#line 1315 "image.c"
+#line 1213 "image.c"
} else {
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = FALSE;
-#line 1319 "image.c"
+#line 1217 "image.c"
}
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp2_) {
-#line 1323 "image.c"
+#line 1221 "image.c"
GdkRectangle _tmp11_ = {0};
gint _tmp12_ = 0;
GdkRectangle _tmp13_ = {0};
gint _tmp14_ = 0;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = *a;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp12_ = _tmp11_.width;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp13_ = *b;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = _tmp13_.width;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = _tmp12_ == _tmp14_;
-#line 1338 "image.c"
+#line 1236 "image.c"
} else {
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = FALSE;
-#line 1342 "image.c"
+#line 1240 "image.c"
}
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp1_) {
-#line 1346 "image.c"
+#line 1244 "image.c"
GdkRectangle _tmp15_ = {0};
gint _tmp16_ = 0;
GdkRectangle _tmp17_ = {0};
gint _tmp18_ = 0;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp15_ = *a;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp16_ = _tmp15_.height;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp17_ = *b;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp18_ = _tmp17_.height;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = _tmp16_ == _tmp18_;
-#line 1361 "image.c"
+#line 1259 "image.c"
} else {
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = FALSE;
-#line 1365 "image.c"
+#line 1263 "image.c"
}
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
result = _tmp0_;
-#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 258 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 1371 "image.c"
+#line 1269 "image.c"
}
@@ -1382,31 +1280,31 @@ gchar* rectangle_to_string (GdkRectangle* rect) {
GdkRectangle _tmp6_ = {0};
gint _tmp7_ = 0;
gchar* _tmp8_ = NULL;
-#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 261 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (rect != NULL, NULL);
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = *rect;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = _tmp0_.x;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = *rect;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = _tmp2_.y;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = *rect;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = _tmp4_.width;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = *rect;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = _tmp6_.height;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = g_strdup_printf ("%d,%d %dx%d", _tmp1_, _tmp3_, _tmp5_, _tmp7_);
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
result = _tmp8_;
-#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 262 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 1410 "image.c"
+#line 1308 "image.c"
}
@@ -1432,65 +1330,65 @@ void clamp_rectangle (GdkRectangle* original, Dimensions* max, GdkRectangle* res
Dimensions _tmp17_ = {0};
gint _tmp18_ = 0;
gint _tmp19_ = 0;
-#line 273 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (original != NULL);
-#line 273 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 265 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (max != NULL);
-#line 274 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 266 "/home/jens/Source/shotwell/src/util/image.vala"
memset (&rect, 0, sizeof (GdkRectangle));
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = *original;
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = _tmp0_.x;
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = *max;
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = _tmp2_.width;
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = CLAMP (_tmp1_, 0, _tmp3_);
-#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 267 "/home/jens/Source/shotwell/src/util/image.vala"
rect.x = _tmp4_;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = *original;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = _tmp5_.y;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = *max;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = _tmp7_.height;
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = CLAMP (_tmp6_, 0, _tmp8_);
-#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 268 "/home/jens/Source/shotwell/src/util/image.vala"
rect.y = _tmp9_;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp10_ = *original;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = _tmp10_.width;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp12_ = *max;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp13_ = _tmp12_.width;
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = CLAMP (_tmp11_, 0, _tmp13_);
-#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 269 "/home/jens/Source/shotwell/src/util/image.vala"
rect.width = _tmp14_;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp15_ = *original;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp16_ = _tmp15_.height;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp17_ = *max;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp18_ = _tmp17_.height;
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp19_ = CLAMP (_tmp16_, 0, _tmp18_);
-#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 270 "/home/jens/Source/shotwell/src/util/image.vala"
rect.height = _tmp19_;
-#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 272 "/home/jens/Source/shotwell/src/util/image.vala"
*result = rect;
-#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 272 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 1494 "image.c"
+#line 1392 "image.c"
}
@@ -1503,33 +1401,33 @@ void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result) {
gdouble _tmp4_ = 0.0;
GdkPoint _tmp5_ = {0};
gint _tmp6_ = 0;
-#line 283 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 275 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (p != NULL);
-#line 284 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_.x = 0;
-#line 284 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 276 "/home/jens/Source/shotwell/src/util/image.vala"
_result_ = _tmp0_;
-#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = factor;
-#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = *p;
-#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = _tmp2_.x;
-#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 277 "/home/jens/Source/shotwell/src/util/image.vala"
_result_.x = (gint) ((_tmp1_ * _tmp3_) + 0.5);
-#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = factor;
-#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = *p;
-#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = _tmp5_.y;
-#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 278 "/home/jens/Source/shotwell/src/util/image.vala"
_result_.y = (gint) ((_tmp4_ * _tmp6_) + 0.5);
-#line 288 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
*result = _result_;
-#line 288 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 280 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 1533 "image.c"
+#line 1431 "image.c"
}
@@ -1544,39 +1442,39 @@ void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
gint _tmp6_ = 0;
GdkPoint _tmp7_ = {0};
gint _tmp8_ = 0;
-#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 283 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (p1 != NULL);
-#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 283 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (p2 != NULL);
-#line 292 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 284 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_.x = 0;
-#line 292 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 284 "/home/jens/Source/shotwell/src/util/image.vala"
_result_ = _tmp0_;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = *p1;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = _tmp1_.x;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = *p2;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = _tmp3_.x;
-#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 285 "/home/jens/Source/shotwell/src/util/image.vala"
_result_.x = _tmp2_ + _tmp4_;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = *p1;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = _tmp5_.y;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = *p2;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = _tmp7_.y;
-#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 286 "/home/jens/Source/shotwell/src/util/image.vala"
_result_.y = _tmp6_ + _tmp8_;
-#line 296 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 288 "/home/jens/Source/shotwell/src/util/image.vala"
*result = _result_;
-#line 296 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 288 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 1580 "image.c"
+#line 1478 "image.c"
}
@@ -1591,39 +1489,39 @@ void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result) {
gint _tmp6_ = 0;
GdkPoint _tmp7_ = {0};
gint _tmp8_ = 0;
-#line 299 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (p1 != NULL);
-#line 299 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 291 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (p2 != NULL);
-#line 300 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 292 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_.x = 0;
-#line 300 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 292 "/home/jens/Source/shotwell/src/util/image.vala"
_result_ = _tmp0_;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = *p1;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = _tmp1_.x;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = *p2;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = _tmp3_.x;
-#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 293 "/home/jens/Source/shotwell/src/util/image.vala"
_result_.x = _tmp2_ - _tmp4_;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = *p1;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = _tmp5_.y;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = *p2;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = _tmp7_.y;
-#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 294 "/home/jens/Source/shotwell/src/util/image.vala"
_result_.y = _tmp6_ - _tmp8_;
-#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 296 "/home/jens/Source/shotwell/src/util/image.vala"
*result = _result_;
-#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 296 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 1627 "image.c"
+#line 1525 "image.c"
}
@@ -1632,29 +1530,29 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
GdkPixbuf* _tmp0_ = NULL;
void* _tmp1_ = NULL;
void* _tmp2_ = NULL;
-#line 308 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 300 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = pixbuf;
-#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = gdk_pixbuf_get_pixels (_tmp0_);
-#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = _tmp1_;
-#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 301 "/home/jens/Source/shotwell/src/util/image.vala"
gdk_pixels = _tmp2_;
-#line 1646 "image.c"
+#line 1544 "image.c"
{
gint j = 0;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
j = 0;
-#line 1651 "image.c"
+#line 1549 "image.c"
{
gboolean _tmp3_ = FALSE;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = TRUE;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
-#line 1658 "image.c"
+#line 1556 "image.c"
gint _tmp5_ = 0;
GdkPixbuf* _tmp6_ = NULL;
gint _tmp7_ = 0;
@@ -1670,49 +1568,49 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
GdkPixbuf* _tmp27_ = NULL;
gint _tmp28_ = 0;
gint _tmp29_ = 0;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
if (!_tmp3_) {
-#line 1676 "image.c"
+#line 1574 "image.c"
gint _tmp4_ = 0;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = j;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
j = _tmp4_ + 1;
-#line 1682 "image.c"
+#line 1580 "image.c"
}
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = FALSE;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = j;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = pixbuf;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = gdk_pixbuf_get_height (_tmp6_);
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = _tmp7_;
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
if (!(_tmp5_ < _tmp8_)) {
-#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 302 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 1698 "image.c"
+#line 1596 "image.c"
}
-#line 311 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 303 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = gdk_pixels;
-#line 311 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 303 "/home/jens/Source/shotwell/src/util/image.vala"
p = _tmp9_;
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp10_ = p;
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = pixbuf;
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp12_ = gdk_pixbuf_get_width (_tmp11_);
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp13_ = _tmp12_;
-#line 312 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 304 "/home/jens/Source/shotwell/src/util/image.vala"
end = _tmp10_ + (4 * _tmp13_);
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
while (TRUE) {
-#line 1716 "image.c"
+#line 1614 "image.c"
guchar* _tmp14_ = NULL;
guchar* _tmp15_ = NULL;
guchar tmp = '\0';
@@ -1726,57 +1624,57 @@ void fix_cairo_pixbuf (GdkPixbuf* pixbuf) {
guchar _tmp23_ = '\0';
guchar _tmp24_ = '\0';
guchar* _tmp25_ = NULL;
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = p;
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp15_ = end;
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
if (!(_tmp14_ < _tmp15_)) {
-#line 314 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 306 "/home/jens/Source/shotwell/src/util/image.vala"
break;
-#line 1738 "image.c"
+#line 1636 "image.c"
}
-#line 315 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp16_ = p;
-#line 315 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp17_ = _tmp16_[0];
-#line 315 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 307 "/home/jens/Source/shotwell/src/util/image.vala"
tmp = _tmp17_;
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp18_ = p;
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp19_ = p;
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp20_ = _tmp19_[2];
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp18_[0] = _tmp20_;
-#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 309 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp21_ = _tmp18_[0];
-#line 318 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp22_ = p;
-#line 318 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp23_ = tmp;
-#line 318 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp22_[2] = _tmp23_;
-#line 318 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 310 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp24_ = _tmp22_[2];
-#line 325 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp25_ = p;
-#line 325 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 317 "/home/jens/Source/shotwell/src/util/image.vala"
p = _tmp25_ + 4;
-#line 1768 "image.c"
+#line 1666 "image.c"
}
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp26_ = gdk_pixels;
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp27_ = pixbuf;
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp28_ = gdk_pixbuf_get_rowstride (_tmp27_);
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp29_ = _tmp28_;
-#line 328 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 320 "/home/jens/Source/shotwell/src/util/image.vala"
gdk_pixels = _tmp26_ + _tmp29_;
-#line 1780 "image.c"
+#line 1678 "image.c"
}
}
}
@@ -1812,57 +1710,57 @@ void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble an
gdouble _tmp13_ = 0.0;
gdouble _tmp14_ = 0.0;
gdouble _tmp15_ = 0.0;
-#line 345 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = angle;
-#line 345 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = degrees_to_radians (_tmp0_);
-#line 345 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = fabs (_tmp1_);
-#line 345 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 337 "/home/jens/Source/shotwell/src/util/image.vala"
angle = _tmp2_;
-#line 346 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 338 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = angle;
-#line 346 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 338 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_assert (_tmp3_ <= G_PI_2, "angle <= Math.PI_2");
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = src_width;
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = angle;
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = cos (_tmp5_);
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = src_height;
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = angle;
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = sin (_tmp8_);
-#line 347 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 339 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_dest_width = (_tmp4_ * _tmp6_) + (_tmp7_ * _tmp9_);
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp10_ = src_height;
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = angle;
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp12_ = cos (_tmp11_);
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp13_ = src_width;
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = angle;
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp15_ = sin (_tmp14_);
-#line 348 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 340 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_dest_height = (_tmp10_ * _tmp12_) + (_tmp13_ * _tmp15_);
-#line 342 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
if (dest_width) {
-#line 342 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
*dest_width = _vala_dest_width;
-#line 1860 "image.c"
+#line 1758 "image.c"
}
-#line 342 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
if (dest_height) {
-#line 342 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 334 "/home/jens/Source/shotwell/src/util/image.vala"
*dest_height = _vala_dest_height;
-#line 1866 "image.c"
+#line 1764 "image.c"
}
}
@@ -1946,200 +1844,200 @@ GdkPixbuf* rotate_arb (GdkPixbuf* source_pixbuf, gdouble angle) {
cairo_pattern_t* _tmp65_ = NULL;
cairo_t* _tmp66_ = NULL;
GdkPixbuf* _tmp67_ = NULL;
-#line 357 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 349 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_val_if_fail (GDK_IS_PIXBUF (source_pixbuf), NULL);
-#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 353 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = angle;
-#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 353 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp0_ == 0.0) {
-#line 1956 "image.c"
+#line 1854 "image.c"
GdkPixbuf* _tmp1_ = NULL;
GdkPixbuf* _tmp2_ = NULL;
-#line 362 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = source_pixbuf;
-#line 362 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = _g_object_ref0 (_tmp1_);
-#line 362 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
result = _tmp2_;
-#line 362 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 354 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 1967 "image.c"
+#line 1865 "image.c"
}
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = source_pixbuf;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = gdk_pixbuf_get_width (_tmp3_);
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = _tmp4_;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = source_pixbuf;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = gdk_pixbuf_get_height (_tmp6_);
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = _tmp7_;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = angle;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
compute_arb_rotated_size ((gdouble) _tmp5_, (gdouble) _tmp8_, _tmp9_, &_tmp10_, &_tmp11_);
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
x_tmp = _tmp10_;
-#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 361 "/home/jens/Source/shotwell/src/util/image.vala"
y_tmp = _tmp11_;
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp12_ = x_tmp;
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp13_ = round (_tmp12_);
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = y_tmp;
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp15_ = round (_tmp14_);
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp16_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, (gint) _tmp13_, (gint) _tmp15_);
-#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 364 "/home/jens/Source/shotwell/src/util/image.vala"
dest_pixbuf = _tmp16_;
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp18_ = source_pixbuf;
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp19_ = gdk_pixbuf_get_has_alpha (_tmp18_);
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp20_ = _tmp19_;
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp20_) {
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp17_ = CAIRO_FORMAT_ARGB32;
-#line 2011 "image.c"
+#line 1909 "image.c"
} else {
-#line 377 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 369 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp17_ = CAIRO_FORMAT_RGB24;
-#line 2015 "image.c"
+#line 1913 "image.c"
}
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp21_ = dest_pixbuf;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp22_ = gdk_pixbuf_get_pixels (_tmp21_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp23_ = _tmp22_;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp24_ = dest_pixbuf;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp25_ = gdk_pixbuf_get_width (_tmp24_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp26_ = _tmp25_;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp27_ = dest_pixbuf;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp28_ = gdk_pixbuf_get_height (_tmp27_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp29_ = _tmp28_;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp30_ = dest_pixbuf;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp31_ = gdk_pixbuf_get_rowstride (_tmp30_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp32_ = _tmp31_;
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp33_ = cairo_image_surface_create_for_data ((guchar*) _tmp23_, _tmp17_, _tmp26_, _tmp29_, _tmp32_);
-#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 367 "/home/jens/Source/shotwell/src/util/image.vala"
surface = _tmp33_;
-#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp34_ = surface;
-#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp35_ = cairo_create (_tmp34_);
-#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 372 "/home/jens/Source/shotwell/src/util/image.vala"
context = _tmp35_;
-#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 374 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp36_ = context;
-#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 374 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_set_source_rgb (_tmp36_, (gdouble) 0, (gdouble) 0, (gdouble) 0);
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp37_ = context;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp38_ = dest_pixbuf;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp39_ = gdk_pixbuf_get_width (_tmp38_);
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp40_ = _tmp39_;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp41_ = dest_pixbuf;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp42_ = gdk_pixbuf_get_height (_tmp41_);
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp43_ = _tmp42_;
-#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 375 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_rectangle (_tmp37_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp40_, (gdouble) _tmp43_);
-#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 376 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp44_ = context;
-#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 376 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_fill (_tmp44_);
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp45_ = context;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp46_ = dest_pixbuf;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp47_ = gdk_pixbuf_get_width (_tmp46_);
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp48_ = _tmp47_;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp49_ = dest_pixbuf;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp50_ = gdk_pixbuf_get_height (_tmp49_);
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp51_ = _tmp50_;
-#line 386 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 378 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_translate (_tmp45_, (gdouble) (_tmp48_ / 2), (gdouble) (_tmp51_ / 2));
-#line 387 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp52_ = context;
-#line 387 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp53_ = angle;
-#line 387 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp54_ = degrees_to_radians (_tmp53_);
-#line 387 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 379 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_rotate (_tmp52_, _tmp54_);
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp55_ = context;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp56_ = source_pixbuf;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp57_ = gdk_pixbuf_get_width (_tmp56_);
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp58_ = _tmp57_;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp59_ = source_pixbuf;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp60_ = gdk_pixbuf_get_height (_tmp59_);
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp61_ = _tmp60_;
-#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 380 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_translate (_tmp55_, (gdouble) ((-_tmp58_) / 2), (gdouble) ((-_tmp61_) / 2));
-#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp62_ = context;
-#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp63_ = source_pixbuf;
-#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 382 "/home/jens/Source/shotwell/src/util/image.vala"
gdk_cairo_set_source_pixbuf (_tmp62_, _tmp63_, (gdouble) 0, (gdouble) 0);
-#line 391 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp64_ = context;
-#line 391 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp65_ = cairo_get_source (_tmp64_);
-#line 391 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 383 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_pattern_set_filter (_tmp65_, CAIRO_FILTER_BEST);
-#line 392 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp66_ = context;
-#line 392 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 384 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_paint (_tmp66_);
-#line 396 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp67_ = dest_pixbuf;
-#line 396 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 388 "/home/jens/Source/shotwell/src/util/image.vala"
fix_cairo_pixbuf (_tmp67_);
-#line 398 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
result = dest_pixbuf;
-#line 398 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
_cairo_destroy0 (context);
-#line 398 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
_cairo_surface_destroy0 (surface);
-#line 398 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 390 "/home/jens/Source/shotwell/src/util/image.vala"
return result;
-#line 2143 "image.c"
+#line 2041 "image.c"
}
@@ -2182,93 +2080,93 @@ void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble a
gdouble _tmp19_ = 0.0;
gdouble _tmp20_ = 0.0;
GdkPoint _tmp21_ = {0};
-#line 414 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 406 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (source_point != NULL);
-#line 417 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 409 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = angle;
-#line 417 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 409 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp0_ == 0.0) {
-#line 2192 "image.c"
+#line 2090 "image.c"
GdkPoint _tmp1_ = {0};
-#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = *source_point;
-#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
*result = _tmp1_;
-#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 411 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 2200 "image.c"
+#line 2098 "image.c"
}
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = img_w;
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = img_h;
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_ = angle;
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
compute_arb_rotated_size ((gdouble) _tmp2_, (gdouble) _tmp3_, _tmp4_, &_tmp5_, &_tmp6_);
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
dest_width = _tmp5_;
-#line 424 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 416 "/home/jens/Source/shotwell/src/util/image.vala"
dest_height = _tmp6_;
-#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 418 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_matrix_init_identity (&matrix);
-#line 427 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = dest_width;
-#line 427 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp8_ = dest_height;
-#line 427 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 419 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_matrix_translate (&matrix, _tmp7_ / 2, _tmp8_ / 2);
-#line 428 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 420 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = angle;
-#line 428 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 420 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp10_ = degrees_to_radians (_tmp9_);
-#line 428 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 420 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_matrix_rotate (&matrix, _tmp10_);
-#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 421 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = img_w;
-#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 421 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp12_ = img_h;
-#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 421 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_matrix_translate (&matrix, (gdouble) ((-_tmp11_) / 2), (gdouble) ((-_tmp12_) / 2));
-#line 430 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 422 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp13_ = invert;
-#line 430 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 422 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp13_) {
-#line 2238 "image.c"
+#line 2136 "image.c"
cairo_status_t _tmp14_ = 0;
-#line 431 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 423 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = cairo_matrix_invert (&matrix);
-#line 431 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 423 "/home/jens/Source/shotwell/src/util/image.vala"
_vala_assert (_tmp14_ == CAIRO_STATUS_SUCCESS, "matrix.invert() == Cairo.Status.SUCCESS");
-#line 2244 "image.c"
+#line 2142 "image.c"
}
-#line 433 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 425 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp15_ = *source_point;
-#line 433 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 425 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp16_ = _tmp15_.x;
-#line 433 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 425 "/home/jens/Source/shotwell/src/util/image.vala"
dest_x = (gdouble) _tmp16_;
-#line 434 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp17_ = *source_point;
-#line 434 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp18_ = _tmp17_.y;
-#line 434 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 426 "/home/jens/Source/shotwell/src/util/image.vala"
dest_y = (gdouble) _tmp18_;
-#line 435 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 427 "/home/jens/Source/shotwell/src/util/image.vala"
cairo_matrix_transform_point (&matrix, &dest_x, &dest_y);
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp19_ = dest_x;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp20_ = dest_y;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp21_.x = (gint) _tmp19_;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp21_.y = (gint) _tmp20_;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
*result = _tmp21_;
-#line 437 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 429 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 2272 "image.c"
+#line 2170 "image.c"
}
@@ -2291,23 +2189,23 @@ void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble
gint _tmp2_ = 0;
gdouble _tmp3_ = 0.0;
GdkPoint _tmp4_ = {0};
-#line 453 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 445 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (source_point != NULL);
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = *source_point;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = img_w;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = img_h;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = angle;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
rotate_point_arb (&_tmp0_, _tmp1_, _tmp2_, _tmp3_, TRUE, &_tmp4_);
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
*result = _tmp4_;
-#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 446 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 2311 "image.c"
+#line 2209 "image.c"
}
@@ -2391,263 +2289,263 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
gint _tmp73_ = 0;
Box _tmp78_ = {0};
gboolean _tmp79_ = FALSE;
-#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 451 "/home/jens/Source/shotwell/src/util/image.vala"
g_return_if_fail (src != NULL);
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp0_ = *src;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp1_ = _tmp0_.left;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp2_ = *src;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp3_ = _tmp2_.top;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_.x = _tmp1_;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp4_.y = _tmp3_;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp5_ = img_w;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp6_ = img_h;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp7_ = angle_deg;
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
derotate_point_arb (&_tmp4_, _tmp5_, _tmp6_, _tmp7_, &_tmp8_);
-#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 454 "/home/jens/Source/shotwell/src/util/image.vala"
top_left = _tmp8_;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp9_ = *src;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp10_ = _tmp9_.right;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp11_ = *src;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp12_ = _tmp11_.top;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp13_.x = _tmp10_;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp13_.y = _tmp12_;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp14_ = img_w;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp15_ = img_h;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp16_ = angle_deg;
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
derotate_point_arb (&_tmp13_, _tmp14_, _tmp15_, _tmp16_, &_tmp17_);
-#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 455 "/home/jens/Source/shotwell/src/util/image.vala"
top_right = _tmp17_;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp18_ = *src;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp19_ = _tmp18_.left;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp20_ = *src;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp21_ = _tmp20_.bottom;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp22_.x = _tmp19_;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp22_.y = _tmp21_;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp23_ = img_w;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp24_ = img_h;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp25_ = angle_deg;
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
derotate_point_arb (&_tmp22_, _tmp23_, _tmp24_, _tmp25_, &_tmp26_);
-#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 456 "/home/jens/Source/shotwell/src/util/image.vala"
bottom_left = _tmp26_;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp27_ = *src;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp28_ = _tmp27_.right;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp29_ = *src;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp30_ = _tmp29_.bottom;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp31_.x = _tmp28_;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp31_.y = _tmp30_;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp32_ = img_w;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp33_ = img_h;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp34_ = angle_deg;
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
derotate_point_arb (&_tmp31_, _tmp32_, _tmp33_, _tmp34_, &_tmp35_);
-#line 465 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 457 "/home/jens/Source/shotwell/src/util/image.vala"
bottom_right = _tmp35_;
-#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp36_ = angle_deg;
-#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp37_ = degrees_to_radians (_tmp36_);
-#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 459 "/home/jens/Source/shotwell/src/util/image.vala"
angle = _tmp37_;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
top_offset = 0;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
bottom_offset = 0;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
left_offset = 0;
-#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 460 "/home/jens/Source/shotwell/src/util/image.vala"
right_offset = 0;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp38_ = top_left;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp39_ = _tmp38_.y;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp40_ = top_right;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp41_ = _tmp40_.y;
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp42_ = MIN (_tmp39_, _tmp41_);
-#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 462 "/home/jens/Source/shotwell/src/util/image.vala"
top = _tmp42_;
-#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp43_ = top;
-#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 463 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp43_ < 0) {
-#line 2515 "image.c"
+#line 2413 "image.c"
gint _tmp44_ = 0;
gdouble _tmp45_ = 0.0;
gdouble _tmp46_ = 0.0;
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp44_ = top;
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp45_ = angle;
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp46_ = cos (_tmp45_);
-#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 464 "/home/jens/Source/shotwell/src/util/image.vala"
top_offset = (gint) ((0 - _tmp44_) * _tmp46_);
-#line 2527 "image.c"
+#line 2425 "image.c"
}
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp47_ = bottom_left;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp48_ = _tmp47_.y;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp49_ = bottom_right;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp50_ = _tmp49_.y;
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp51_ = MAX (_tmp48_, _tmp50_);
-#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 466 "/home/jens/Source/shotwell/src/util/image.vala"
bottom = _tmp51_;
-#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp52_ = bottom;
-#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp53_ = img_h;
-#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 467 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp52_ > _tmp53_) {
-#line 2547 "image.c"
+#line 2445 "image.c"
gint _tmp54_ = 0;
gint _tmp55_ = 0;
gdouble _tmp56_ = 0.0;
gdouble _tmp57_ = 0.0;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp54_ = img_h;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp55_ = bottom;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp56_ = angle;
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp57_ = cos (_tmp56_);
-#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 468 "/home/jens/Source/shotwell/src/util/image.vala"
bottom_offset = (gint) ((_tmp54_ - _tmp55_) * _tmp57_);
-#line 2562 "image.c"
+#line 2460 "image.c"
}
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp58_ = top_left;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp59_ = _tmp58_.x;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp60_ = bottom_left;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp61_ = _tmp60_.x;
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp62_ = MIN (_tmp59_, _tmp61_);
-#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 470 "/home/jens/Source/shotwell/src/util/image.vala"
left = _tmp62_;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp63_ = left;
-#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 471 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp63_ < 0) {
-#line 2580 "image.c"
+#line 2478 "image.c"
gint _tmp64_ = 0;
gdouble _tmp65_ = 0.0;
gdouble _tmp66_ = 0.0;
-#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp64_ = left;
-#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp65_ = angle;
-#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp66_ = cos (_tmp65_);
-#line 480 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 472 "/home/jens/Source/shotwell/src/util/image.vala"
left_offset = (gint) ((0 - _tmp64_) * _tmp66_);
-#line 2592 "image.c"
+#line 2490 "image.c"
}
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp67_ = top_right;
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp68_ = _tmp67_.x;
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp69_ = bottom_right;
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp70_ = _tmp69_.x;
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp71_ = MAX (_tmp68_, _tmp70_);
-#line 482 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 474 "/home/jens/Source/shotwell/src/util/image.vala"
right = _tmp71_;
-#line 483 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp72_ = right;
-#line 483 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp73_ = img_w;
-#line 483 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 475 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp72_ > _tmp73_) {
-#line 2612 "image.c"
+#line 2510 "image.c"
gint _tmp74_ = 0;
gint _tmp75_ = 0;
gdouble _tmp76_ = 0.0;
gdouble _tmp77_ = 0.0;
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp74_ = img_w;
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp75_ = right;
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp76_ = angle;
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp77_ = cos (_tmp76_);
-#line 484 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 476 "/home/jens/Source/shotwell/src/util/image.vala"
right_offset = (gint) ((_tmp74_ - _tmp75_) * _tmp77_);
-#line 2627 "image.c"
+#line 2525 "image.c"
}
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp79_ = preserve_geom;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
if (_tmp79_) {
-#line 2633 "image.c"
+#line 2531 "image.c"
gint _tmp80_ = 0;
gint _tmp81_ = 0;
gint _tmp82_ = 0;
gint _tmp83_ = 0;
Box _tmp84_ = {0};
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp80_ = left_offset;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp81_ = right_offset;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp82_ = top_offset;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp83_ = bottom_offset;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
box_get_offset (src, _tmp80_ + _tmp81_, _tmp82_ + _tmp83_, &_tmp84_);
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp78_ = _tmp84_;
-#line 2651 "image.c"
+#line 2549 "image.c"
} else {
Box _tmp85_ = {0};
gint _tmp86_ = 0;
@@ -2661,39 +2559,39 @@ void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle
Box _tmp94_ = {0};
gint _tmp95_ = 0;
gint _tmp96_ = 0;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp85_ = *src;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp86_ = _tmp85_.left;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp87_ = left_offset;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp88_ = *src;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp89_ = _tmp88_.top;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp90_ = top_offset;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp91_ = *src;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp92_ = _tmp91_.right;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp93_ = right_offset;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp94_ = *src;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp95_ = _tmp94_.bottom;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
_tmp96_ = bottom_offset;
-#line 487 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 479 "/home/jens/Source/shotwell/src/util/image.vala"
box_init (&_tmp78_, _tmp86_ + _tmp87_, _tmp89_ + _tmp90_, _tmp92_ + _tmp93_, _tmp95_ + _tmp96_);
-#line 2691 "image.c"
+#line 2589 "image.c"
}
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
*result = _tmp78_;
-#line 486 "/home/jens/Source/shotwell/src/util/image.vala"
+#line 478 "/home/jens/Source/shotwell/src/util/image.vala"
return;
-#line 2697 "image.c"
+#line 2595 "image.c"
}
diff --git a/src/util/image.vala b/src/util/image.vala
index db872df..4adafae 100644
--- a/src/util/image.vala
+++ b/src/util/image.vala
@@ -250,14 +250,6 @@ public void shift_colors(Gdk.Pixbuf pixbuf, int red, int green, int blue, int al
}
}
-public void dim_pixbuf(Gdk.Pixbuf pixbuf) {
- PixelTransformer transformer = new PixelTransformer();
- SaturationTransformation sat = new SaturationTransformation(SaturationTransformation.MIN_PARAMETER);
- transformer.attach_transformation(sat);
- transformer.transform_pixbuf(pixbuf);
- shift_colors(pixbuf, 0, 0, 0, -100);
-}
-
bool coord_in_rectangle(int x, int y, Gdk.Rectangle rect) {
return (x >= rect.x && x < (rect.x + rect.width) && y >= rect.y && y <= (rect.y + rect.height));
}
diff --git a/src/util/misc.c b/src/util/misc.c
index b1a0d40..848194e 100644
--- a/src/util/misc.c
+++ b/src/util/misc.c
@@ -1,4 +1,4 @@
-/* misc.c generated by valac 0.34.2, the Vala compiler
+/* misc.c generated by valac 0.32.1, the Vala compiler
* generated from misc.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -269,9 +269,6 @@ void op_timer_start (OpTimer* self);
void op_timer_stop (OpTimer* self);
gchar* op_timer_to_string (OpTimer* self);
static void op_timer_finalize (OpTimer* obj);
-void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message);
-gboolean is_twentyfour_hr_time_system (void);
-gboolean is_string_empty (const gchar* s);
guint int64_hash (gint64* n) {
@@ -285,32 +282,32 @@ guint int64_hash (gint64* n) {
u8 = (guint8*) _tmp0_;
#line 10 "/home/jens/Source/shotwell/src/util/misc.vala"
hash = (guint) 0;
-#line 289 "misc.c"
+#line 286 "misc.c"
{
gint ctr = 0;
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
ctr = 0;
-#line 294 "misc.c"
+#line 291 "misc.c"
{
gboolean _tmp1_ = FALSE;
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = TRUE;
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
-#line 301 "misc.c"
+#line 298 "misc.c"
gint _tmp3_ = 0;
guint _tmp4_ = 0U;
guint _tmp5_ = 0U;
guint8* _tmp6_ = NULL;
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
if (!_tmp1_) {
-#line 308 "misc.c"
+#line 305 "misc.c"
gint _tmp2_ = 0;
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp2_ = ctr;
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
ctr = _tmp2_ + 1;
-#line 314 "misc.c"
+#line 311 "misc.c"
}
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = FALSE;
@@ -320,7 +317,7 @@ guint int64_hash (gint64* n) {
if (!(((gulong) _tmp3_) < (sizeof (gint64) / sizeof (guint8)))) {
#line 11 "/home/jens/Source/shotwell/src/util/misc.vala"
break;
-#line 324 "misc.c"
+#line 321 "misc.c"
}
#line 12 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = hash;
@@ -332,7 +329,7 @@ guint int64_hash (gint64* n) {
u8 = _tmp6_ + 1;
#line 12 "/home/jens/Source/shotwell/src/util/misc.vala"
hash = ((_tmp4_ << 4) ^ (_tmp5_ >> 28)) ^ (*_tmp6_);
-#line 336 "misc.c"
+#line 333 "misc.c"
}
}
}
@@ -340,7 +337,7 @@ guint int64_hash (gint64* n) {
result = hash;
#line 15 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 344 "misc.c"
+#line 341 "misc.c"
}
@@ -362,7 +359,7 @@ gboolean int64_equal (gint64* a, gint64* b) {
result = (*bia) == (*bib);
#line 22 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 366 "misc.c"
+#line 363 "misc.c"
}
@@ -386,7 +383,7 @@ gint int64_compare (gint64* a, gint64* b) {
result = -1;
#line 28 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 390 "misc.c"
+#line 387 "misc.c"
} else {
gint64 _tmp3_ = 0LL;
#line 29 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -397,13 +394,13 @@ gint int64_compare (gint64* a, gint64* b) {
result = 1;
#line 30 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 401 "misc.c"
+#line 398 "misc.c"
} else {
#line 32 "/home/jens/Source/shotwell/src/util/misc.vala"
result = 0;
#line 32 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 407 "misc.c"
+#line 404 "misc.c"
}
}
}
@@ -435,7 +432,7 @@ gint uint64_compare (guint64* a, guint64* b) {
result = -1;
#line 40 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 439 "misc.c"
+#line 436 "misc.c"
} else {
guint64 _tmp4_ = 0ULL;
guint64 _tmp5_ = 0ULL;
@@ -449,13 +446,13 @@ gint uint64_compare (guint64* a, guint64* b) {
result = 1;
#line 42 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 453 "misc.c"
+#line 450 "misc.c"
} else {
#line 44 "/home/jens/Source/shotwell/src/util/misc.vala"
result = 0;
#line 44 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 459 "misc.c"
+#line 456 "misc.c"
}
}
}
@@ -477,7 +474,7 @@ gboolean bool_value_equals (GValue* a, GValue* b) {
result = g_value_get_boolean (&_tmp0_) == g_value_get_boolean (&_tmp1_);
#line 50 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 481 "misc.c"
+#line 478 "misc.c"
}
@@ -497,7 +494,7 @@ gboolean int_value_equals (GValue* a, GValue* b) {
result = g_value_get_int (&_tmp0_) == g_value_get_int (&_tmp1_);
#line 54 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 501 "misc.c"
+#line 498 "misc.c"
}
@@ -521,7 +518,7 @@ gulong timeval_to_ms (GTimeVal* time_val) {
result = (((gulong) _tmp1_) * 1000) + (((gulong) _tmp3_) / 1000);
#line 58 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 525 "misc.c"
+#line 522 "misc.c"
}
@@ -537,7 +534,7 @@ gulong now_ms (void) {
result = _tmp1_;
#line 62 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 541 "misc.c"
+#line 538 "misc.c"
}
@@ -556,7 +553,7 @@ gulong now_sec (void) {
result = (gulong) _tmp1_;
#line 68 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 560 "misc.c"
+#line 557 "misc.c"
}
@@ -569,7 +566,7 @@ inline time_t now_time_t (void) {
result = (time_t) _tmp0_;
#line 72 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 573 "misc.c"
+#line 570 "misc.c"
}
@@ -606,7 +603,7 @@ gchar* md5_binary (guint8* buffer, gsize length) {
_g_checksum_free0 (md5);
#line 81 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 610 "misc.c"
+#line 607 "misc.c"
}
@@ -655,7 +652,7 @@ gchar* md5_file (GFile* file, GError** error) {
_g_checksum_free0 (md5);
#line 88 "/home/jens/Source/shotwell/src/util/misc.vala"
return NULL;
-#line 659 "misc.c"
+#line 656 "misc.c"
}
{
gboolean _tmp4_ = FALSE;
@@ -663,7 +660,7 @@ gchar* md5_file (GFile* file, GError** error) {
_tmp4_ = TRUE;
#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
-#line 667 "misc.c"
+#line 664 "misc.c"
gsize bytes_read = 0UL;
GFileInputStream* _tmp5_ = NULL;
guint8* _tmp6_ = NULL;
@@ -676,7 +673,7 @@ gchar* md5_file (GFile* file, GError** error) {
gsize _tmp11_ = 0UL;
#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
if (!_tmp4_) {
-#line 680 "misc.c"
+#line 677 "misc.c"
}
#line 89 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = FALSE;
@@ -687,7 +684,7 @@ gchar* md5_file (GFile* file, GError** error) {
#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6__length1 = buffer_length1;
#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
- _tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, g_input_stream_get_type (), GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
+ _tmp7_ = g_input_stream_read (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, G_TYPE_INPUT_STREAM, GInputStream), _tmp6_, (gsize) _tmp6__length1, NULL, &_inner_error_);
#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
bytes_read = (gsize) _tmp7_;
#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -702,7 +699,7 @@ gchar* md5_file (GFile* file, GError** error) {
_g_checksum_free0 (md5);
#line 90 "/home/jens/Source/shotwell/src/util/misc.vala"
return NULL;
-#line 706 "misc.c"
+#line 703 "misc.c"
}
#line 91 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp8_ = bytes_read;
@@ -710,7 +707,7 @@ gchar* md5_file (GFile* file, GError** error) {
if (_tmp8_ <= ((gsize) 0)) {
#line 92 "/home/jens/Source/shotwell/src/util/misc.vala"
break;
-#line 714 "misc.c"
+#line 711 "misc.c"
}
#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp9_ = md5;
@@ -722,7 +719,7 @@ gchar* md5_file (GFile* file, GError** error) {
_tmp11_ = bytes_read;
#line 94 "/home/jens/Source/shotwell/src/util/misc.vala"
g_checksum_update (_tmp9_, (guchar*) _tmp10_, _tmp11_);
-#line 726 "misc.c"
+#line 723 "misc.c"
}
}
{
@@ -730,10 +727,10 @@ gchar* md5_file (GFile* file, GError** error) {
#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp12_ = fins;
#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
- g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, g_input_stream_get_type (), GInputStream), NULL, &_inner_error_);
+ g_input_stream_close (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, G_TYPE_INPUT_STREAM, GInputStream), NULL, &_inner_error_);
#line 98 "/home/jens/Source/shotwell/src/util/misc.vala"
if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 737 "misc.c"
+#line 734 "misc.c"
goto __catch5_g_error;
}
}
@@ -766,7 +763,7 @@ gchar* md5_file (GFile* file, GError** error) {
_g_free0 (_tmp15_);
#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_error_free0 (err);
-#line 770 "misc.c"
+#line 767 "misc.c"
}
__finally5:
#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -781,7 +778,7 @@ gchar* md5_file (GFile* file, GError** error) {
_g_checksum_free0 (md5);
#line 97 "/home/jens/Source/shotwell/src/util/misc.vala"
return NULL;
-#line 785 "misc.c"
+#line 782 "misc.c"
}
#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp18_ = md5;
@@ -799,7 +796,7 @@ gchar* md5_file (GFile* file, GError** error) {
_g_checksum_free0 (md5);
#line 103 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 803 "misc.c"
+#line 800 "misc.c"
}
@@ -829,7 +826,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
_tmp2_ = a;
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp2_ != NULL) {
-#line 833 "misc.c"
+#line 830 "misc.c"
GeeSet* _tmp3_ = NULL;
gint _tmp4_ = 0;
gint _tmp5_ = 0;
@@ -841,25 +838,25 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
_tmp5_ = _tmp4_;
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = _tmp5_ == 0;
-#line 845 "misc.c"
+#line 842 "misc.c"
} else {
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = FALSE;
-#line 849 "misc.c"
+#line 846 "misc.c"
}
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp1_) {
-#line 853 "misc.c"
+#line 850 "misc.c"
GeeSet* _tmp6_ = NULL;
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6_ = b;
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = _tmp6_ == NULL;
-#line 859 "misc.c"
+#line 856 "misc.c"
} else {
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = FALSE;
-#line 863 "misc.c"
+#line 860 "misc.c"
}
#line 108 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp0_) {
@@ -867,20 +864,20 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
result = TRUE;
#line 109 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 871 "misc.c"
+#line 868 "misc.c"
}
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp8_ = a;
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp8_ == NULL) {
-#line 877 "misc.c"
+#line 874 "misc.c"
gboolean _tmp9_ = FALSE;
GeeSet* _tmp10_ = NULL;
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp10_ = b;
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp10_ != NULL) {
-#line 884 "misc.c"
+#line 881 "misc.c"
GeeSet* _tmp11_ = NULL;
gint _tmp12_ = 0;
gint _tmp13_ = 0;
@@ -892,19 +889,19 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
_tmp13_ = _tmp12_;
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp9_ = _tmp13_ == 0;
-#line 896 "misc.c"
+#line 893 "misc.c"
} else {
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp9_ = FALSE;
-#line 900 "misc.c"
+#line 897 "misc.c"
}
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp7_ = _tmp9_;
-#line 904 "misc.c"
+#line 901 "misc.c"
} else {
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp7_ = FALSE;
-#line 908 "misc.c"
+#line 905 "misc.c"
}
#line 111 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp7_) {
@@ -912,29 +909,29 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
result = TRUE;
#line 112 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 916 "misc.c"
+#line 913 "misc.c"
}
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp16_ = a;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp16_ == NULL) {
-#line 922 "misc.c"
+#line 919 "misc.c"
GeeSet* _tmp17_ = NULL;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp17_ = b;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp15_ = _tmp17_ != NULL;
-#line 928 "misc.c"
+#line 925 "misc.c"
} else {
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp15_ = FALSE;
-#line 932 "misc.c"
+#line 929 "misc.c"
}
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp15_) {
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp14_ = TRUE;
-#line 938 "misc.c"
+#line 935 "misc.c"
} else {
gboolean _tmp18_ = FALSE;
GeeSet* _tmp19_ = NULL;
@@ -942,21 +939,21 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
_tmp19_ = a;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp19_ != NULL) {
-#line 946 "misc.c"
+#line 943 "misc.c"
GeeSet* _tmp20_ = NULL;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp20_ = b;
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp18_ = _tmp20_ == NULL;
-#line 952 "misc.c"
+#line 949 "misc.c"
} else {
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp18_ = FALSE;
-#line 956 "misc.c"
+#line 953 "misc.c"
}
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp14_ = _tmp18_;
-#line 960 "misc.c"
+#line 957 "misc.c"
}
#line 114 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp14_) {
@@ -964,23 +961,23 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
result = FALSE;
#line 115 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 968 "misc.c"
+#line 965 "misc.c"
}
#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp22_ = a;
#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp22_ == NULL) {
-#line 974 "misc.c"
+#line 971 "misc.c"
GeeSet* _tmp23_ = NULL;
#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp23_ = b;
#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp21_ = _tmp23_ == NULL;
-#line 980 "misc.c"
+#line 977 "misc.c"
} else {
#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp21_ = FALSE;
-#line 984 "misc.c"
+#line 981 "misc.c"
}
#line 117 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp21_) {
@@ -988,7 +985,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
result = TRUE;
#line 118 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 992 "misc.c"
+#line 989 "misc.c"
}
#line 120 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp24_ = a;
@@ -1008,7 +1005,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
result = FALSE;
#line 121 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1012 "misc.c"
+#line 1009 "misc.c"
}
{
GeeIterator* _element_it = NULL;
@@ -1022,7 +1019,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
_element_it = _tmp31_;
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
-#line 1026 "misc.c"
+#line 1023 "misc.c"
GeeIterator* _tmp32_ = NULL;
gboolean _tmp33_ = FALSE;
gchar* element = NULL;
@@ -1039,7 +1036,7 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
if (!_tmp33_) {
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
break;
-#line 1043 "misc.c"
+#line 1040 "misc.c"
}
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp34_ = _element_it;
@@ -1063,28 +1060,28 @@ gboolean equal_sets (GeeSet* a, GeeSet* b) {
_g_object_unref0 (_element_it);
#line 127 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1067 "misc.c"
+#line 1064 "misc.c"
}
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_free0 (element);
-#line 1071 "misc.c"
+#line 1068 "misc.c"
}
#line 125 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_object_unref0 (_element_it);
-#line 1075 "misc.c"
+#line 1072 "misc.c"
}
#line 130 "/home/jens/Source/shotwell/src/util/misc.vala"
result = TRUE;
#line 130 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1081 "misc.c"
+#line 1078 "misc.c"
}
static gpointer _g_object_ref0 (gpointer self) {
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
return self ? g_object_ref (self) : NULL;
-#line 1088 "misc.c"
+#line 1085 "misc.c"
}
@@ -1111,27 +1108,27 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp1_ = a;
#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp1_ != NULL) {
-#line 1115 "misc.c"
+#line 1112 "misc.c"
GeeSet* _tmp2_ = NULL;
#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp2_ = b;
#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = _tmp2_ == NULL;
-#line 1121 "misc.c"
+#line 1118 "misc.c"
} else {
#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = FALSE;
-#line 1125 "misc.c"
+#line 1122 "misc.c"
}
#line 136 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp0_) {
-#line 1129 "misc.c"
+#line 1126 "misc.c"
GeeSet* _tmp3_ = NULL;
#line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp3_ = excluded;
#line 137 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp3_ != NULL) {
-#line 1135 "misc.c"
+#line 1132 "misc.c"
GeeSet* _tmp4_ = NULL;
GeeSet* _tmp5_ = NULL;
#line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1140,39 +1137,39 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp5_ = a;
#line 138 "/home/jens/Source/shotwell/src/util/misc.vala"
gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1144 "misc.c"
+#line 1141 "misc.c"
}
#line 140 "/home/jens/Source/shotwell/src/util/misc.vala"
result = NULL;
#line 140 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1150 "misc.c"
+#line 1147 "misc.c"
}
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp7_ = a;
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp7_ == NULL) {
-#line 1156 "misc.c"
+#line 1153 "misc.c"
GeeSet* _tmp8_ = NULL;
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp8_ = b;
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6_ = _tmp8_ != NULL;
-#line 1162 "misc.c"
+#line 1159 "misc.c"
} else {
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6_ = FALSE;
-#line 1166 "misc.c"
+#line 1163 "misc.c"
}
#line 143 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp6_) {
-#line 1170 "misc.c"
+#line 1167 "misc.c"
GeeSet* _tmp9_ = NULL;
#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp9_ = excluded;
#line 144 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp9_ != NULL) {
-#line 1176 "misc.c"
+#line 1173 "misc.c"
GeeSet* _tmp10_ = NULL;
GeeSet* _tmp11_ = NULL;
#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1181,19 +1178,19 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp11_ = b;
#line 145 "/home/jens/Source/shotwell/src/util/misc.vala"
gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
-#line 1185 "misc.c"
+#line 1182 "misc.c"
}
#line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
result = NULL;
#line 147 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1191 "misc.c"
+#line 1188 "misc.c"
}
#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp12_ = gee_hash_set_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, g_free, NULL, NULL, NULL, NULL, NULL, NULL);
#line 150 "/home/jens/Source/shotwell/src/util/misc.vala"
intersection = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_SET, GeeSet);
-#line 1197 "misc.c"
+#line 1194 "misc.c"
{
GeeIterator* _element_it = NULL;
GeeSet* _tmp13_ = NULL;
@@ -1206,7 +1203,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_element_it = _tmp14_;
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
-#line 1210 "misc.c"
+#line 1207 "misc.c"
GeeIterator* _tmp15_ = NULL;
gboolean _tmp16_ = FALSE;
gchar* element = NULL;
@@ -1223,7 +1220,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
if (!_tmp16_) {
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
break;
-#line 1227 "misc.c"
+#line 1224 "misc.c"
}
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp17_ = _element_it;
@@ -1239,7 +1236,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp21_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_COLLECTION, GeeCollection), _tmp20_);
#line 153 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp21_) {
-#line 1243 "misc.c"
+#line 1240 "misc.c"
GeeSet* _tmp22_ = NULL;
const gchar* _tmp23_ = NULL;
#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1248,14 +1245,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp23_ = element;
#line 154 "/home/jens/Source/shotwell/src/util/misc.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, GEE_TYPE_COLLECTION, GeeCollection), _tmp23_);
-#line 1252 "misc.c"
+#line 1249 "misc.c"
} else {
GeeSet* _tmp24_ = NULL;
#line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp24_ = excluded;
#line 155 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp24_ != NULL) {
-#line 1259 "misc.c"
+#line 1256 "misc.c"
GeeSet* _tmp25_ = NULL;
const gchar* _tmp26_ = NULL;
#line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1264,16 +1261,16 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp26_ = element;
#line 156 "/home/jens/Source/shotwell/src/util/misc.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_COLLECTION, GeeCollection), _tmp26_);
-#line 1268 "misc.c"
+#line 1265 "misc.c"
}
}
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_free0 (element);
-#line 1273 "misc.c"
+#line 1270 "misc.c"
}
#line 152 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_object_unref0 (_element_it);
-#line 1277 "misc.c"
+#line 1274 "misc.c"
}
{
GeeIterator* _element_it = NULL;
@@ -1287,7 +1284,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_element_it = _tmp28_;
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
-#line 1291 "misc.c"
+#line 1288 "misc.c"
GeeIterator* _tmp29_ = NULL;
gboolean _tmp30_ = FALSE;
gchar* element = NULL;
@@ -1304,7 +1301,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
if (!_tmp30_) {
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
break;
-#line 1308 "misc.c"
+#line 1305 "misc.c"
}
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp31_ = _element_it;
@@ -1320,7 +1317,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp35_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, GEE_TYPE_COLLECTION, GeeCollection), _tmp34_);
#line 160 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp35_) {
-#line 1324 "misc.c"
+#line 1321 "misc.c"
GeeSet* _tmp36_ = NULL;
const gchar* _tmp37_ = NULL;
#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1329,14 +1326,14 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp37_ = element;
#line 161 "/home/jens/Source/shotwell/src/util/misc.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_COLLECTION, GeeCollection), _tmp37_);
-#line 1333 "misc.c"
+#line 1330 "misc.c"
} else {
GeeSet* _tmp38_ = NULL;
#line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp38_ = excluded;
#line 162 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp38_ != NULL) {
-#line 1340 "misc.c"
+#line 1337 "misc.c"
GeeSet* _tmp39_ = NULL;
const gchar* _tmp40_ = NULL;
#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -1345,16 +1342,16 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp40_ = element;
#line 163 "/home/jens/Source/shotwell/src/util/misc.vala"
gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_COLLECTION, GeeCollection), _tmp40_);
-#line 1349 "misc.c"
+#line 1346 "misc.c"
}
}
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_free0 (element);
-#line 1354 "misc.c"
+#line 1351 "misc.c"
}
#line 159 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_object_unref0 (_element_it);
-#line 1358 "misc.c"
+#line 1355 "misc.c"
}
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp42_ = intersection;
@@ -1364,17 +1361,17 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_tmp44_ = _tmp43_;
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp44_ > 0) {
-#line 1368 "misc.c"
+#line 1365 "misc.c"
GeeSet* _tmp45_ = NULL;
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp45_ = intersection;
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp41_ = _tmp45_;
-#line 1374 "misc.c"
+#line 1371 "misc.c"
} else {
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp41_ = NULL;
-#line 1378 "misc.c"
+#line 1375 "misc.c"
}
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp46_ = _g_object_ref0 (_tmp41_);
@@ -1384,7 +1381,7 @@ GeeSet* intersection_of_sets (GeeSet* a, GeeSet* b, GeeSet* excluded) {
_g_object_unref0 (intersection);
#line 166 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1388 "misc.c"
+#line 1385 "misc.c"
}
@@ -1428,7 +1425,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
_ids_size_ = ids_length1;
#line 171 "/home/jens/Source/shotwell/src/util/misc.vala"
ctr = 0;
-#line 1432 "misc.c"
+#line 1429 "misc.c"
{
GeeIterator* _photo_it = NULL;
GeeCollection* _tmp4_ = NULL;
@@ -1441,7 +1438,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
_photo_it = _tmp5_;
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
-#line 1445 "misc.c"
+#line 1442 "misc.c"
GeeIterator* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
Photo* photo = NULL;
@@ -1462,7 +1459,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
if (!_tmp7_) {
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
break;
-#line 1466 "misc.c"
+#line 1463 "misc.c"
}
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp8_ = _photo_it;
@@ -1490,11 +1487,11 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
_tmp15_ = _tmp10_[_tmp11_];
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_object_unref0 (photo);
-#line 1494 "misc.c"
+#line 1491 "misc.c"
}
#line 172 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_object_unref0 (_photo_it);
-#line 1498 "misc.c"
+#line 1495 "misc.c"
}
#line 175 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp16_ = photos;
@@ -1526,7 +1523,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
if (result_length1) {
#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
*result_length1 = _tmp21__length1;
-#line 1530 "misc.c"
+#line 1527 "misc.c"
}
#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
result = _tmp21_;
@@ -1534,7 +1531,7 @@ guchar* serialize_photo_ids (GeeCollection* photos, int* result_length1) {
ids = (g_free (ids), NULL);
#line 179 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1538 "misc.c"
+#line 1535 "misc.c"
}
@@ -1567,14 +1564,14 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
if (_tmp2_ <= ((gsize) 0)) {
#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = TRUE;
-#line 1571 "misc.c"
+#line 1568 "misc.c"
} else {
guchar* _tmp3_ = NULL;
#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp3_ = serialized;
#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = _tmp3_ == NULL;
-#line 1578 "misc.c"
+#line 1575 "misc.c"
}
#line 184 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp1_) {
@@ -1582,7 +1579,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
result = NULL;
#line 185 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1586 "misc.c"
+#line 1583 "misc.c"
}
#line 187 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = count;
@@ -1612,7 +1609,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
_tmp10_ = ids;
#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp10__length1 = ids_length1;
-#line 1616 "misc.c"
+#line 1613 "misc.c"
{
gint64* id_collection = NULL;
gint id_collection_length1 = 0;
@@ -1624,11 +1621,11 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
id_collection_length1 = _tmp10__length1;
#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
for (id_it = 0; id_it < _tmp10__length1; id_it = id_it + 1) {
-#line 1628 "misc.c"
+#line 1625 "misc.c"
gint64 id = 0LL;
#line 191 "/home/jens/Source/shotwell/src/util/misc.vala"
id = id_collection[id_it];
-#line 1632 "misc.c"
+#line 1629 "misc.c"
{
GeeArrayList* _tmp11_ = NULL;
gint64 _tmp12_ = 0LL;
@@ -1641,7 +1638,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
photo_id_init (&_tmp13_, _tmp12_);
#line 192 "/home/jens/Source/shotwell/src/util/misc.vala"
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), &_tmp13_);
-#line 1645 "misc.c"
+#line 1642 "misc.c"
}
}
}
@@ -1651,7 +1648,7 @@ GeeList* unserialize_photo_ids (guchar* serialized, gint size) {
ids = (g_free (ids), NULL);
#line 194 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1655 "misc.c"
+#line 1652 "misc.c"
}
@@ -1695,7 +1692,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
_atoms_size_ = atoms_length1;
#line 199 "/home/jens/Source/shotwell/src/util/misc.vala"
ctr = 0;
-#line 1699 "misc.c"
+#line 1696 "misc.c"
{
GeeIterator* _current_media_it = NULL;
GeeCollection* _tmp4_ = NULL;
@@ -1708,7 +1705,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
_current_media_it = _tmp5_;
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
while (TRUE) {
-#line 1712 "misc.c"
+#line 1709 "misc.c"
GeeIterator* _tmp6_ = NULL;
gboolean _tmp7_ = FALSE;
MediaSource* current_media = NULL;
@@ -1730,7 +1727,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
if (!_tmp7_) {
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
break;
-#line 1734 "misc.c"
+#line 1731 "misc.c"
}
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp8_ = _current_media_it;
@@ -1762,11 +1759,11 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
_g_free0 (_tmp14_);
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_object_unref0 (current_media);
-#line 1766 "misc.c"
+#line 1763 "misc.c"
}
#line 200 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_object_unref0 (_current_media_it);
-#line 1770 "misc.c"
+#line 1767 "misc.c"
}
#line 203 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp17_ = media;
@@ -1798,7 +1795,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
if (result_length1) {
#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
*result_length1 = _tmp22__length1;
-#line 1802 "misc.c"
+#line 1799 "misc.c"
}
#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
result = _tmp22_;
@@ -1806,7 +1803,7 @@ guchar* serialize_media_sources (GeeCollection* media, int* result_length1) {
atoms = (g_free (atoms), NULL);
#line 207 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1810 "misc.c"
+#line 1807 "misc.c"
}
@@ -1839,14 +1836,14 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
if (_tmp2_ <= ((gsize) 0)) {
#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = TRUE;
-#line 1843 "misc.c"
+#line 1840 "misc.c"
} else {
guchar* _tmp3_ = NULL;
#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp3_ = serialized;
#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = _tmp3_ == NULL;
-#line 1850 "misc.c"
+#line 1847 "misc.c"
}
#line 212 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp1_) {
@@ -1854,7 +1851,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
result = NULL;
#line 213 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1858 "misc.c"
+#line 1855 "misc.c"
}
#line 215 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = count;
@@ -1884,7 +1881,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
_tmp10_ = atoms;
#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp10__length1 = atoms_length1;
-#line 1888 "misc.c"
+#line 1885 "misc.c"
{
GdkAtom* current_atom_collection = NULL;
gint current_atom_collection_length1 = 0;
@@ -1896,11 +1893,11 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
current_atom_collection_length1 = _tmp10__length1;
#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
for (current_atom_it = 0; current_atom_it < _tmp10__length1; current_atom_it = current_atom_it + 1) {
-#line 1900 "misc.c"
+#line 1897 "misc.c"
GdkAtom current_atom = 0U;
#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
current_atom = current_atom_collection[current_atom_it];
-#line 1904 "misc.c"
+#line 1901 "misc.c"
{
MediaSource* media = NULL;
MediaCollectionRegistry* _tmp11_ = NULL;
@@ -1945,7 +1942,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), _tmp20_);
#line 219 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_object_unref0 (media);
-#line 1949 "misc.c"
+#line 1946 "misc.c"
}
}
}
@@ -1955,7 +1952,7 @@ GeeList* unserialize_media_sources (guchar* serialized, gint size) {
atoms = (g_free (atoms), NULL);
#line 225 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 1959 "misc.c"
+#line 1956 "misc.c"
}
@@ -1971,37 +1968,37 @@ static gchar* g_time_format (struct tm *self, const gchar* format) {
gchar* _tmp3_ = NULL;
gint _tmp3__length1 = 0;
gchar* _tmp4_ = NULL;
-#line 2758 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2709 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (format != NULL, NULL);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = g_new0 (gchar, 64);
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
buffer = _tmp0_;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
buffer_length1 = 64;
-#line 2759 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2710 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_buffer_size_ = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = buffer;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1__length1 = buffer_length1;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = format;
-#line 2760 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2711 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
strftime (_tmp1_, _tmp1__length1, _tmp2_, &(*self));
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = buffer;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3__length1 = buffer_length1;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = g_strdup ((const gchar*) _tmp3_);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp4_;
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
buffer = (g_free (buffer), NULL);
-#line 2761 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 2712 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
-#line 2005 "misc.c"
+#line 2002 "misc.c"
}
@@ -2037,7 +2034,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
_tmp3_ = _tmp2_.tm_year;
#line 233 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp1_ == _tmp3_) {
-#line 2041 "misc.c"
+#line 2038 "misc.c"
gboolean _tmp4_ = FALSE;
struct tm _tmp5_ = {0};
gint _tmp6_ = 0;
@@ -2053,7 +2050,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
_tmp8_ = _tmp7_.tm_mon;
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp6_ == _tmp8_) {
-#line 2057 "misc.c"
+#line 2054 "misc.c"
struct tm _tmp9_ = {0};
gint _tmp10_ = 0;
struct tm _tmp11_ = {0};
@@ -2068,15 +2065,15 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
_tmp12_ = _tmp11_.tm_mday;
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = _tmp10_ == (_tmp12_ - 1);
-#line 2072 "misc.c"
+#line 2069 "misc.c"
} else {
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = FALSE;
-#line 2076 "misc.c"
+#line 2073 "misc.c"
}
#line 235 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp4_) {
-#line 2080 "misc.c"
+#line 2077 "misc.c"
gchar* _tmp13_ = NULL;
gchar* _tmp14_ = NULL;
#line 237 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2091,7 +2088,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
_g_free0 (to_format);
#line 238 "/home/jens/Source/shotwell/src/util/misc.vala"
to_format = _tmp14_;
-#line 2095 "misc.c"
+#line 2092 "misc.c"
} else {
gchar* _tmp15_ = NULL;
gchar* _tmp16_ = NULL;
@@ -2107,7 +2104,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
_g_free0 (to_format);
#line 243 "/home/jens/Source/shotwell/src/util/misc.vala"
to_format = _tmp16_;
-#line 2111 "misc.c"
+#line 2108 "misc.c"
}
} else {
gchar* _tmp17_ = NULL;
@@ -2124,7 +2121,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
_g_free0 (to_format);
#line 249 "/home/jens/Source/shotwell/src/util/misc.vala"
to_format = _tmp18_;
-#line 2128 "misc.c"
+#line 2125 "misc.c"
}
#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp19_ = from_format;
@@ -2160,7 +2157,7 @@ gchar* format_local_datespan (struct tm* from_date, struct tm* to_date) {
_g_free0 (from_format);
#line 252 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 2164 "misc.c"
+#line 2161 "misc.c"
}
@@ -2194,7 +2191,7 @@ gchar* format_local_date (struct tm* date) {
result = _tmp5_;
#line 257 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 2198 "misc.c"
+#line 2195 "misc.c"
}
@@ -2226,14 +2223,14 @@ OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar*
self->priv->callback_target = _tmp2__target;
#line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
return self;
-#line 2230 "misc.c"
+#line 2227 "misc.c"
}
OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target) {
#line 267 "/home/jens/Source/shotwell/src/util/misc.vala"
return one_shot_scheduler_construct (TYPE_ONE_SHOT_SCHEDULER, name, callback, callback_target);
-#line 2237 "misc.c"
+#line 2234 "misc.c"
}
@@ -2248,7 +2245,7 @@ gboolean one_shot_scheduler_is_scheduled (OneShotScheduler* self) {
result = _tmp0_ != ((guint) 0);
#line 281 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 2252 "misc.c"
+#line 2249 "misc.c"
}
@@ -2257,7 +2254,7 @@ void one_shot_scheduler_at_idle (OneShotScheduler* self) {
g_return_if_fail (IS_ONE_SHOT_SCHEDULER (self));
#line 285 "/home/jens/Source/shotwell/src/util/misc.vala"
one_shot_scheduler_at_priority_idle (self, G_PRIORITY_DEFAULT_IDLE);
-#line 2261 "misc.c"
+#line 2258 "misc.c"
}
@@ -2266,7 +2263,7 @@ static gboolean _one_shot_scheduler_callback_wrapper_gsource_func (gpointer self
result = one_shot_scheduler_callback_wrapper ((OneShotScheduler*) self);
#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 2270 "misc.c"
+#line 2267 "misc.c"
}
@@ -2278,7 +2275,7 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
_tmp0_ = self->priv->scheduled;
#line 289 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp0_ == ((guint) 0)) {
-#line 2282 "misc.c"
+#line 2279 "misc.c"
gint _tmp1_ = 0;
guint _tmp2_ = 0U;
#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
@@ -2287,7 +2284,7 @@ void one_shot_scheduler_at_priority_idle (OneShotScheduler* self, gint priority)
_tmp2_ = g_idle_add_full (_tmp1_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref);
#line 290 "/home/jens/Source/shotwell/src/util/misc.vala"
self->priv->scheduled = _tmp2_;
-#line 2291 "misc.c"
+#line 2288 "misc.c"
}
}
@@ -2303,7 +2300,7 @@ void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gbool
_tmp1_ = reschedule;
#line 294 "/home/jens/Source/shotwell/src/util/misc.vala"
one_shot_scheduler_priority_after_timeout (self, G_PRIORITY_DEFAULT, _tmp0_, _tmp1_);
-#line 2307 "misc.c"
+#line 2304 "misc.c"
}
@@ -2320,35 +2317,35 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
_tmp1_ = self->priv->scheduled;
#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp1_ != ((guint) 0)) {
-#line 2324 "misc.c"
+#line 2321 "misc.c"
gboolean _tmp2_ = FALSE;
#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp2_ = reschedule;
#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = !_tmp2_;
-#line 2330 "misc.c"
+#line 2327 "misc.c"
} else {
#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp0_ = FALSE;
-#line 2334 "misc.c"
+#line 2331 "misc.c"
}
#line 298 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp0_) {
#line 299 "/home/jens/Source/shotwell/src/util/misc.vala"
return;
-#line 2340 "misc.c"
+#line 2337 "misc.c"
}
#line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp3_ = self->priv->scheduled;
#line 301 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp3_ != ((guint) 0)) {
-#line 2346 "misc.c"
+#line 2343 "misc.c"
guint _tmp4_ = 0U;
#line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp4_ = self->priv->scheduled;
#line 302 "/home/jens/Source/shotwell/src/util/misc.vala"
g_source_remove (_tmp4_);
-#line 2352 "misc.c"
+#line 2349 "misc.c"
}
#line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp5_ = priority;
@@ -2358,7 +2355,7 @@ void one_shot_scheduler_priority_after_timeout (OneShotScheduler* self, gint pri
_tmp7_ = g_timeout_add_full (_tmp5_, _tmp6_, _one_shot_scheduler_callback_wrapper_gsource_func, one_shot_scheduler_ref (self), one_shot_scheduler_unref);
#line 304 "/home/jens/Source/shotwell/src/util/misc.vala"
self->priv->scheduled = _tmp7_;
-#line 2362 "misc.c"
+#line 2359 "misc.c"
}
@@ -2373,7 +2370,7 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) {
if (_tmp0_ == ((guint) 0)) {
#line 309 "/home/jens/Source/shotwell/src/util/misc.vala"
return;
-#line 2377 "misc.c"
+#line 2374 "misc.c"
}
#line 311 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp1_ = self->priv->scheduled;
@@ -2381,7 +2378,7 @@ void one_shot_scheduler_cancel (OneShotScheduler* self) {
g_source_remove (_tmp1_);
#line 312 "/home/jens/Source/shotwell/src/util/misc.vala"
self->priv->scheduled = (guint) 0;
-#line 2385 "misc.c"
+#line 2382 "misc.c"
}
@@ -2403,14 +2400,14 @@ static gboolean one_shot_scheduler_callback_wrapper (OneShotScheduler* self) {
result = FALSE;
#line 319 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 2407 "misc.c"
+#line 2404 "misc.c"
}
static void value_one_shot_scheduler_init (GValue* value) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = NULL;
-#line 2414 "misc.c"
+#line 2411 "misc.c"
}
@@ -2419,7 +2416,7 @@ static void value_one_shot_scheduler_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
one_shot_scheduler_unref (value->data[0].v_pointer);
-#line 2423 "misc.c"
+#line 2420 "misc.c"
}
}
@@ -2429,11 +2426,11 @@ static void value_one_shot_scheduler_copy_value (const GValue* src_value, GValue
if (src_value->data[0].v_pointer) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
dest_value->data[0].v_pointer = one_shot_scheduler_ref (src_value->data[0].v_pointer);
-#line 2433 "misc.c"
+#line 2430 "misc.c"
} else {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2437 "misc.c"
+#line 2434 "misc.c"
}
}
@@ -2441,37 +2438,37 @@ static void value_one_shot_scheduler_copy_value (const GValue* src_value, GValue
static gpointer value_one_shot_scheduler_peek_pointer (const GValue* value) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
return value->data[0].v_pointer;
-#line 2445 "misc.c"
+#line 2442 "misc.c"
}
static gchar* value_one_shot_scheduler_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
if (collect_values[0].v_pointer) {
-#line 2452 "misc.c"
+#line 2449 "misc.c"
OneShotScheduler* object;
object = collect_values[0].v_pointer;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
if (object->parent_instance.g_class == NULL) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2459 "misc.c"
+#line 2456 "misc.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2463 "misc.c"
+#line 2460 "misc.c"
}
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = one_shot_scheduler_ref (object);
-#line 2467 "misc.c"
+#line 2464 "misc.c"
} else {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = NULL;
-#line 2471 "misc.c"
+#line 2468 "misc.c"
}
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
return NULL;
-#line 2475 "misc.c"
+#line 2472 "misc.c"
}
@@ -2482,25 +2479,25 @@ static gchar* value_one_shot_scheduler_lcopy_value (const GValue* value, guint n
if (!object_p) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2486 "misc.c"
+#line 2483 "misc.c"
}
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
if (!value->data[0].v_pointer) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
*object_p = NULL;
-#line 2492 "misc.c"
+#line 2489 "misc.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
*object_p = value->data[0].v_pointer;
-#line 2496 "misc.c"
+#line 2493 "misc.c"
} else {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
*object_p = one_shot_scheduler_ref (value->data[0].v_pointer);
-#line 2500 "misc.c"
+#line 2497 "misc.c"
}
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
return NULL;
-#line 2504 "misc.c"
+#line 2501 "misc.c"
}
@@ -2514,7 +2511,7 @@ GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick,
G_PARAM_SPEC (spec)->value_type = object_type;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
return G_PARAM_SPEC (spec);
-#line 2518 "misc.c"
+#line 2515 "misc.c"
}
@@ -2523,7 +2520,7 @@ gpointer value_get_one_shot_scheduler (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ONE_SHOT_SCHEDULER), NULL);
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
return value->data[0].v_pointer;
-#line 2527 "misc.c"
+#line 2524 "misc.c"
}
@@ -2543,17 +2540,17 @@ void value_set_one_shot_scheduler (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
one_shot_scheduler_ref (value->data[0].v_pointer);
-#line 2547 "misc.c"
+#line 2544 "misc.c"
} else {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = NULL;
-#line 2551 "misc.c"
+#line 2548 "misc.c"
}
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
if (old) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
one_shot_scheduler_unref (old);
-#line 2557 "misc.c"
+#line 2554 "misc.c"
}
}
@@ -2572,17 +2569,17 @@ void value_take_one_shot_scheduler (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = v_object;
-#line 2576 "misc.c"
+#line 2573 "misc.c"
} else {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = NULL;
-#line 2580 "misc.c"
+#line 2577 "misc.c"
}
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
if (old) {
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
one_shot_scheduler_unref (old);
-#line 2586 "misc.c"
+#line 2583 "misc.c"
}
}
@@ -2594,7 +2591,7 @@ static void one_shot_scheduler_class_init (OneShotSchedulerClass * klass) {
((OneShotSchedulerClass *) klass)->finalize = one_shot_scheduler_finalize;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
g_type_class_add_private (klass, sizeof (OneShotSchedulerPrivate));
-#line 2598 "misc.c"
+#line 2595 "misc.c"
}
@@ -2605,7 +2602,7 @@ static void one_shot_scheduler_instance_init (OneShotScheduler * self) {
self->priv->scheduled = (guint) 0;
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
self->ref_count = 1;
-#line 2609 "misc.c"
+#line 2606 "misc.c"
}
@@ -2619,7 +2616,7 @@ static void one_shot_scheduler_finalize (OneShotScheduler* obj) {
one_shot_scheduler_cancel (self);
#line 263 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_free0 (self->priv->name);
-#line 2623 "misc.c"
+#line 2620 "misc.c"
}
@@ -2644,7 +2641,7 @@ gpointer one_shot_scheduler_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
return instance;
-#line 2648 "misc.c"
+#line 2645 "misc.c"
}
@@ -2657,7 +2654,7 @@ void one_shot_scheduler_unref (gpointer instance) {
ONE_SHOT_SCHEDULER_GET_CLASS (self)->finalize (self);
#line 262 "/home/jens/Source/shotwell/src/util/misc.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 2661 "misc.c"
+#line 2658 "misc.c"
}
}
@@ -2680,14 +2677,14 @@ OpTimer* op_timer_construct (GType object_type, const gchar* name) {
self->priv->name = _tmp1_;
#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
return self;
-#line 2684 "misc.c"
+#line 2681 "misc.c"
}
OpTimer* op_timer_new (const gchar* name) {
#line 331 "/home/jens/Source/shotwell/src/util/misc.vala"
return op_timer_construct (TYPE_OP_TIMER, name);
-#line 2691 "misc.c"
+#line 2688 "misc.c"
}
@@ -2699,7 +2696,7 @@ void op_timer_start (OpTimer* self) {
_tmp0_ = self->priv->timer;
#line 336 "/home/jens/Source/shotwell/src/util/misc.vala"
g_timer_start (_tmp0_);
-#line 2703 "misc.c"
+#line 2700 "misc.c"
}
@@ -2734,13 +2731,13 @@ void op_timer_stop (OpTimer* self) {
_tmp5_ = self->priv->shortest;
#line 344 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp4_ < _tmp5_) {
-#line 2738 "misc.c"
+#line 2735 "misc.c"
gdouble _tmp6_ = 0.0;
#line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp6_ = time;
#line 345 "/home/jens/Source/shotwell/src/util/misc.vala"
self->priv->shortest = _tmp6_;
-#line 2744 "misc.c"
+#line 2741 "misc.c"
}
#line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp7_ = time;
@@ -2748,19 +2745,19 @@ void op_timer_stop (OpTimer* self) {
_tmp8_ = self->priv->longest;
#line 347 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp7_ > _tmp8_) {
-#line 2752 "misc.c"
+#line 2749 "misc.c"
gdouble _tmp9_ = 0.0;
#line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp9_ = time;
#line 348 "/home/jens/Source/shotwell/src/util/misc.vala"
self->priv->longest = _tmp9_;
-#line 2758 "misc.c"
+#line 2755 "misc.c"
}
#line 350 "/home/jens/Source/shotwell/src/util/misc.vala"
_tmp10_ = self->priv->count;
#line 350 "/home/jens/Source/shotwell/src/util/misc.vala"
self->priv->count = _tmp10_ + 1;
-#line 2764 "misc.c"
+#line 2761 "misc.c"
}
@@ -2773,7 +2770,7 @@ gchar* op_timer_to_string (OpTimer* self) {
_tmp0_ = self->priv->count;
#line 354 "/home/jens/Source/shotwell/src/util/misc.vala"
if (_tmp0_ > ((glong) 0)) {
-#line 2777 "misc.c"
+#line 2774 "misc.c"
const gchar* _tmp1_ = NULL;
glong _tmp2_ = 0L;
gdouble _tmp3_ = 0.0;
@@ -2802,7 +2799,7 @@ gchar* op_timer_to_string (OpTimer* self) {
result = _tmp8_;
#line 355 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 2806 "misc.c"
+#line 2803 "misc.c"
} else {
const gchar* _tmp9_ = NULL;
gchar* _tmp10_ = NULL;
@@ -2814,7 +2811,7 @@ gchar* op_timer_to_string (OpTimer* self) {
result = _tmp10_;
#line 358 "/home/jens/Source/shotwell/src/util/misc.vala"
return result;
-#line 2818 "misc.c"
+#line 2815 "misc.c"
}
}
@@ -2822,7 +2819,7 @@ gchar* op_timer_to_string (OpTimer* self) {
static void value_op_timer_init (GValue* value) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = NULL;
-#line 2826 "misc.c"
+#line 2823 "misc.c"
}
@@ -2831,7 +2828,7 @@ static void value_op_timer_free_value (GValue* value) {
if (value->data[0].v_pointer) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
op_timer_unref (value->data[0].v_pointer);
-#line 2835 "misc.c"
+#line 2832 "misc.c"
}
}
@@ -2841,11 +2838,11 @@ static void value_op_timer_copy_value (const GValue* src_value, GValue* dest_val
if (src_value->data[0].v_pointer) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
dest_value->data[0].v_pointer = op_timer_ref (src_value->data[0].v_pointer);
-#line 2845 "misc.c"
+#line 2842 "misc.c"
} else {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
dest_value->data[0].v_pointer = NULL;
-#line 2849 "misc.c"
+#line 2846 "misc.c"
}
}
@@ -2853,37 +2850,37 @@ static void value_op_timer_copy_value (const GValue* src_value, GValue* dest_val
static gpointer value_op_timer_peek_pointer (const GValue* value) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
return value->data[0].v_pointer;
-#line 2857 "misc.c"
+#line 2854 "misc.c"
}
static gchar* value_op_timer_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
if (collect_values[0].v_pointer) {
-#line 2864 "misc.c"
+#line 2861 "misc.c"
OpTimer* object;
object = collect_values[0].v_pointer;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
if (object->parent_instance.g_class == NULL) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2871 "misc.c"
+#line 2868 "misc.c"
} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2875 "misc.c"
+#line 2872 "misc.c"
}
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = op_timer_ref (object);
-#line 2879 "misc.c"
+#line 2876 "misc.c"
} else {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = NULL;
-#line 2883 "misc.c"
+#line 2880 "misc.c"
}
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
return NULL;
-#line 2887 "misc.c"
+#line 2884 "misc.c"
}
@@ -2894,25 +2891,25 @@ static gchar* value_op_timer_lcopy_value (const GValue* value, guint n_collect_v
if (!object_p) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2898 "misc.c"
+#line 2895 "misc.c"
}
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
if (!value->data[0].v_pointer) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
*object_p = NULL;
-#line 2904 "misc.c"
+#line 2901 "misc.c"
} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
*object_p = value->data[0].v_pointer;
-#line 2908 "misc.c"
+#line 2905 "misc.c"
} else {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
*object_p = op_timer_ref (value->data[0].v_pointer);
-#line 2912 "misc.c"
+#line 2909 "misc.c"
}
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
return NULL;
-#line 2916 "misc.c"
+#line 2913 "misc.c"
}
@@ -2926,7 +2923,7 @@ GParamSpec* param_spec_op_timer (const gchar* name, const gchar* nick, const gch
G_PARAM_SPEC (spec)->value_type = object_type;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
return G_PARAM_SPEC (spec);
-#line 2930 "misc.c"
+#line 2927 "misc.c"
}
@@ -2935,7 +2932,7 @@ gpointer value_get_op_timer (const GValue* value) {
g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_OP_TIMER), NULL);
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
return value->data[0].v_pointer;
-#line 2939 "misc.c"
+#line 2936 "misc.c"
}
@@ -2955,17 +2952,17 @@ void value_set_op_timer (GValue* value, gpointer v_object) {
value->data[0].v_pointer = v_object;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
op_timer_ref (value->data[0].v_pointer);
-#line 2959 "misc.c"
+#line 2956 "misc.c"
} else {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = NULL;
-#line 2963 "misc.c"
+#line 2960 "misc.c"
}
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
if (old) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
op_timer_unref (old);
-#line 2969 "misc.c"
+#line 2966 "misc.c"
}
}
@@ -2984,17 +2981,17 @@ void value_take_op_timer (GValue* value, gpointer v_object) {
g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = v_object;
-#line 2988 "misc.c"
+#line 2985 "misc.c"
} else {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
value->data[0].v_pointer = NULL;
-#line 2992 "misc.c"
+#line 2989 "misc.c"
}
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
if (old) {
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
op_timer_unref (old);
-#line 2998 "misc.c"
+#line 2995 "misc.c"
}
}
@@ -3006,7 +3003,7 @@ static void op_timer_class_init (OpTimerClass * klass) {
((OpTimerClass *) klass)->finalize = op_timer_finalize;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
g_type_class_add_private (klass, sizeof (OpTimerPrivate));
-#line 3010 "misc.c"
+#line 3007 "misc.c"
}
@@ -3028,7 +3025,7 @@ static void op_timer_instance_init (OpTimer * self) {
self->priv->longest = DBL_MIN;
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
self->ref_count = 1;
-#line 3032 "misc.c"
+#line 3029 "misc.c"
}
@@ -3042,7 +3039,7 @@ static void op_timer_finalize (OpTimer* obj) {
_g_free0 (self->priv->name);
#line 325 "/home/jens/Source/shotwell/src/util/misc.vala"
_g_timer_destroy0 (self->priv->timer);
-#line 3046 "misc.c"
+#line 3043 "misc.c"
}
@@ -3067,7 +3064,7 @@ gpointer op_timer_ref (gpointer instance) {
g_atomic_int_inc (&self->ref_count);
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
return instance;
-#line 3071 "misc.c"
+#line 3068 "misc.c"
}
@@ -3080,58 +3077,9 @@ void op_timer_unref (gpointer instance) {
OP_TIMER_GET_CLASS (self)->finalize (self);
#line 323 "/home/jens/Source/shotwell/src/util/misc.vala"
g_type_free_instance ((GTypeInstance *) self);
-#line 3084 "misc.c"
+#line 3081 "misc.c"
}
}
-void suppress_warnings (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message) {
-#line 369 "/home/jens/Source/shotwell/src/util/misc.vala"
- g_return_if_fail (message != NULL);
-#line 3092 "misc.c"
-}
-
-
-static void g_time_local (time_t time, struct tm* result) {
- struct tm _result_ = {0};
- struct tm _tmp0_ = {0};
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- localtime_r (&time, &_tmp0_);
-#line 2750 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- _result_ = _tmp0_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- *result = _result_;
-#line 2751 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
- return;
-#line 3107 "misc.c"
-}
-
-
-gboolean is_twentyfour_hr_time_system (void) {
- gboolean result = FALSE;
- struct tm _tmp0_ = {0};
- gchar* _tmp1_ = NULL;
- gchar* _tmp2_ = NULL;
- gboolean _tmp3_ = FALSE;
- gboolean _tmp4_ = FALSE;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
- g_time_local ((time_t) 0, &_tmp0_);
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
- _tmp1_ = g_time_format (&_tmp0_, "%p");
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
- _tmp2_ = _tmp1_;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
- _tmp3_ = is_string_empty (_tmp2_);
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
- _tmp4_ = _tmp3_;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
- _g_free0 (_tmp2_);
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
- result = _tmp4_;
-#line 375 "/home/jens/Source/shotwell/src/util/misc.vala"
- return result;
-#line 3134 "misc.c"
-}
-
-
diff --git a/src/util/misc.vala b/src/util/misc.vala
index cc6a278..cbc6dfa 100644
--- a/src/util/misc.vala
+++ b/src/util/misc.vala
@@ -360,18 +360,3 @@ public class OpTimer {
}
}
-// Dummy function for suppressing 'could not stat file' errors
-// generated when saving into a previously non-existent file -
-// please see https://bugzilla.gnome.org/show_bug.cgi?id=662814
-// and to work around a spurious warning given by GDK when a
-// key press event is passed from a child class' event handler
-// to a parent's; (gnome bug pending, but see https://bugzilla.redhat.com/show_bug.cgi?id=665568).
-public void suppress_warnings(string? log_domain, LogLevelFlags log_levels, string message) {
- // do nothing.
-}
-
-public bool is_twentyfour_hr_time_system() {
- // if no AM/PM designation is found, the location is set to use a 24 hr time system
- return is_string_empty(Time.local(0).format("%p"));
-}
-
diff --git a/src/util/string.c b/src/util/string.c
index ccf6504..4cfeedd 100644
--- a/src/util/string.c
+++ b/src/util/string.c
@@ -1,4 +1,4 @@
-/* string.c generated by valac 0.34.2, the Vala compiler
+/* string.c generated by valac 0.32.1, the Vala compiler
* generated from string.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
@@ -65,15 +65,15 @@ static gchar string_get (const gchar* self, glong index) {
gchar result = '\0';
glong _tmp0_ = 0L;
gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1086 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 79 "string.c"
}
@@ -614,19 +614,19 @@ static gchar* string_strip (const gchar* self) {
gchar* _result_ = NULL;
gchar* _tmp0_ = NULL;
const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1207 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1208 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1209 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1210 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 632 "string.c"
}
@@ -639,25 +639,25 @@ static gchar* string_delimit (const gchar* self, const gchar* delimiters, gchar
const gchar* _tmp1_ = NULL;
const gchar* _tmp2_ = NULL;
gchar _tmp3_ = '\0';
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1215 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1215 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (delimiters != NULL, NULL);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = g_strdup (self);
-#line 1216 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1216 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_result_ = _tmp0_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = _result_;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = delimiters;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = new_delimiter;
-#line 1217 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1217 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_strdelimit (_tmp1_, _tmp2_, _tmp3_);
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _result_;
-#line 1218 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1218 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 663 "string.c"
}
@@ -895,33 +895,33 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
gunichar _tmp1_ = 0U;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1007 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1008 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1010 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 913 "string.c"
gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1011 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 921 "string.c"
} else {
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = -1;
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1013 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 927 "string.c"
}
@@ -956,35 +956,35 @@ static gint string_index_of (const gchar* self, const gchar* needle, gint start_
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 987 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 987 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = strstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 988 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 988 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 990 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 990 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 976 "string.c"
gchar* _tmp4_ = NULL;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 991 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 991 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 984 "string.c"
} else {
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = -1;
-#line 993 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 993 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 990 "string.c"
}
@@ -1031,103 +1031,103 @@ static gchar* string_slice (const gchar* self, glong start, glong end) {
glong _tmp19_ = 0L;
glong _tmp20_ = 0L;
gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1328 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1329 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1330 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp2_ < ((glong) 0)) {
#line 1047 "string.c"
glong _tmp3_ = 0L;
glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1331 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
start = _tmp3_ + _tmp4_;
#line 1056 "string.c"
}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1333 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp5_ < ((glong) 0)) {
#line 1062 "string.c"
glong _tmp6_ = 0L;
glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1334 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
end = _tmp6_ + _tmp7_;
#line 1071 "string.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp9_ >= ((glong) 0)) {
#line 1077 "string.c"
glong _tmp10_ = 0L;
glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp8_ = _tmp10_ <= _tmp11_;
#line 1086 "string.c"
} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp8_ = FALSE;
#line 1090 "string.c"
}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1336 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp13_ >= ((glong) 0)) {
#line 1098 "string.c"
glong _tmp14_ = 0L;
glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp12_ = _tmp14_ <= _tmp15_;
#line 1107 "string.c"
} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp12_ = FALSE;
#line 1111 "string.c"
}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1338 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 1133 "string.c"
}
@@ -1221,35 +1221,35 @@ static gint string_last_index_of (const gchar* self, const gchar* needle, gint s
const gchar* _tmp1_ = NULL;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 997 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 997 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (needle != NULL, 0);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = needle;
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = g_strrstr (((gchar*) self) + _tmp0_, (gchar*) _tmp1_);
-#line 998 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 998 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1000 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1000 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1241 "string.c"
gchar* _tmp4_ = NULL;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1001 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1001 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 1249 "string.c"
} else {
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = -1;
-#line 1003 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1003 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 1255 "string.c"
}
@@ -1325,33 +1325,33 @@ static gint string_last_index_of_char (const gchar* self, gunichar c, gint start
gunichar _tmp1_ = 0U;
gchar* _tmp2_ = NULL;
gchar* _tmp3_ = NULL;
-#line 1017 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1017 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = start_index;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = c;
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = g_utf8_strrchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1018 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1018 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_result_ = _tmp2_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = _result_;
-#line 1020 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1020 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp3_ != NULL) {
#line 1343 "string.c"
gchar* _tmp4_ = NULL;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = _result_;
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1021 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1021 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 1351 "string.c"
} else {
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = -1;
-#line 1023 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1023 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 1357 "string.c"
}
@@ -1392,15 +1392,15 @@ static gunichar string_get_char (const gchar* self, glong index) {
gunichar result = 0U;
glong _tmp0_ = 0L;
gunichar _tmp1_ = 0U;
-#line 1116 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1116 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, 0U);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = index;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = _tmp1_;
-#line 1117 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1117 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 1406 "string.c"
}
@@ -1537,54 +1537,54 @@ static gboolean string_get_next_char (const gchar* self, gint* index, gunichar*
gint _tmp0_ = 0;
gunichar _tmp1_ = 0U;
gunichar _tmp2_ = 0U;
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
g_return_val_if_fail (self != NULL, FALSE);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp0_ = *index;
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp1_ = g_utf8_get_char (((gchar*) self) + _tmp0_);
-#line 1106 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1106 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_vala_c = _tmp1_;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp2_ = _vala_c;
-#line 1107 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1107 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (_tmp2_ != ((gunichar) 0)) {
#line 1553 "string.c"
gint _tmp3_ = 0;
gchar* _tmp4_ = NULL;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp3_ = *index;
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
_tmp4_ = g_utf8_next_char (((gchar*) self) + _tmp3_);
-#line 1108 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1108 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
*index = (gint) (_tmp4_ - ((gchar*) self));
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = TRUE;
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (c) {
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1568 "string.c"
}
-#line 1109 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1109 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 1572 "string.c"
} else {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
result = FALSE;
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (c) {
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1580 "string.c"
}
-#line 1111 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
return result;
#line 1584 "string.c"
}
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
if (c) {
-#line 1105 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1105 "/usr/share/vala-0.32/vapi/glib-2.0.vapi"
*c = _vala_c;
#line 1590 "string.c"
}
diff --git a/src/util/system.c b/src/util/system.c
index 8ab729d..cef9603 100644
--- a/src/util/system.c
+++ b/src/util/system.c
@@ -1,4 +1,4 @@
-/* system.c generated by valac 0.34.2, the Vala compiler
+/* system.c generated by valac 0.32.1, the Vala compiler
* generated from system.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/src/util/ui.c b/src/util/ui.c
index 56a355a..ee1017e 100644
--- a/src/util/ui.c
+++ b/src/util/ui.c
@@ -1,4 +1,4 @@
-/* ui.c generated by valac 0.34.2, the Vala compiler
+/* ui.c generated by valac 0.32.1, the Vala compiler
* generated from ui.vala, do not modify */
/* Copyright 2016 Software Freedom Conservancy Inc.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 17:43:09 +0000