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

From Marcin Prus, "I don't know if you seen my second reply to your information about merging my Image and dds plugin changes. I found one problem in your latest submit. In ReaderWriterDDS::ComputeImageSizeInBytes pixelFormat and pixelType are not passed into osg::Image::computeImageSizeInBytes.

Browse Source 
It's
return osg::Image::computeImageSizeInBytes(width, height, depth, packing, slice_packing, image_packing);
but I think it should be
return osg::Image::computeImageSizeInBytes(width, height, depth, pixelFormat, pixelType, packing, slice_packing, image_packing);"
This commit is contained in:
Robert Osfield 2013-06-07 10:54:55 +00:00
parent a6e57026b2
commit eb556797e2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -408,7 +408,7 @@ static unsigned int ComputeImageSizeInBytes( int width, int height, int depth,
if( height < 1 ) height = 1;
if( depth < 1 ) depth = 1;
return osg::Image::computeImageSizeInBytes(width, height, depth, packing, slice_packing, image_packing);
return osg::Image::computeImageSizeInBytes(width, height, depth, pixelFormat, pixelType, packing, slice_packing, image_packing);
}
osg::Image* ReadDDSFile(std::istream& _istream, bool flipDDSRead)