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

From Jannik Heller and Robert Osfield, introduced ReadResult/WriteResult::statusMessage() method that creates a std::string from the stutus value and message string.

Browse Source
This commit is contained in:
Robert Osfield
2016-01-19 17:39:03 +00:00
parent 845bb6aceb
commit ff1051a6fd
8 changed files with 99 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgText/Font.cpp
View File

@@ -151,9 +151,9 @@ osgText::Font* osgText::readFontStream(std::istream& stream, const osgDB::Reader
osgDB::ReaderWriter *reader = osgDB::Registry::instance()->getReaderWriterForExtension("ttf");
if (reader == 0) return 0;
osgDB::ReaderWriter::ReadResult rr = reader->readObject(stream, userOptions ? userOptions : localOptions.get());
if (rr.error())
if (!rr.success())
{
OSG_WARN << rr.message() << std::endl;
OSG_WARN << rr.statusMessage() << std::endl;
return 0;
}
if (!rr.validObject()) return 0;
@@ -211,9 +211,9 @@ osg::ref_ptr<Font> osgText::readRefFontStream(std::istream& stream, const osgDB:
osgDB::ReaderWriter *reader = osgDB::Registry::instance()->getReaderWriterForExtension("ttf");
if (reader == 0) return 0;
osgDB::ReaderWriter::ReadResult rr = reader->readObject(stream, userOptions ? userOptions : localOptions.get());
if (rr.error())
if (!rr.success())
{
OSG_WARN << rr.message() << std::endl;
OSG_WARN << rr.statusMessage() << std::endl;
return 0;
}
if (!rr.validObject()) return 0;