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

From Marco Jez, "fixes a bug that prevented mipmaps in images from being read correctly (the call to

Browse Source 
setImage() clears the previously filled _mipmapData vector)."
This commit is contained in:
Robert Osfield 2004-04-18 13:44:09 +00:00
parent cf8c4c6a97
commit 4df7836f65
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/osgPlugins/ive/Image.cpp
View File

@ -105,15 +105,15 @@ void Image::read(DataInputStream* in)
// Read modified tag.
setModifiedTag((unsigned int)in->readInt());
// Read mipmapdata vector
// Read mipmapdata vector
int size = in->readInt();
_mipmapData.resize(size);
MipmapDataType mipmapData(size);
//if (size) std::cout<<"is mip mapped ";
for(int i=0;i<size;i++)
{
_mipmapData[i]=(unsigned int)in->readInt();
mipmapData[i]=(unsigned int)in->readInt();
//std::cout<<_mipmapData[i]<<"\t";
}
//std::cout<<std::endl;
@ -139,6 +139,8 @@ void Image::read(DataInputStream* in)
setImage(is, it, ir, internalTextureFormat, pixelFormat,
dataType, (unsigned char* ) data, osg::Image::USE_NEW_DELETE, packing);
}
_mipmapData.swap(mipmapData);
}
else{
throw Exception("Image::read(): Expected Image identification.");