[librsvg] Move rsvg_file_get_path definition to rsvg-io.h
- From: Christian Persch <chpe src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg] Move rsvg_file_get_path definition to rsvg-io.h
- Date: Thu, 7 Jun 2012 23:42:04 +0000 (UTC)
commit e9fe299e6fcb386bce5cac2de41da3fd56022437
Author: Christian Persch <chpe gnome org>
Date: Fri Jun 8 01:40:33 2012 +0200
Move rsvg_file_get_path definition to rsvg-io.h
This is the right place since the impl is already in rsvg-io.c, and fixes
a bug due to a missing declaration.
https://bugzilla.gnome.org/show_bug.cgi?id=677661
rsvg-defs.c | 3 +--
rsvg-image.h | 2 --
rsvg-io.c | 5 +++--
rsvg-io.h | 4 ++++
4 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/rsvg-defs.c b/rsvg-defs.c
index fa43a47..8e2f98f 100644
--- a/rsvg-defs.c
+++ b/rsvg-defs.c
@@ -27,7 +27,6 @@
#include "rsvg-private.h"
#include "rsvg-defs.h"
#include "rsvg-styles.h"
-#include "rsvg-image.h"
#include "rsvg-io.h"
#include <glib.h>
@@ -70,7 +69,7 @@ rsvg_defs_load_extern (const RsvgDefs * defs, const char *name)
guint8 *data;
gsize data_len;
- filename = rsvg_get_file_path (name, rsvg_handle_get_base_uri (defs->ctx));
+ filename = _rsvg_io_get_file_path (name, rsvg_handle_get_base_uri (defs->ctx));
data = _rsvg_handle_acquire_data (defs->ctx, name, NULL, &data_len, NULL);
diff --git a/rsvg-image.h b/rsvg-image.h
index aa66dac..9f291d0 100644
--- a/rsvg-image.h
+++ b/rsvg-image.h
@@ -52,8 +52,6 @@ G_GNUC_INTERNAL
void rsvg_preserve_aspect_ratio (unsigned int aspect_ratio, double width,
double height, double *w, double *h, double *x, double *y);
G_GNUC_INTERNAL
-gchar *rsvg_get_file_path (const gchar * filename, const gchar * basedir);
-G_GNUC_INTERNAL
cairo_surface_t *rsvg_cairo_surface_new_from_href (RsvgHandle *handle, const char *href, GError ** error);
G_END_DECLS
diff --git a/rsvg-io.c b/rsvg-io.c
index b41c0c9..3d6c8b5 100644
--- a/rsvg-io.c
+++ b/rsvg-io.c
@@ -125,7 +125,8 @@ rsvg_acquire_data_data (const char *uri,
}
gchar *
-rsvg_get_file_path (const gchar * filename, const gchar * base_uri)
+_rsvg_io_get_file_path (const gchar * filename,
+ const gchar * base_uri)
{
gchar *absolute_filename;
@@ -167,7 +168,7 @@ rsvg_acquire_file_data (const char *filename,
rsvg_return_val_if_fail (filename != NULL, NULL, error);
g_assert (out_len != NULL);
- path = rsvg_get_file_path (filename, base_uri);
+ path = _rsvg_io_get_file_path (filename, base_uri);
if (path == NULL)
return NULL;
diff --git a/rsvg-io.h b/rsvg-io.h
index 43b8eff..ea94436 100644
--- a/rsvg-io.h
+++ b/rsvg-io.h
@@ -26,6 +26,10 @@
#include <glib.h>
#include <gio/gio.h>
+G_GNUC_INTERNAL
+gchar *_rsvg_io_get_file_path (const gchar *filename,
+ const gchar *basedir);
+
guint8* _rsvg_io_acquire_data (const char *uri,
const char *base_uri,
char **mime_type,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]