summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--content/content.c2
-rw-r--r--image/rsvg.c28
-rw-r--r--image/rsvg.h1
3 files changed, 20 insertions, 11 deletions
diff --git a/content/content.c b/content/content.c
index ee20e7d04..d5ec7e51c 100644
--- a/content/content.c
+++ b/content/content.c
@@ -314,7 +314,7 @@ static const struct handler_entry handler_map[] = {
0, svg_destroy, 0, svg_redraw, 0, 0, 0, false},
#endif
#ifdef WITH_RSVG
- {rsvg_create, 0, rsvg_convert,
+ {rsvg_create, rsvg_process_data, rsvg_convert,
0, rsvg_destroy, 0, rsvg_redraw, 0, 0, 0, false},
#endif
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, false}
diff --git a/image/rsvg.c b/image/rsvg.c
index c37859bf3..0a2493ba0 100644
--- a/image/rsvg.c
+++ b/image/rsvg.c
@@ -58,6 +58,24 @@ bool rsvg_create(struct content *c, const char *params[])
return true;
}
+bool rsvg_process_data(struct content *c, const char *data,
+ unsigned int size)
+{
+ struct content_rsvg_data *d = &c->data.rsvg;
+ union content_msg_data msg_data;
+ GError *err = NULL;
+
+ if (rsvg_handle_write(d->rsvgh, (const guchar *)data, (gsize)size,
+ &err) == FALSE) {
+ LOG(("rsvg_handle_write returned an error: %s", err->message));
+ msg_data.error = err->message;
+ content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
+ return false;
+ }
+
+ return true;
+}
+
/** Convert Cairo's ARGB output to NetSurf's favoured ABGR format. It converts
* the data in-place. Operation is endian-swap and rotate right 8 bits.
*
@@ -92,16 +110,6 @@ bool rsvg_convert(struct content *c, int iwidth, int iheight)
union content_msg_data msg_data;
RsvgDimensionData rsvgsize;
GError *err = NULL;
-
- if (rsvg_handle_write(d->rsvgh, (guchar *)c->source_data,
- (gsize)c->source_size, &err) == FALSE) {
- LOG(("rsvg_handle_write returned an error: %s", err->message));
- msg_data.error = err->message;
- content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
- return false;
- }
-
- assert(err == NULL);
if (rsvg_handle_close(d->rsvgh, &err) == FALSE) {
LOG(("rsvg_handle_close returned an error: %s", err->message));
diff --git a/image/rsvg.h b/image/rsvg.h
index 04ec655c5..704b434bc 100644
--- a/image/rsvg.h
+++ b/image/rsvg.h
@@ -28,6 +28,7 @@ struct content_rsvg_data {
};
bool rsvg_create(struct content *c, const char *params[]);
+bool rsvg_process_data(struct content *c, const char *data, unsigned int size);
bool rsvg_convert(struct content *c, int width, int height);
void rsvg_destroy(struct content *c);
bool rsvg_redraw(struct content *c, int x, int y,