Changeset 121 for trunk/src/gfx/texture_atlas.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/texture_atlas.cc (modified) (5 diffs)

trunk/src/gfx/texture_atlas.cc

@@ -37 +37 @@
                         {
                                 best_height = y + size.y;
-                                best_index = i;
+                                best_index = static_cast<int>( i );
                                 best_width = node.z;
                                 r.pos.x = node.x;
@@ -52 +52 @@
         m_nodes.insert( m_nodes.begin() + best_index, glm::ivec3( r.pos.x, r.pos.y + size.y, size.x ) );
 
-        for( size_t i = best_index+1; i < m_nodes.size(); ++i )
+        for( size_t i = static_cast<size_t>( best_index )+1; i < m_nodes.size(); ++i )
         {
                 glm::ivec3 node = m_nodes[ i ];
@@ -65 +65 @@
                         if (m_nodes[ i ].z <= 0)
                         {
-                                m_nodes.erase( m_nodes.begin() + i );
+                                m_nodes.erase( m_nodes.begin() + static_cast<int>(i) );
                                 --i;
                         }
@@ -79 +79 @@
         }
         merge();
-        m_used += size.x * size.y;
+        m_used += static_cast<uint16>(size.x * size.y);
         return r;
 }
@@ -119 +119 @@
                 {
                         m_nodes[ i ].z += m_nodes[ i+1 ].z;
-            m_nodes.erase( m_nodes.begin()+i+1 );
+            m_nodes.erase( m_nodes.begin()+static_cast<int>(i+1) );
                         --i;
                 }