[mapserver-commits] r12567 - in branches/branch-6-0/mapserver: . mapscript/php

[svn at osgeo.org]

Author: tbonfort
Date: 2011-09-21 05:28:33 -0700 (Wed, 21 Sep 2011)
New Revision: 12567

Modified:
   branches/branch-6-0/mapserver/
   branches/branch-6-0/mapserver/HISTORY.TXT
   branches/branch-6-0/mapserver/mapgeomtransform.c
   branches/branch-6-0/mapserver/mapscript/php/
Log:
fix centroid geomtransform parser (#4029)


Property changes on: branches/branch-6-0/mapserver
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/aboudreault:9103-9193
/sandbox/mapserver6:10108-10742
/trunk/mapserver:11877,11961
   + /sandbox/aboudreault:9103-9193
/sandbox/mapserver6:10108-10742
/trunk/mapserver:11877,11961,12566

Modified: branches/branch-6-0/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-6-0/mapserver/HISTORY.TXT	2011-09-21 12:25:27 UTC (rev 12566)
+++ branches/branch-6-0/mapserver/HISTORY.TXT	2011-09-21 12:28:33 UTC (rev 12567)
@@ -14,6 +14,7 @@
 
 Current Version (future 6.0.2, SVN branch-6-0):
 ---------------------------
+- fix centroid geomtransform parser (#4029)
 
 - PHP MapScript is missing many styleObj properties (#3901)
 

Modified: branches/branch-6-0/mapserver/mapgeomtransform.c
===================================================================
--- branches/branch-6-0/mapserver/mapgeomtransform.c	2011-09-21 12:25:27 UTC (rev 12566)
+++ branches/branch-6-0/mapserver/mapgeomtransform.c	2011-09-21 12:28:33 UTC (rev 12567)
@@ -53,6 +53,9 @@
   else if(!strncasecmp("labelpoly",transform,9)) {
     s->_geomtransform.type = MS_GEOMTRANSFORM_LABELPOLY;
   }
+  else if(!strncasecmp("centroid",transform,8)) {
+    s->_geomtransform.type = MS_GEOMTRANSFORM_CENTROID;
+  }
   else {
     s->_geomtransform.type = MS_GEOMTRANSFORM_NONE;
     msSetError(MS_MISCERR,"unknown transform expression","msStyleSetGeomTransform()");


Property changes on: branches/branch-6-0/mapserver/mapscript/php
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/aboudreault/mapscript/php3:9103-9193
/sandbox/mapserver6/mapscript/php:10108-10742
/trunk/mapserver/mapscript/php:11877,11961
   + /sandbox/aboudreault/mapscript/php3:9103-9193
/sandbox/mapserver6/mapscript/php:10108-10742
/trunk/mapserver/mapscript/php:11877,11961,12566