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

Mannually computes the mipmap levels to ensure correct loading of dds

Browse Source 
images which arn't square.
This commit is contained in:
Robert Osfield
2003-04-19 06:57:07 +00:00
parent b6ee5445b7
commit a79fada938
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osgPlugins/dds/ReaderWriterDDS.cpp
View File

@@ -254,14 +254,7 @@ osg::Image* ReadDDSFile(const char *filename)
osg::notify(osg::INFO) << "ReadDDSFile info : power2_s="<<power2_s<<std::endl;
osg::notify(osg::INFO) << "ReadDDSFile info : power2_t="<<power2_t<<std::endl;
//Alberto's fix, which I can't quite figure out why its needed..
// int prop = (int)(s>=t ? (s/t) : (t/s));
// prop = (int)(log(prop)/log(2));
// mipmaps.resize(ddsd.dwMipMapCount+prop);
mipmaps.resize(ddsd.dwMipMapCount-1);
mipmaps.resize((unsigned int)osg::maximum(power2_s,power2_t),0);
// Handle compressed mipmaps.
if(ddsd.ddpfPixelFormat.dwFlags & DDPF_FOURCC)