[librsvg] Revert "Only permit threadsafe pixbuf loaders"
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] Revert "Only permit threadsafe pixbuf loaders"
- Date: Mon, 7 Nov 2011 19:01:51 +0000 (UTC)
commit 4369021d7099fe3c7dcfd389516e204ca50071f8
Author: Christian Persch <chpe gnome org>
Date: Mon Nov 7 19:59:35 2011 +0100
Revert "Only permit threadsafe pixbuf loaders"
This reverts commit 9333f2da7ea92d475a45861fcf47dc385a783171.
It didn't work as intended and needs more work.
rsvg-image.c | 13 -------------
1 files changed, 0 insertions(+), 13 deletions(-)
---
diff --git a/rsvg-image.c b/rsvg-image.c
index 9d7dc49..02882bd 100644
--- a/rsvg-image.c
+++ b/rsvg-image.c
@@ -29,7 +29,6 @@
#include "config.h"
-#define GDK_PIXBUF_ENABLE_BACKEND
#include "rsvg-image.h"
#include <string.h>
#include <math.h>
@@ -189,21 +188,9 @@ rsvg_pixbuf_new_from_href (const char *href, const char *base_uri, GError ** err
if (arr) {
GdkPixbufLoader *loader;
GdkPixbuf *pixbuf = NULL;
- GdkPixbufFormat *format;
int res;
loader = gdk_pixbuf_loader_new ();
- format = gdk_pixbuf_loader_get_format (loader);
- if (format == NULL ||
- (format->flags & GDK_PIXBUF_FORMAT_THREADSAFE) == 0) {
- g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
- "Loader for format '%s' is not threadsafe; deadlock prevented.",
- format && format->name ? format->name : "(unknown)");
- g_byte_array_free (arr, TRUE);
- gdk_pixbuf_loader_close (loader, NULL /* ignore errors */);
- g_object_unref (loader);
- return NULL;
- }
res = gdk_pixbuf_loader_write (loader, arr->data, arr->len, error);
g_byte_array_free (arr, TRUE);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]