[mapserver-commits] r13216 - sandbox/tb-labels

[svn at osgeo.org]

Author: tbonfort
Date: 2012-03-08 09:29:50 -0800 (Thu, 08 Mar 2012)
New Revision: 13216

Modified:
   sandbox/tb-labels/mapdraw.c
Log:
make label_no_clip actually work with rfc77 multi-labels.


Modified: sandbox/tb-labels/mapdraw.c
===================================================================
--- sandbox/tb-labels/mapdraw.c	2012-03-08 17:11:46 UTC (rev 13215)
+++ sandbox/tb-labels/mapdraw.c	2012-03-08 17:29:50 UTC (rev 13216)
@@ -1830,7 +1830,7 @@
    if (bClipShape &&
            (
            bHasGeomTransform ||
-           (shape->text && msLayerGetProcessingKey(layer, "LABEL_NO_CLIP"))
+           (layer->class[c]->numlabels>0 && msLayerGetProcessingKey(layer, "LABEL_NO_CLIP"))
            )) {
       bNeedUnclippedShape = MS_TRUE;
    }
@@ -2056,7 +2056,7 @@
    if (bClipShape &&
            (
            bHasGeomTransform ||
-           (shape->text && msLayerGetProcessingKey(layer, "LABEL_NO_CLIP"))
+           (layer->class[c]->numlabels>0 && msLayerGetProcessingKey(layer, "LABEL_NO_CLIP"))
            )) {
       bNeedUnclippedShape = MS_TRUE;
    }
@@ -2134,7 +2134,7 @@
 
    if (layer->class[c]->numlabels > 0) {
       double minfeaturesize = layer->class[c]->labels[0]->minfeaturesize * image->resolutionfactor;
-      if (msPolygonLabelPoint(shape, &annopnt, minfeaturesize) == MS_SUCCESS) {
+      if (msPolygonLabelPoint(unclipped_shape, &annopnt, minfeaturesize) == MS_SUCCESS) {
          for (l = 0; l < layer->class[c]->numlabels; l++)
             if (layer->class[c]->labels[l]->angle != 0) layer->class[c]->labels[l]->angle -= map->gt.rotation_angle; /* TODO: is this correct ??? */
          if (layer->labelcache) {