1 files changed, 4 insertions, 3 deletions

diff --git a/src/packedintarray.cpp b/src/packedintarray.cpp
index b91358e..824f589 100644
--- a/src/packedintarray.cpp
+++ b/src/packedintarray.cpp
@@ -4,7 +4,7 @@
 

 #define bitsizeof( x )      ((sizeof(x))*8)

 #define StoreBits           ((bitsizeof(PackedIntArray::Store)))

-#define StoreCount( x )     (((x*iBitWidth)/StoreBits)+(((x*iBitWidth)%StoreBits)?1:0))

+#define StoreCount( x )     ((((x)*iBitWidth)/StoreBits)+((((x)*iBitWidth)%StoreBits)?1:0))

 

 PackedIntArray::PackedIntArray( PackedIntArray::Unit iBitWidth ) :

     iBitWidth( iBitWidth ),

@@ -207,10 +207,11 @@ void PackedIntArray::checkCapacity()
     {

 //        Bu::println("!!! Resizing !!!");

         Store *aOldData = aData;

+        int iSize = StoreCount(iCapacity);

         int iNewSize = (iCapacity==0)?(bitsizeof(Store)/iBitWidth):(iCapacity=StoreCount(iCapacity*2));

-        while( iNewSize < iCount )

+        int iCountSize = StoreCount(iCount);

+        while( iNewSize < iCountSize )

             iNewSize *= 2;

-        int iSize = StoreCount(iCapacity);

 //        Bu::println("  %1 => %2 (%3 bit words)").arg( iSize ).arg( iNewSize )

 //            .arg( StoreBits );

         aData = new Store[iNewSize];