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

Updated the plugins so they do the extension checking with a non

Browse Source 
case sensitive comparison.
This commit is contained in:
Robert Osfield
2002-11-14 09:03:31 +00:00
parent e35a6ce097
commit 0980eeda1e
9 changed files with 72 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -305,7 +305,7 @@ class ReaderWriterBMP : public osgDB::ReaderWriter
{
public:
virtual const char* className() { return "BMP Image Reader"; }
virtual bool acceptsExtension(const std::string& extension) { return extension=="bmp"; }
virtual bool acceptsExtension(const std::string& extension) { return osgDB::equalCaseInsensitive(extension,"bmp"); }
virtual ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options*)
{

2
src/osgPlugins/jpeg/ReaderWriterJPEG.cpp
View File

@@ -305,7 +305,7 @@ class ReaderWriterJPEG : public osgDB::ReaderWriter
virtual const char* className() { return "JPEG Image Reader"; }
virtual bool acceptsExtension(const std::string& extension)
{
return osgDB::equalCaseInsensitive(extension,"jpeg");
return osgDB::equalCaseInsensitive(extension,"jpeg") || osgDB::equalCaseInsensitive(extension,"jpg");
}
virtual ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options*)

2
src/osgPlugins/lib3ds/ReaderWriter3DS.cpp
View File

@@ -84,7 +84,7 @@ class ReaderWriter3DS : public osgDB::ReaderWriter
ReaderWriter3DS();
virtual const char* className() { return "3DS Auto Studio Reader"; }
virtual bool acceptsExtension(const std::string& extension) { return extension=="3ds"; }
virtual bool acceptsExtension(const std::string& extension) { return osgDB::equalCaseInsensitive(extension,"3ds"); }
virtual ReadResult readNode(const std::string& fileName, const osgDB::ReaderWriter::Options*);

3
src/osgPlugins/lwo/ReaderWriterLWO.cpp
View File

@@ -28,6 +28,7 @@
#include <osgDB/Registry>
#include <osgDB/ReadFile>
#include <osgDB/FileNameUtils>
#include <osgUtil/SmoothingVisitor>
#include <osgUtil/Tesselator>
@@ -42,7 +43,7 @@ public:
virtual const char* className() { return "Lightwave Object Reader"; }
virtual bool acceptsExtension(const std::string& extension) {
return (extension == "lwo" || extension == "lw" || extension == "geo");
return osgDB::equalCaseInsensitive(extension,"lwo") || osgDB::equalCaseInsensitive(extension,"lw") || osgDB::equalCaseInsensitive(extension,"geo");
}
virtual ReadResult readNode(const std::string& fileName, const osgDB::ReaderWriter::Options* options)

118
src/osgPlugins/pfb/ReaderWriterPFB.cpp
View File

