From d0f7b85ae00fff91ddc445ae96eb195c4b1949f5 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 30 Mar 2018 16:34:01 +0100 Subject: [PATCH] Fixed build with OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION set to OFF --- src/osgDB/OutputStream.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgDB/OutputStream.cpp b/src/osgDB/OutputStream.cpp index be625826c..29a29e6f3 100644 --- a/src/osgDB/OutputStream.cpp +++ b/src/osgDB/OutputStream.cpp @@ -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 ) {