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

Fixed build with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF

Browse Source
This commit is contained in:
Robert Osfield 2018-03-30 16:34:01 +01:00
parent 9d5a22a0aa
commit d0f7b85ae0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgDB/OutputStream.cpp
View File

@ -69,7 +69,7 @@ OutputStream::OutputStream( const osgDB::Options* options )
if (version > 0 && version <= OPENSCENEGRAPH_SOVERSION)
_targetFileVersion = version;
}
if (_targetFileVersion < 99) _useRobustBinaryFormat = false;
}
@ -463,7 +463,7 @@ void OutputStream::writeImage( const osg::Image* img )
unsigned int id = findOrCreateObjectID( img, newID );
if (_targetFileVersion > 94) *this << PROPERTY("ClassName") << name << std::endl; // Write object name
*this << PROPERTY("UniqueID") << id << std::endl; // Write image ID
if ( getException() ) return;
@ -580,7 +580,7 @@ void OutputStream::writeImage( const osg::Image* img )
case IMAGE_INLINE_FILE:
if ( isBinary() )
{
std::string fullPath = osgDB::findDataFile( img->getFileName(), _options );
std::string fullPath = osgDB::findDataFile( img->getFileName(), _options.get() );
osgDB::ifstream infile( fullPath.c_str(), std::ios::in|std::ios::binary );
if ( infile )
{