[mapserver-commits] r13140 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2012-02-13 03:49:51 -0800 (Mon, 13 Feb 2012)
New Revision: 13140

Modified:
   trunk/mapserver/maplegend.c
   trunk/mapserver/mapscale.c
Log:
restore embedded legend/scalebar functionality after rfc77 merge


Modified: trunk/mapserver/maplegend.c
===================================================================
--- trunk/mapserver/maplegend.c	2012-02-13 11:20:31 UTC (rev 13139)
+++ trunk/mapserver/maplegend.c	2012-02-13 11:49:51 UTC (rev 13140)
@@ -717,7 +717,7 @@
   GET_LAYER(map, l)->class[0]->labels[0]->force = MS_TRUE;
   GET_LAYER(map, l)->class[0]->labels[0]->size = MS_MEDIUM; /* must set a size to have a valid label definition */
   GET_LAYER(map, l)->class[0]->labels[0]->priority = MS_MAX_LABEL_PRIORITY;
-  GET_LAYER(map, l)->class[0]->labels[0]->annotext = msStrdup("");
+  GET_LAYER(map, l)->class[0]->labels[0]->annotext = msStrdup(" ");
 
   if(map->legend.postlabelcache) /* add it directly to the image */
     msDrawMarkerSymbol(&map->symbolset, img, &point, GET_LAYER(map, l)->class[0]->styles[0], 1.0);

Modified: trunk/mapserver/mapscale.c
===================================================================
--- trunk/mapserver/mapscale.c	2012-02-13 11:20:31 UTC (rev 13139)
+++ trunk/mapserver/mapscale.c	2012-02-13 11:49:51 UTC (rev 13140)
@@ -442,7 +442,7 @@
   GET_LAYER(map, l)->class[0]->labels[0]->force = MS_TRUE;
   GET_LAYER(map, l)->class[0]->labels[0]->size = MS_MEDIUM; /* must set a size to have a valid label definition */
   GET_LAYER(map, l)->class[0]->labels[0]->priority = MS_MAX_LABEL_PRIORITY;
-  GET_LAYER(map, l)->class[0]->labels[0]->annotext = msStrdup("");
+  GET_LAYER(map, l)->class[0]->labels[0]->annotext = msStrdup(" ");
 
   if(map->scalebar.postlabelcache) /* TODO: add it directly to the image */
     msDrawMarkerSymbol(&map->symbolset, img, &point, GET_LAYER(map, l)->class[0]->styles[0], 1.0);