From eb556797e2d40a71b808ebe9c1e1bcb280030fd8 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 7 Jun 2013 10:54:55 +0000 Subject: [PATCH] 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. 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);" --- src/osgPlugins/dds/ReaderWriterDDS.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osgPlugins/dds/ReaderWriterDDS.cpp b/src/osgPlugins/dds/ReaderWriterDDS.cpp index a5cd0eb52..3fb8d6b4b 100644 --- a/src/osgPlugins/dds/ReaderWriterDDS.cpp +++ b/src/osgPlugins/dds/ReaderWriterDDS.cpp @@ -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)