Changeset 12050 for issm/trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp

Timestamp:

04/18/12 15:17:58 (13 years ago)

Author:

Mathieu Morlighem

Message:

ALWAYS use Matlab's memory manager in mex modules

File:

• issm/trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp (modified) (8 diffs)

issm/trunk-jpl/src/modules/TriMeshProcessRifts/TriMeshProcessRifts.cpp

@@ -74 +74 @@
                 nel=mxGetM(prhs[0]);
                 tindex_in=mxGetPr(prhs[0]);
-                index_in=(double*)xmalloc(nel*3*sizeof(double));
+                index_in=(double*)mxMalloc(nel*3*sizeof(double));
                 for (i=0;i<nel;i++){
                         for (j=0;j<3;j++){
@@ -90 +90 @@
                 nods=mxGetM(prhs[1]);
                 x_inm=mxGetPr(prhs[1]);
-                x_in=(double*)xmalloc(nods*sizeof(double));
+                x_in=(double*)mxMalloc(nods*sizeof(double));
                 for (i=0;i<nods;i++){
                         x_in[i]=x_inm[i];
@@ -103 +103 @@
         if(mxIsDouble(prhs[2])){
                 y_inm=mxGetPr(prhs[2]);
-                y_in=(double*)xmalloc(nods*sizeof(double));
+                y_in=(double*)mxMalloc(nods*sizeof(double));
                 for (i=0;i<nods;i++){
                         y_in[i]=y_inm[i];
@@ -117 +117 @@
                 num_seg=mxGetM(prhs[3]);
                 tsegments_in=mxGetPr(prhs[3]);
-                segments_in=(double*)xmalloc(num_seg*3*sizeof(double));
+                segments_in=(double*)mxMalloc(num_seg*3*sizeof(double));
                 for (i=0;i<num_seg;i++){
                         for (j=0;j<3;j++){
@@ -132 +132 @@
         if(mxIsDouble(prhs[4])){
                 tsegmentmarkers_in=mxGetPr(prhs[4]);
-                segmentmarkers_in=(double*)xmalloc(num_seg*sizeof(double));
+                segmentmarkers_in=(double*)mxMalloc(num_seg*sizeof(double));
                 for (i=0;i<num_seg;i++){
                         segmentmarkers_in[i]=tsegmentmarkers_in[i];
@@ -270 +270 @@
                         pmxa_array2= mxCreateDoubleMatrix(0,0,mxREAL);
                         mxSetM(pmxa_array2,1);
-                        pair=(double*)xmalloc(2*sizeof(double));
+                        pair=(double*)mxMalloc(2*sizeof(double));
                         pair[0]=*(out_riftstips+2*i+0);
                         pair[1]=*(out_riftstips+2*i+1);
@@ -293 +293 @@
 
                         /*State: */
-                        state=(double*)xmalloc(out_riftsnumpenaltypairs[i]*sizeof(double));
+                        state=(double*)mxMalloc(out_riftsnumpenaltypairs[i]*sizeof(double));
                         for(j=0;j<out_riftsnumpenaltypairs[i];j++)state[j]=FreeEnum;
                         pmxa_array2= mxCreateDoubleMatrix(0,0,mxREAL);
@@ -306 +306 @@
         else{
                 /*output NaN :*/
-                pNaN=(double*)xmalloc(sizeof(double));
+                pNaN=(double*)mxMalloc(sizeof(double));
                 *pNaN=NAN;
                 pmxa_array= mxCreateDoubleMatrix(0,0,mxREAL);