@@ -33,65 +33,65 @@ class ReaderWriterPFB : public osgDB::ReaderWriter
virtual bool acceptsExtension(const std::string& extension)
{
return
extension=="3ds" ? true :
extension=="arcinfo" ? true :
extension=="bin" ? true :
extension=="bpoly" ? true :
extension=="bw" ? true :
extension=="byu" ? true :
extension=="closest" ? true :
extension=="csb" ? true :
extension=="ct" ? true :
extension=="dem" ? true :
extension=="doublerot" ? true :
extension=="doublescale" ? true :
extension=="doubletrans" ? true :
extension=="dted" ? true :
extension=="dwb" ? true :
extension=="dxf" ? true :
extension=="evt" ? true :
extension=="flt" ? true :
extension=="gds" ? true :
extension=="gfo" ? true :
extension=="im" ? true :
extension=="irtp" ? true :
extension=="iv20" ? true :
extension=="iv" ? true :
extension=="lodfix" ? true :
extension=="lsa" ? true :
extension=="lsb" ? true :
extension=="medit" ? true :
extension=="m" ? true :
extension=="nff" ? true :
extension=="obj" ? true :
extension=="pegg" ? true :
extension=="pfb" ? true :
extension=="pfs" ? true :
extension=="phd" ? true :
extension=="poly" ? true :
extension=="post" ? true :
extension=="proc" ? true :
extension=="projtex" ? true :
extension=="pts" ? true :
extension=="rot" ? true :
extension=="scale" ? true :
extension=="sgf" ? true :
extension=="sgo" ? true :
extension=="so" ? true :
extension=="spf" ? true :
extension=="spherepatch3" ? true :
extension=="spherepatch" ? true :
extension=="sphere" ? true :
extension=="sponge" ? true :
extension=="star" ? true :
extension=="stla" ? true :
extension=="stlb" ? true :
extension=="substclip" ? true :
extension=="sv" ? true :
extension=="trans" ? true :
extension=="tri" ? true :
extension=="unc" ? true :
extension=="vct" ? true :
osgDB::equalCaseInsensitive(extension,"3ds") ? true :
osgDB::equalCaseInsensitive(extension,"arcinfo") ? true :
osgDB::equalCaseInsensitive(extension,"bin") ? true :
osgDB::equalCaseInsensitive(extension,"bpoly") ? true :
osgDB::equalCaseInsensitive(extension,"bw") ? true :
osgDB::equalCaseInsensitive(extension,"byu") ? true :
osgDB::equalCaseInsensitive(extension,"closest") ? true :
osgDB::equalCaseInsensitive(extension,"csb") ? true :
osgDB::equalCaseInsensitive(extension,"ct") ? true :
osgDB::equalCaseInsensitive(extension,"dem") ? true :
osgDB::equalCaseInsensitive(extension,"doublerot") ? true :
osgDB::equalCaseInsensitive(extension,"doublescale") ? true :
osgDB::equalCaseInsensitive(extension,"doubletrans") ? true :
osgDB::equalCaseInsensitive(extension,"dted") ? true :
osgDB::equalCaseInsensitive(extension,"dwb") ? true :
osgDB::equalCaseInsensitive(extension,"dxf") ? true :
osgDB::equalCaseInsensitive(extension,"evt") ? true :
osgDB::equalCaseInsensitive(extension,"flt") ? true :
osgDB::equalCaseInsensitive(extension,"gds") ? true :
osgDB::equalCaseInsensitive(extension,"gfo") ? true :
osgDB::equalCaseInsensitive(extension,"im") ? true :
osgDB::equalCaseInsensitive(extension,"irtp") ? true :
osgDB::equalCaseInsensitive(extension,"iv20") ? true :
osgDB::equalCaseInsensitive(extension,"iv") ? true :
osgDB::equalCaseInsensitive(extension,"lodfix") ? true :
osgDB::equalCaseInsensitive(extension,"lsa") ? true :
osgDB::equalCaseInsensitive(extension,"lsb") ? true :
osgDB::equalCaseInsensitive(extension,"medit") ? true :
osgDB::equalCaseInsensitive(extension,"m") ? true :
osgDB::equalCaseInsensitive(extension,"nff") ? true :
osgDB::equalCaseInsensitive(extension,"obj") ? true :
osgDB::equalCaseInsensitive(extension,"pegg") ? true :
osgDB::equalCaseInsensitive(extension,"pfb") ? true :
osgDB::equalCaseInsensitive(extension,"pfs") ? true :
osgDB::equalCaseInsensitive(extension,"phd") ? true :
osgDB::equalCaseInsensitive(extension,"poly") ? true :
osgDB::equalCaseInsensitive(extension,"post") ? true :
osgDB::equalCaseInsensitive(extension,"proc") ? true :
osgDB::equalCaseInsensitive(extension,"projtex") ? true :
osgDB::equalCaseInsensitive(extension,"pts") ? true :
osgDB::equalCaseInsensitive(extension,"rot") ? true :
osgDB::equalCaseInsensitive(extension,"scale") ? true :
osgDB::equalCaseInsensitive(extension,"sgf") ? true :
osgDB::equalCaseInsensitive(extension,"sgo") ? true :
osgDB::equalCaseInsensitive(extension,"so") ? true :
osgDB::equalCaseInsensitive(extension,"spf") ? true :
osgDB::equalCaseInsensitive(extension,"spherepatch3") ? true :
osgDB::equalCaseInsensitive(extension,"spherepatch") ? true :
osgDB::equalCaseInsensitive(extension,"sphere") ? true :
osgDB::equalCaseInsensitive(extension,"sponge") ? true :
osgDB::equalCaseInsensitive(extension,"star") ? true :
osgDB::equalCaseInsensitive(extension,"stla") ? true :
osgDB::equalCaseInsensitive(extension,"stlb") ? true :
osgDB::equalCaseInsensitive(extension,"substclip") ? true :
osgDB::equalCaseInsensitive(extension,"sv") ? true :
osgDB::equalCaseInsensitive(extension,"trans") ? true :
osgDB::equalCaseInsensitive(extension,"tri") ? true :
osgDB::equalCaseInsensitive(extension,"unc") ? true :
osgDB::equalCaseInsensitive(extension,"vct") ? true :
false;
}

