[mapserver-commits] r10013 - trunk/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2010-03-25 11:04:19 -0400 (Thu, 25 Mar 2010)
New Revision: 10013

Modified:
   trunk/mapserver/maplegend.c
Log:
WMS GetLegendGraphic and keyimage size (#3398)

Modified: trunk/mapserver/maplegend.c
===================================================================
--- trunk/mapserver/maplegend.c	2010-03-25 14:42:48 UTC (rev 10012)
+++ trunk/mapserver/maplegend.c	2010-03-25 15:04:19 UTC (rev 10013)
@@ -131,12 +131,15 @@
       symbol = map->symbolset.symbol[symbolNum];
       
       initStyle(&imgStyle);
-      /*set size so thet symbol will be scaled properly #3296*/
-      if (width/symbol->sizex <= height/symbol->sizey)
+      /*set size so that symbol will be scaled properly #3296*/
+      if (width/symbol->sizex < height/symbol->sizey)
         imgStyle.size = symbol->sizey*(width/symbol->sizex);
       else
         imgStyle.size = symbol->sizey*(height/symbol->sizey);
 
+      if (imgStyle.size > imgStyle.maxsize)
+        imgStyle.maxsize = imgStyle.size;
+
       imgStyle.symbol = symbolNum;
       msDrawMarkerSymbol(&map->symbolset,image,&marker,&imgStyle,lp->scalefactor);
       /* TO DO: we may want to handle this differently depending on the relative size of the keyimage */