Changeset 11952

Timestamp:

08/23/07 17:51:25 (1 year ago)

Author:

warmerdam

Message:

fix typemap for gettig length from string #(1712)

Files:

• trunk/gdal/swig/include/python/typemaps_python.i (modified) (1 diff)
• trunk/gdal/swig/python/gdal_wrap.cpp (modified) (2 diffs)
• trunk/gdal/swig/python/ogr_wrap.cpp (modified) (1 diff)

trunk/gdal/swig/include/python/typemaps_python.i

@@ -240 +240 @@
-%typemap(in,numinputs=1) (int nLen, char *pBuf )
-{
- = $1
+
-  /* %typemap(in,numinputs=1) (int nLen, char *pBuf ) */
-  PyString_AsStringAndSize($input, &$2, &safeLen );
+  $1 = (int) safeLen;
-}
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER)

trunk/gdal/swig/python/gdal_wrap.cpp

@@ -8112 +8112 @@
-  arg5 = static_cast< int >(val5);
-  {
- = arg6
+
-    /* %typemap(in,numinputs=1) (int nLen, char *pBuf ) */
-    PyString_AsStringAndSize(obj5, &arg7, &safeLen );
+    arg6 = (int) safeLen;
-  }
-  if (obj6) {
@@ -9744 +9745 @@
-  arg5 = static_cast< int >(val5);
-  {
- = arg6
+
-    /* %typemap(in,numinputs=1) (int nLen, char *pBuf ) */
-    PyString_AsStringAndSize(obj5, &arg7, &safeLen );
+    arg6 = (int) safeLen;
-  }
-  if (obj6) {

trunk/gdal/swig/python/ogr_wrap.cpp

@@ -8936 +8936 @@
-  if (!PyArg_ParseTupleAndKeywords(args,kwargs,(char *)"O|O:CreateGeometryFromWkb",kwnames,&obj0,&obj1)) SWIG_fail;
-  {
- = arg1
+
-    /* %typemap(in,numinputs=1) (int nLen, char *pBuf ) */
-    PyString_AsStringAndSize(obj0, &arg2, &safeLen );
+    arg1 = (int) safeLen;
-  }
-  if (obj1) {