diff --git a/src/osgPlugins/ive/DataInputStream.cpp b/src/osgPlugins/ive/DataInputStream.cpp index 2763a2a31..7406014dc 100644 --- a/src/osgPlugins/ive/DataInputStream.cpp +++ b/src/osgPlugins/ive/DataInputStream.cpp @@ -155,7 +155,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite if (_options.get()) { setLoadExternalReferenceFiles(_options->getOptionString().find("noLoadExternalReferenceFiles")==std::string::npos); - OSG_NOTIFY(osg::DEBUG_INFO) << "ive::DataInputStream.setLoadExternalReferenceFiles()=" << getLoadExternalReferenceFiles() << std::endl; + OSG_DEBUG << "ive::DataInputStream.setLoadExternalReferenceFiles()=" << getLoadExternalReferenceFiles() << std::endl; } if(!istream){ @@ -169,7 +169,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite if ( endianType != OPPOSITE_ENDIAN_TYPE ) { throwException("DataInputStream::DataInputStream(): This file has an unreadable endian type.") ; } - OSG_NOTIFY(osg::INFO)<<"DataInputStream::DataInputStream: Reading a byteswapped file" << std::endl ; + OSG_INFO<<"DataInputStream::DataInputStream: Reading a byteswapped file" << std::endl ; _byteswap = 1 ; } @@ -186,7 +186,7 @@ DataInputStream::DataInputStream(std::istream* istream, const osgDB::ReaderWrite if (compressionLevel>0) { - OSG_NOTIFY(osg::INFO)<<"compressed ive stream"<0) { - OSG_NOTIFY(osg::NOTICE) << "Compression not supported in this .ive version." << std::endl; + OSG_NOTICE << "Compression not supported in this .ive version." << std::endl; _compressionLevel = 0; } #endif @@ -298,7 +298,7 @@ bool DataOutputStream::compress(std::ostream& fout, const std::string& source) c if (ret == Z_STREAM_ERROR) { - OSG_NOTIFY(osg::NOTICE)<<"Z_STREAM_ERROR"<max_error_short) max_error_short = error_short; } - OSG_NOTIFY(osg::DEBUG_INFO)<<"maxError "<writeInt(r()); - OSG_NOTIFY(osg::DEBUG_INFO) << "image written '" << getFileName()<<"'\t"<writeInt(getInternalTextureFormat()); diff --git a/src/osgPlugins/ive/ReaderWriterIVE.cpp b/src/osgPlugins/ive/ReaderWriterIVE.cpp index cd7ba35b9..f2f661df3 100644 --- a/src/osgPlugins/ive/ReaderWriterIVE.cpp +++ b/src/osgPlugins/ive/ReaderWriterIVE.cpp @@ -165,7 +165,7 @@ class ReaderWriterIVE : public ReaderWriter if (fout.fail()) return WriteResult::ERROR_IN_WRITING_FILE; if (out.getException()) { - osg::notify(osg::WARN)<<"Error writing IVE image: "<< out.getException()->getError() << std::endl; + OSG_WARN<<"Error writing IVE image: "<< out.getException()->getError() << std::endl; return WriteResult::FILE_NOT_HANDLED; } return WriteResult::FILE_SAVED; @@ -180,7 +180,7 @@ class ReaderWriterIVE : public ReaderWriter if ( fout.fail() ) return WriteResult::ERROR_IN_WRITING_FILE; if (out.getException()) { - osg::notify(osg::WARN)<<"Error writing IVE image: "<< out.getException()->getError() << std::endl; + OSG_WARN<<"Error writing IVE image: "<< out.getException()->getError() << std::endl; return WriteResult::FILE_NOT_HANDLED; } diff --git a/src/osgPlugins/ive/TerrainTile.cpp b/src/osgPlugins/ive/TerrainTile.cpp index c3ef17b22..943a7a93e 100644 --- a/src/osgPlugins/ive/TerrainTile.cpp +++ b/src/osgPlugins/ive/TerrainTile.cpp @@ -102,7 +102,7 @@ void TerrainTile::read(DataInputStream* in) int y = in->readInt(); setTileID(osgTerrain::TileID(level,x,y)); - // osg::notify(osg::NOTICE)<<"Read TileID("<getVersion() >= VERSION_0023) diff --git a/src/osgPlugins/ive/Uniform.cpp b/src/osgPlugins/ive/Uniform.cpp index 80e17d098..2cc9905d6 100644 --- a/src/osgPlugins/ive/Uniform.cpp +++ b/src/osgPlugins/ive/Uniform.cpp @@ -134,7 +134,7 @@ void Uniform::write(DataOutputStream* out){ } default: { - OSG_NOTIFY(osg::WARN)<<"Warning : uniform "<