[mapserver-commits] r9654 - in trunk/mapserver: . mapscript/swiginc

[svn at osgeo.org]

Author: tamas
Date: 2010-01-02 15:36:16 -0500 (Sat, 02 Jan 2010)
New Revision: 9654

Modified:
   trunk/mapserver/HISTORY.TXT
   trunk/mapserver/mapscript/swiginc/style.i
   trunk/mapserver/mapserver.h
Log:
Expose getGeomTransform/setGeomTransform to SWIG instead of exposing the private vars for rfc48 (#3214)

Modified: trunk/mapserver/HISTORY.TXT
===================================================================
--- trunk/mapserver/HISTORY.TXT	2010-01-02 20:35:06 UTC (rev 9653)
+++ trunk/mapserver/HISTORY.TXT	2010-01-02 20:36:16 UTC (rev 9654)
@@ -14,6 +14,8 @@
 Current Version (SVN trunk):
 ----------------------------
 
+- Expose getGeomTransform/setGeomTransform to SWIG instead of exposing the private vars for rfc48 (#3214)
+
 - Fixed writeSymbol to support writing 'ANGLE AUTO' (#3214)
 
 - Fixed problems with point queries not working via the CGI (mode=query or mode=nquery) (#3246)

Modified: trunk/mapserver/mapscript/swiginc/style.i
===================================================================
--- trunk/mapserver/mapscript/swiginc/style.i	2010-01-02 20:35:06 UTC (rev 9653)
+++ trunk/mapserver/mapscript/swiginc/style.i	2010-01-02 20:36:16 UTC (rev 9654)
@@ -162,4 +162,14 @@
 
     return self->bindings[binding].item;
   }
+  
+  char *getGeomTransform() 
+  {
+    return self->_geomtransformexpression;
+  }
+  
+  void setGeomTransform(char *transform) 
+  {
+    msStyleSetGeomTransform(self, transform);
+  }
 }

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2010-01-02 20:35:06 UTC (rev 9653)
+++ trunk/mapserver/mapserver.h	2010-01-02 20:36:16 UTC (rev 9654)
@@ -776,11 +776,12 @@
 #ifdef SWIG
 %mutable;
 #endif /* SWIG */
-  
+
+#ifndef SWIG
   /*private vars for rfc48*/
-  /*TODO: how/if to expose these two to swig*/
   char *_geomtransformexpression;
   int _geomtransform;
+#endif
   
   /*should an angle be automatically computed*/
   int autoangle;