Changeset 11951

Timestamp:

08/23/07 17:49:52 (1 year ago)

Author:

warmerdam

Message:

fix typemap for gettig length from string #(1712)

Files:

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

branches/1.4/gdal/swig/include/python/typemaps_python.i

@@ -442 +442 @@
-%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)

branches/1.4/gdal/swig/python/gdal_wrap.cpp

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

branches/1.4/gdal/swig/python/ogr_wrap.cpp

@@ -7439 +7439 @@
-  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) {