Merge branch 'branch-6-2'

Conflicts: maplegend.c
MapServer · May 7, 2013 · eb76e3a · eb76e3a
2 parents 772dcf2 + 929ed6f
commit eb76e3a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/maplegend.c b/maplegend.c
@@ -258,11 +258,13 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
           if((lp->maxscaledenom > 0) && (map->scaledenom > lp->maxscaledenom)) continue;
           if((lp->minscaledenom > 0) && (map->scaledenom <= lp->minscaledenom)) continue;
         }
-        if (theclass->styles[i]->_geomtransform.type != MS_GEOMTRANSFORM_NONE)
+        if (theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_NONE ||
+            theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_LABELPOINT ||
+            theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_LABELPOLY)
+          msDrawLineSymbol(&map->symbolset, image_draw, &zigzag, theclass->styles[i], lp->scalefactor);
+        else
           msDrawTransformedShape(map, &map->symbolset, image_draw, &zigzag, 
                                         theclass->styles[i], lp->scalefactor);
-        else
-          msDrawLineSymbol(&map->symbolset, image_draw, &zigzag, theclass->styles[i], lp->scalefactor);
       }
 
       free(zigzag.line[0].point);
@@ -280,7 +282,9 @@ int msDrawLegendIcon(mapObj *map, layerObj *lp, classObj *theclass,
         }
       }
       for(i=0; i<theclass->numstyles; i++)
-        if (theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_NONE)
+        if (theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_NONE ||
+            theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_LABELPOINT ||
+            theclass->styles[i]->_geomtransform.type == MS_GEOMTRANSFORM_LABELPOLY)
           msDrawShadeSymbol(&map->symbolset, image_draw, &box, theclass->styles[i], lp->scalefactor);
         else
           msDrawTransformedShape(map, &map->symbolset, image_draw, &box,