Changeset 11491 for OpenSceneGraph/trunk/src/osgPlugins/Inventor/ReaderWriterIV.cpp

Timestamp:

05/28/10 18:25:41 (3 years ago)

Author:

robert

Message:

Converted osg::notify to OSG_INFO etc.

Files:

• OpenSceneGraph/trunk/src/osgPlugins/Inventor/ReaderWriterIV.cpp (modified) (6 diffs)

OpenSceneGraph/trunk/src/osgPlugins/Inventor/ReaderWriterIV.cpp

@@ -99 +99 @@
     if (result.success()) {
         if (fileName.length())
-            osg::notify(osg::NOTICE) << "osgDB::ReaderWriterIV::readNode() "
+        {
+            OSG_NOTICE << "osgDB::ReaderWriterIV::readNode() "
                       << "File " << fileName.data()
                       << " loaded successfully." << std::endl;
+        }
         else
-            osg::notify(osg::NOTICE) << "osgDB::ReaderWriterIV::readNode() "
+        {
+            OSG_NOTICE << "osgDB::ReaderWriterIV::readNode() "
                       << "Stream loaded successfully." << std::endl;
+        }
     } else {
         if (fileName.length())
-            osg::notify(osg::WARN) << "osgDB::ReaderWriterIV::readNode() "
+        {
+            OSG_WARN << "osgDB::ReaderWriterIV::readNode() "
                       << "Failed to load file " << fileName.data()
                       << "." << std::endl;
+        }
         else
-            osg::notify(osg::WARN) << "osgDB::ReaderWriterIV::readNode() "
+        {
+            OSG_WARN << "osgDB::ReaderWriterIV::readNode() "
                   << "Failed to load stream." << std::endl;
+        }
     }
 
@@ -133 +141 @@
 
     // Notify
-    osg::notify(osg::NOTICE) << "osgDB::ReaderWriterIV::readNode() Reading file "
+    OSG_NOTICE << "osgDB::ReaderWriterIV::readNode() Reading file "
                              << fileName.data() << std::endl;
-    osg::notify(osg::INFO) << "osgDB::ReaderWriterIV::readNode() Inventor version: "
+    OSG_INFO << "osgDB::ReaderWriterIV::readNode() Inventor version: "
                            << SoDB::getVersion() << std::endl;
 
@@ -142 +150 @@
     if (!input.openFile(fileName.data()))
     {
-        osg::notify(osg::WARN) << "osgDB::ReaderWriterIV::readIVFile() "
+        OSG_WARN << "osgDB::ReaderWriterIV::readIVFile() "
                                << "Cannot open file " << fileName << std::endl;
         return ReadResult::ERROR_IN_READING_FILE;
@@ -157 +165 @@
 {
     // Notify
-    osg::notify(osg::NOTICE) << "osgDB::ReaderWriterIV::readNode() "
+    OSG_NOTICE << "osgDB::ReaderWriterIV::readNode() "
               "Reading from stream." << std::endl;
-    osg::notify(osg::INFO) << "osgDB::ReaderWriterIV::readNode() "
+    OSG_INFO << "osgDB::ReaderWriterIV::readNode() "
               "Inventor version: " << SoDB::getVersion() << std::endl;
 
@@ -189 +197 @@
     }
     input.setBuffer(buf, dataSize);
-    osg::notify(osg::INFO) << "osgDB::ReaderWriterIV::readNode() "
+    OSG_INFO << "osgDB::ReaderWriterIV::readNode() "
               "Stream size: " << dataSize << std::endl;
 
@@ -212 +220 @@
     bool useVRML1 = !isInventorExtension(osgDB::getFileExtension(fileName));
 
-    osg::notify(osg::NOTICE) << "osgDB::ReaderWriterIV::writeNode() Writing file "
+    OSG_NOTICE << "osgDB::ReaderWriterIV::writeNode() Writing file "
                              << fileName.data() << std::endl;