From 4982b6384adffe54c33ee0f5a15ba2cd3482f1f7 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 10 Jun 2003 02:45:07 +0000 Subject: [PATCH] natFont.cc (getAscent): Correctly access "ascent" field. * gnu/gcj/xlib/natFont.cc (getAscent): Correctly access "ascent" field. (getDescent): Likewise, for "descent". From-SVN: r67695 --- libjava/ChangeLog | 6 ++++++ libjava/gnu/gcj/xlib/natFont.cc | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 3fdf18f8386..88b59f05811 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2003-06-09 Tom Tromey + + * gnu/gcj/xlib/natFont.cc (getAscent): Correctly access "ascent" + field. + (getDescent): Likewise, for "descent". + 2003-06-09 Scott Gilbertson * 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 c929d227599..54ac655d17b 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 } -- 2.30.2