diff options
| author | Andrew John Hughes <ahughes@redhat.com> | 2012-05-04 15:17:39 +0100 |
|---|---|---|
| committer | Andrew John Hughes <ahughes@redhat.com> | 2012-05-04 15:17:39 +0100 |
| commit | c6649596a7cf598c5d382f973ff5d7cecb255790 (patch) | |
| tree | 399af30b678be39f187e9ce48d9236c188e88879 | |
| parent | 1b03ed1d538170454c3073a082dc2aa931b5663f (diff) | |
| download | classpath-c6649596a7cf598c5d382f973ff5d7cecb255790.tar.gz | |
Remove use of deprecated pango_ft2_font_map_create_context which breaks -Werror build.
2012-05-04 Andrew John Hughes <ahughes@redhat.com>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c,
(font_map): Renamed from ft2_map.
(Java_gnu_java_awt_peer_gtk_GdkFontPeer_initStaticState(JNIEnv,
jclass)): Remove cast to pango_ft2_font_map_new.
(Java_gnu_java_awt_peer_gtk_GdKFontPeer_setFont(JNIEnv,
jobject,jstring,jint,jint)): Call pango_font_map_create_context
rather than deprecated pango_ft2_font_map_create_context.
Signed-off-by: Andrew John Hughes <ahughes@redhat.com>
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c | 6 |
2 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,13 @@ +2012-05-04 Andrew John Hughes <ahughes@redhat.com> + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c, + (font_map): Renamed from ft2_map. + (Java_gnu_java_awt_peer_gtk_GdkFontPeer_initStaticState(JNIEnv, + jclass)): Remove cast to pango_ft2_font_map_new. + (Java_gnu_java_awt_peer_gtk_GdKFontPeer_setFont(JNIEnv, + jobject,jstring,jint,jint)): Call pango_font_map_create_context + rather than deprecated pango_ft2_font_map_create_context. + 2012-05-01 Andrew John Hughes <ahughes@redhat.com> * java/text/DateFormatSymbols.java: diff --git a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c index a5e59f7e4..771b23e37 100644 --- a/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c +++ b/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c @@ -59,14 +59,14 @@ enum java_awt_font_baseline { java_awt_font_HANGING_BASELINE = 2 }; -static PangoFT2FontMap *ft2_map = NULL; +static PangoFontMap *font_map = NULL; JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkFontPeer_initStaticState (JNIEnv *env, jclass clazz __attribute__((unused))) { gtkpeer_init_font_IDs(env); - ft2_map = PANGO_FT2_FONT_MAP(pango_ft2_font_map_new()); + font_map = pango_ft2_font_map_new(); } JNIEXPORT void JNICALL @@ -287,7 +287,7 @@ Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont pango_font_description_set_size (pfont->desc, size * PANGO_SCALE); /* Create new context */ - pfont->ctx = pango_ft2_font_map_create_context (ft2_map); + pfont->ctx = pango_font_map_create_context (font_map); g_assert (pfont->ctx != NULL); pango_context_set_font_description (pfont->ctx, pfont->desc); |