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

From Bryan Thrall, "The osgDB::ReaderWriter and osgDB::ReaderWriter::Options classes have

Browse Source 
copy constructors that take a const osg::CopyOp rather than a
osg::CopyOp&, forcing an unnecessary copy. The attached header fixes
this, based off OSG 1.2.

Also fixed duplicate "or" openArchive()'s comment."
This commit is contained in:
Robert Osfield
2007-01-30 14:18:39 +00:00
parent b8d98a2cfe
commit 35c720420e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osgDB/ReaderWriter
View File

@@ -38,7 +38,7 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object
ReaderWriter() {}
ReaderWriter(const ReaderWriter& rw,const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY):
ReaderWriter(const ReaderWriter& rw,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
osg::Object(rw,copyop) {}
virtual ~ReaderWriter();
@@ -85,7 +85,7 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object
Options():_objectCacheHint(CACHE_ARCHIVES) {}
Options(const std::string& str):_str(str) {}
Options(const Options& options,const osg::CopyOp copyop=osg::CopyOp::SHALLOW_COPY):
Options(const Options& options,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY):
osg::Object(options,copyop),
_str(options._str),
_databasePaths(options._databasePaths),
@@ -219,7 +219,7 @@ class OSGDB_EXPORT ReaderWriter : public osg::Object
CREATE
};
/** open an archive for reading, writing or or to create an empty archive for writing to.*/
/** open an archive for reading, writing, or to create an empty archive for writing to.*/
virtual ReadResult openArchive(const std::string& /*fileName*/,ArchiveStatus, unsigned int =4096, const Options* =NULL) const { return ReadResult(ReadResult::FILE_NOT_HANDLED); }
/** open an archive for reading.*/