Index: trunk/src/gui/gui_gfx_renderer.cc
===================================================================
--- trunk/src/gui/gui_gfx_renderer.cc	(revision 469)
+++ trunk/src/gui/gui_gfx_renderer.cc	(revision 471)
@@ -215,5 +215,5 @@
 	image_data* data = m_window->get_device()->create_image_data( filename );
 	// TODO: Repitching
-	assert( data->get_depth() == 4 );
+	NV_ASSERT( data->get_depth() == 4, "depth != 4" );
 	region r = m_atlas.get_region( data->get_size() );
 	m_atlas.set_region( r, data->get_data() );
@@ -327,5 +327,5 @@
 						position p2 = p + g->size + gp;
 						qvec.emplace_back( p + gp, p2, color, g->tl, g->br );
-						p += g->advance;
+						p += ivec2( g->advance );
 					}
 				}