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

Added extension checking to the rgb and bmp write of images.

Browse Source
This commit is contained in:
Robert Osfield
2002-10-18 12:23:42 +00:00
parent d2a3bed549
commit 00fd58283c
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/osgPlugins/bmp/ReaderWriterBMP.cpp
View File

@@ -5,6 +5,7 @@
#include <osg/GL>
#include <osgDB/Registry>
#include <osgDB/FileNameUtils>
/****************************************************************************
*
@@ -309,6 +310,9 @@ class ReaderWriterBMP : public osgDB::ReaderWriter
virtual ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options*)
{
std::string ext = osgDB::getFileExtension(fileName);
if (!acceptsExtension(ext)) return ReadResult::FILE_NOT_HANDLED;
unsigned char *imageData = NULL;
int width_ret;
int height_ret;
@@ -345,6 +349,9 @@ class ReaderWriterBMP : public osgDB::ReaderWriter
}
virtual WriteResult writeImage(const osg::Image &img,const std::string& fileName, const osgDB::ReaderWriter::Options*)
{
std::string ext = osgDB::getFileExtension(fileName);
if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED;
FILE *fp = fopen(fileName.c_str(), "wb");
if (!fp) return WriteResult::ERROR_IN_WRITING_FILE;
// its easier for me to write a binary write using stdio than streams

3
src/osgPlugins/rgb/ReaderWriterRGB.cpp
View File

@@ -366,6 +366,9 @@ class ReaderWriterRGB : public osgDB::ReaderWriter
virtual WriteResult writeImage(const osg::Image &img,const std::string& fileName, const osgDB::ReaderWriter::Options*)
{
std::string ext = osgDB::getFileExtension(fileName);
if (!acceptsExtension(ext)) return WriteResult::FILE_NOT_HANDLED;
FILE *fp = fopen(fileName.c_str(), "wb");
if (!fp) return WriteResult::ERROR_IN_WRITING_FILE;