stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8078654: CloseTTFontFileFunc callback should be removed

Browse Source 
Reviewed-by: prr, martin
This commit is contained in:
Andrew Dinn 2015-04-29 16:02:57 -07:00
parent 722ec3f5ed
commit c9ba8831c6
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/src/java.desktop/share/native/libfontmanager/freetypeScaler.c
View File

@ -147,20 +147,6 @@ static void invalidateJavaScaler(JNIEnv *env,
#define FILEDATACACHESIZE 1024 #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, static unsigned long ReadTTFontFileFunc(FT_Stream stream,
unsigned long offset, unsigned long offset,
unsigned char* destBuffer, unsigned char* destBuffer,
@ -305,7 +291,7 @@ Java_sun_font_FreetypeFontScaler_initNativeScaler(
ftstream->size = filesize; ftstream->size = filesize;
ftstream->pos = 0; ftstream->pos = 0;
ftstream->read = (FT_Stream_IoFunc) ReadTTFontFileFunc; ftstream->read = (FT_Stream_IoFunc) ReadTTFontFileFunc;
ftstream->close = (FT_Stream_CloseFunc) CloseTTFontFileFunc; ftstream->close = NULL;
ftstream->pathname.pointer = (void *) scalerInfo; ftstream->pathname.pointer = (void *) scalerInfo;
memset(&ft_open_args, 0, sizeof(FT_Open_Args)); memset(&ft_open_args, 0, sizeof(FT_Open_Args));