From c2a4825afa92b0dd6207f21fda49da545f851f5d Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 6 Jun 2008 14:59:17 +0000
Subject: [PATCH] From Mathieu Marache, "I have made the logo plugin work again
 (a simple copy and paste problem) and added the path of the logo file (if not
 empty) to the data file path in order to be able to find images relatively."

---
 src/osgPlugins/logo/ReaderWriterLOGO.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/osgPlugins/logo/ReaderWriterLOGO.cpp b/src/osgPlugins/logo/ReaderWriterLOGO.cpp
index 08cb315fe..cb57d26f5 100644
--- a/src/osgPlugins/logo/ReaderWriterLOGO.cpp
+++ b/src/osgPlugins/logo/ReaderWriterLOGO.cpp
@@ -98,8 +98,8 @@ class Logos: public osg::Drawable
             {
                 vx = viewport->x();
                 vy = viewport->y();
-                vx = viewport->width();
-                vy = viewport->height();
+                vw = viewport->width();
+                vh = viewport->height();
             }
 
             glMatrixMode( GL_PROJECTION );
@@ -161,6 +161,8 @@ class Logos: public osg::Drawable
             osg::Image *image = osgDB::readImageFile( name.c_str() );
             if( image != NULL )
                 logos[pos].push_back( image ); 
+            else
+                osg::notify(osg::WARN)<< "Logos::addLogo image file not found : " << name << ".\n";
         }
 
         osg::Viewport *getViewport() { return viewport; }
@@ -209,7 +211,14 @@ class LOGOReaderWriter : public osgDB::ReaderWriter
             if (fileName.empty()) 
                 return ReadResult::FILE_NOT_FOUND;
 
-            osg::notify(osg::INFO)<<   "ReaderWriterLOGO::readNode( "<<fileName.c_str()<<" )\n";
+            osg::notify(osg::INFO)<< "ReaderWriterLOGO::readNode( "<<fileName.c_str()<<" )\n";
+
+            std::string filePath = osgDB::getFilePath(fileName);
+            if (!filePath.empty()) {
+                osg::notify(osg::DEBUG_INFO)<< "Adding : " << filePath << " to the file data path\n";
+                osgDB::getDataFilePathList().push_back(filePath);
+            }
+
 
             osg::Geode *geode = new osg::Geode;