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

[svn at osgeo.org]

Author: sdlime
Date: 2012-01-17 07:02:31 -0800 (Tue, 17 Jan 2012)
New Revision: 12991

Modified:
   sandbox/sdlime/rfc-77/mapfile.c
   sandbox/sdlime/rfc-77/mapserver.h
Log:
Added status, expression and text attributes to label objects.

Modified: sandbox/sdlime/rfc-77/mapfile.c
===================================================================
--- sandbox/sdlime/rfc-77/mapfile.c	2012-01-17 14:16:41 UTC (rev 12990)
+++ sandbox/sdlime/rfc-77/mapfile.c	2012-01-17 15:02:31 UTC (rev 12991)
@@ -1650,6 +1650,10 @@
     label->bindings[i].index = -1;
   }
 
+  label->status = MS_ON;
+  initExpression(&(label->expression));
+  initExpression(&(label->text));
+
   label->annotext = NULL;
   label->annopoly = NULL;
 
@@ -1677,6 +1681,9 @@
   for(i=0; i<MS_LABEL_BINDING_LENGTH; i++)
     msFree(label->bindings[i].item);
 
+  freeExpression(&(label->expression));
+  freeExpression(&(label->text));
+
   /* RFC 77 TODO: free book keeping vars */
   msFree(label->annotext);
 

Modified: sandbox/sdlime/rfc-77/mapserver.h
===================================================================
--- sandbox/sdlime/rfc-77/mapserver.h	2012-01-17 14:16:41 UTC (rev 12990)
+++ sandbox/sdlime/rfc-77/mapserver.h	2012-01-17 15:02:31 UTC (rev 12991)
@@ -943,8 +943,7 @@
   char wrap;
   int maxlength;
   int minlength;
-  double space_size_10; /*cached size of a single space character -
-                       used for label text alignment of rfc40 */
+  double space_size_10; /*cached size of a single space character used for label text alignment of rfc40 */
 
   int minfeaturesize; /* minimum feature size (in pixels) to label */
   int autominfeaturesize; /* true or false */
@@ -962,7 +961,13 @@
 
   int priority;  /* Priority level 1 to MS_MAX_LABEL_PRIORITY, default=1 */
 
+  int status;
 #ifndef SWIG
+  expressionObj expression;
+  expressionObj text;
+#endif
+
+#ifndef SWIG
   styleObj **styles;
   int maxstyles;
 #endif