Commit 8e3ac5aa authored by Matthias Clasen's avatar Matthias Clasen Committed by Hiroyuki Ikezoe

Parse presentation attributes before looking for a style matching class/id.

Fix for bug #614704.
parent 97f6a127
...@@ -1282,6 +1282,9 @@ rsvg_parse_style_attrs (RsvgHandle * ctx, ...@@ -1282,6 +1282,9 @@ rsvg_parse_style_attrs (RsvgHandle * ctx,
gboolean found = FALSE; gboolean found = FALSE;
GString *klazz_list = NULL; GString *klazz_list = NULL;
if (rsvg_property_bag_size (atts) > 0)
rsvg_parse_style_pairs (ctx, state, atts);
/* Try to properly support all of the following, including inheritance: /* Try to properly support all of the following, including inheritance:
* * * *
* #id * #id
...@@ -1352,8 +1355,6 @@ rsvg_parse_style_attrs (RsvgHandle * ctx, ...@@ -1352,8 +1355,6 @@ rsvg_parse_style_attrs (RsvgHandle * ctx,
if (rsvg_property_bag_size (atts) > 0) { if (rsvg_property_bag_size (atts) > 0) {
const char *value; const char *value;
rsvg_parse_style_pairs (ctx, state, atts);
if ((value = rsvg_property_bag_lookup (atts, "style")) != NULL) if ((value = rsvg_property_bag_lookup (atts, "style")) != NULL)
rsvg_parse_style (ctx, state, value); rsvg_parse_style (ctx, state, value);
if ((value = rsvg_property_bag_lookup (atts, "transform")) != NULL) if ((value = rsvg_property_bag_lookup (atts, "transform")) != NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment