Mercurial > hg > release > icedtea7-forest-2.5 > jdk

changeset 8185:4ca679b197d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8078654, PR2333: CloseTTFontFileFunc callback should be removed Reviewed-by: prr, martin
author prr
date Wed, 03 Jun 2015 15:52:40 +0100
parents a5fcd1d93d68
children ef3273e2be46
files src/share/native/sun/font/freetypeScaler.c
diffstat 1 files changed, 1 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/native/sun/font/freetypeScaler.c	Mon Apr 27 17:17:07 2015 +0100
+++ b/src/share/native/sun/font/freetypeScaler.c	Wed Jun 03 15:52:40 2015 +0100
@@ -151,20 +151,6 @@
 
 #define FILEDATACACHESIZE 1024
 
-/* NB: is it ever called? */
-static void CloseTTFontFileFunc(FT_Stream stream) {
-    FTScalerInfo *scalerInfo = (FTScalerInfo *) stream->pathname.pointer;
-    JNIEnv* env = scalerInfo->env;
-    jclass tmpClass = (*env)->FindClass(env, "sun/font/TrueTypeFont");
-    jfieldID platNameField =
-         (*env)->GetFieldID(env, tmpClass, "platName", "Ljava/lang/String;");
-    jstring platName = (*env)->GetObjectField(env,
-                                              scalerInfo->font2D,
-                                              platNameField);
-    const char *name = JNU_GetStringPlatformChars(env, platName, NULL);
-    JNU_ReleaseStringPlatformChars(env, platName, name);
-}
-
 static unsigned long ReadTTFontFileFunc(FT_Stream stream,
                                         unsigned long offset,
                                         unsigned char* destBuffer,
@@ -309,7 +295,7 @@
                 ftstream->size = filesize;
                 ftstream->pos = 0;
                 ftstream->read = (FT_Stream_IoFunc) ReadTTFontFileFunc;
-                ftstream->close = (FT_Stream_CloseFunc) CloseTTFontFileFunc;
+                ftstream->close = NULL;
                 ftstream->pathname.pointer = (void *) scalerInfo;
 
                 memset(&ft_open_args, 0, sizeof(FT_Open_Args));