Changeset 8915

Timestamp:

09/22/08 17:01:25 (5 years ago)

Author:

robert

Message:

From Ulrich Hertlein, fixes for OSX build

Location:

OpenSceneGraph/trunk/src

Files:

• osg/ImageStream.cpp (modified) (1 diff)
• osg/OperationThread.cpp (modified) (1 diff)
• osgVolume/CMakeLists.txt (modified) (1 diff)

OpenSceneGraph/trunk/src/osg/ImageStream.cpp

@@ -32 +32 @@
 ImageStream::ImageStream(const ImageStream& image,const CopyOp& copyop):
     Image(image,copyop),
-    _status(image._status)
+    _status(image._status),
+    _loopingMode(image._loopingMode)
 {
 }

OpenSceneGraph/trunk/src/osg/OperationThread.cpp

@@ -345 +345 @@
             // commenting out debug info as it was cashing crash on exit, presumable
             // due to osg::notify or std::cout destructing earlier than this destructor.
-            osg::notify(osg::INFO)<<"   Waiting for OperationThread to cancel "<<this<<std::endl;
+            osg::notify(osg::DEBUG_INFO)<<"   Waiting for OperationThread to cancel "<<this<<std::endl;
             OpenThreads::Thread::YieldCurrentThread();
         }

OpenSceneGraph/trunk/src/osgVolume/CMakeLists.txt

@@ -31 +31 @@
 SET(TARGET_LIBRARIES_VARS FREETYPE_LIBRARY )
 LINK_INTERNAL(${LIB_NAME}     
+    osgUtil
     osgDB
     osg