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

Timestamp:

01/12/17 14:41:17 (8 years ago)

Author:

epyon

Message:

CONTINUED:

• getting rid of size_t
• datatypes now restricted to uint32 size
• 64-bit compatibility
• copyright updates where modified

File:

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

trunk/src/gfx/image.cc

@@ -1 @@
-// Copyright (C) 2011-2015 ChaosForge Ltd
+// Copyright (C) 2011-2017 ChaosForge Ltd
 // http://chaosforge.org/
 //
@@ -10 +10 @@
 using namespace nv;
 
-image::image( ivec2 size, nv::size_t depth )
+image::image( ivec2 size, uint32 depth )
         : m_size( size ), m_depth( depth ), m_data( nullptr )
 {
@@ -23 +23 @@
 
 
-image::image( ivec2 size, nv::size_t depth, const uint8 * data, bool reversed )
+image::image( ivec2 size, uint32 depth, const uint8 * data, bool reversed )
         : m_size( size ), m_depth( depth ), m_data( nullptr )
 {
         NV_ASSERT( size.x >= 0 && size.y >= 0, "bad parameters passed to image!" );
         sint32 bsize = m_size.x * m_size.y * static_cast<sint32>( m_depth );
-        m_data = new uint8[ size_t( bsize ) ];
+        m_data = new uint8[ uint32( bsize ) ];
 
         if ( reversed )
@@ -97 +97 @@
         uint32 rsizey     = static_cast< uint32 >( r.size.y );
         const uint8* data = idata->get_data();
-        size_t depth      = idata->get_depth();
-        size_t cdepth     = m_depth > depth ? depth : m_depth;
+        uint32 depth      = idata->get_depth();
+        uint32 cdepth     = m_depth > depth ? depth : m_depth;
         uint32 dstride    = rsizex * depth;
 
@@ -107 +107 @@
                 {
                         uint32 xy = pos + x * m_depth;
-                        for( size_t e = 0; e < cdepth; ++e )
+                        for( uint32 e = 0; e < cdepth; ++e )
                         {
                                 m_data[ xy + e ] = data[ y*dstride + x * depth + e ];