blob: 1694ca0586750585d1bb71e118031b35d3f23c97 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
|
diff --git a/scripts/isolate-test.sh b/scripts/isolate-test.sh
index 82dadd14..9aafcac0 100755
--- a/scripts/isolate-test.sh
+++ b/scripts/isolate-test.sh
@@ -77,7 +77,7 @@ mkdir -p "$XDG_CONFIG_HOME"
export G_DEBUG="fatal-critical"
echo "Variables in isolated environment:" >&2
-env -i G_DEBUG="$G_DEBUG" HOME="$HOME" XDG_CONFIG_HOME="$XDG_CONFIG_HOME" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" dbus-run-session -- env >&2
+env -i G_DEBUG="$G_DEBUG" HOME="$HOME" PATH="$PATH" XDG_CONFIG_HOME="$XDG_CONFIG_HOME" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" dbus-run-session -- env >&2
echo >&2
-env -i G_DEBUG="$G_DEBUG" HOME="$HOME" XDG_CONFIG_HOME="$XDG_CONFIG_HOME" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" dbus-run-session -- "$@"
+env -i G_DEBUG="$G_DEBUG" HOME="$HOME" PATH="$PATH" XDG_CONFIG_HOME="$XDG_CONFIG_HOME" XDG_RUNTIME_DIR="$XDG_RUNTIME_DIR" dbus-run-session -- "$@"
diff --git a/src/image-load.cc b/src/image-load.cc
index f4ed3deb..67d05687 100644
--- a/src/image-load.cc
+++ b/src/image-load.cc
@@ -528,32 +528,8 @@ static void image_loader_area_updated_cb(gpointer,
g_mutex_unlock(il->data_mutex);
}
-static void image_loader_area_prepared_cb(gpointer, gpointer data)
+static void image_loader_area_prepared_cb(gpointer, gpointer)
{
- auto il = static_cast<ImageLoader *>(data);
- GdkPixbuf *pb;
- guchar *pix;
- size_t h;
- size_t rs;
-
- /* a workaround for
- https://bugzilla.gnome.org/show_bug.cgi?id=547669
- https://bugzilla.gnome.org/show_bug.cgi?id=589334
- */
- g_autofree gchar *format = il->backend->get_format_name();
- if (strcmp(format, "svg") == 0 ||
- strcmp(format, "xpm") == 0)
- {
- return;
- }
-
- pb = il->backend->get_pixbuf();
-
- h = gdk_pixbuf_get_height(pb);
- rs = gdk_pixbuf_get_rowstride(pb);
- pix = gdk_pixbuf_get_pixels(pb);
-
- memset(pix, 0, rs * h); /*this should be faster than pixbuf_fill */
}
static void image_loader_size_cb(gpointer,
|