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

Changes for IRIX build

Browse Source
This commit is contained in:
Don BURNS
2004-11-28 23:49:01 +00:00
parent ef18d0f483
commit 860bc59f8e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPlugins/osga/OSGA_Archive.h
View File

@@ -151,7 +151,7 @@ class OSGA_Archive : public osgDB::Archive
/** Functor used in internal implementations.*/
struct ReadFunctor
{
ReadFunctor(const std::string& filename, const ReaderWriter::Options* options):
ReadFunctor(const std::string& filename, const osgDB::ReaderWriter::Options* options):
_filename(filename),
_options(options) {}
@@ -159,7 +159,7 @@ class OSGA_Archive : public osgDB::Archive
virtual osgDB::ReaderWriter::ReadResult doRead(osgDB::ReaderWriter& rw, std::istream& input) const = 0;
std::string _filename;
const ReaderWriter::Options* _options;
const osgDB::ReaderWriter::Options* _options;
};
struct ReadObjectFunctor;
@@ -170,7 +170,7 @@ class OSGA_Archive : public osgDB::Archive
/** Functor used in internal implementations.*/
struct WriteFunctor
{
WriteFunctor(const std::string& filename, const ReaderWriter::Options* options):
WriteFunctor(const std::string& filename, const osgDB::ReaderWriter::Options* options):
_filename(filename),
_options(options) {}
@@ -178,7 +178,7 @@ class OSGA_Archive : public osgDB::Archive
virtual osgDB::ReaderWriter::WriteResult doWrite(osgDB::ReaderWriter& rw, std::ostream& output) const = 0;
std::string _filename;
const ReaderWriter::Options* _options;
const osgDB::ReaderWriter::Options* _options;
};
struct WriteObjectFunctor;
@@ -187,8 +187,8 @@ class OSGA_Archive : public osgDB::Archive
struct WriteNodeFunctor;
ReaderWriter::ReadResult read(const ReadFunctor& readFunctor);
ReaderWriter::WriteResult write(const WriteFunctor& writeFunctor);
osgDB::ReaderWriter::ReadResult read(const ReadFunctor& readFunctor);
osgDB::ReaderWriter::WriteResult write(const WriteFunctor& writeFunctor);
typedef std::list< osg::ref_ptr<IndexBlock> > IndexBlockList;

4
src/osgPlugins/osga/ReaderWriterOSGA.cpp
View File

@@ -58,7 +58,7 @@ public:
if (!result.validArchive()) return result;
osg::ref_ptr<ReaderWriter::Options> local_options = new ReaderWriter::Options;
osg::ref_ptr<osgDB::ReaderWriter::Options> local_options = new osgDB::ReaderWriter::Options;
local_options->setDatabasePath(file);
ReadResult result_2 = result.getArchive()->readImage(result.getArchive()->getMasterFileName(),local_options.get());
@@ -78,7 +78,7 @@ public:
if (!result.validArchive()) return result;
osg::ref_ptr<ReaderWriter::Options> local_options = new ReaderWriter::Options;
osg::ref_ptr<osgDB::ReaderWriter::Options> local_options = new osgDB::ReaderWriter::Options;
local_options->setDatabasePath(file);
ReadResult result_2 = result.getArchive()->readNode(result.getArchive()->getMasterFileName(),local_options.get());