[mapserver-commits] r9653 - in branches/branch-5-6/mapserver: . mapscript/swiginc

[svn at osgeo.org]

Author: tamas
Date: 2010-01-02 15:35:06 -0500 (Sat, 02 Jan 2010)
New Revision: 9653

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

Modified: branches/branch-5-6/mapserver/HISTORY.TXT
===================================================================
--- branches/branch-5-6/mapserver/HISTORY.TXT	2010-01-02 20:09:06 UTC (rev 9652)
+++ branches/branch-5-6/mapserver/HISTORY.TXT	2010-01-02 20:35:06 UTC (rev 9653)
@@ -15,6 +15,8 @@
 Current Version (SVN branch-5-6):
 --------------------------------
 
+- 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: branches/branch-5-6/mapserver/mapscript/swiginc/style.i
===================================================================
--- branches/branch-5-6/mapserver/mapscript/swiginc/style.i	2010-01-02 20:09:06 UTC (rev 9652)
+++ branches/branch-5-6/mapserver/mapscript/swiginc/style.i	2010-01-02 20:35:06 UTC (rev 9653)
@@ -162,4 +162,14 @@
 
     return self->bindings[binding].item;
   }
+  
+  char *getGeomTransform() 
+  {
+    return self->_geomtransformexpression;
+  }
+  
+  void setGeomTransform(char *transform) 
+  {
+    msStyleSetGeomTransform(self, transform);
+  }
 }

Modified: branches/branch-5-6/mapserver/mapserver.h
===================================================================
--- branches/branch-5-6/mapserver/mapserver.h	2010-01-02 20:09:06 UTC (rev 9652)
+++ branches/branch-5-6/mapserver/mapserver.h	2010-01-02 20:35:06 UTC (rev 9653)
@@ -769,10 +769,11 @@
 %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;