FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added support into passing the ReaderWriter::Options structure onto readImageFile

Browse Source
This commit is contained in:
Robert Osfield
2005-02-11 10:00:50 +00:00
parent 6747e6ff1f
commit 192daa0408
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgPlugins/ive/DataInputStream.cpp
View File

@@ -617,7 +617,7 @@ osg::Image* DataInputStream::readImage(std::string filename)
// Image is not in list.
// Read it from disk,
osg::Image* image = osgDB::readImageFile(filename.c_str());
osg::Image* image = osgDB::readImageFile(filename.c_str(),_options.get());
// add it to the imageList,
_imageMap[filename] = image;

20
src/osgPlugins/ive/ReaderWriterIVE.cpp
View File

@@ -36,7 +36,7 @@ class IVEReaderWriter : public ReaderWriter
// code for setting up the database path so that internally referenced file are searched for on relative paths.
osg::ref_ptr<Options> local_opt = options ? static_cast<Options*>(options->clone(osg::CopyOp::SHALLOW_COPY)) : new Options;
local_opt->setDatabasePath(osgDB::getFilePath(fileName));
std::ifstream istream(fileName.c_str(), std::ios::in | std::ios::binary);
return readNode(istream,local_opt.get());
}
@@ -48,24 +48,18 @@ class IVEReaderWriter : public ReaderWriter
virtual ReadResult readNode(std::istream& fin, const Options* options) const
{
#define IVE_CATCH_EXCEPTIONS
#ifdef IVE_CATCH_EXCEPTIONS
try{
#endif
try{
// Create datainputstream.
ive::DataInputStream in(&fin);
in.setOptions(options);
return in.readNode();
#ifdef IVE_CATCH_EXCEPTIONS
}
catch(ive::Exception e)
}
catch(ive::Exception e)
{
std::cout<<"Error reading file: "<< e.getError()<<std::endl;
return ReadResult::FILE_NOT_HANDLED;
}
return 0;
#endif
osg::notify(osg::NOTICE)<<"Error reading file: "<< e.getError()<<std::endl;
return ReadResult::FILE_NOT_HANDLED;
}
}