diff options
| author | Lillian Angel <langel@redhat.com> | 2005-11-25 21:00:53 +0000 |
|---|---|---|
| committer | Lillian Angel <langel@redhat.com> | 2005-11-25 21:00:53 +0000 |
| commit | ee89c7af786b004c076ccc757144dd9640019557 (patch) | |
| tree | 0a56f6680ffc37f2dfd978442053d45663c2fe48 | |
| parent | 30484828457a39e78f8b524aa9592a86bc2e78eb (diff) | |
| download | classpath-ee89c7af786b004c076ccc757144dd9640019557.tar.gz | |
2005-11-25 Lillian Angel <langel@redhat.com>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c
(drawString): Changed pointer to be const, and fixed check to
draw characters only if they are >= ' '. Handles all control
characters.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c | 8 |
2 files changed, 11 insertions, 4 deletions
@@ -1,3 +1,10 @@ +2005-11-25 Lillian Angel <langel@redhat.com> + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c + (drawString): Changed pointer to be const, and fixed check to + draw characters only if they are >= ' '. Handles all control + characters. + 2005-11-25 Mark Wielaard <mark@klomp.org> Fixes bug #24981 diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c index 2825e7166..f6c36e415 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c @@ -1,4 +1,4 @@ -/* gdkgraphics.c +d/* gdkgraphics.c Copyright (C) 1999 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -291,9 +291,9 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString struct peerfont *pfont = NULL; struct graphics *g = NULL; const char *cstr = NULL; - char *p = NULL; + const char *sTmp = NULL; char *tmp = NULL; - char *sTmp = NULL; + char *p = NULL; int count = 0; int charSize = 0; int baseline_y = 0; @@ -317,7 +317,7 @@ Java_gnu_java_awt_peer_gtk_GdkGraphics_drawString tmp = p; sTmp = cstr; for (; *sTmp != '\0'; sTmp++) - if (isprint(*sTmp)) + if (((unsigned char) *sTmp) >= ' ') { *p = *sTmp; count++; |