From 77057d06ab3f03f388bf0203e6e2532b0440715f Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 12 May 2011 18:52:18 +0000 Subject: [PATCH] Warning and build fixes --- include/osg/View | 2 ++ src/osgPlugins/dicom/ReaderWriterDICOM.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/include/osg/View b/include/osg/View index 778d43ec4..2636d2262 100644 --- a/include/osg/View +++ b/include/osg/View @@ -112,6 +112,8 @@ class OSG_EXPORT View : public virtual osg::Object _useMastersSceneData(rhs._useMastersSceneData), _updateSlaveCallback(rhs._updateSlaveCallback) {} + virtual ~Slave() {} + Slave& operator = (const Slave& rhs) { _camera = rhs._camera; diff --git a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp index 5f548f7e8..785ac9eac 100644 --- a/src/osgPlugins/dicom/ReaderWriterDICOM.cpp +++ b/src/osgPlugins/dicom/ReaderWriterDICOM.cpp @@ -283,7 +283,7 @@ class ReaderWriterDICOM : public osgDB::ReaderWriter { getDicomFilesInDirectory(fileName, files); } - else if (isFileADicom(fileName) + else if (isFileADicom(fileName)) { files.push_back(fileName); }