< prev index next >

src/java.desktop/macosx/native/libawt_lwawt/font/CCharToGlyphMapper.m

Print this page
rev 54096 : 8259651: [macOS] Replace JNF_COCOA_ENTER/EXIT macros
rev 54098 : 8260616: Removing remaining JNF dependencies in the java.desktop module
8259729: Missed JNFInstanceOf -> IsInstanceOf conversion

@@ -21,11 +21,11 @@
  * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
 
-#import <JavaNativeFoundation/JavaNativeFoundation.h>
+#import "JNIUtilities.h"
 
 #import "AWTFont.h"
 #import "CoreTextSupport.h"
 
 #import "sun_font_CCharToGlyphMapper.h"

@@ -39,16 +39,16 @@
 Java_sun_font_CCharToGlyphMapper_countGlyphs
     (JNIEnv *env, jclass clazz, jlong awtFontPtr)
 {
     jint numGlyphs = 0;
 
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
 
     AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr);
     numGlyphs = [awtFont->fFont numberOfGlyphs];
 
-JNF_COCOA_EXIT(env);
+JNI_COCOA_EXIT(env);
 
     return numGlyphs;
 }
 
 static inline void

@@ -88,11 +88,11 @@
 JNIEXPORT void JNICALL
 Java_sun_font_CCharToGlyphMapper_nativeCharsToGlyphs
     (JNIEnv *env, jclass clazz,
      jlong awtFontPtr, jint count, jcharArray unicodes, jintArray glyphs)
 {
-JNF_COCOA_ENTER(env);
+JNI_COCOA_ENTER(env);
 
     AWTFont *awtFont = (AWTFont *)jlong_to_ptr(awtFontPtr);
 
     // check the array size
     jint len = (*env)->GetArrayLength(env, glyphs);

@@ -109,7 +109,7 @@
 
         (*env)->ReleasePrimitiveArrayCritical(env, unicodes,
                                               unicodesAsChars, JNI_ABORT);
     }
 
-JNF_COCOA_EXIT(env);
+JNI_COCOA_EXIT(env);
 }
< prev index next >