#include "svgtiny_strings.h"
#undef SVGTINY_STRING_ACTION2
+ /* Intern SVG's xmlns separately because it's an lwc_string
+ * and not a dom_string. We initialize its pointer to NULL
+ * because the "cleanup:" test to see if it needs to be free'd
+ * looks for NULL. Returning a LIBDOM_ERROR on failure is not
+ * perfect but it's the closest of the available options. */
+ state.interned_svg_xmlns = NULL;
+ if (lwc_intern_string("http://www.w3.org/2000/svg",
+ 26,
+ &state.interned_svg_xmlns) != lwc_error_ok) {
+ code = svgtiny_LIBDOM_ERROR;
+ goto cleanup;
+ }
+
svgtiny_parse_position_attributes(svg, state, &x, &y, &width, &height);
diagram->width = width;
diagram->height = height;
dom_string_unref(state.interned_##s);
#include "svgtiny_strings.h"
#undef SVGTINY_STRING_ACTION2
+
+ if (state.interned_svg_xmlns != NULL) {
+ lwc_string_unref(state.interned_svg_xmlns);
+ }
+
return code;
}
dom_string *attr;
dom_exception exc;
+ /* We store the result of svgtiny_parse_style_inline() in
+ * inline_sheet, and that function returns NULL on error; in
+ * particular you do not need to css_stylesheet_destroy() the
+ * result if it is NULL. We initialize inline_sheet to NULL to
+ * retain the same semantics. */
+ css_stylesheet *inline_sheet = NULL;
+
exc = dom_element_get_attribute(node, state->interned_fill, &attr);
if (exc == DOM_NO_ERR && attr != NULL) {
svgtiny_parse_color(attr, &state->fill, &state->fill_grad, state);
exc = dom_element_get_attribute(node, state->interned_style, &attr);
if (exc == DOM_NO_ERR && attr != NULL) {
+ /* First parse the style attribute into a libcss stylesheet
+ in case any of its properties are known to libcss. */
+ inline_sheet = svgtiny_parse_style_inline(
+ (uint8_t *)dom_string_data(attr),
+ dom_string_byte_length(attr));
+
+ /* Parse any other properties "by hand" until they can
+ be supported in libcss. */
char *style = strndup(dom_string_data(attr),
dom_string_byte_length(attr));
const char *s;
free(style);
dom_string_unref(attr);
}
+
+ if (inline_sheet != NULL) {
+ css_stylesheet_destroy(inline_sheet);
+ }
}