Changeset 21341 for issm/trunk/src/wrappers/python/io/FetchPythonData.cpp

Timestamp:

11/04/16 13:48:43 (8 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 21337

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/wrappers/python/io/FetchPythonData.cpp (modified) (2 diffs)

issm/trunk/src/wrappers/python/io/FetchPythonData.cpp

@@ -267 +267 @@
                                 _error_("unrecognized int pyarray type in input!");
 
+                        /* These lines are causing a segfault
                         if (py_matrix2)
                                 delete(py_matrix2);
+                        */
                 }
                 else
@@ -442 +444 @@
                                 _error_("unrecognized double pyarray type in input!");
 
+                        /* Causing a seg fault.
                         if (py_vector2)
                                 delete(py_vector2);
+                        */
                 }
                 else