From a79fada93865b09948127dbccb58e2b171ba0fa4 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Sat, 19 Apr 2003 06:57:07 +0000
Subject: [PATCH] Mannually computes the mipmap levels to ensure correct
 loading of dds images which arn't square.

---
 src/osgPlugins/dds/ReaderWriterDDS.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/osgPlugins/dds/ReaderWriterDDS.cpp b/src/osgPlugins/dds/ReaderWriterDDS.cpp
index 0b562c91c..ee6bdb76f 100644
--- a/src/osgPlugins/dds/ReaderWriterDDS.cpp
+++ b/src/osgPlugins/dds/ReaderWriterDDS.cpp
@@ -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)