StopOpacity: Turn into a struct; put both the "kind" enum and the actual opacity value here

This makes the stop-opacity property be similar to the stop-color one.

1 files changed, 10 insertions, 5 deletions

diff --git a/rsvg-styles.h b/rsvg-styles.h
index 320d3834..3b62fa34 100644
--- a/rsvg-styles.h
+++ b/rsvg-styles.h
@@ -73,8 +73,13 @@ struct _RsvgVpathDash {
 };
 
 typedef enum {
-    STOP_OPACITY_SPECIFIED,
-    STOP_OPACITY_INHERIT
+    STOP_OPACITY_INHERIT,
+    STOP_OPACITY_SPECIFIED
+} StopOpacityKind;
+
+typedef struct {
+    StopOpacityKind kind;
+    guint8 opacity; /* 0..255; only valid if kind == STOP_OPACITY_SPECIFIED */
 } StopOpacity;
 
 /* end libart theft... */
@@ -146,11 +151,11 @@ struct _RsvgState {
 
     guint text_offset;
 
-    RsvgCssColorSpec stop_color;         /* rgb */
+    RsvgCssColorSpec stop_color;
     gboolean has_stop_color;
-    gint stop_opacity;          /* 0..255 */
+
+    StopOpacity stop_opacity;
     gboolean has_stop_opacity;
-    StopOpacity stop_opacity_mode;
 
     gboolean visible;
     gboolean has_visible;