--- a/jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m	Mon Jun 22 15:47:44 2015 +0300
+++ b/jdk/src/java.desktop/macosx/native/libsplashscreen/splashscreen_sys.m	Thu Jun 25 15:16:55 2015 +0300
@@ -275,7 +275,6 @@
         [image addRepresentation: rep];
         float scaleFactor = splash->scaleFactor;
         if (scaleFactor > 0 && scaleFactor != 1) {
-            [image setScalesWhenResized:YES];
             NSSize size = [image size];
             size.width /= scaleFactor;
             size.height /= scaleFactor;

--- a/jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c	Mon Jun 22 15:47:44 2015 +0300
+++ b/jdk/src/java.desktop/share/native/libawt/awt/image/awt_parseImage.c	Thu Jun 25 15:16:55 2015 +0300
@@ -852,7 +852,7 @@
             hintP->needToExpand = TRUE;
             hintP->expandToNbits = cmodelP->maxNbits;
         }
-        else if (rasterP->sppsm.offsets != NULL) {
+        else {
             for (i=0; i < rasterP->numBands; i++) {
                 if (!(rasterP->sppsm.offsets[i] % 8)) {
                     hintP->needToExpand  = TRUE;