3:52 p.m.
Hi,
I have been looking at svgtiny for some simple svg parsing, and it seems
very nice. While working on it, I've noticed that it didn't parse
stroke-width correctly, and the alpha channel isn't handled. See the
following mails for fixes for this.
--
Bye, Peter Korsgaard
3:52 p.m.
New subject: [PATCH 1/3] svntiny: fix stroke-width parsing
Split the string like it's done for the other attributes so
svgtiny_parse_length doesn't get confused about the remainder of the
string.
Signed-off-by: Peter Korsgaard <jacmet(a)sunsite.dk>
---
src/svgtiny.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/src/svgtiny.c b/src/svgtiny.c
index a6dbd89..7a07b61 100644
--- a/src/svgtiny.c
+++ b/src/svgtiny.c
@@ -917,8 +917,10 @@ void svgtiny_parse_paint_attributes(const xmlNode *node,
s += 13;
while (*s == ' ')
s++;
- state->stroke_width = svgtiny_parse_length(s,
+ value = strndup(s, strcspn(s, "; "));
+ state->stroke_width = svgtiny_parse_length(value,
state->viewport_width, *state);
+ free(value);
}
}
}
--
1.7.1
7:45 p.m.
New subject: [PATCH 1/3] svntiny: fix stroke-width parsing
On Sat, 18 Sep 2010 21:52:49 +0200
Peter Korsgaard <jacmet(a)sunsite.dk> wrote:
Split the string like it's done for the other attributes so
svgtiny_parse_length doesn't get confused about the remainder of the
string.
I've checked in this one.
James
3:52 p.m.
New subject: [PATCH 2/3] svgtiny: add alpha support and parse fill-opacity / stroke-opacity
Signed-off-by: Peter Korsgaard <jacmet(a)sunsite.dk>
---
include/svgtiny.h | 11 +++++++----
src/svgtiny.c | 35 +++++++++++++++++++++++++++++++++++
src/svgtiny_internal.h | 2 ++
3 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/include/svgtiny.h b/include/svgtiny.h
index 9d685e9..e54ca98 100644
--- a/include/svgtiny.h
+++ b/include/svgtiny.h
@@ -10,18 +10,21 @@
#include <libxml/parser.h>
-typedef int svgtiny_colour;
-#define svgtiny_TRANSPARENT 0x1000000
+typedef unsigned int svgtiny_colour;
+#define svgtiny_TRANSPARENT 0
#ifdef __riscos__
-#define svgtiny_RGB(r, g, b) ((b) << 16 | (g) << 8 | (r))
+#define svgtiny_RGB(r, g, b) (0xff000000 | (b) << 16 | (g) << 8 | (r))
#define svgtiny_RED(c) ((c) & 0xff)
#define svgtiny_GREEN(c) (((c) >> 8) & 0xff)
#define svgtiny_BLUE(c) (((c) >> 16) & 0xff)
+#define svgtiny_ALPHA(c) (((c) >> 24) & 0xff)
+
#else
-#define svgtiny_RGB(r, g, b) ((r) << 16 | (g) << 8 | (b))
+#define svgtiny_RGB(r, g, b) (0xff000000 | (r) << 16 | (g) << 8 | (b))
#define svgtiny_RED(c) (((c) >> 16) & 0xff)
#define svgtiny_GREEN(c) (((c) >> 8) & 0xff)
#define svgtiny_BLUE(c) ((c) & 0xff)
+#define svgtiny_ALPHA(c) (((c) >> 24) & 0xff)
#endif
struct svgtiny_shape {
diff --git a/src/svgtiny.c b/src/svgtiny.c
index 7a07b61..f8b214f 100644
--- a/src/svgtiny.c
+++ b/src/svgtiny.c
@@ -887,11 +887,15 @@ void svgtiny_parse_paint_attributes(const xmlNode *node,
const char *content = (const char *) attr->children->content;
if (strcmp(name, "fill") == 0)
svgtiny_parse_color(content, &state->fill, state);
+ else if (strcmp(name, "fill-opacity") == 0)
+ svgtiny_parse_opacity(content, &state->fill, state);
else if (strcmp(name, "stroke") == 0)
svgtiny_parse_color(content, &state->stroke, state);
else if (strcmp(name, "stroke-width") == 0)
state->stroke_width = svgtiny_parse_length(content,
state->viewport_width, *state);
+ else if (strcmp(name, "stroke-opacity") == 0)
+ svgtiny_parse_opacity(content, &state->stroke, state);
else if (strcmp(name, "style") == 0) {
const char *style = (const char *)
attr->children->content;
@@ -905,6 +909,14 @@ void svgtiny_parse_paint_attributes(const xmlNode *node,
svgtiny_parse_color(value, &state->fill, state);
free(value);
}
+ if ((s = strstr(style, "fill-opacity:"))) {
+ s += 13;
+ while (*s == ' ')
+ s++;
+ value = strndup(s, strcspn(s, "; "));
+ svgtiny_parse_opacity(value, &state->fill, state);
+ free(value);
+ }
if ((s = strstr(style, "stroke:"))) {
s += 7;
while (*s == ' ')
@@ -913,6 +925,14 @@ void svgtiny_parse_paint_attributes(const xmlNode *node,
svgtiny_parse_color(value, &state->stroke, state);
free(value);
}
+ if ((s = strstr(style, "stroke-opacity:"))) {
+ s += 15;
+ while (*s == ' ')
+ s++;
+ value = strndup(s, strcspn(s, "; "));
+ svgtiny_parse_opacity(value, &state->stroke, state);
+ free(value);
+ }
if ((s = strstr(style, "stroke-width:"))) {
s += 13;
while (*s == ' ')
@@ -989,6 +1009,21 @@ void svgtiny_parse_color(const char *s, svgtiny_colour *c,
}
+void svgtiny_parse_opacity(const char *s, svgtiny_colour *c,
+ struct svgtiny_parse_state *state)
+{
+ float af;
+ unsigned int a;
+
+ UNUSED(state);
+
+ if (sscanf(s, "%f", &af) == 1) {
+ a = af * 255;
+ *c = (*c & 0x00ffffff) | (a << 24);
+ }
+}
+
+
/**
* Parse font attributes, if present.
*/
diff --git a/src/svgtiny_internal.h b/src/svgtiny_internal.h
index 3ea6e7b..92bd744 100644
--- a/src/svgtiny_internal.h
+++ b/src/svgtiny_internal.h
@@ -58,6 +58,8 @@ float svgtiny_parse_length(const char *s, int viewport_size,
const struct svgtiny_parse_state state);
void svgtiny_parse_color(const char *s, svgtiny_colour *c,
struct svgtiny_parse_state *state);
+void svgtiny_parse_opacity(const char *s, svgtiny_colour *c,
+ struct svgtiny_parse_state *state);
void svgtiny_parse_transform(char *s, float *ma, float *mb,
float *mc, float *md, float *me, float *mf);
struct svgtiny_shape *svgtiny_add_shape(struct svgtiny_parse_state *state);
--
1.7.1
8:04 p.m.
New subject: [PATCH 2/3] svgtiny: add alpha support and parse fill-opacity / stroke-opacity
On Sat, 18 Sep 2010 21:52:50 +0200
Peter Korsgaard <jacmet(a)sunsite.dk> wrote:
Signed-off-by: Peter Korsgaard <jacmet(a)sunsite.dk>
---
include/svgtiny.h | 11 +++++++----
src/svgtiny.c | 35 +++++++++++++++++++++++++++++++++++
src/svgtiny_internal.h | 2 ++
3 files changed, 44 insertions(+), 4 deletions(-)
I noticed a couple of bugs in this when testing.
1. If an fill-opacity is given in an ancestor element of an element that
has a fill, the opacity gets lost. The reason is that
svgtiny_parse_color() overwrites it. That could be avoided by doing a
similar logical operation there to the one in
svgtiny_parse_opacity(). For example
http://www.croczilla.com/bits_and_pieces/svg/samples/circles1/circles1.svg
2. Gradient fills use a special value for state->fill:
#define svgtiny_LINEAR_GRADIENT 0x2000000
That would conflict with the opacity.
I think the best solution to both of these may be to split opacity into
separate members of struct svgtiny_parse_state, and only combine it
when creating a svgtiny_shape.
Otherwise it looks good and I'll try and fix this and check it in soon.
James
7:17 a.m.
New subject: [PATCH 2/3] svgtiny: add alpha support and parse fill-opacity / stroke-opacity
>>>> "James" == James Bursa
<james(a)netsurf-browser.org> writes:
Hi,
James> I think the best solution to both of these may be to split
James> opacity into separate members of struct svgtiny_parse_state, and
James> only combine it when creating a svgtiny_shape.
James> Otherwise it looks good and I'll try and fix this and check it
James> in soon.
Thanks for both!
--
Bye, Peter Korsgaard
3:52 p.m.
New subject: [PATCH 3/3] svgtiny_display_x11: render alpha channel as well
Now that svgtiny provides alpha values, use those as well for rendering.
Signed-off-by: Peter Korsgaard <jacmet(a)sunsite.dk>
---
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
1:32 p.m.
On Sat, 18 Sep 2010 21:52:48 +0200
Peter Korsgaard <jacmet(a)sunsite.dk> wrote:
I have been looking at svgtiny for some simple svg parsing, and it
seems very nice. While working on it, I've noticed that it didn't
parse stroke-width correctly, and the alpha channel isn't handled.
See the following mails for fixes for this.
Hi Peter,
Thanks for the patches! I will review and commit them in the next few
days.
James
4633
days inactive
4640
days old
netsurf-dev@netsurf-browser.org
7 comments
2 participants
participants (2)
-
James Bursa -
Peter Korsgaard