callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Special case resource pixbuf files loading

Browse Source 
This means we can share the pixbuf data when using GdkPixdata
images in the resource.
This commit is contained in:
Alexander Larsson
2012-02-03 15:51:55 +01:00
parent 57386285fa
commit 610ea728b2
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
gtk/gtkcssimageurl.c
View File

@ -20,6 +20,8 @@
#include "config.h" #include "config.h"
#include <string.h>
#include "gtkcssimageurlprivate.h" #include "gtkcssimageurlprivate.h"
#include "gtkcssprovider.h" #include "gtkcssprovider.h"
@ -75,16 +77,32 @@ gtk_css_image_url_parse (GtkCssImage *image,
if (file == NULL) if (file == NULL)
return FALSE; return FALSE;
input = g_file_read (file, NULL, &error); /* We special case resources here so we can use
if (input == NULL) gdk_pixbuf_new_from_resource, which in turn has some special casing
for GdkPixdata files to avoid duplicating the memory for the pixbufs */
if (g_file_has_uri_scheme (file, "resource"))
{ {
_gtk_css_parser_take_error (parser, error); char *uri = g_file_get_uri (file);
return FALSE; char *resource_path = g_uri_unescape_string (uri + strlen ("resource://"), NULL);
} g_print ("uri: %s, resource_path: %s\n", uri, resource_path);
g_object_unref (file);
pixbuf = gdk_pixbuf_new_from_stream (G_INPUT_STREAM (input), NULL, &error); pixbuf = gdk_pixbuf_new_from_resource (resource_path, &error);
g_object_unref (input); g_free (resource_path);
g_free (uri);
}
else
{
input = g_file_read (file, NULL, &error);
if (input == NULL)
{
_gtk_css_parser_take_error (parser, error);
return FALSE;
}
g_object_unref (file);
pixbuf = gdk_pixbuf_new_from_stream (G_INPUT_STREAM (input), NULL, &error);
g_object_unref (input);
}
if (pixbuf == NULL) if (pixbuf == NULL)
{ {