[mapserver-commits] r9493 - in trunk/mapserver: . mapscript/php3

[svn at osgeo.org]

Author: aboudreault
Date: 2009-10-19 11:50:22 -0400 (Mon, 19 Oct 2009)
New Revision: 9493

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/php3/php_mapscript.c
Log:
PHP/Mapscript: added autofollow and repeatdistance in labelObj (#3175)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2009-10-19 14:55:32 UTC (rev 9492)
+++ trunk/mapserver/HISTORY.TXT	2009-10-19 15:50:22 UTC (rev 9493)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- PHP/Mapscript: added "autofollow" and "repeatdistance" in labelObj (#3175)
+
 - Added charset in content-type http header for wms/wfs/sos/wcs requests (#2583)
 
 Version 5.6.0-beta4 (2009-10-18):

Modified: trunk/mapserver/mapscript/php3/php_mapscript.c
===================================================================
--- trunk/mapserver/mapscript/php3/php_mapscript.c	2009-10-19 14:55:32 UTC (rev 9492)
+++ trunk/mapserver/mapscript/php3/php_mapscript.c	2009-10-19 15:50:22 UTC (rev 9493)
@@ -9155,11 +9155,13 @@
     add_property_long(return_value,   "offsety",    plabel->offsety);
     add_property_double(return_value, "angle",      plabel->angle);
     add_property_long(return_value,   "autoangle",  plabel->autoangle);
+    add_property_long(return_value,   "autofollow",  plabel->autofollow);
     add_property_long(return_value,   "buffer",     plabel->buffer);
     add_property_long(return_value,   "antialias",  plabel->antialias);
     add_property_long(return_value,   "wrap",       plabel->wrap);
     add_property_long(return_value,   "minfeaturesize",plabel->minfeaturesize);
     add_property_long(return_value,   "autominfeaturesize",plabel->autominfeaturesize);
+    add_property_long(return_value,   "repeatdistance",plabel->repeatdistance);
     add_property_long(return_value,   "mindistance",plabel->mindistance);
     add_property_long(return_value,   "partials",   plabel->partials);
     add_property_long(return_value,   "force",      plabel->force);
@@ -9245,15 +9247,9 @@
 {
     labelObj *self;
     pval   *pPropertyName, *pNewValue, *pThis;
-#ifdef PHP4
     HashTable   *list=NULL;
-#endif
 
-#ifdef PHP4
     pThis = getThis();
-#else
-    getThis(&pThis);
-#endif
 
     if (pThis == NULL ||
         getParameters(ht, 2, &pPropertyName, &pNewValue) != SUCCESS)
@@ -9285,11 +9281,14 @@
     else IF_SET_LONG(  "offsety",      self->offsety)
     else IF_SET_DOUBLE("angle",        self->angle)
     else IF_SET_LONG(  "autoangle",    self->autoangle)
+    else IF_SET_LONG(  "autofollow",  self->autofollow)
     else IF_SET_LONG(  "buffer",       self->buffer)
     else IF_SET_LONG(  "antialias",    self->antialias)
     else IF_SET_BYTE(  "wrap",         self->wrap)
     else IF_SET_LONG(  "minfeaturesize", self->minfeaturesize)
     else IF_SET_LONG(  "autominfeaturesize", self->autominfeaturesize)
+    else IF_SET_LONG(  "autofollow",  self->autofollow)
+    else IF_SET_LONG(  "repeatdistance",  self->repeatdistance)
     else IF_SET_LONG(  "mindistance",  self->mindistance)
     else IF_SET_LONG(  "partials",     self->partials)
     else IF_SET_LONG(  "force",        self->force)