Fix offset calculation for line legend icons (MapServer#2636)

faegi · Jan 4, 2013 · ef87d86 · ef87d86
1 parent e5f90f3
commit ef87d86
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/maplegend.c b/maplegend.c
@@ -208,7 +208,11 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
       offset = 1;
       /* To set the offset, we only check the size/width parameter of the first style */
       if (theclass->numstyles > 0) {
-        offset = (theclass->styles[0]->size != -1) ? theclass->styles[0]->size/2 : theclass->styles[0]->width/2;
+        if (theclass->styles[0]->symbol > 0 && theclass->styles[0]->symbol < map->symbolset.numsymbols && 
+              map->symbolset.symbol[theclass->styles[0]->symbol]->type != MS_SYMBOL_SIMPLE)
+            offset = theclass->styles[0]->size/2;
+        else
+            offset = theclass->styles[0]->width/2;
       }
       zigzag.line = (lineObj *)msSmallMalloc(sizeof(lineObj));
       zigzag.numlines = 1;