Merge branch 'branch-6-2'

MapServer · Jan 5, 2013 · 3b34b30 · 3b34b30
2 parents 79f839d + b24f4d4
commit 3b34b30
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/mapfile.c b/mapfile.c
@@ -5565,6 +5565,7 @@ int initMap(mapObj *map)
 
   msInitSymbolSet(&map->symbolset);
   map->symbolset.fontset =  &(map->fontset);
+  map->symbolset.map = map;
 
   initLegend(&map->legend);
   initScalebar(&map->scalebar);

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;

diff --git a/mapscript/mapscript.i b/mapscript/mapscript.i
@@ -41,6 +41,8 @@
 %ignore layerObj::extent;
 #endif
 
+%newobject msLoadMapFromString;
+
 %{
 #include "../../mapserver.h"
 #include "../../maptemplate.h"