Changeset 5304 for nanovis


Ignore:
Timestamp:
Apr 24, 2015, 7:34:34 PM (4 years ago)
Author:
ldelgass
Message:

merge r5302:5303 from trunk

Location:
nanovis/branches/1.2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.2

  • nanovis/branches/1.2/Command.cpp

    r4937 r5304  
    12981298    const char *tag = Tcl_GetString(objv[4]);
    12991299
     1300    if (nbytes <= 0) {
     1301        Tcl_AppendResult(interp, "bad # bytes request \"",
     1302                         Tcl_GetString(objv[3]), "\" for \"data follows\"", (char *)NULL);
     1303        ERROR("Bad nbytes %d", nbytes);
     1304        return TCL_ERROR;
     1305    }
     1306
    13001307    Rappture::Buffer buf(nbytes);
    13011308    if (GetDataStream(interp, buf, nbytes) != TCL_OK) {
     
    13331340    } else if ((nBytes > 14) && (strncmp(bytes, "# vtk DataFile", 14) == 0)) {
    13341341        TRACE("VTK loading...");
    1335         if (nBytes <= 0) {
    1336             ERROR("data buffer is empty");
    1337             abort();
    1338         }
    13391342        std::stringstream fdata;
    13401343        fdata.write(bytes, nBytes);
     
    13541357        }
    13551358        TRACE("DX loading...");
    1356         if (nBytes <= 0) {
    1357             ERROR("data buffer is empty");
    1358             abort();
    1359         }
    13601359        std::stringstream fdata;
    13611360        fdata.write(bytes, nBytes);
Note: See TracChangeset for help on using the changeset viewer.