[librsvg] Use cairo_line_join_t directly

[Christian Persch <chpe src gnome org>]

commit 6d124de98ccd69b7488ea3751a4ff98bd89a232f
Author: Christian Persch <chpe gnome org>
Date:   Thu Sep 15 18:20:16 2011 +0200

    Use cairo_line_join_t directly
    
    Although it appears this property is only parsed, but not used
    when rendering...

 rsvg-styles.c |    8 ++++----
 rsvg-styles.h |    8 +-------
 2 files changed, 5 insertions(+), 11 deletions(-)
---
diff --git a/rsvg-styles.c b/rsvg-styles.c
index 279dbcd..72f48ca 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 0c2d823..cbfe855 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;