src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m

*** 110,120 ****
  (JNIEnv *env, jclass klass, jintArray buffer, jint width, jint height)
  {
      jlong result = 0L;
  
  JNF_COCOA_ENTER(env);
!     
      NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height);
      if (imageRep) {
          NSImage *nsImage = [[NSImage alloc] initWithSize:NSMakeSize(width, height)];
          [nsImage addRepresentation:imageRep];
          result = ptr_to_jlong(nsImage);
--- 110,120 ----
  (JNIEnv *env, jclass klass, jintArray buffer, jint width, jint height)
  {
      jlong result = 0L;
  
  JNF_COCOA_ENTER(env);
! 
      NSBitmapImageRep* imageRep = CImage_CreateImageRep(env, buffer, width, height);
      if (imageRep) {
          NSImage *nsImage = [[NSImage alloc] initWithSize:NSMakeSize(width, height)];
          [nsImage addRepresentation:imageRep];
          result = ptr_to_jlong(nsImage);
*** 323,342 ****
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CImage_nativeResizeNSImageRepresentations
  (JNIEnv *env, jclass clazz, jlong image, jdouble w, jdouble h)
  {
      if (!image) return;
      NSImage *i = (NSImage *)jlong_to_ptr(image);
!     
  JNF_COCOA_ENTER(env);
!     
      NSImageRep *imageRep = nil;
      NSArray *imageRepresentations = [i representations];
      NSEnumerator *imageEnumerator = [imageRepresentations objectEnumerator];
      while ((imageRep = [imageEnumerator nextObject]) != nil) {
          [imageRep setSize:NSMakeSize(w, h)];
      }
!     
  JNF_COCOA_EXIT(env);
  }
  
  NSComparisonResult getOrder(BOOL order){
      return (NSComparisonResult) (order ? NSOrderedAscending : NSOrderedDescending);
--- 323,342 ----
  JNIEXPORT void JNICALL Java_sun_lwawt_macosx_CImage_nativeResizeNSImageRepresentations
  (JNIEnv *env, jclass clazz, jlong image, jdouble w, jdouble h)
  {
      if (!image) return;
      NSImage *i = (NSImage *)jlong_to_ptr(image);
! 
  JNF_COCOA_ENTER(env);
! 
      NSImageRep *imageRep = nil;
      NSArray *imageRepresentations = [i representations];
      NSEnumerator *imageEnumerator = [imageRepresentations objectEnumerator];
      while ((imageRep = [imageEnumerator nextObject]) != nil) {
          [imageRep setSize:NSMakeSize(w, h)];
      }
! 
  JNF_COCOA_EXIT(env);
  }
  
  NSComparisonResult getOrder(BOOL order){
      return (NSComparisonResult) (order ? NSOrderedAscending : NSOrderedDescending);
*** 354,388 ****
      if (!image) return NULL;
      jobjectArray jreturnArray = NULL;
      NSImage *img = (NSImage *)jlong_to_ptr(image);
  
  JNF_COCOA_ENTER(env);
!         
      NSArray *imageRepresentations = [img representations];
      if([imageRepresentations count] == 0){
          return NULL;
      }
!     
      NSArray *sortedImageRepresentations = [imageRepresentations
                      sortedArrayUsingComparator: ^(id obj1, id obj2) {
!         
          NSImageRep *imageRep1 = (NSImageRep *) obj1;
          NSImageRep *imageRep2 = (NSImageRep *) obj2;
          NSSize size1 = [imageRep1 size];
          NSSize size2 = [imageRep2 size];
!         
          if (NSEqualSizes(size1, size2)) {
              return getOrder([imageRep1 pixelsWide] <= [imageRep2 pixelsWide] &&
                              [imageRep1 pixelsHigh] <= [imageRep2 pixelsHigh]);
          }
  
          return getOrder(size1.width <= size2.width && size1.height <= size2.height);
      }];
  
      NSMutableArray *sortedPixelSizes = [[[NSMutableArray alloc] init] autorelease];
      NSSize lastSize = [[sortedImageRepresentations lastObject] size];
!     
      NSUInteger i = [sortedImageRepresentations indexOfObjectPassingTest:
                 ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
          NSSize imageRepSize = [obj size];
          return (w <= imageRepSize.width && h <= imageRepSize.height)
                     || NSEqualSizes(imageRepSize, lastSize);
--- 354,388 ----
      if (!image) return NULL;
      jobjectArray jreturnArray = NULL;
      NSImage *img = (NSImage *)jlong_to_ptr(image);
  
  JNF_COCOA_ENTER(env);
! 
      NSArray *imageRepresentations = [img representations];
      if([imageRepresentations count] == 0){
          return NULL;
      }
! 
      NSArray *sortedImageRepresentations = [imageRepresentations
                      sortedArrayUsingComparator: ^(id obj1, id obj2) {
! 
          NSImageRep *imageRep1 = (NSImageRep *) obj1;
          NSImageRep *imageRep2 = (NSImageRep *) obj2;
          NSSize size1 = [imageRep1 size];
          NSSize size2 = [imageRep2 size];
! 
          if (NSEqualSizes(size1, size2)) {
              return getOrder([imageRep1 pixelsWide] <= [imageRep2 pixelsWide] &&
                              [imageRep1 pixelsHigh] <= [imageRep2 pixelsHigh]);
          }
  
          return getOrder(size1.width <= size2.width && size1.height <= size2.height);
      }];
  
      NSMutableArray *sortedPixelSizes = [[[NSMutableArray alloc] init] autorelease];
      NSSize lastSize = [[sortedImageRepresentations lastObject] size];
! 
      NSUInteger i = [sortedImageRepresentations indexOfObjectPassingTest:
                 ^BOOL(id obj, NSUInteger idx, BOOL *stop) {
          NSSize imageRepSize = [obj size];
          return (w <= imageRepSize.width && h <= imageRepSize.height)
                     || NSEqualSizes(imageRepSize, lastSize);