Now that svgtiny provides alpha values, use those as well for rendering.

Signed-off-by: Peter Korsgaard <[email protected]>
---
 examples/svgtiny_display_x11.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/svgtiny_display_x11.c b/examples/svgtiny_display_x11.c
index d10bfbc..cbb5bf7 100644
--- a/examples/svgtiny_display_x11.c
+++ b/examples/svgtiny_display_x11.c
@@ -349,10 +349,11 @@ void event_diagram_expose(const XExposeEvent 
*expose_event)
                        render_path(cr, scale, &diagram->shape[i]);
 
                } else if (diagram->shape[i].text) {
-                       cairo_set_source_rgb(cr,
+                       cairo_set_source_rgba(cr,
                                svgtiny_RED(diagram->shape[i].stroke) / 255.0,
                                svgtiny_GREEN(diagram->shape[i].stroke) / 255.0,
-                               svgtiny_BLUE(diagram->shape[i].stroke) / 255.0);
+                               svgtiny_BLUE(diagram->shape[i].stroke) / 255.0,
+                               svgtiny_ALPHA(diagram->shape[i].stroke) / 
255.0);
                        cairo_move_to(cr,
                                        scale * diagram->shape[i].text_x,
                                        scale * diagram->shape[i].text_y);
@@ -416,17 +417,19 @@ void render_path(cairo_t *cr, float scale, struct 
svgtiny_shape *path)
                }
        }
        if (path->fill != svgtiny_TRANSPARENT) {
-               cairo_set_source_rgb(cr,
+               cairo_set_source_rgba(cr,
                                svgtiny_RED(path->fill) / 255.0,
                                svgtiny_GREEN(path->fill) / 255.0,
-                               svgtiny_BLUE(path->fill) / 255.0);
+                               svgtiny_BLUE(path->fill) / 255.0,
+                               svgtiny_ALPHA(path->fill) / 255.0);
                cairo_fill_preserve(cr);
        }
        if (path->stroke != svgtiny_TRANSPARENT) {
-               cairo_set_source_rgb(cr,
+               cairo_set_source_rgba(cr,
                                svgtiny_RED(path->stroke) / 255.0,
                                svgtiny_GREEN(path->stroke) / 255.0,
-                               svgtiny_BLUE(path->stroke) / 255.0);
+                               svgtiny_BLUE(path->stroke) / 255.0,
+                               svgtiny_ALPHA(path->stroke) / 255.0);
                cairo_set_line_width(cr, scale * path->stroke_width);
                cairo_stroke_preserve(cr);
        }
-- 
1.7.1


Reply via email to