Allow Canvas to also read images with absolute paths (if allowed by IOrules)

diff --git a/src/Canvas/FGCanvasSystemAdapter.cxx b/src/Canvas/FGCanvasSystemAdapter.cxx
index c91c5d17caf754e2f6dfb46d4af6ed0e0a5beef6..576e859b1cecdbc3b5e5b014bc04235550a8fa6a 100644 (file)
--- a/src/Canvas/FGCanvasSystemAdapter.cxx
+++ b/src/Canvas/FGCanvasSystemAdapter.cxx
@@ -19,6 +19,7 @@
 #include "FGCanvasSystemAdapter.hxx"
 
 #include <Main/globals.hxx>
+#include <Main/util.hxx>
 #include <Scripting/NasalSys.hxx>
 #include <Viewer/renderer.hxx>
 
@@ -77,14 +78,24 @@ namespace canvas
   //----------------------------------------------------------------------------
   osg::Image* FGCanvasSystemAdapter::getImage(const std::string& path) const
   {
-    SGPath tpath = globals->resolve_resource_path(path);
-    if( tpath.isNull() || !tpath.exists() )
+    if( SGPath(path).isAbsolute() )
     {
-      SG_LOG(SG_GL, SG_ALERT, "canvas::Image: No such image: " << path);
-      return 0;
+      const char* valid_path = fgValidatePath(path.c_str(), false);
+      if( valid_path )
+        return osgDB::readImageFile(valid_path);
+
+      SG_LOG(SG_IO, SG_ALERT, "canvas::Image: reading '" << path << "' denied");
+    }
+    else
+    {
+      SGPath tpath = globals->resolve_resource_path(path);
+      if( !tpath.isNull() )
+        return osgDB::readImageFile(tpath.c_str());
+
+      SG_LOG(SG_IO, SG_ALERT, "canvas::Image: No such image: '" << path << "'");
     }
 
-    return osgDB::readImageFile(tpath.c_str());
+    return 0;
   }
 
   /**