Commit 5f8a45f7 by Thomas Fitzsimmons Committed by Thomas Fitzsimmons

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.

From-SVN: r74198
parent e7f2e92f
2003-12-02 Thomas Fitzsimmons <fitzsim@redhat.com> 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.
* gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Make * gnu/java/awt/peer/gtk/GdkPixbufDecoder.java: Make
BufferedImageBuilder class static. BufferedImageBuilder class static.
......
...@@ -47,7 +47,7 @@ exception statement from your version. */ ...@@ -47,7 +47,7 @@ exception statement from your version. */
#define NUM_METRICS 5 #define NUM_METRICS 5
JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState 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; jintArray array;
jint *metrics; jint *metrics;
...@@ -93,7 +93,8 @@ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState ...@@ -93,7 +93,8 @@ JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_initState
} }
JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth 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; PangoFontDescription *font_desc;
PangoContext *context; PangoContext *context;
...@@ -103,6 +104,7 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth ...@@ -103,6 +104,7 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth
const char *font_name; const char *font_name;
cstr = (*env)->GetStringUTFChars (env, str, NULL); cstr = (*env)->GetStringUTFChars (env, str, NULL);
font_name = (*env)->GetStringUTFChars (env, fname, NULL);
gdk_threads_enter (); gdk_threads_enter ();
...@@ -121,6 +123,7 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth ...@@ -121,6 +123,7 @@ JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkFontMetrics_stringWidth
gdk_threads_leave (); gdk_threads_leave ();
(*env)->ReleaseStringUTFChars (env, fname, font_name);
(*env)->ReleaseStringUTFChars (env, str, cstr); (*env)->ReleaseStringUTFChars (env, str, cstr);
return width; return width;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment