[Libufo-commits] ufo-0.5/src/gl ugl_builtinfontrenderer.cpp,1.8,1.9

[Johannes S. <sch...@us...>]

Update of /cvsroot/libufo/ufo-0.5/src/gl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5497/src/gl

Modified Files:
	ugl_builtinfontrenderer.cpp 
Log Message:
Fixed range checking (thanks Dmitriy)

Index: ugl_builtinfontrenderer.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/gl/ugl_builtinfontrenderer.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ugl_builtinfontrenderer.cpp	5 Jul 2005 11:29:53 -0000	1.8
--- ugl_builtinfontrenderer.cpp	21 Jan 2006 17:11:26 -0000	1.9
***************
*** 220,224 ****
  int
  UGL_BuiltinFontMetrics::getCharWidth(const wchar_t chA) const {
! 	return (m_renderer->m_fontStruct.m_characters[chA])[0];
  }
  
--- 220,224 ----
  int
  UGL_BuiltinFontMetrics::getCharWidth(const wchar_t chA) const {
! 	return (m_renderer->m_fontStruct.m_characters[uint8_t(chA)])[0];
  }
  
***************
*** 230,234 ****
  
  	for (;index < nChar; ++index) {
! 		advance += (m_renderer->m_fontStruct.m_characters[text[index]])[0];
  		if (advance > w) {
  			index--;
--- 230,234 ----
  
  	for (;index < nChar; ++index) {
! 		advance += (m_renderer->m_fontStruct.m_characters[uint8_t(text[index])])[0];
  		if (advance > w) {
  			index--;