Changeset 12434 for issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp

Timestamp:

06/15/12 16:43:53 (13 years ago)

Author:

Mathieu Morlighem

Message:

changing xmalloc to xNew and xfree to xDelete

File:

• issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp (modified) (11 diffs)

issm/trunk-jpl/src/c/matlab/io/MatlabNArrayToNArray.cpp

@@ -39 +39 @@
         ndims=mxGetNumberOfDimensions(mxmatrix);
         ipt  =mxGetDimensions(mxmatrix);
-        size =(int *) xcalloc(ndims,sizeof(int));
-        for (i=0; i<ndims; i++) size[i]=(int)ipt[i];
+        size =xNew<int>(ndims);
+        for (i=0;i<ndims;i++) size[i]=(int)ipt[i];
 
         /*Ok, first check if we are dealing with a sparse or full matrix: */
@@ -51 +51 @@
                 nz=(int)((double)nnz/(double)rows);
 
-                matrix=(double*)xcalloc(rows*cols,sizeof(double));
+                matrix=xNewInit<double>(rows*cols,0.0);
 
                 /*Now, get ir,jc and pr: */
@@ -74 +74 @@
                 
                 /*Create serial matrix: */
-                matrix=(double*)xcalloc(numel,sizeof(double));
-
-                dims=(int *) xcalloc(ndims,sizeof(int));
+                matrix=xNewInit<double>(numel,0.0);
+
+                dims=xNew<int>(ndims);
                 for(i=0;i<numel;i++){
                         ColumnWiseDimsFromIndex(dims,i,size,ndims);
@@ -82 +82 @@
                         *(matrix+j)=*(mxmatrix_ptr+i);
                 }
-                xfree((void**)&dims);
+                xDelete<int>(dims);
                 
         }
@@ -119 +119 @@
         ndims=mxGetNumberOfDimensions(mxmatrix);
         ipt  =mxGetDimensions(mxmatrix);
-        size =(int *) xcalloc(ndims,sizeof(int));
-        for (i=0; i<ndims; i++) size[i]=(int)ipt[i];
+        size =xNew<int>(ndims);
+        for (i=0;i<ndims;i++) size[i]=(int)ipt[i];
 
         /*Ok, first check if we are dealing with a sparse or full matrix: */
@@ -131 +131 @@
                 nz=(int)((double)nnz/(double)rows);
 
-                matrix=(bool*)xcalloc(rows*cols,sizeof(bool));
+                matrix=xNewInit<bool>(rows*cols,false);
 
                 /*Now, get ir,jc and pm: */
@@ -154 +154 @@
                 
                 /*Create serial matrix: */
-                matrix=(bool*)xcalloc(numel,sizeof(bool));
-
-                dims=(int *) xcalloc(ndims,sizeof(int));
+                matrix=xNew<bool>(numel);
+                dims=xNew<int>(ndims);
                 for(i=0;i<numel;i++){
                         ColumnWiseDimsFromIndex(dims,i,size,ndims);
@@ -162 +161 @@
                         *(matrix+j)=(bool)*(mxmatrix_ptr+i);
                 }
-                xfree((void**)&dims);
-                
+                xDelete<int>(dims);
         }
 
@@ -199 +197 @@
         ndims=mxGetNumberOfDimensions(mxmatrix);
         ipt  =mxGetDimensions(mxmatrix);
-        size =(int *) xcalloc(ndims,sizeof(int));
-        for (i=0; i<ndims; i++) size[i]=(int)ipt[i];
+        size =xNew<int>(ndims);
+        for (i=0;i<ndims;i++) size[i]=(int)ipt[i];
 
         /*Ok, first check if we are dealing with a sparse or full matrix: */
@@ -211 +209 @@
                 nz=(int)((double)nnz/(double)rows);
 
-                matrix=(char*)xcalloc(rows*cols,sizeof(double));
+                matrix=xNew<char>(rows*cols);
 
                 /*Now, get ir,jc and pm: */
@@ -234 +232 @@
                 
                 /*Create serial matrix: */
-                matrix=(char*)xcalloc(numel+1,sizeof(mxChar));
+                matrix=xNew<char>(numel+1);
 
                 /*looping code adapted from Matlab example explore.c: */