diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-10 02:45:07 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-06-10 02:45:07 +0000 |
| commit | 434bf49ed27ba66c65815e9e1a8cc1baf22c25d4 (patch) | |
| tree | 1e2ec5b9b01f1f3a100e2d70c3e39fd8cf79f0d7 /libjava | |
| parent | a5b4d70c658dacbd0b0384579c30095aae8ca5f8 (diff) | |
| download | ppe42-gcc-434bf49ed27ba66c65815e9e1a8cc1baf22c25d4.tar.gz ppe42-gcc-434bf49ed27ba66c65815e9e1a8cc1baf22c25d4.zip | |
* gnu/gcj/xlib/natFont.cc (getAscent): Correctly access "ascent"
field.
(getDescent): Likewise, for "descent".
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@67695 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 6 | ||||
| -rw-r--r-- | 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 <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 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 } |
