[mapserver-commits] r13054 - sandbox/sdlime/rfc-77

[svn at osgeo.org]

Author: sdlime
Date: 2012-02-06 09:21:15 -0800 (Mon, 06 Feb 2012)
New Revision: 13054

Modified:
   sandbox/sdlime/rfc-77/mapdraw.c
Log:
Fixed error in base processing of label expression. Fixed logic error in msDrawLabelCache() related to label status...

Modified: sandbox/sdlime/rfc-77/mapdraw.c
===================================================================
--- sandbox/sdlime/rfc-77/mapdraw.c	2012-02-06 17:15:17 UTC (rev 13053)
+++ sandbox/sdlime/rfc-77/mapdraw.c	2012-02-06 17:21:15 UTC (rev 13054)
@@ -2488,6 +2488,7 @@
 
                 for(i=0; i<npositions; i++) {
   		  fprintf(stderr, "%d ", i);
+                  // RFC 77 TODO: take label_marker_offset_x/y into account
                   labelPtr->annopoint = get_metrics(&(cachePtr->point), positions[i], r, (marker_offset_x + label_offset_x), (marker_offset_y + label_offset_y), labelPtr->angle, label_buffer, poly);
 
                   /* if cachePtr->status we're still working on the first valid label with a valid status value */
@@ -2528,6 +2529,7 @@
 
                 fprintf(stderr, "    explicit position case (ll=%d)\n", ll);
 
+                // RFC 77 TODO: take label_marker_offset_x/y into account
                 if(labelPtr->position == MS_CC) { /* don't need the marker_offset */
                   labelPtr->annopoint = get_metrics(&(cachePtr->point), labelPtr->position, r, label_offset_x, label_offset_y, labelPtr->angle, label_buffer, poly);
                   if(labelPtr->annopoly) get_metrics_line(&(cachePtr->point), labelPtr->position, r, label_offset_x, label_offset_y, labelPtr->angle, 1, labelPtr->annopoly->line);