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

Timestamp:

06/02/15 20:56:15 (10 years ago)

Author:

epyon

Message:

• more work on stl
• fully working vectors!
• copy & copy_n
• removal of a lot of std code!

File:

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

trunk/src/gfx/image.cc

@@ -4 +4 @@
 
 #include "nv/gfx/image.hh"
+#include "nv/stl/algorithm.hh"
 
 using namespace nv;
@@ -31 +32 @@
                 for( int i = 0; i < m_size.y; ++i )
                 {
-                        std::copy( data + i * bline, data + (i + 1) * bline, m_data + bsize - ( i + 1 ) * bline );
+                        raw_copy( data + i * bline, data + (i + 1) * bline, m_data + bsize - ( i + 1 ) * bline );
                 }
 
@@ -37 +38 @@
         else 
         {
-                std::copy( data, data + bsize, m_data );
+                raw_copy( data, data + bsize, m_data );
         }
 }
@@ -43 +44 @@
 void image::fill( uint8 value )
 {
-        std::fill( m_data, m_data + m_size.x * m_size.y * (int)m_depth, value );
+        raw_fill( m_data, m_data + m_size.x * m_size.y * (int)m_depth, value );
 }
 
@@ -56 +57 @@
         {
                 // TODO: test 
-                std::fill( m_data + bpos + bline * i, m_data + bpos + bline * i + stride, value );
+                raw_fill( m_data + bpos + bline * i, m_data + bpos + bline * i + stride, value );
         }
 }
@@ -73 +74 @@
 //              memcpy( m_data+((r.pos.y+i)*m_size.x + r.pos.x ) * m_depth, 
 //                      data + (i*stride), r.size.x * m_depth );
-                std::copy( data + i*stride, data + (i+1)*stride, m_data + bpos + bline * i );
+                raw_copy( data + i*stride, data + (i+1)*stride, m_data + bpos + bline * i );
         }
 }