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

Timestamp:

06/15/13 17:47:57 (12 years ago)

Author:

epyon

Message:

• Nova builds with -Weverything/-Wall/-pedantic/etc on: on MSVC 2012 on GCC 4.6.3 on clang 3.2
• ... without a single fucking warning.

File:

• trunk/src/gfx/image.cc (modified) (3 diffs)

trunk/src/gfx/image.cc

@@ -12 +12 @@
         : m_size( size ), m_depth( depth ), m_data( nullptr )
 {
-        m_data = new uint8[ m_size.x * m_size.y * m_depth ];
+        m_data = new uint8[ static_cast<uint16>( m_size.x * m_size.y ) * m_depth ];
 }
 
@@ -25 +25 @@
         : m_size( size ), m_depth( depth ), m_data( nullptr )
 {
-        std::size_t bsize = m_size.x * m_size.y * m_depth;
-        m_data = new uint8[ m_size.x * m_size.y * m_depth ];
+        sint32 bsize = m_size.x * m_size.y * static_cast<sint32>( m_depth );
+        m_data = new uint8[ bsize ];
 
         if ( reversed )
         {
-                std::size_t bline = m_size.x * m_depth;
+                sint32 bline = m_size.x * static_cast<sint32>( m_depth );
                 for( int i = 0; i < m_size.y; ++i )
                 {
@@ -45 +45 @@
 void image::fill( uint8 value )
 {
-        std::fill( m_data, m_data + m_size.x * m_size.y * m_depth, value );
+        std::fill( m_data, m_data + m_size.x * m_size.y * (int)m_depth, value );
 }
 
-void image::set_region( region r, const uint8 * data, size_t stride )
+void image::set_region( region r, const uint8 * data, int stride )
 {
-        if ( stride == 0 ) stride = r.size.x * m_depth;
+        if ( stride == 0 ) stride = r.size.x * static_cast<sint32>( m_depth );
         
-        std::size_t bpos  = (r.pos.y*m_size.x + r.pos.x ) * m_depth;
-        std::size_t bline = m_size.x*m_depth;
+        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 );
 
         for( int i = 0; i < r.size.y; ++i )