--- old/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m 2020-08-05 17:14:44.000000000 -0700 +++ new/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m 2020-08-05 17:14:43.000000000 -0700 @@ -242,10 +242,10 @@ NSString *string = [NSString stringWithCharacters:chars length:length]; /* - The calls below were used previously but for unknown reason did not - render using the right font (see bug 7183516) when attribString is not - initialized with font dictionary attributes. It seems that "options" - in CTTypesetterCreateWithAttributedStringAndOptions which contains the + The calls below were used previously but for unknown reason did not + render using the right font (see bug 7183516) when attribString is not + initialized with font dictionary attributes. It seems that "options" + in CTTypesetterCreateWithAttributedStringAndOptions which contains the font dictionary is ignored. NSAttributedString *attribString = [[NSAttributedString alloc] initWithString:string]; @@ -255,7 +255,7 @@ NSAttributedString *attribString = [[NSAttributedString alloc] initWithString:string attributes:ctsDictionaryFor(nsFont, JRSFontStyleUsesFractionalMetrics(strike->fStyle))]; - + CTTypesetterRef typeSetterRef = CTTypesetterCreateWithAttributedString((CFAttributedStringRef) attribString); CFRange range = {0, length}; @@ -352,12 +352,12 @@ jdoubleArray g_gtiTransformsArray = JNFGetObjectField(env, gti, jm_StandardGlyphVector_GlyphTransformInfo_transforms); //(*env)->GetObjectField(env, gti, g_gtiTransforms); if (g_gtiTransformsArray == NULL) { return; - } + } jdouble *g_gvTransformsAsDoubles = (*env)->GetPrimitiveArrayCritical(env, g_gtiTransformsArray, NULL); if (g_gvTransformsAsDoubles == NULL) { (*env)->DeleteLocalRef(env, g_gtiTransformsArray); return; - } + } static JNF_MEMBER_CACHE(jm_StandardGlyphVector_GlyphTransformInfo_indices, jc_StandardGlyphVector_GlyphTransformInfo, "indices", "[I"); jintArray g_gtiTXIndicesArray = JNFGetObjectField(env, gti, jm_StandardGlyphVector_GlyphTransformInfo_indices);