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

Fix to computation of size of texture in presense of compressed textures + mipaplevels<=1

Browse Source
This commit is contained in:
Robert Osfield
2004-01-26 09:01:08 +00:00
parent b10393d001
commit fbd7a45b8e
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/txp/TXPParser.cpp
View File

@@ -1288,8 +1288,7 @@ osg::Texture2D* txp::getLocalTexture(trpgrImageHelper& image_helper, const trpgT
// osg::Image do their own mipmaps
if(num_mipmaps <= 1)
{
int32 size = s.x*s.y*depth;
// int32 size = const_cast<trpgTexture*>(tex)->MipLevelSize(1) ;
int32 size = tex->CalcTotalSize();
data = new char [size];
image_helper.GetLocalGL(tex,data,size);
image->setImage(s.x,s.y,1,internalFormat, pixelFormat, dataType,
@@ -1361,8 +1360,7 @@ osg::Texture2D* txp::getTemplateTexture(trpgrImageHelper& image_helper, trpgLoca
// osg::Image do their own mipmaps
if(num_mipmaps <= 1)
{
int32 size = s.x*s.y*depth;
// int32 size = const_cast<trpgTexture*>(tex)->MipLevelSize(1) ;
int32 size = tex->CalcTotalSize();
data = new char [size];
image_helper.GetNthImageForLocalMat(locmat,index, data,size);