diff --git a/src/osgPlugins/scale/ReaderWriterSCALE.cpp b/src/osgPlugins/scale/ReaderWriterSCALE.cpp index 127aca04b..54508c1fd 100644 --- a/src/osgPlugins/scale/ReaderWriterSCALE.cpp +++ b/src/osgPlugins/scale/ReaderWriterSCALE.cpp @@ -51,7 +51,7 @@ static bool getFilenameAndParams(const std::string& input, std::string& filename params = input.substr(pos+1, std::string::npos ); if( params.empty() ) { - osg::notify(osg::WARN) << "Missing parameters for " EXTENSION_NAME " pseudo-loader" << std::endl; + OSG_WARN << "Missing parameters for " EXTENSION_NAME " pseudo-loader" << std::endl; return false; } @@ -114,7 +114,7 @@ public: if( !acceptsExtension(ext) ) return ReadResult::FILE_NOT_HANDLED; - osg::notify(osg::INFO) << "ReaderWriterSCALE( \"" << fileName << "\" )" << std::endl; + OSG_INFO << "ReaderWriterSCALE( \"" << fileName << "\" )" << std::endl; // strip the pseudo-loader extension std::string tmpName = osgDB::getNameLessExtension( fileName ); @@ -130,12 +130,12 @@ public: if( subFileName.empty()) { - osg::notify(osg::WARN) << "Missing subfilename for " EXTENSION_NAME " pseudo-loader" << std::endl; + OSG_WARN << "Missing subfilename for " EXTENSION_NAME " pseudo-loader" << std::endl; return ReadResult::FILE_NOT_HANDLED; } - osg::notify(osg::INFO) << " params = \"" << params << "\"" << std::endl; - osg::notify(osg::INFO) << " subFileName = \"" << subFileName << "\"" << std::endl; + OSG_INFO << " params = \"" << params << "\"" << std::endl; + OSG_INFO << " subFileName = \"" << subFileName << "\"" << std::endl; float sx, sy, sz; int count = sscanf( params.c_str(), "%f,%f,%f", &sx, &sy, &sz ); @@ -147,7 +147,7 @@ public: } else if( count != 3 ) { - osg::notify(osg::WARN) << "Bad parameters for " EXTENSION_NAME " pseudo-loader: \"" << params << "\"" << std::endl; + OSG_WARN << "Bad parameters for " EXTENSION_NAME " pseudo-loader: \"" << params << "\"" << std::endl; return ReadResult::FILE_NOT_HANDLED; } @@ -156,7 +156,7 @@ public: if( !node ) { // propagate the read failure upwards - osg::notify(osg::WARN) << "Subfile \"" << subFileName << "\" could not be loaded" << std::endl; + OSG_WARN << "Subfile \"" << subFileName << "\" could not be loaded" << std::endl; return ReadResult::FILE_NOT_HANDLED; }