[mapserver-commits] r7894 - trunk/mapserver

[svn at osgeo.org]

Author: Assefa
Date: 2008-09-03 09:57:23 -0400 (Wed, 03 Sep 2008)
New Revision: 7894

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapdraw.c
Log:
Correct bug when LABEL_NO_CLIP in combination with minfeaturesize (#2758)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2008-09-02 02:57:48 UTC (rev 7893)
+++ trunk/mapserver/HISTORY.TXT	2008-09-03 13:57:23 UTC (rev 7894)
@@ -11,6 +11,8 @@
 
 Current Version (5.3-dev, SVN trunk):
 ------------------------------------
+- Correct bug when LABEL_NO_CLIP in combination with minfeaturesize (#2758) 
+
 - Fix a label size computation for AGG bug when scalefactor is used (#2756)
 
 - various SOS updates for CITE compliance (#2646)

Modified: trunk/mapserver/mapdraw.c
===================================================================
--- trunk/mapserver/mapdraw.c	2008-09-02 02:57:48 UTC (rev 7893)
+++ trunk/mapserver/mapdraw.c	2008-09-03 13:57:23 UTC (rev 7894)
@@ -1486,7 +1486,7 @@
       /* No-clip labeling support */
       if(shape->text && msLayerGetProcessingKey(layer, "LABEL_NO_CLIP") != NULL) {
         bLabelNoClip = MS_TRUE;
-        annocallret = msPolygonLabelPoint(shape, &annopnt, layer->class[c]->label.minfeaturesize);
+        annocallret = msPolygonLabelPoint(shape, &annopnt, map->cellsize*layer->class[c]->label.minfeaturesize);
         annopnt.x = MS_MAP2IMAGE_X(annopnt.x, map->extent.minx, map->cellsize);
         annopnt.y = MS_MAP2IMAGE_Y(annopnt.y, map->extent.maxy, map->cellsize);
       }
@@ -1702,7 +1702,7 @@
     /* No-clip labeling support */
     if(shape->text && msLayerGetProcessingKey(layer, "LABEL_NO_CLIP") != NULL) {
       bLabelNoClip = MS_TRUE;
-      annocallret = msPolygonLabelPoint(shape, &annopnt, layer->class[c]->label.minfeaturesize);
+      annocallret = msPolygonLabelPoint(shape, &annopnt, map->cellsize*layer->class[c]->label.minfeaturesize);
       annopnt.x = MS_MAP2IMAGE_X(annopnt.x, map->extent.minx, map->cellsize);
       annopnt.y = MS_MAP2IMAGE_Y(annopnt.y, map->extent.maxy, map->cellsize);
     }