提交 6a31b16a 编写于 作者: J jchen

8025664: [parfait] warnings from b62 for jdk.src.share.native.sun.font

Reviewed-by: prr, jgodinez
上级 5fa58cb8
...@@ -252,7 +252,6 @@ Java_sun_font_FreetypeFontScaler_initNativeScaler( ...@@ -252,7 +252,6 @@ Java_sun_font_FreetypeFontScaler_initNativeScaler(
JNIEnv *env, jobject scaler, jobject font2D, jint type, JNIEnv *env, jobject scaler, jobject font2D, jint type,
jint indexInCollection, jboolean supportsCJK, jint filesize) { jint indexInCollection, jboolean supportsCJK, jint filesize) {
FTScalerInfo* scalerInfo = NULL; FTScalerInfo* scalerInfo = NULL;
FT_Stream ftstream;
FT_Open_Args ft_open_args; FT_Open_Args ft_open_args;
int error; int error;
jobject bBuffer; jobject bBuffer;
...@@ -309,9 +308,10 @@ Java_sun_font_FreetypeFontScaler_initNativeScaler( ...@@ -309,9 +308,10 @@ Java_sun_font_FreetypeFontScaler_initNativeScaler(
} }
} else { /* Truetype */ } else { /* Truetype */
scalerInfo->fontData = (unsigned char*) malloc(FILEDATACACHESIZE); scalerInfo->fontData = (unsigned char*) malloc(FILEDATACACHESIZE);
ftstream = (FT_Stream) calloc(1, sizeof(FT_StreamRec));
if (ftstream != NULL && scalerInfo->fontData != NULL) { if (scalerInfo->fontData != NULL) {
FT_Stream ftstream = (FT_Stream) calloc(1, sizeof(FT_StreamRec));
if (ftstream != NULL) {
scalerInfo->directBuffer = (*env)->NewDirectByteBuffer(env, scalerInfo->directBuffer = (*env)->NewDirectByteBuffer(env,
scalerInfo->fontData, scalerInfo->fontData,
FILEDATACACHESIZE); FILEDATACACHESIZE);
...@@ -339,6 +339,7 @@ Java_sun_font_FreetypeFontScaler_initNativeScaler( ...@@ -339,6 +339,7 @@ Java_sun_font_FreetypeFontScaler_initNativeScaler(
} }
} }
} }
}
if (error) { if (error) {
FT_Done_FreeType(scalerInfo->library); FT_Done_FreeType(scalerInfo->library);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册