summaryrefslogtreecommitdiff
path: root/gsk
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-09-13 19:36:17 -0400
committerBenjamin Otte <otte@redhat.com>2021-09-17 00:25:22 +0200
commitc77b5c46a39577df8f26b1a3c023ae98786304b6 (patch)
tree7f8992ee1d2130f47b402acde8e9e8b70d93e3c0 /gsk
parent5b82cf1145bbf73ce7f8ea96dc18da6eb0d83ded (diff)
downloadgtk+-c77b5c46a39577df8f26b1a3c023ae98786304b6.tar.gz
rendernodeparser: Avoid gdk_texture_new_for_pixbuf
We can just use gdk_texture_new_from_bytes here now. Update affected test output.
Diffstat (limited to 'gsk')
-rw-r--r--gsk/gskrendernodeparser.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/gsk/gskrendernodeparser.c b/gsk/gskrendernodeparser.c
index fe5c55ac1e..ed08bd4431 100644
--- a/gsk/gskrendernodeparser.c
+++ b/gsk/gskrendernodeparser.c
@@ -85,24 +85,17 @@ parse_texture (GtkCssParser *parser,
scheme = g_uri_parse_scheme (url);
if (scheme && g_ascii_strcasecmp (scheme, "data") == 0)
{
- GInputStream *stream;
- GdkPixbuf *pixbuf;
GBytes *bytes;
- texture = NULL;
-
bytes = gtk_css_data_url_parse (url, NULL, &error);
if (bytes)
{
- stream = g_memory_input_stream_new_from_bytes (bytes);
+ texture = gdk_texture_new_from_bytes (bytes, &error);
g_bytes_unref (bytes);
- pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, &error);
- g_object_unref (stream);
- if (pixbuf != NULL)
- {
- texture = gdk_texture_new_for_pixbuf (pixbuf);
- g_object_unref (pixbuf);
- }
+ }
+ else
+ {
+ texture = NULL;
}
}
else