[librsvg] rsvg_handle_new_from_file(): implement in terms of rsvg_handle_new_from_gfile_sync()
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] rsvg_handle_new_from_file(): implement in terms of rsvg_handle_new_from_gfile_sync()
- Date: Sun, 18 Nov 2018 23:16:39 +0000 (UTC)
commit 2719a227cb2f698c86529ecea59fe6d69bd32cff
Author: Federico Mena Quintero <federico gnome org>
Date: Sun Nov 18 17:13:00 2018 -0600
rsvg_handle_new_from_file(): implement in terms of rsvg_handle_new_from_gfile_sync()
librsvg/rsvg-handle.c | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
---
diff --git a/librsvg/rsvg-handle.c b/librsvg/rsvg-handle.c
index a3c4e263..15dd8b29 100644
--- a/librsvg/rsvg-handle.c
+++ b/librsvg/rsvg-handle.c
@@ -481,10 +481,7 @@ RsvgHandle *
rsvg_handle_new_from_file (const gchar *file_name, GError **error)
{
gchar *base_uri;
- gchar *mime_type;
- char *data;
- gsize data_len;
- RsvgHandle *handle = NULL;
+ RsvgHandle *handle;
GFile *file;
char *scheme;
@@ -507,21 +504,9 @@ rsvg_handle_new_from_file (const gchar *file_name, GError **error)
g_object_unref (file);
return NULL;
}
-
- data = _rsvg_io_acquire_data (base_uri, base_uri, &mime_type, &data_len, NULL, error);
-
- if (data) {
- handle = rsvg_handle_new ();
- rsvg_handle_set_base_uri (handle, base_uri);
- if (!rsvg_handle_fill_with_data (handle, data, data_len, error)) {
- g_object_unref (handle);
- handle = NULL;
- }
- g_free (data);
- }
-
- g_free (mime_type);
g_free (base_uri);
+
+ handle = rsvg_handle_new_from_gfile_sync (file, 0, NULL, error);
g_object_unref (file);
return handle;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]