From 568aeef975907b39feba23110ba3356299087f1d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Mon, 3 Sep 2012 15:19:00 +0000 Subject: [PATCH] From Brad Christiansen, "fix for the NVTTImageProcessor. When the code was updated in revision 12912 a couple of typos where made. These cause a crash when compressing transparent images and mangled colours when compressing rgb images. " --- src/osgPlugins/nvtt/NVTTImageProcessor.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/osgPlugins/nvtt/NVTTImageProcessor.cpp b/src/osgPlugins/nvtt/NVTTImageProcessor.cpp index 0fe95a2c8..5f88d77fb 100644 --- a/src/osgPlugins/nvtt/NVTTImageProcessor.cpp +++ b/src/osgPlugins/nvtt/NVTTImageProcessor.cpp @@ -185,7 +185,7 @@ void NVTTProcessor::convertRGBAToBGRA( std::vector& outputData, c { outputData[n] = data[column*4+2]; outputData[n+1] = data[column*4+1]; - outputData[n+2] = data[column*4+n]; + outputData[n+2] = data[column*4]; outputData[n+3] = data[column*4+3]; n+=4; } @@ -203,7 +203,7 @@ void NVTTProcessor::convertRGBToBGRA( std::vector& outputData, co { outputData[n] = data[column*3+2]; outputData[n+1] = data[column*3+1]; - outputData[n+2] = data[column*3+n]; + outputData[n+2] = data[column*3]; outputData[n+3] = 255; n+=4; } @@ -343,4 +343,4 @@ void NVTTProcessor::generateMipMap(osg::Image& image, bool resizeToPowerOfTwo, C process( image, nvtt::Format_RGBA, true, resizeToPowerOfTwo, method, NORMAL); } -REGISTER_OSGIMAGEPROCESSOR(nvtt, NVTTProcessor) \ No newline at end of file +REGISTER_OSGIMAGEPROCESSOR(nvtt, NVTTProcessor)