src/java.desktop/macosx/classes/sun/java2d/IntegerNIORaster.java

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2012, 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
*** 38,62 ****
          if ((w <= 0) || (h <= 0)) {
              throw new IllegalArgumentException("Width (" + w + ") and height (" + h +
                                                 ") cannot be <= 0");
          }
          // This is cribbed from java.awt.image.Raster.
!         DataBuffer db = new DataBufferNIOInt(w * h);
          if (location == null) {
              location = new Point(0, 0);
          }
          SinglePixelPackedSampleModel sppsm =  new SinglePixelPackedSampleModel(DataBuffer.TYPE_INT, w, h, w, bandMasks);
          return new IntegerNIORaster(sppsm, db, location);
      }
  
!     public IntegerNIORaster(SampleModel sampleModel, DataBuffer dataBuffer, Point origin) {
          // This is all cribbed from sun.awt.image.IntegerInterleavedRaster & sun.awt.image.IntegerComponentRaster
          super(sampleModel, dataBuffer, new Rectangle(origin.x, origin.y, sampleModel.getWidth(), sampleModel.getHeight()), origin, null);
!         if (!(dataBuffer instanceof DataBufferNIOInt)) {
!            throw new RasterFormatException("IntegerNIORasters must have DataBufferNIOInt DataBuffers");
!         }
!         this.data = ((DataBufferNIOInt)dataBuffer).getBuffer();
      }
  
      public WritableRaster createCompatibleWritableRaster() {
          return new IntegerNIORaster(sampleModel, new DataBufferNIOInt(sampleModel.getWidth() * sampleModel.getHeight()), new Point(0,0));
      }
--- 38,60 ----
          if ((w <= 0) || (h <= 0)) {
              throw new IllegalArgumentException("Width (" + w + ") and height (" + h +
                                                 ") cannot be <= 0");
          }
          // This is cribbed from java.awt.image.Raster.
!         DataBufferNIOInt db = new DataBufferNIOInt(w * h);
          if (location == null) {
              location = new Point(0, 0);
          }
          SinglePixelPackedSampleModel sppsm =  new SinglePixelPackedSampleModel(DataBuffer.TYPE_INT, w, h, w, bandMasks);
          return new IntegerNIORaster(sppsm, db, location);
      }
  
!     public IntegerNIORaster(SampleModel sampleModel, DataBufferNIOInt dataBuffer, Point origin) {
          // This is all cribbed from sun.awt.image.IntegerInterleavedRaster & sun.awt.image.IntegerComponentRaster
          super(sampleModel, dataBuffer, new Rectangle(origin.x, origin.y, sampleModel.getWidth(), sampleModel.getHeight()), origin, null);
! 
!         this.data = dataBuffer.getBuffer();
      }
  
      public WritableRaster createCompatibleWritableRaster() {
          return new IntegerNIORaster(sampleModel, new DataBufferNIOInt(sampleModel.getWidth() * sampleModel.getHeight()), new Point(0,0));
      }