lwc_string_unref(svg_name_lwc);
dom_string_unref(svg_name);
- /* get graphic dimensions */
+ /* initialize the state struct with zeros */
memset(&state, 0, sizeof(state));
+
+ /* get graphic dimensions */
state.diagram = diagram;
state.document = document;
state.viewport_width = viewport_width;
state.viewport_height = viewport_height;
-
/* Initialize CSS context */
- if (state.select_ctx == NULL) {
- css_code = css_select_ctx_create(&state.select_ctx);
- if (css_code != CSS_OK) {
- dom_node_unref(svg);
- dom_node_unref(document);
- return svgtiny_LIBCSS_ERROR;
- }
+ css_code = css_select_ctx_create(&state.select_ctx);
+ if (css_code != CSS_OK) {
+ dom_node_unref(svg);
+ dom_node_unref(document);
+ return svgtiny_LIBCSS_ERROR;
}
#define SVGTINY_STRING_ACTION2(s,n) \
#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;
+ css_error code;
+ uint8_t fill_opacity_type;
+ css_fixed fill_opacity;
+ uint8_t stroke_opacity_type;
+ css_fixed stroke_opacity;
/* 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. */
+ * result if it is NULL, and css_stylesheet_destroy() checks
+ * for that case. */
css_stylesheet *inline_sheet = NULL;
+ /* Initialize this to NULL for the same reason: so that we can
+ * safely destroy it later even if we never populated it. */
+ css_select_results *styles = 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);
dom_string_unref(attr);
}
- if (inline_sheet != NULL) {
+ struct dom_element *parent;
+ dom_element_parent_node(node, &parent);
+ if (parent == NULL) {
+ /* This is the root <svg> node, skip it.
+ *
+ * While initialising its selection state, libcss sets its
+ * node_data->bloom pointer using css__get_parent_bloom().
+ * But if there is no parent, that function returns,
+ *
+ * static css_bloom empty_bloom[CSS_BLOOM_SIZE];
+ *
+ * A problem later arises because when libcss FINALISES its
+ * selection state, it frees node_data->bloom! That obviously
+ * won't work then node has no parent, i.e. if it's the root
+ * <svg> element.
+ */
css_stylesheet_destroy(inline_sheet);
+ return;
+ }
+ else {
+ /* We only needed to know if it was NULL */
+ dom_node_unref(parent);
+ }
+
+ code = svgtiny_select_style(state, node, inline_sheet, &styles);
+ css_stylesheet_destroy(inline_sheet);
+ if (code != CSS_OK) {
+ return;
+ }
+
+ fill_opacity_type = css_computed_fill_opacity(
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+ &fill_opacity);
+ stroke_opacity_type = css_computed_stroke_opacity(
+ styles->styles[CSS_PSEUDO_ELEMENT_NONE],
+ &stroke_opacity);
+ css_select_results_destroy(styles);
+
+ if (fill_opacity_type == CSS_FILL_OPACITY_SET) {
+ state->fill_opacity = FIXTOFLT(fill_opacity);
+ }
+ if (stroke_opacity_type == CSS_STROKE_OPACITY_SET) {
+ state->stroke_opacity = FIXTOFLT(stroke_opacity);
}
}