Changeset 281

Timestamp:

05/06/09 16:27:20 (16 years ago)

Author:

Eric.Larour

Message:

Better test for NaN

File:

• issm/trunk/src/c/io/SerialFetchData.cpp (modified) (2 diffs)

issm/trunk/src/c/io/SerialFetchData.cpp

@@ -67 +67 @@
         }
         else if (strcmp(data_type,"Matrix")==0){
+        
                 if(mxIsEmpty(mxdata) ){
                         /*Nothing to pick up. Just initialize matrix pointer to NULL: */
@@ -77 +78 @@
 
                         /*Check mxdata is not pointing to NaN: */
-                        if (mxIsNaN(*(mxGetPr(mxdata)))){
+                        if ( mxIsNaN(*(mxGetPr(mxdata))) && (mxGetM(mxdata)==1) && (mxGetN(mxdata)==1) ){
                                 outmatrix_rows=0;
                                 outmatrix_cols=0;