This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Patch: FYI: small GdkFontMetrics fix
- From: Thomas Fitzsimmons <fitzsim at redhat dot com>
- To: GCJ Patches <java-patches at gcc dot gnu dot org>
- Date: Tue, 02 Dec 2003 15:58:12 -0500
- Subject: Patch: FYI: small GdkFontMetrics fix
Hi,
I'm committing this on the trunk. My previous GdkFontMetrics patch
didn't properly initialize the C font_name array. It also triggered
some new compiler warnings.
Tom
2003-12-02 Thomas Fitzsimmons <fitzsim@redhat.com>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
(initState): Mark obj parameter as unused.
(stringWidth): Mark obj parameter as unused. Initialize
font_name properly.
Index: jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c
===================================================================
RCS file:
/cvs/gcc/gcc/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,v
retrieving revision 1.2
diff -u -r1.2 gnu_java_awt_peer_gtk_GdkFontMetrics.c
--- jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c 1 Dec 2003
23:12:09 -0000 1.2
+++ jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c 2 Dec 2003
20:54:18 -0000
@@ -47,7 +47,7 @@
#define NUM_METRICS 5
JNIEXPORT jintArray JNICALL
Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState
- (JNIEnv *env, jobject obj, jstring fname, jint size)
+ (JNIEnv *env, jobject obj __attribute__((unused)), jstring fname,
jint size)
{
jintArray array;
jint *metrics;
@@ -93,7 +93,8 @@
}
JNIEXPORT jint JNICALL
Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth
- (JNIEnv *env, jobject obj, jstring fname, jint size, jstring str)
+ (JNIEnv *env, jobject obj __attribute__((unused)),
+ jstring fname, jint size, jstring str)
{
PangoFontDescription *font_desc;
PangoContext *context;
@@ -103,6 +104,7 @@
const char *font_name;
cstr = (*env)->GetStringUTFChars (env, str, NULL);
+ font_name = (*env)->GetStringUTFChars (env, fname, NULL);
gdk_threads_enter ();
@@ -121,6 +123,7 @@
gdk_threads_leave ();
+ (*env)->ReleaseStringUTFChars (env, fname, font_name);
(*env)->ReleaseStringUTFChars (env, str, cstr);
return width;