FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed build OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION to ON and then fixed all the resulting build errors.

Browse Source
This commit is contained in:
Robert Osfield
2009-06-17 10:39:39 +00:00
parent 7c4225e574
commit ad8f2d8974
17 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/zip/ReaderWriterZIP.cpp
View File

@@ -71,7 +71,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
local_opt->getDatabasePathList().push_front(osgDB::getFilePath(file));
// Now pass through to memory zip handler
rresult = readNode(tmpStrmBuffer,local_opt);
rresult = readNode(tmpStrmBuffer,local_opt.get());
// Clean up options
local_opt->getDatabasePathList().pop_front();
@@ -81,7 +81,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
return rresult;
}
virtual ReadResult readNode(std::istream& fin,const osgDB::Options* options =NULL) const
virtual ReadResult readNode(std::istream& fin,const osgDB::Options* options) const
{
ReadResult result = ReadResult(ReadResult::FILE_NOT_HANDLED);
@@ -145,7 +145,7 @@ class ReaderWriterZIP : public osgDB::ReaderWriter
local_opt->setPluginStringData("STREAM_FILENAME",osgDB::getSimpleFileName(StreamName));
result = rw->readNode(buffer,local_opt);
result = rw->readNode(buffer,local_opt.get());
if (result.validNode())
{
grp->addChild( result.takeNode() );