librsvg r1166 - trunk

[simon svn gnome org]

Author: simon
Date: Mon Aug  4 14:45:18 2008
New Revision: 1166
URL: http://svn.gnome.org/viewvc/librsvg?rev=1166&view=rev

Log:
2008-08-04  Simon Budig  <simon gimp org>

	* rsvg-styles.[ch]: fix the handling of the stroke-dashoffset
	property.



Modified:
   trunk/ChangeLog
   trunk/rsvg-styles.c
   trunk/rsvg-styles.h

Modified: trunk/rsvg-styles.c
==============================================================================
--- trunk/rsvg-styles.c	(original)
+++ trunk/rsvg-styles.c	Mon Aug  4 14:45:18 2008
@@ -106,6 +106,7 @@
     state->has_cap = FALSE;
     state->has_join = FALSE;
     state->has_dash = FALSE;
+    state->has_dashoffset = FALSE;
     state->has_visible = FALSE;
     state->has_cond = FALSE;
     state->has_stop_color = FALSE;
@@ -268,6 +269,10 @@
             dst->dash.dash[i] = src->dash.dash[i];
     }
 
+    if (function (dst->has_dashoffset, src->has_dashoffset)) {
+        dst->dash.offset = src->dash.offset;
+    }
+
     if (inherituninheritables) {
         dst->clip_path_ref = src->clip_path_ref;
         dst->mask = src->mask;
@@ -664,7 +669,7 @@
         state->has_miter_limit = TRUE;
         state->miter_limit = g_ascii_strtod (str + arg_off, NULL);
     } else if (rsvg_css_param_match (str, "stroke-dashoffset")) {
-        state->has_dash = TRUE;
+        state->has_dashoffset = TRUE;
         state->dash.offset = _rsvg_css_parse_length (str + arg_off);
         if (state->dash.offset.length < 0.)
             state->dash.offset.length = 0.;

Modified: trunk/rsvg-styles.h
==============================================================================
--- trunk/rsvg-styles.h	(original)
+++ trunk/rsvg-styles.h	Mon Aug  4 14:45:18 2008
@@ -209,6 +209,7 @@
 
     RsvgVpathDash dash;
     gboolean has_dash;
+    gboolean has_dashoffset;
 
     guint32 current_color;
     gboolean has_current_color;