From Mathias Froehlich, build fixes

This commit is contained in:
Robert Osfield 2008-10-07 12:31:42 +00:00
parent 8c98220878
commit ff8c6aa32b
5 changed files with 5 additions and 4 deletions

View File

@ -62,7 +62,7 @@ class OSGSHADOW_EXPORT MinimalShadowMap : public StandardShadowMap
EMPTY_BOX,
BOUNDING_SPHERE,
BOUNDING_BOX,
DEFAULT_ACCURACY = BOUNDING_BOX,
DEFAULT_ACCURACY = BOUNDING_BOX
};
void setShadowReceivingCoarseBoundAccuracy

View File

@ -1630,7 +1630,7 @@ void DatabasePager::compileGLObjects(osg::State& state, double& availableTime)
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_dataToCompileList->_requestMutex);
// advance to the next entry to compile if one is available.
databaseRequest = _dataToCompileList->_requestList.empty() ? 0 : _dataToCompileList->_requestList.front();
databaseRequest = _dataToCompileList->_requestList.empty() ? 0 : _dataToCompileList->_requestList.front().get();
};
unsigned int numObjectsCompiled = 0;

View File

@ -561,7 +561,7 @@ bool OSGA_Archive::addFileReference(pos_type position, size_type size, const std
// get an IndexBlock with space available if possible
unsigned int blockSize = 4096;
osg::ref_ptr<IndexBlock> indexBlock = _indexBlockList.empty() ? 0 : _indexBlockList.back();
osg::ref_ptr<IndexBlock> indexBlock = _indexBlockList.empty() ? 0 : _indexBlockList.back().get();
osg::ref_ptr<IndexBlock> previousBlock = indexBlock;
if (indexBlock.valid())
{

View File

@ -204,7 +204,7 @@ void LightPointNode::traverse(osg::NodeVisitor& nv)
// as this will be our special light point drawable.
osgUtil::StateGraph::LeafList::iterator litr;
for(litr = rg->_leaves.begin();
litr != rg->_leaves.end() && (*litr)->_drawable!=drawable;
litr != rg->_leaves.end() && (*litr)->_drawable.get()!=drawable;
++litr)
{}

View File

@ -12,6 +12,7 @@
*/
#include <float.h>
#include <string.h>
#include <osg/Math>
#include <osg/Notify>
#include <osgVolume/ImageUtils>