Labelling: Bugfixes in get_closure

[leo.git] / sym-text.c

diff --git a/sym-text.c b/sym-text.c
index 159f00ebe911a8a0ae5d828bfc92ea7374ddcab4..8acfe4b0a1565683b658173c6a49da8b413c61ec 100644 (file)
--- a/sym-text.c
+++ b/sym-text.c
@@ -224,6 +224,23 @@ static void prepare_text_element(struct sym_text *t, struct svg *svg)
     svg_set_attr(svg, "font-style", osm_val_decode(font->style));
 }
 
+static struct symbol * sym_text_copy(struct symbol *sym)
+{
+  struct sym_text *t = (struct sym_text *) sym;
+
+  struct sym_text *new = xmalloc(sizeof(struct sym_text));
+  *new = *t;   // FIXME: Is this OK? with respect to pointer fields...
+
+  return (struct symbol *) new;
+}
+
+static bool sym_text_look_same(struct symbol *s1, struct symbol *s2)
+{
+  struct sym_text *st1 = (struct sym_text *) s1;
+  struct sym_text *st2 = (struct sym_text *) s2;
+  return (st1->text == st2->text && st1->text_color == st2->text_color);
+}
+
 static void sym_text_draw(struct symbol *sym, struct svg *svg)
 {
   struct sym_text *t = (struct sym_text *) sym;
@@ -534,6 +551,8 @@ struct symbolizer symbolizer_text = {
   .draw = sym_text_draw,
   .gen = sym_text_gen,
   .init = sym_text_init,
+  .copy = sym_text_copy,
+  .look_same = sym_text_look_same,
 };
 
 struct sym_text *sym_text_new(struct osm_object *o)