Text archives Help

---

Author: bigler
Date: Wed Feb 27 12:01:20 2008
New Revision: 2129

Modified:
   trunk/Model/MiscObjects/KeyFrameAnimation.cc
   trunk/scenes/galileo/CMakeLists.txt
   trunk/scenes/octisovol.cc
Log:
Model/MiscObjects/KeyFrameAnimation.cc
scenes/octisovol.cc

  Quiet cast warnings.

scenes/galileo/CMakeLists.txt

  If using GCC don't use warnings on generated files.


Modified: trunk/Model/MiscObjects/KeyFrameAnimation.cc
==============================================================================
--- trunk/Model/MiscObjects/KeyFrameAnimation.cc        (original)
+++ trunk/Model/MiscObjects/KeyFrameAnimation.cc        Wed Feb 27 12:01:20 
2008
@@ -142,11 +142,11 @@
     {
                frame = (lastFrame+1)%(numFrames);
     }
-    lastFrame = frame;
+    lastFrame = static_cast<int>(frame);
 
     if (interpolation == linear) {
       //do interpolation in parallel
-      int start = static_cast<int>(frame);
+      int start = lastFrame;
       int end   = (start+1) % (numFrames);
       float t = frame - start;
 

Modified: trunk/scenes/galileo/CMakeLists.txt
==============================================================================
--- trunk/scenes/galileo/CMakeLists.txt (original)
+++ trunk/scenes/galileo/CMakeLists.txt Wed Feb 27 12:01:20 2008
@@ -17,6 +17,12 @@
     # This will eliminate the yyunput function that isn't used.
     ADD_DEFINITIONS(-DYY_NO_UNPUT)
     
+    # Stop warnings from these generated files
+    IF   (USING_GCC)
+      SET_SOURCE_FILES_PROPERTIES(${BF_SOURCES}
+        PROPERTIES COMPILE_FLAGS "-w")
+    ENDIF(USING_GCC)
+
     ADD_LIBRARY(scene_galileo galileo.cc ${BF_SOURCES})
     TARGET_LINK_LIBRARIES(scene_galileo ${MANTA_SCENE_LINK})
     

Modified: trunk/scenes/octisovol.cc
==============================================================================
--- trunk/scenes/octisovol.cc   (original)
+++ trunk/scenes/octisovol.cc   Wed Feb 27 12:01:20 2008
@@ -122,7 +122,8 @@
   else if (strcmp(c_buildfrom_filename,"")!=0)
   {
     cerr << "Creating octree volume from original rectilinear grid data." << 
endl;
-    ov = new OctreeVolume(c_buildfrom_filename, tstart, tend, variance, 
kernel_width, (double)isomin, (double)isomax);
+    ov = new OctreeVolume(c_buildfrom_filename, tstart, tend, variance, 
kernel_width,
+                          static_cast<Manta::ST>(isomin), 
static_cast<Manta::ST>(isomax));
   }
   else
   {

---

• [Manta] r2129 - in trunk: Model/MiscObjects scenes scenes/galileo, James Bigler, 02/27/2008

---

Archive powered by MHonArc 2.6.16.