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

Fixed warnings

Browse Source
This commit is contained in:
Robert Osfield
2008-12-18 11:54:34 +00:00
parent 4ad20a413a
commit 666a55c0a0
10 changed files with 46 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/osgPlugins/dicom/ReaderWriterDICOM.cpp
View File

@@ -235,7 +235,7 @@ class ReaderWriterDICOM : public osgDB::ReaderWriter
#ifdef USE_DCMTK
void convertPixelTypes(const DiPixel* pixelData,
EP_Representation& pixelRep, unsigned int& numPlanes,
EP_Representation& pixelRep, int& numPlanes,
GLenum& dataType, GLenum& pixelFormat, unsigned int& pixelSize) const
{
dataType = GL_UNSIGNED_BYTE;
@@ -362,11 +362,10 @@ class ReaderWriterDICOM : public osgDB::ReaderWriter
osg::ref_ptr<osg::Image> image;
unsigned int imageNum = 0;
EP_Representation pixelRep;
unsigned int numPlanes = 0;
int numPlanes = 0;
GLenum pixelFormat = 0;
GLenum dataType = 0;
unsigned int pixelSize = 0;
bool invertOrigiantion = false;
typedef std::list<FileInfo> FileInfoList;
FileInfoList fileInfoList;
@@ -576,7 +575,7 @@ class ReaderWriterDICOM : public osgDB::ReaderWriter
osg::ref_ptr<osg::Image> imageAdapter = new osg::Image;
EP_Representation curr_pixelRep;
unsigned int curr_numPlanes;
int curr_numPlanes;
GLenum curr_pixelFormat;
GLenum curr_dataType;
unsigned int curr_pixelSize;
@@ -619,7 +618,8 @@ class ReaderWriterDICOM : public osgDB::ReaderWriter
notice()<<"Image dimensions = "<<image->s()<<", "<<image->t()<<", "<<image->r()<<" pixelFormat=0x"<<std::hex<<pixelFormat<<" dataType=0x"<<std::hex<<dataType<<std::endl;
}
else if (pixelData->getPlanes()>numPlanes || pixelData->getRepresentation()>pixelRep)
else if (pixelData->getPlanes()>numPlanes ||
pixelData->getRepresentation()>pixelRep)
{
notice()<<"Need to reallocated "<<image->s()<<", "<<image->t()<<", "<<image->r()<<std::endl;
@@ -696,6 +696,8 @@ class ReaderWriterDICOM : public osgDB::ReaderWriter
sliceThickness = rhs.sliceThickness;
numSlices = rhs.numSlices;
distance = rhs.distance;
return *this;
}
std::string filename;

43
src/osgPlugins/gif/ReaderWriterGIF.cpp
View File

@@ -64,13 +64,18 @@ extern "C"
class GifImageStream : public osg::ImageStream, public OpenThreads::Thread
{
public:
GifImageStream()
: _length(0), _dataNum(0), _frameNum(0),
_done(false), _currentLength(0), _multiplier(1.0),
osg::ImageStream()
GifImageStream() :
osg::ImageStream(),
_multiplier(1.0),
_currentLength(0),
_length(0),
_frameNum(0),
_dataNum(0),
_done(false)
{
_status=PAUSED;
}
virtual Object* clone() const { return new GifImageStream; }
virtual bool isSameKindAs( const Object* obj ) const
{ return dynamic_cast<const GifImageStream*>(obj) != NULL; }
@@ -182,13 +187,10 @@ public:
return;
}
_s = ss;
_t = tt;
_r = rr;
_internalFormat = numComponents;
_dataType = GL_UNSIGNED_BYTE;
GLint internalFormat = numComponents;
GLenum dataType = GL_UNSIGNED_BYTE;
_pixelFormat =
GLenum pixelFormat =
numComponents == 1 ? GL_LUMINANCE :
numComponents == 2 ? GL_LUMINANCE_ALPHA :
numComponents == 3 ? GL_RGB :
@@ -197,7 +199,7 @@ public:
if ( _dataList.empty() )
{
// Set image texture for the first time
setImage(_s,_t,_r,_internalFormat,_pixelFormat,_dataType,
setImage(ss, tt, rr, internalFormat, pixelFormat, dataType,
imgData,osg::Image::NO_DELETE,1);
}
@@ -222,7 +224,7 @@ protected:
if ( *_dataIter )
{
unsigned char* image = (*_dataIter)->data;
setImage(_s,_t,_r,_internalFormat,_pixelFormat,_dataType,
setImage(_s,_t,_r,_internalTextureFormat,_pixelFormat,_dataType,
image,osg::Image::NO_DELETE,1);
dirty();
}
@@ -241,22 +243,15 @@ protected:
}
}
double _multiplier;
unsigned int _currentLength;
unsigned int _length;
double _multiplier;
unsigned int _currentLength;
unsigned int _length;
unsigned int _frameNum;
unsigned int _dataNum;
unsigned int _frameNum;
unsigned int _dataNum;
std::vector<FrameData*> _dataList;
std::vector<FrameData*>::iterator _dataIter;
int _s;
int _t;
int _r;
int _internalFormat;
unsigned int _pixelFormat;
unsigned int _dataType;
bool _done;
OpenThreads::Mutex _mutex;
};

