From 976df65bcc94c1b5b14507eee9de6815306a073b Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 22 Sep 2008 15:01:25 +0000 Subject: [PATCH] From Ulrich Hertlein, fixes for OSX build --- src/osg/ImageStream.cpp | 3 ++- src/osg/OperationThread.cpp | 2 +- src/osgVolume/CMakeLists.txt | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/osg/ImageStream.cpp b/src/osg/ImageStream.cpp index af0ec37f3..c5c67a501 100644 --- a/src/osg/ImageStream.cpp +++ b/src/osg/ImageStream.cpp @@ -31,7 +31,8 @@ ImageStream::ImageStream(): ImageStream::ImageStream(const ImageStream& image,const CopyOp& copyop): Image(image,copyop), - _status(image._status) + _status(image._status), + _loopingMode(image._loopingMode) { } diff --git a/src/osg/OperationThread.cpp b/src/osg/OperationThread.cpp index 5fd975ddd..8ba41388c 100644 --- a/src/osg/OperationThread.cpp +++ b/src/osg/OperationThread.cpp @@ -344,7 +344,7 @@ int OperationThread::cancel() #endif // 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 "<