summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rsvg-styles.c8
-rw-r--r--rsvg-styles.h8
2 files changed, 5 insertions, 11 deletions
diff --git a/rsvg-styles.c b/rsvg-styles.c
index 279dbcde..72f48ca8 100644
--- a/rsvg-styles.c
+++ b/rsvg-styles.c
@@ -106,7 +106,7 @@ rsvg_state_init (RsvgState * state)
state->stroke_width = _rsvg_css_parse_length ("1");
state->miter_limit = 4;
state->cap = RSVG_PATH_STROKE_CAP_BUTT;
- state->join = RSVG_PATH_STROKE_JOIN_MITER;
+ state->join = CAIRO_LINE_JOIN_MITER;
state->stop_opacity = 0xff;
state->fill_rule = CAIRO_FILL_RULE_WINDING;
state->clip_rule = CAIRO_FILL_RULE_WINDING;
@@ -629,11 +629,11 @@ rsvg_parse_style_pair (RsvgHandle * ctx,
} else if (g_str_equal (name, "stroke-linejoin")) {
state->has_join = TRUE;
if (g_str_equal (value, "miter"))
- state->join = RSVG_PATH_STROKE_JOIN_MITER;
+ state->join = CAIRO_LINE_JOIN_MITER;
else if (g_str_equal (value, "round"))
- state->join = RSVG_PATH_STROKE_JOIN_ROUND;
+ state->join = CAIRO_LINE_JOIN_ROUND;
else if (g_str_equal (value, "bevel"))
- state->join = RSVG_PATH_STROKE_JOIN_BEVEL;
+ state->join = CAIRO_LINE_JOIN_BEVEL;
else
g_warning (_("unknown line join style %s\n"), value);
} else if (g_str_equal (name, "font-size")) {
diff --git a/rsvg-styles.h b/rsvg-styles.h
index 0c2d8239..cbfe855e 100644
--- a/rsvg-styles.h
+++ b/rsvg-styles.h
@@ -65,12 +65,6 @@ typedef enum {
/* enums and data structures are ABI compatible with libart */
typedef enum {
- RSVG_PATH_STROKE_JOIN_MITER,
- RSVG_PATH_STROKE_JOIN_ROUND,
- RSVG_PATH_STROKE_JOIN_BEVEL
-} RsvgPathStrokeJoinType;
-
-typedef enum {
RSVG_PATH_STROKE_CAP_BUTT,
RSVG_PATH_STROKE_CAP_ROUND,
RSVG_PATH_STROKE_CAP_SQUARE
@@ -120,7 +114,7 @@ struct _RsvgState {
RsvgPathStrokeCapType cap;
gboolean has_cap;
- RsvgPathStrokeJoinType join;
+ cairo_line_join_t join;
gboolean has_join;
RsvgLength font_size;