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

8009013: Better handling of T2K glyphs

Browse Source 
Reviewed-by: bae, mschoene, prr
This commit is contained in:
Jia-Hong Chen 2013-03-19 14:29:34 -07:00 committed by Jennifer Godinez
parent 0244671a23
commit 33af6236b8
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jdk/src/share/native/sun/font/freetypeScaler.c
View File

@ -1351,17 +1351,22 @@ Java_sun_font_FreetypeFontScaler_getGlyphVectorOutlineNative(
FTScalerInfo *scalerInfo = FTScalerInfo *scalerInfo =
(FTScalerInfo*) jlong_to_ptr(pScaler); (FTScalerInfo*) jlong_to_ptr(pScaler);
glyphs = (jint*) malloc(numGlyphs*sizeof(jint)); glyphs = NULL;
if (numGlyphs > 0 && 0xffffffffu / sizeof(jint) >= numGlyphs) {
glyphs = (jint*) malloc(numGlyphs*sizeof(jint));
}
if (glyphs == NULL) { if (glyphs == NULL) {
// We reach here if:
// 1. numGlyphs <= 0,
// 2. overflow check failed, or
// 3. malloc failed.
gp = (*env)->NewObject(env, sunFontIDs.gpClass, sunFontIDs.gpCtrEmpty); gp = (*env)->NewObject(env, sunFontIDs.gpClass, sunFontIDs.gpCtrEmpty);
if (!isNullScalerContext(context) && scalerInfo != NULL) {
invalidateJavaScaler(env, scaler, scalerInfo);
}
return gp; return gp;
} }
(*env)->GetIntArrayRegion(env, glyphArray, 0, numGlyphs, glyphs); (*env)->GetIntArrayRegion(env, glyphArray, 0, numGlyphs, glyphs);
gpdata.numCoords = 0;
for (i=0; i<numGlyphs;i++) { for (i=0; i<numGlyphs;i++) {
if (glyphs[i] >= INVISIBLE_GLYPHS) { if (glyphs[i] >= INVISIBLE_GLYPHS) {
continue; continue;