Changeset 4894 for nanovis/trunk

Timestamp:

Dec 20, 2014 1:00:49 PM (9 years ago)

Author:

ldelgass

Message:

sync with release branch

Location:

nanovis/trunk

Files:

• Command.cpp (modified) (4 diffs)
• LIC.cpp (modified) (1 diff)
• ZincBlendeReconstructor.cpp (modified) (1 diff)
• ZincBlendeReconstructor.h (modified) (1 diff)

nanovis/trunk/Command.cpp

@@ -66 +66 @@
 #include "HeightMap.h"
 #include "Camera.h"
+#include "ZincBlendeVolume.h"
 #include "ZincBlendeReconstructor.h"
 #include "OrientationIndicator.h"
@@ -1291 +1292 @@
     if ((nBytes > 5) && (strncmp(bytes, "<HDR>", 5) == 0)) {
         TRACE("ZincBlende Stream loading...");
-        volume = (Volume *)ZincBlendeReconstructor::getInstance()->loadFromMemory(bytes);
+        volume = ZincBlendeReconstructor::getInstance()->loadFromMemory(bytes);
         if (volume == NULL) {
             Tcl_AppendResult(interp, "can't get volume instance", (char *)NULL);
@@ -1364 +1365 @@
         char info[1024];
         int cmdLength =
-            sprintf(info, "nv>data tag %s min %g max %g vmin %g vmax %g\n", tag, 
+            sprintf(info, "nv>data tag %s min %g max %g vmin %g vmax %g\n", tag,
                     volume->wAxis.min(), volume->wAxis.max(),
                     Volume::valueMin, Volume::valueMax);
@@ -1853 +1854 @@
     return (*proc) (clientData, interp, objc, objv);
 }
-
 
 static int

nanovis/trunk/LIC.cpp

@@ -4 +4 @@
  *
  *  Authors:
+ *    Insoo Woo <iwoo@purdue.edu>
  *    Wei Qiao <qiaow@purdue.edu>
  */

nanovis/trunk/ZincBlendeReconstructor.cpp

@@ -6 +6 @@
  *   Insoo Woo <iwoo@purdue.edu>
  */
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstring>
+#include <cstdlib>
+#include <fstream>
 
 #include <vrmath/Vector3f.h>

nanovis/trunk/ZincBlendeReconstructor.h

@@ -9 +9 @@
 #define NV_ZINC_BLENDE_RECONSTRUCTOR_H
 
-#include <stdio.h>
-#include <ostream>
-#include <sstream>
-#include <fstream>
+#include <istream>
 
 #include <vrmath/Vector3f.h>