src/macosx/native/sun/awt/CImage.m

*** 106,116 ****
  (JNIEnv *env, jclass klass, jintArray buffer, jint width, jint height)
  {
      jlong result = 0L;
  
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_ANY_THREAD;
  
      NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height);
      if (imageRep) {
          NSImage *nsImage = [[NSImage alloc] initWithSize:NSMakeSize(width, height)];
          [nsImage addRepresentation:imageRep];
--- 106,115 ----
*** 137,147 ****
  (JNIEnv *env, jclass klass, jobjectArray buffers, jintArray widths, jintArray heights)
  {
      jlong result = 0L;
  
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_ANY_THREAD;
  
      jsize num = (*env)->GetArrayLength(env, buffers);
      NSMutableArray * reps = [NSMutableArray arrayWithCapacity: num];
  
      jint * ws = (*env)->GetIntArrayElements(env, widths, NULL);
--- 136,145 ----
*** 185,195 ****
  (JNIEnv *env, jclass klass, jint selector)
  {
      NSImage *image = nil;
  
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_ANY_THREAD;
  
      IconRef iconRef;
      if (noErr == GetIconRef(kOnSystemDisk, kSystemIconsCreator, selector, &iconRef)) {
          image = [[NSImage alloc] initWithIconRef:iconRef];
          if (image) CFRetain(image); // GC
--- 183,192 ----
*** 210,220 ****
  (JNIEnv *env, jclass klass, jstring file)
  {
      NSImage *image = nil;
  
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_ANY_THREAD;
  
      NSString *path = JNFNormalizedNSStringForPath(env, file);
      image = [[NSImage alloc] initByReferencingFile:path];
      if (image) CFRetain(image); // GC
  
--- 207,216 ----
*** 232,245 ****
  (JNIEnv *env, jclass klass, jstring file)
  {
      __block NSImage *image = nil;
  
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_ANY_THREAD;
  
      NSString *path = JNFNormalizedNSStringForPath(env, file);
!     [JNFRunLoop performOnMainThreadWaiting:YES withBlock:^(){
          image = [[NSWorkspace sharedWorkspace] iconForFile:path];
          [image setScalesWhenResized:TRUE];
          if (image) CFRetain(image); // GC
      }];
  
--- 228,240 ----
  (JNIEnv *env, jclass klass, jstring file)
  {
      __block NSImage *image = nil;
  
  JNF_COCOA_ENTER(env);
  
      NSString *path = JNFNormalizedNSStringForPath(env, file);
!     [ThreadUtilities performOnMainThreadWaiting:YES block:^(){
          image = [[NSWorkspace sharedWorkspace] iconForFile:path];
          [image setScalesWhenResized:TRUE];
          if (image) CFRetain(image); // GC
      }];
  
*** 257,267 ****
  (JNIEnv *env, jclass klass, jstring name)
  {
      NSImage *image = nil;
  
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_ANY_THREAD;
  
      image = [NSImage imageNamed:JNFJavaToNSString(env, name)];
      if (image) CFRetain(image); // GC
  
  JNF_COCOA_EXIT(env);
--- 252,261 ----
*** 276,286 ****
   */
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CImage_nativeCopyNSImageIntoArray
  (JNIEnv *env, jclass klass, jlong nsImgPtr, jintArray buffer, jint w, jint h)
  {
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_ANY_THREAD;
  
      NSImage *img = (NSImage *)jlong_to_ptr(nsImgPtr);
      jint *dst = (*env)->GetPrimitiveArrayCritical(env, buffer, NULL);
      if (dst) {
          CImage_CopyNSImageIntoArray(img, dst, w, h);
--- 270,279 ----
*** 299,309 ****
  (JNIEnv *env, jclass klass, jlong nsImgPtr)
  {
      jobject size = NULL;
  
  JNF_COCOA_ENTER(env);
- AWT_ASSERT_ANY_THREAD;
  
      size = NSToJavaSize(env, [(NSImage *)jlong_to_ptr(nsImgPtr) size]);
  
  JNF_COCOA_EXIT(env);
  
--- 292,301 ----