14.04 compile changes

mattjr · Aug 6, 2014 · f8366b3 · f8366b3
1 parent 0c7d8e4
commit f8366b3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/PLYWriterNodeVisitor.cc b/PLYWriterNodeVisitor.cc
@@ -211,7 +211,7 @@ class PrimitiveIndexWriter : public osg::PrimitiveIndexFunctor {
         }
 
         // not sure if this is correct?
-        if(_geo->getNormalBinding() && _geo->getNormalBinding() == osg::Geometry::BIND_PER_PRIMITIVE) ++_normalIndex;
+        //if(_geo->getNormalBinding() && _geo->getNormalBinding() == osg::Geometry::BIND_PER_PRIMITIVE) ++_normalIndex;
     }
 
     // operator for lines
@@ -222,7 +222,7 @@ class PrimitiveIndexWriter : public osg::PrimitiveIndexFunctor {
         write(i2);
         _fout << std::endl;
         // not sure if this is correct?
-        if(_geo->getNormalBinding() && _geo->getNormalBinding() == osg::Geometry::BIND_PER_PRIMITIVE) ++_normalIndex;
+	//  if(_geo->getNormalBinding() && _geo->getNormalBinding() == osg::Geometry::BIND_PER_PRIMITIVE) ++_normalIndex;
     }
 
     // operator for points
@@ -232,7 +232,7 @@ class PrimitiveIndexWriter : public osg::PrimitiveIndexFunctor {
         write(i1);
         _fout << std::endl;
         // not sure if this is correct?
-        if(_geo->getNormalBinding() && _geo->getNormalBinding() == osg::Geometry::BIND_PER_PRIMITIVE) ++_normalIndex;
+	//  if(_geo->getNormalBinding() && _geo->getNormalBinding() == osg::Geometry::BIND_PER_PRIMITIVE) ++_normalIndex;
     }
 
     virtual void begin(GLenum mode)

diff --git a/SiftGPU/src/SiftGPU/CMakeLists.txt b/SiftGPU/src/SiftGPU/CMakeLists.txt
@@ -1,5 +1,10 @@
 find_package(OpenGL REQUIRED)
 find_package(GLUT REQUIRED)
+if( DEFINED GLUT_Xmu_LIBRARY AND NOT GLUT_Xmu_LIBRARY)
+
+ list(REMOVE_ITEM GLUT_LIBRARIES ${GLUT_Xmu_LIBRARY})
+endif()
+
 #find_package(Glew)
 include(../../../FindGlew.cmake)
 FIND_PACKAGE(CUDA)

diff --git a/swrender/Raster.cpp b/swrender/Raster.cpp
@@ -155,7 +155,7 @@ namespace Raster
             return  false;
 
         float denom = 1.0f / d;
-        if (!isfinite(denom)) {
+        if (!std::isfinite(denom)) {
 			return false;
 		}