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;