3
src/osgPlugins/osg/ImageSequence.cpp
View File

@@ -27,9 +27,6 @@ bool ImageSequence_readLocalData(Object& obj, Input& fr)
ImageSequence& is = static_cast<ImageSequence&>(obj);
unsigned int numFilesToPreLoad = 1;
std::string modeStr;
if (fr.read("Mode",modeStr))
{

4
src/osgPlugins/osg/StateAttribute.cpp
View File

@@ -32,7 +32,7 @@ bool StateAttribute_readLocalData(Object& obj, Input& fr)
static ref_ptr<StateAttribute::Callback> s_callback = new osg::StateAttribute::Callback;
while (fr.matchSequence("UpdateCallback {"))
{
int entry = fr[0].getNoNestedBrackets();
//int entry = fr[0].getNoNestedBrackets();
fr += 2;
StateAttribute::Callback* callback = dynamic_cast<StateAttribute::Callback*>(fr.readObjectOfType(*s_callback));
if (callback) {
@@ -43,7 +43,7 @@ bool StateAttribute_readLocalData(Object& obj, Input& fr)
while (fr.matchSequence("EventCallback {"))
{
int entry = fr[0].getNoNestedBrackets();
//int entry = fr[0].getNoNestedBrackets();
fr += 2;
StateAttribute::Callback* callback = dynamic_cast<StateAttribute::Callback*>(fr.readObjectOfType(*s_callback));
if (callback) {

4
src/osgPlugins/osg/StateSet.cpp
View File

@@ -337,7 +337,7 @@ bool StateSet_readLocalData(Object& obj, Input& fr)
static ref_ptr<StateSet::Callback> s_callback = new osg::StateSet::Callback;
while (fr.matchSequence("UpdateCallback {"))
{
int entry = fr[0].getNoNestedBrackets();
// int entry = fr[0].getNoNestedBrackets();
fr += 2;
StateSet::Callback* callback = dynamic_cast<StateSet::Callback*>(fr.readObjectOfType(*s_callback));
if (callback) {
@@ -348,7 +348,7 @@ bool StateSet_readLocalData(Object& obj, Input& fr)
while (fr.matchSequence("EventCallback {"))
{
int entry = fr[0].getNoNestedBrackets();
//int entry = fr[0].getNoNestedBrackets();
fr += 2;
StateSet::Callback* callback = dynamic_cast<StateSet::Callback*>(fr.readObjectOfType(*s_callback));
if (callback) {

4
src/osgPlugins/osg/Uniform.cpp
View File

@@ -212,7 +212,7 @@ bool Uniform_readLocalData(Object& obj, Input& fr)
static ref_ptr<Uniform::Callback> s_callback = new osg::Uniform::Callback;
while (fr.matchSequence("UpdateCallback {"))
{
int entry = fr[0].getNoNestedBrackets();
//int entry = fr[0].getNoNestedBrackets();
fr += 2;
Uniform::Callback* callback = dynamic_cast<Uniform::Callback*>(fr.readObjectOfType(*s_callback));
if (callback) {
@@ -223,7 +223,7 @@ bool Uniform_readLocalData(Object& obj, Input& fr)
while (fr.matchSequence("EventCallback {"))
{
int entry = fr[0].getNoNestedBrackets();
//int entry = fr[0].getNoNestedBrackets();
fr += 2;
Uniform::Callback* callback = dynamic_cast<Uniform::Callback*>(fr.readObjectOfType(*s_callback));
if (callback) {

8
src/osgPlugins/osgViewer/CompositeViewer.cpp
View File

@@ -20,9 +20,9 @@ osgDB::RegisterDotOsgWrapperProxy CompositeViewer_Proxy
CompositeViewer_writeLocalData
);
bool CompositeViewer_readLocalData(osg::Object &obj, osgDB::Input &fr)
bool CompositeViewer_readLocalData(osg::Object& /*obj*/, osgDB::Input& /*fr*/)
{
osgViewer::CompositeViewer* compositeViewer = dynamic_cast<osgViewer::CompositeViewer*>(&obj);
// osgViewer::CompositeViewer* compositeViewer = dynamic_cast<osgViewer::CompositeViewer*>(&obj);
bool iteratorAdvanced = false;
osg::notify(osg::NOTICE)<<"CompositeViewer_readLocalData"<<std::endl;
@@ -30,9 +30,9 @@ bool CompositeViewer_readLocalData(osg::Object &obj, osgDB::Input &fr)
return iteratorAdvanced;
}
bool CompositeViewer_writeLocalData(const osg::Object &obj, osgDB::Output &fw)
bool CompositeViewer_writeLocalData(const osg::Object& /*obj*/, osgDB::Output& /*fw*/)
{
const osgViewer::CompositeViewer* compositeViewer = dynamic_cast<const osgViewer::CompositeViewer*>(&obj);
// const osgViewer::CompositeViewer* compositeViewer = dynamic_cast<const osgViewer::CompositeViewer*>(&obj);
osg::notify(osg::NOTICE)<<"CompositeViewer_writeLocalData"<<std::endl;

3
src/osgPlugins/osgViewer/View.cpp
View File

@@ -56,7 +56,7 @@ static bool readMatrix(osg::Matrix& matrix, osgDB::Input& fr, const char* keywor
return iteratorAdvanced;
}
#if 0
static bool writeMatrix(const osg::Matrix& matrix, osgDB::Output& fw, const char* keyword)
{
fw.indent() << keyword <<" {" << std::endl;
@@ -69,6 +69,7 @@ static bool writeMatrix(const osg::Matrix& matrix, osgDB::Output& fw, const char
fw.indent() << "}"<< std::endl;
return true;
}
#endif
osg::Image* readIntensityImage(osgDB::Input& fr, bool& itrAdvanced)
{

8
src/osgPlugins/osgViewer/Viewer.cpp
View File

@@ -20,16 +20,16 @@ osgDB::RegisterDotOsgWrapperProxy Viewer_Proxy
Viewer_writeLocalData
);
bool Viewer_readLocalData(osg::Object &obj, osgDB::Input &fr)
bool Viewer_readLocalData(osg::Object& /*obj*/, osgDB::Input& /*fr*/)
{
osgViewer::Viewer* viewer = dynamic_cast<osgViewer::Viewer*>(&obj);
// osgViewer::Viewer* viewer = dynamic_cast<osgViewer::Viewer*>(&obj);
bool iteratorAdvanced = false;
return iteratorAdvanced;
}
bool Viewer_writeLocalData(const osg::Object &obj, osgDB::Output &fw)
bool Viewer_writeLocalData(const osg::Object& /*obj*/, osgDB::Output& /*fw*/)
{
const osgViewer::Viewer* viewer = dynamic_cast<const osgViewer::Viewer*>(&obj);
// const osgViewer::Viewer* viewer = dynamic_cast<const osgViewer::Viewer*>(&obj);
return true;
}

8
src/osgVolume/Brick.cpp
View File

@@ -24,8 +24,8 @@ using namespace osgVolume;
//
Brick::Brick():
_volume(0),
_hasBeenTraversal(false),
_dirty(false)
_dirty(false),
_hasBeenTraversal(false)
{
setThreadSafeRefUnref(true);
}
@@ -33,9 +33,9 @@ Brick::Brick():
Brick::Brick(const Brick& brick,const osg::CopyOp& copyop):
Group(brick,copyop),
_volume(0),
_dirty(false),
_hasBeenTraversal(false),
_image(brick._image),
_dirty(false)
_image(brick._image)
{
if (brick.getVolumeTechnique())
{