diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3fdf18f83869e37b7e1ee77ef12ffb2bc7c85c0d..88b59f0581126cf1be7780b71aad6e05106fcfd0 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-06-09 Tom Tromey <tromey@redhat.com> + + * gnu/gcj/xlib/natFont.cc (getAscent): Correctly access "ascent" + field. + (getDescent): Likewise, for "descent". + 2003-06-09 Scott Gilbertson <scottg@mantatest.com> * gnu/gcj/xlib/natFont.cc (getMaxAscent): adjusted return value. diff --git a/libjava/gnu/gcj/xlib/natFont.cc b/libjava/gnu/gcj/xlib/natFont.cc index c929d227599b7b84c718aa24ec5ebf4a7117203c..54ac655d17b32b8bea544cff0293ad6e671ca828 100644 --- a/libjava/gnu/gcj/xlib/natFont.cc +++ b/libjava/gnu/gcj/xlib/natFont.cc @@ -60,7 +60,7 @@ jint gnu::gcj::xlib::Font::getAscent() if (fontStruct->min_byte1==0 && fontStruct->min_char_or_byte2<=(unsigned)'O') returnValue = fontStruct ->per_char[(unsigned)'O'-fontStruct->min_char_or_byte2] - ->ascent; + .ascent; return returnValue+1; // +1 to include the baseline } @@ -71,7 +71,7 @@ jint gnu::gcj::xlib::Font::getDescent() if (fontStruct->min_byte1==0 && fontStruct->min_char_or_byte2<=(unsigned)'y') returnValue = fontStruct ->per_char[(unsigned)'y'-fontStruct->min_char_or_byte2] - ->descent; + .descent; return returnValue-1; // -1 to exclude the baseline }