[mapserver-commits] r8959 - branches/branch-5-4/mapserver

[svn at osgeo.org]

Author: assefa
Date: 2009-04-24 11:07:54 -0400 (Fri, 24 Apr 2009)
New Revision: 8959

Modified:
   branches/branch-5-4/mapserver/HISTORY.TXT
   branches/branch-5-4/mapserver/maplegend.c
Log:
Fix Getlegendgraphic when sizeunit is set (#2983)

Modified: branches/branch-5-4/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-4/mapserver/HISTORY.TXT	2009-04-23 21:45:44 UTC (rev 8958)
+++ branches/branch-5-4/mapserver/HISTORY.TXT	2009-04-24 15:07:54 UTC (rev 8959)
@@ -9,11 +9,16 @@
 
 For a complete change history, please see the Subversion log comments.
 
+Current Version:
+----------------
+
+- Fix Getlegendgraphic when sizeunit is set
+
+- Fix mapogcfilter.c not to cause syntax error if PROJ.4 is not compiled in (#2987)
+
 Version 5.4.0 (2009-04-22):
 ---------------------------
 
-- Fix mapogcfilter.c not to cause syntax error if PROJ.4 is not compiled in (#2987)
-
 Version 5.4.0-rc2 (2009-04-15):
 -------------------------------
 

Modified: branches/branch-5-4/mapserver/maplegend.c
===================================================================
--- branches/branch-5-4/mapserver/maplegend.c	2009-04-23 21:45:44 UTC (rev 8958)
+++ branches/branch-5-4/mapserver/maplegend.c	2009-04-24 15:07:54 UTC (rev 8959)
@@ -351,8 +351,10 @@
 
     /* set the scale factor so that scale dependant symbols are drawn in the legend with their default size */
     if(cur->layer->sizeunits != MS_PIXELS)
+    {
+      map->cellsize = msAdjustExtent(&(map->extent), map->width, map->height);
       cur->layer->scalefactor = (msInchesPerUnit(cur->layer->sizeunits,0)/msInchesPerUnit(map->units,0)) / map->cellsize;
-
+    }
     if(msDrawLegendIcon(map, cur->layer, cur->theclass,  map->legend.keysizex,  map->legend.keysizey, image, HMARGIN, (int) pnt.y) != MS_SUCCESS)
       return NULL;