fly/flightgear
1
0
Fork 0
Code Activity

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

Browse source
This commit is contained in:
Thomas Geymayer 2013-04-29 22:16:29 +02:00
parent 222f2f71ef
commit 952a61424a
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/Canvas/FGCanvasSystemAdapter.cxx
View file

@ -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;
}
/**