Changeset 13372

Timestamp:

09/14/12 11:16:56 (12 years ago)

Author:

jschierm

Message:

CHG: Changed python FetchData for strings, vectors, and matrices to copy data out of python space.

File:

• issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp (modified) (7 diffs)

issm/trunk-jpl/src/c/python/io/FetchPythonData.cpp

@@ -63 +63 @@
 
         /*output: */
+        double* dmatrix=NULL;
         double* matrix=NULL;
         int M,N;
-        int ndim;
+        int i,ndim;
         npy_intp*  dims=NULL;
 
@@ -75 +76 @@
         
         /*retrieve internal value: */
-        matrix=(double*)PyArray_DATA((PyArrayObject*)py_matrix);
+        dmatrix=(double*)PyArray_DATA((PyArrayObject*)py_matrix);
+
+        /*copy matrix: */
+        matrix=xNew<double>(M*N);
+        for(i=0;i<M*N;i++)matrix[i]=dmatrix[i];
 
         /*output: */
@@ -119 +124 @@
 
         /*output: */
+        double* dvector=NULL;
         double* vector=NULL;
         int M;
-        int ndim;
+        int i,ndim;
         npy_intp*  dims=NULL;
 
@@ -131 +137 @@
         
         /*retrieve internal value: */
-        vector=(double*)PyArray_DATA((PyArrayObject*)py_vector);
+        dvector=(double*)PyArray_DATA((PyArrayObject*)py_vector);
+
+        /*copy vector: */
+        vector=xNew<double>(M);
+        for(i=0;i<M;i++)vector[i]=dvector[i];
 
         /*output: */
@@ -282 +292 @@
 
         /*clean-up and assign output pointer*/
+        xDelete<char>(contourname);
         *pcontours=contours;
 }
@@ -294 +305 @@
         char* string=NULL;
 
-        
         /*convert to bytes format: */
         PyUnicode_FSConverter(py_unicode,&py_bytes);
@@ -312 +322 @@
         /*extract internal string: */
         string=PyString_AsString(py_string);
-        
-        *pstring=string;
+
+        /*copy string (note strlen does not include trailing NULL): */
+        *pstring=xNew<char>(strlen(string)+1);
+        memcpy(*pstring,string,(strlen(string)+1)*sizeof(char));
 }
 /*}}}*/