Changeset 4894 for nanovis


Ignore:
Timestamp:
Dec 20, 2014, 4:00:49 PM (4 years ago)
Author:
ldelgass
Message:

sync with release branch

Location:
nanovis/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • nanovis/trunk/Command.cpp

    r4880 r4894  
    6666#include "HeightMap.h"
    6767#include "Camera.h"
     68#include "ZincBlendeVolume.h"
    6869#include "ZincBlendeReconstructor.h"
    6970#include "OrientationIndicator.h"
     
    12911292    if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
    12921293        TRACE("ZincBlende Stream loading...");
    1293         volume = (Volume *)ZincBlendeReconstructor::getInstance()->loadFromMemory(bytes);
     1294        volume = ZincBlendeReconstructor::getInstance()->loadFromMemory(bytes);
    12941295        if (volume == NULL) {
    12951296            Tcl_AppendResult(interp, "can't get volume instance", (char *)NULL);
     
    13641365        char info[1024];
    13651366        int cmdLength =
    1366             sprintf(info, "nv>data tag %s min %g max %g vmin %g vmax %g\n", tag, 
     1367            sprintf(info, "nv>data tag %s min %g max %g vmin %g vmax %g\n", tag,
    13671368                    volume->wAxis.min(), volume->wAxis.max(),
    13681369                    Volume::valueMin, Volume::valueMax);
     
    18531854    return (*proc) (clientData, interp, objc, objv);
    18541855}
    1855 
    18561856
    18571857static int
  • nanovis/trunk/LIC.cpp

    r4167 r4894  
    44 *
    55 *  Authors:
     6 *    Insoo Woo <iwoo@purdue.edu>
    67 *    Wei Qiao <qiaow@purdue.edu>
    78 */
  • nanovis/trunk/ZincBlendeReconstructor.cpp

    r4063 r4894  
    66 *   Insoo Woo <iwoo@purdue.edu>
    77 */
    8 #include <stdio.h>
    9 #include <string.h>
    10 #include <stdlib.h>
     8#include <cstdio>
     9#include <cstring>
     10#include <cstdlib>
     11#include <fstream>
    1112
    1213#include <vrmath/Vector3f.h>
  • nanovis/trunk/ZincBlendeReconstructor.h

    r4063 r4894  
    99#define NV_ZINC_BLENDE_RECONSTRUCTOR_H
    1010
    11 #include <stdio.h>
    12 #include <ostream>
    13 #include <sstream>
    14 #include <fstream>
     11#include <istream>
    1512
    1613#include <vrmath/Vector3f.h>
Note: See TracChangeset for help on using the changeset viewer.