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

Revert "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 
as this submission was meant for the master only, not the binary compatible 3.4 branch.

This reverts commit df97a18a5754ed39ac43044ad9557e8409790ff3.
This commit is contained in:
Robert Osfield
2016-01-25 12:18:32 +00:00
parent e798db04c8
commit bf1aa5088e
8 changed files with 105 additions and 99 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.success())
if (rr.error())
{
OSG_WARN << rr.statusMessage() << std::endl;
OSG_WARN << rr.message() << 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.success())
if (rr.error())
{
OSG_WARN << rr.statusMessage() << std::endl;
OSG_WARN << rr.message() << std::endl;
return 0;
}
if (!rr.validObject()) return 0;