3
src/osgPlugins/pic/ReaderWriterPIC.cpp
View File

@@ -4,6 +4,7 @@
#include <osg/GL>
#include <osgDB/Registry>
#include <osgDB/FileNameUtils>
/****************************************************************************
*
@@ -187,7 +188,7 @@ class ReaderWriterPIC : public osgDB::ReaderWriter
{
public:
virtual const char* className() { return "PIC Image Reader"; }
virtual bool acceptsExtension(const std::string& extension) { return extension=="pic"; }
virtual bool acceptsExtension(const std::string& extension) { return osgDB::equalCaseInsensitive(extension,"pic"); }
virtual ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options*)
{

2
src/osgPlugins/png/ReaderWriterPNG.cpp
View File

@@ -31,7 +31,7 @@ class ReaderWriterPNG : public osgDB::ReaderWriter
{
public:
virtual const char* className() { return "PNG Image Reader/Writer"; }
virtual bool acceptsExtension(const std::string& extension) { return extension=="png"; }
virtual bool acceptsExtension(const std::string& extension) { return osgDB::equalCaseInsensitive(extension,"png"); }
virtual ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options*)
{

3
src/osgPlugins/tga/ReaderWriterTGA.cpp
View File

@@ -4,6 +4,7 @@
#include <osg/GL>
#include <osgDB/Registry>
#include <osgDB/FileNameUtils>
#include <stdio.h>
#include <assert.h>
@@ -467,7 +468,7 @@ class ReaderWriterTGA : public osgDB::ReaderWriter
{
public:
virtual const char* className() { return "TGA Image Reader"; }
virtual bool acceptsExtension(const std::string& extension) { return extension=="tga"; }
virtual bool acceptsExtension(const std::string& extension) { return osgDB::equalCaseInsensitive(extension,"tga"); }
virtual ReadResult readImage(const std::string& fileName, const osgDB::ReaderWriter::Options*)
{

5
src/osgPlugins/tiff/ReaderWriterTIFF.cpp
View File

@@ -6,6 +6,7 @@
#include <osg/GL>
#include <osgDB/Registry>
#include <osgDB/FileNameUtils>
#include <stdio.h>
@@ -405,8 +406,8 @@ class ReaderWriterTIFF : public osgDB::ReaderWriter
virtual const char* className() { return "TIFF Image Reader"; }
virtual bool acceptsExtension(const std::string& extension)
{
if( extension == "tiff" ) return true;
if( extension == "tif" ) return true;
if( osgDB::equalCaseInsensitive(extension,"tiff")) return true;
if( osgDB::equalCaseInsensitive(extension,"tif") ) return true;
return false;
}