archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 10:04:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Lana Steuck 2018-02-02 01:52:03 +00:00
commit 414e05f6d7
1018 changed files with 27214 additions and 7501 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.desktop/share/classes/java/awt/Toolkit.java
View file

@ -678,6 +678,11 @@ public abstract class Toolkit {
* If the connection to the specified URL requires
* either {@code URLPermission} or {@code SocketPermission},
* then {@code URLPermission} is used for security checks.
* For compatibility with pre-1.2 security managers, if the access
* is denied with {@code FilePermission} or {@code SocketPermission},
* the method throws the {@code SecurityException}
* if the corresponding 1.1-style SecurityManager.checkXXX method
* also denies permission.
* @param url the URL to use in fetching the pixel data.
* @return an image which gets its pixel data from
* the specified URL.
@ -719,6 +724,11 @@ public abstract class Toolkit {
* If the connection to the specified URL requires
* either {@code URLPermission} or {@code SocketPermission},
* then {@code URLPermission} is used for security checks.
* For compatibility with pre-1.2 security managers, if the access
* is denied with {@code FilePermission} or {@code SocketPermission},
* the method throws {@code SecurityException}
* if the corresponding 1.1-style SecurityManager.checkXXX method
* also denies permission.
* @param url the URL to use in fetching the pixel data.
* @return an image which gets its pixel data from
* the specified URL.

28
src/java.desktop/share/classes/java/awt/image/BandedSampleModel.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2018, 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
@ -185,7 +185,33 @@ public final class BandedSampleModel extends ComponentSampleModel
public DataBuffer createDataBuffer() {
DataBuffer dataBuffer = null;
// The minimum size required to store samples of one band
int size = scanlineStride * height;
if (numBanks == 1) {
/*
* The sample model contains a single bank of data buffer. Hence
* we need to compute the size required to store samples of all
* bands including the respective offsets.
*/
int sizePerBand = size;
size += bandOffsets[0];
for (int index = 1; index < bandOffsets.length; index++) {
size += (bandOffsets[index] - size) + sizePerBand;
}
} else {
/*
* The sample model contains multiple banks of data buffer where
* each bank would correspond to a particular band. Hence we need
* to compute only the additional space required for band offsets.
*/
int maxBandOffset = bandOffsets[0];
for (int index = 1; index < bandOffsets.length; index++) {
maxBandOffset = Math.max(maxBandOffset, bandOffsets[index]);
}
size += maxBandOffset;
}
switch (dataType) {
case DataBuffer.TYPE_BYTE:
dataBuffer = new DataBufferByte(size, numBanks);