Changeset 22367

Timestamp:

01/26/18 13:34:30 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing options fetching char*

File:

• issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp (modified) (2 diffs)

issm/trunk-jpl/src/wrappers/matlab/io/FetchMatlabData.cpp

@@ -846 +846 @@
 GenericOption<char*>* OptionCharParse( char* name, const mxArray* prhs[]){ /*{{{*/
 
-        GenericOption<char*>  *ochar = NULL;
-
         /*check and parse the name  */
-        ochar=new GenericOption<char*>();
+        GenericOption<char*>* ochar=new GenericOption<char*>();
         ochar->name =xNew<char>(strlen(name)+1);
         memcpy(ochar->name,name,(strlen(name)+1)*sizeof(char));
@@ -857 +855 @@
                 _error_("Value of option \"" << ochar->name  << "\" must be class \"char\", not class \"" << mxGetClassName(prhs[0]) <<"\".");
         }
-        FetchData(&ochar->value,&ochar->numel,&ochar->ndims,&ochar->size,prhs[0]);
+        //FetchData(&ochar->value,&ochar->numel,&ochar->ndims,&ochar->size,prhs[0]);
+        FetchData(&ochar->value,prhs[0]);
+        ochar->numel = strlen(name);
+        ochar->ndims = 2;
+        ochar->size = xNew<int>(2);
+        ochar->size[0] = ochar->numel;
+        ochar->size[1] = 1;
 
         return(ochar);