Labelling: Variants may have offset

diff --git a/labeller.c b/labeller.c
index c93fd1e0864208c5794396c122e65cd6878d1cff..345b70cee807a813adbd80afcaff491b891291bf 100644 (file)
--- a/labeller.c
+++ b/labeller.c
@@ -252,6 +252,8 @@ void labeller_init(void)
 
 void make_bitmap(struct variant *v, struct symbol *sym)
 {
+  v->offset_x = v->offset_y = 0;
+
   switch (sym->type)
   {
     case SYMBOLIZER_POINT:

diff --git a/labeller.h b/labeller.h
index 14905bb9d727c68ab0884aad7f947bc07f190fa7..e0088173446a392a2f6a4661bd17310b3caa423f 100644 (file)
--- a/labeller.h
+++ b/labeller.h
@@ -31,6 +31,8 @@ struct variant
 {
   int width;
   int height;
+  int offset_x;
+  int offset_y;
   bool *bitmap;
 };