[mapserver-commits] r13191 - in trunk/mapserver/mapscript: python swiginc

svn at osgeo.org svn at osgeo.org
Thu Mar 1 14:04:18 EST 2012


Author: rouault
Date: 2012-03-01 11:04:18 -0800 (Thu, 01 Mar 2012)
New Revision: 13191

Modified:
   trunk/mapserver/mapscript/python/pyextend.i
   trunk/mapserver/mapscript/swiginc/image.i
Log:
Fix mapscript compilation error due to r13186 (#4216)

Modified: trunk/mapserver/mapscript/python/pyextend.i
===================================================================
--- trunk/mapserver/mapscript/python/pyextend.i	2012-03-01 17:25:48 UTC (rev 13190)
+++ trunk/mapserver/mapscript/python/pyextend.i	2012-03-01 19:04:18 UTC (rev 13191)
@@ -349,7 +349,8 @@
         else if (PyFile_Check(file)) /* a Python (C) file */
         {
             renderer = self->format->vtable;
-            retval = renderer->saveImage(self, PyFile_AsFile(file), self->format);
+            /* FIXME? as an improvement, pass a map argument instead of the NULL (see #4216) */
+            retval = renderer->saveImage(self, NULL, PyFile_AsFile(file), self->format);
         }
         else /* presume a Python file-like object */
         {

Modified: trunk/mapserver/mapscript/swiginc/image.i
===================================================================
--- trunk/mapserver/mapscript/swiginc/image.i	2012-03-01 17:25:48 UTC (rev 13190)
+++ trunk/mapserver/mapscript/swiginc/image.i	2012-03-01 19:04:18 UTC (rev 13191)
@@ -116,7 +116,8 @@
             if (file)
             {
                 renderer = self->format->vtable;
-                retval = renderer->saveImage(self, file, self->format);
+                /* FIXME? as an improvement, pass a map argument instead of the NULL (see #4216) */
+                retval = renderer->saveImage(self, NULL, file, self->format);
             }
             else
             {



More information about the mapserver-commits mailing list