[mapserver-commits] r7895 - branches/branch-5-2/mapserver

[svn at osgeo.org]

Author: Assefa
Date: 2008-09-03 10:04:03 -0400 (Wed, 03 Sep 2008)
New Revision: 7895

Modified:
   branches/branch-5-2/mapserver/HISTORY.TXT
   branches/branch-5-2/mapserver/mapdraw.c
Log:
Correct bug when LABEL_NO_CLIP in combination with minfeaturesize (#2758)

Modified: branches/branch-5-2/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-2/mapserver/HISTORY.TXT	2008-09-03 13:57:23 UTC (rev 7894)
+++ branches/branch-5-2/mapserver/HISTORY.TXT	2008-09-03 14:04:03 UTC (rev 7895)
@@ -12,6 +12,8 @@
 
 Current Version (SVN branch-5-2)
 --------------------------------
+- Correct bug when LABEL_NO_CLIP in combination with minfeaturesize (#2758) 
+
 - Fix a label size computation for AGG bug when scalefactor is used (#2756) 
 
 - Got rid of misleading errors about OWS SERVICE not being compiled in

Modified: branches/branch-5-2/mapserver/mapdraw.c
===================================================================
--- branches/branch-5-2/mapserver/mapdraw.c	2008-09-03 13:57:23 UTC (rev 7894)
+++ branches/branch-5-2/mapserver/mapdraw.c	2008-09-03 14:04:03 UTC (rev 7895)
@@ -1477,7 +1477,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);
       }
@@ -1693,7 +1693,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);
     }