Ignore:
Timestamp:
Dec 22, 2014, 7:18:59 AM (5 years ago)
Author:
ldelgass
Message:

Merge serveral changes from trunk. Does not include threading, world space
changes, etc.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • nanovis/branches/1.1/dxReader.h

    r4889 r4904  
    99#include <iostream>
    1010
    11 namespace Rappture {
    12 class Outcome;
    13 }
    14 
    1511namespace nv {
    1612
     
    1814
    1915extern Volume *
    20 load_dx_volume_stream(Rappture::Outcome& status, const char *tag,
    21                       std::iostream& fin);
     16load_dx_volume_stream(const char *tag, std::iostream& fin);
    2217
    2318}
Note: See TracChangeset for help on using the changeset viewer.