src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.  Oracle designates this
*** 45,54 ****
--- 45,58 ----
  #include <dlfcn.h>
  
  #include <sizecalc.h>
  #import "ThreadUtilities.h"
  
+ NSString* findScaledImageName(NSString *fileName,
+                               NSUInteger dotIndex,
+                               NSString *strToAppend);
+ 
  static NSScreen* SplashNSScreen()
  {
      return [[NSScreen screens] objectAtIndex: 0];
  }
  
*** 157,177 ****
          NSRange range = [fileName rangeOfString: @"."
                                          options:NSBackwardsSearch];
          NSUInteger dotIndex = range.location;
          NSString *fileName2x = nil;
          
!         if (dotIndex == NSNotFound) {
!             fileName2x = [fileName stringByAppendingString: @"@2x"];
!         } else {
!             fileName2x = [fileName substringToIndex: dotIndex];
!             fileName2x = [fileName2x stringByAppendingString: @"@2x"];
!             fileName2x = [fileName2x stringByAppendingString:
!                           [fileName substringFromIndex: dotIndex]];
          }
!         
!         if ((fileName2x != nil) && (jar || [[NSFileManager defaultManager]
!                     fileExistsAtPath: fileName2x])){
              if (strlen([fileName2x UTF8String]) > scaledImageLength) {
                  [pool drain];
                  return JNI_FALSE;
              }
              *scaleFactor = 2;
--- 161,177 ----
          NSRange range = [fileName rangeOfString: @"."
                                          options:NSBackwardsSearch];
          NSUInteger dotIndex = range.location;
          NSString *fileName2x = nil;
  
!         fileName2x = findScaledImageName(fileName, dotIndex, @"@2x");
!         if(![[NSFileManager defaultManager]
!                 fileExistsAtPath: fileName2x]) {
!             fileName2x = findScaledImageName(fileName, dotIndex, @"@200pct");
          }
!         if (jar || [[NSFileManager defaultManager]
!                 fileExistsAtPath: fileName2x]){
              if (strlen([fileName2x UTF8String]) > scaledImageLength) {
                  [pool drain];
                  return JNI_FALSE;
              }
              *scaleFactor = 2;
*** 456,460 ****
--- 456,473 ----
  void
  SplashReconfigure(Splash * splash) {
      sendctl(splash, SPLASHCTL_RECONFIGURE);
  }
  
+ NSString* findScaledImageName(NSString *fileName, NSUInteger dotIndex, NSString *strToAppend) {
+     NSString *fileName2x = nil;
+     if (dotIndex == NSNotFound) {
+         fileName2x = [fileName stringByAppendingString: strToAppend];
+     } else {
+         fileName2x = [fileName substringToIndex: dotIndex];
+         fileName2x = [fileName2x stringByAppendingString: strToAppend];
+         fileName2x = [fileName2x stringByAppendingString:
+                       [fileName substringFromIndex: dotIndex]];
+     }
+     return fileName2x;
+ }
+