Changeset 323 for trunk/src/gfx/image.cc

Timestamp:

08/26/14 04:03:10 (11 years ago)

Author:

epyon

Message:

• nova now compiles again under all three compilers with -Winsane and no warnings

File:

• trunk/src/gfx/image.cc (modified) (1 diff)

trunk/src/gfx/image.cc

@@ -89 +89 @@
         fill( r, 255 );
 
-        sint32 bpos       = (r.pos.y*m_size.x + r.pos.x ) * static_cast<sint32>( m_depth );
-        sint32 bline      = m_size.x*static_cast<sint32>( m_depth );
+        uint32 bpos       = static_cast< uint32 >( r.pos.y*m_size.x + r.pos.x ) * m_depth;
+        uint32 bline      = static_cast< uint32 >( m_size.x ) * m_depth;
 
+        uint32 rsizex     = static_cast< uint32 >( r.size.x );
+        uint32 rsizey     = static_cast< uint32 >( r.size.y );
         const uint8* data = idata->get_data();
-        sint32 depth      = idata->get_depth();
-        sint32 dstride    = r.size.x * static_cast<sint32>( depth );
+        size_t depth      = idata->get_depth();
+        uint32 dstride    = rsizex * depth;
 
-        for( int y = 0; y < r.size.y; ++y )
+        for( uint32 y = 0; y < rsizey; ++y )
         {
-                sint32 pos = bpos + bline * y;
-                for( int x = 0; x < r.size.x; ++x )
+                uint32 pos = bpos + bline * y;
+                for( uint32 x = 0; x < rsizex; ++x )
                 {
-                        sint32 xy = pos + x * m_depth;
-                        for( int e = 0; e < depth; ++e )
+                        uint32 xy = pos + x * m_depth;
+                        for( size_t e = 0; e < depth; ++e )
                         {
                                 m_data[ xy + e ] = data[ y*dstride + x * depth + e ];