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

[svn at osgeo.org]

Author: tamas
Date: 2010-12-11 07:03:52 -0800 (Sat, 11 Dec 2010)
New Revision: 10795

Modified:
   trunk/mapserver/mapscript/swiginc/style.i
   trunk/mapserver/mapserver.h
Log:
Fix for the issues introduced with a recent commit.

Modified: trunk/mapserver/mapscript/swiginc/style.i
===================================================================
--- trunk/mapserver/mapscript/swiginc/style.i	2010-12-10 06:17:55 UTC (rev 10794)
+++ trunk/mapserver/mapscript/swiginc/style.i	2010-12-11 15:03:52 UTC (rev 10795)
@@ -165,7 +165,7 @@
   
   char *getGeomTransform() 
   {
-    return self->_geomtransformexpression;
+    return self->_geomtransform.string;
   }
   
   void setGeomTransform(char *transform) 

Modified: trunk/mapserver/mapserver.h
===================================================================
--- trunk/mapserver/mapserver.h	2010-12-10 06:17:55 UTC (rev 10794)
+++ trunk/mapserver/mapserver.h	2010-12-11 15:03:52 UTC (rev 10795)
@@ -495,6 +495,7 @@
     struct _FilterNode  *psLeftNode;
     struct _FilterNode  *psRightNode;
 } FilterEncodingNode;
+#endif /*SWIG*/
 
 /* Define supported bindings here (only covers existing bindings at first). Not accessible directly using MapScript. */
 #define MS_STYLE_BINDING_LENGTH 8
@@ -510,7 +511,7 @@
     char *item;
     int index;
   } attributeBindingObj;
-#endif
+#endif /*SWIG*/
 
 /************************************************************************/
 /*                             labelPathObj                             */
@@ -518,7 +519,7 @@
 /*      Label path object - used to hold path and bounds of curved      */
 /*      labels - Bug #1620 implementation.                              */
 /************************************************************************/
-
+#ifndef SWIG
 typedef struct {
   multipointObj path;
   shapeObj bounds;