Changeset 937 for library/bdm/base

Show
Ignore:
Timestamp:
05/12/10 23:02:03 (14 years ago)
Author:
smidl
Message:

matlab class extension for pdf

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • library/bdm/base/itpp/itmex.h

    r813 r937  
    336336  int i, size; 
    337337  double* temp = (double*) mxGetPr(in); 
    338   if (temp == 0) mexErrMsgTxt("mxArray2ivec: Pointer to data is NULL"); 
    339338 
    340339  size = mxGetNumberOfElements(in); 
    341   if (size == 0) mexErrMsgTxt("mxArray2ivec: Size of data is zero"); 
     340  if ((size > 0) && (temp == 0)) mexErrMsgTxt("mxArray2ivec: Size of data is zero"); 
    342341 
    343342  out.set_size(size, false); 
    … …  
    356355  int i, size; 
    357356  double* temp = (double*) mxGetPr(in); 
    358   if (temp == 0) mexErrMsgTxt("mxArray2vec: Pointer to data is NULL"); 
    359357 
    360358  size = mxGetNumberOfElements(in); 
    361   if (size == 0) mexErrMsgTxt("mxArray2vec: Size of data is zero"); 
    362  
     359  if ((size >0) && (temp == 0)) mexErrMsgTxt("mxArray2vec: Pointer to data is NULL"); 
     360   
    363361  out.set_size(size, false); 
    364362 
    … …  
    577575{ 
    578576  double* temp = (double *) mxGetPr(out); 
    579   if (temp == 0) mexErrMsgTxt("vec2mxArray: Pointer to data is NULL"); 
    580   if (in.size() == 0) mexErrMsgTxt("vec2mxArray: Size of data is zero"); 
     577  if ((in.size() > 0) && (temp == 0)) mexErrMsgTxt("vec2mxArray: Pointer to data is NULL"); 
    581578 
    582579  for (int i = 0; i < in.size(); i++) {