Add -enable-assertions to configure, cleanup assertions, fix crash in LyXFont::ascent...

[lyx.git] / src / lyxfont.C

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 447979c540810a0ac4bf12ce08a99e30bb7b1d4d..0615b6a9591e72fdccd6631fc3074abc698e0910 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -812,12 +812,12 @@ int LyXFont::maxDescent() const
 int LyXFont::ascent(char c) const
 {
        XFontStruct * finfo = getXFontstruct();
+       unsigned int uc = static_cast<unsigned char>(c);
        if (finfo->per_char
-           && static_cast<unsigned char>(c) >= finfo->min_char_or_byte2
-           && static_cast<unsigned char>(c) <= finfo->max_char_or_byte2) {
-               unsigned int index = c - finfo->min_char_or_byte2;
-               return finfo->per_char[index].ascent;
-       } else
+           && uc >= finfo->min_char_or_byte2
+           && uc <= finfo->max_char_or_byte2) 
+               return finfo->per_char[uc - finfo->min_char_or_byte2].ascent;
+       else
                return finfo->ascent;
 }
 
@@ -825,12 +825,12 @@ int LyXFont::ascent(char c) const
 int LyXFont::descent(char c) const
 {
        XFontStruct * finfo = getXFontstruct();
+       unsigned int uc = static_cast<unsigned char>(c);
        if (finfo->per_char
-           && static_cast<unsigned char>(c) >= finfo->min_char_or_byte2
-           && static_cast<unsigned char>(c) <= finfo->max_char_or_byte2) {
-               unsigned int index = c - finfo->min_char_or_byte2;
-               return finfo->per_char[index].descent;
-       } else
+           && uc >= finfo->min_char_or_byte2
+           && uc <= finfo->max_char_or_byte2) 
+               return finfo->per_char[uc - finfo->min_char_or_byte2].descent;
+       else
                return finfo->descent;
 }
 
@@ -849,12 +849,12 @@ int LyXFont::width(char c) const
 int LyXFont::lbearing(char c) const
 {
        XFontStruct * finfo = getXFontstruct();
+       unsigned int uc = static_cast<unsigned char>(c);
        if (finfo->per_char
-           && static_cast<unsigned char>(c) >= finfo->min_char_or_byte2
-           && static_cast<unsigned char>(c) <= finfo->max_char_or_byte2) {
-               unsigned int index = c - finfo->min_char_or_byte2;
-               return finfo->per_char[index].lbearing;
-       } else
+           && uc >= finfo->min_char_or_byte2
+           && uc <= finfo->max_char_or_byte2) 
+               return finfo->per_char[uc - finfo->min_char_or_byte2].lbearing;
+       else
                return 0;
 }
 
@@ -862,12 +862,12 @@ int LyXFont::lbearing(char c) const
 int LyXFont::rbearing(char c) const
 {
        XFontStruct * finfo = getXFontstruct();
+       unsigned int uc = static_cast<unsigned char>(c);
        if (finfo->per_char
-           && static_cast<unsigned char>(c) >= finfo->min_char_or_byte2
-           && static_cast<unsigned char>(c) <= finfo->max_char_or_byte2) {
-               unsigned int index = c - finfo->min_char_or_byte2;
-               return finfo->per_char[index].rbearing;
-       } else
+           && uc >= finfo->min_char_or_byte2
+           && uc <= finfo->max_char_or_byte2) 
+               return finfo->per_char[uc - finfo->min_char_or_byte2].rbearing;
+       else
                return width(c);
 }