Update of /cvsroot/libufo/ufo-0.5/src/text
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4188/src/text
Modified Files:
utextlayout.cpp
Log Message:
Fixed warnings about comparison of signed vs. unsigned values. Fixed warnings about unhandled switch values. Fixed warnings about unused variables.
Index: utextlayout.cpp
===================================================================
RCS file: /cvsroot/libufo/ufo-0.5/src/text/utextlayout.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** utextlayout.cpp 20 Jul 2005 10:05:44 -0000 1.2
--- utextlayout.cpp 30 Sep 2005 12:37:20 -0000 1.3
***************
*** 121,125 ****
layout();
int m_tabSize = 4;
- int fontHeight = m_font.getFontMetrics()->getHeight();
int tabMultiplier = m_font.getFontMetrics()->getMaxCharWidth();
--- 121,124 ----
***************
*** 208,212 ****
unsigned int index = line.getOffset();
! unsigned int left = 0;
for (;index < line.getOffset() + line.getLength() && index < m_length;
--- 207,211 ----
unsigned int index = line.getOffset();
! int left = 0;
for (;index < line.getOffset() + line.getLength() && index < m_length;
***************
*** 287,291 ****
if (width + addWidth >= maxWidth) {
! int wrap_index = (index > 0) ? index - 1 : 0;
char c = m_text[wrap_index];
while (!isWrapCharacter(c) && wrap_index > lineStart) {
--- 286,290 ----
if (width + addWidth >= maxWidth) {
! unsigned int wrap_index = (index > 0) ? index - 1 : 0;
char c = m_text[wrap_index];
while (!isWrapCharacter(c) && wrap_index > lineStart) {
|
