Changeset 406 for trunk/src/gui/gui_gfx_renderer.cc

Timestamp:

06/20/15 00:05:17 (10 years ago)

Author:

epyon

Message:

• code compiles cleanly on maximum warning level

File:

• trunk/src/gui/gui_gfx_renderer.cc (modified) (7 diffs)

trunk/src/gui/gui_gfx_renderer.cc

@@ -190 +190 @@
 {
         std::string id_name( filename );
-        char buffer[8]; size_t len = nv::sint32_to_buffer( (sint32)size, buffer );
+        char buffer[8]; size_t len = nv::sint32_to_buffer( sint32( size ), buffer );
         id_name.append( std::string( buffer, len ) );
         auto i = m_font_names.find( id_name );
@@ -197 +197 @@
                 return i->second;
         }
-        size_t result = (size_t)m_fonts.size();
-        texture_font* f = new texture_font( &m_atlas, filename.c_str(), (float)size );
+        size_t result = m_fonts.size();
+        texture_font* f = new texture_font( &m_atlas, filename.c_str(), static_cast<float>( size ) );
         f->load_glyphs( "!\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~ " );
         m_fonts.push_back( f );
@@ -228 +228 @@
 void gfx_renderer::redraw( element* e, uint32 )
 {
-        screen_render_data* sr = (screen_render_data*)m_render_data;
+        screen_render_data* sr = reinterpret_cast< screen_render_data* >( m_render_data );
         if ( e->m_render_data == nullptr )
         {
                 e->m_render_data = new element_render_data( &sr->buffer );
         }
-        element_render_data* er = (element_render_data*)( e->m_render_data );
+        element_render_data* er = reinterpret_cast< element_render_data* >( e->m_render_data );
         size_t size_before = er->buffer.data().size();
 
@@ -318 +318 @@
                         if ( m_style.get( e, "text_color", selector, color ) && m_style.get( e, "text_font", selector, path ) && m_style.get( e, "text_size", selector, border ) )
                         {
-                                size_t font_id = load_font( path, (uint16)border );
+                                size_t font_id = load_font( path, size_t( border ) );
                                 texture_font* font = get_font( font_id );
                                 position p = abs.ul + position( 0, border );
@@ -361 +361 @@
 void gfx_renderer::draw( element* e )
 {
-        element_render_data* er = (element_render_data*)( e->m_render_data );
+        element_render_data* er = reinterpret_cast< element_render_data* >( e->m_render_data );
         er->buffer.commit();
 }
@@ -367 +367 @@
 void gfx_renderer::draw()
 {
-        screen_render_data* sr = (screen_render_data*)m_render_data;
+        screen_render_data* sr = reinterpret_cast< screen_render_data* >( m_render_data );
 
         if ( m_reupload )
         {
-                m_context->update( sr->tex, (void*)m_atlas.get_data() );
+                m_context->update( sr->tex, m_atlas.get_data() );
                 m_reupload = false;
         }
@@ -392 +392 @@
         if ( m_render_data )
         {
-                m_context->get_device()->release( ( (screen_render_data*)m_render_data )->tex );
+                m_context->get_device()->release( reinterpret_cast< screen_render_data* >( m_render_data )->tex );
                 delete m_render_data;
         }