Changeset 5461 for nanovis


Ignore:
Timestamp:
May 7, 2015, 7:38:35 AM (4 years ago)
Author:
ldelgass
Message:

merge r5460 from nanovis trunk

Location:
nanovis/branches/1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.2

  • nanovis/branches/1.2/Unirect.cpp

    r5431 r5461  
    538538                return false;
    539539            }
    540         } else if (sscanf(line, "object %*d class array type %*s shape 3"
    541                 " rank 1 items %d data follows", &npts) == 1) {
     540        } else if (sscanf(line, "object %*d class array type %*s rank 1"
     541                " shape 3 items %d data follows", &npts) == 1) {
    542542            if (npts < 0) {
    543543                ERROR("bad # points %d", npts);
     
    545545            }
    546546            TRACE("#points=%d", npts);
    547             if (npts != nx*ny*nz) {
    548                 ERROR("inconsistent data: expected %d points"
    549                       " but found %d points", nx*ny*nz, npts);
    550                 return false;
    551             }
    552             break;
    553         } else if (sscanf(line, "object %*d class array type %*s rank 0"
    554                 " times %d data follows", &npts) == 1) {
    555547            if (npts != nx*ny*nz) {
    556548                ERROR("inconsistent data: expected %d points"
Note: See TracChangeset for help on using the changeset viewer.