Changeset 505 for trunk/src/gfx

Timestamp:

07/12/16 20:22:23 (9 years ago)

Author:

epyon

Message:

• several STL updates
• several minor fixes

File:

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

trunk/src/gfx/image.cc

@@ -98 +98 @@
         const uint8* data = idata->get_data();
         size_t depth      = idata->get_depth();
+        size_t cdepth     = m_depth > depth ? depth : m_depth;
         uint32 dstride    = rsizex * depth;
 
@@ -106 +107 @@
                 {
                         uint32 xy = pos + x * m_depth;
-                        for( size_t e = 0; e < depth; ++e )
+                        for( size_t e = 0; e < cdepth; ++e )
                         {
                                 m_data[ xy + e ] = data[ y*dstride + x * depth + e ];