mirror of
https://github.com/openjdk/jdk.git
synced 2025-09-18 01:54:47 +02:00
8180501: RescaleOp.filter does not document IllegalArgumentException if sizes differ
Reviewed-by: bpb, pnarayanan
This commit is contained in:
parent
837250ab0e
commit
a569f5293b
2 changed files with 73 additions and 2 deletions
|
@ -360,7 +360,8 @@ public class RescaleOp implements BufferedImageOp, RasterOp {
|
||||||
* of {@code src} is an {@code IndexColorModel},
|
* of {@code src} is an {@code IndexColorModel},
|
||||||
* or if the number of scaling factors and offsets in this
|
* or if the number of scaling factors and offsets in this
|
||||||
* {@code RescaleOp} do not meet the requirements
|
* {@code RescaleOp} do not meet the requirements
|
||||||
* stated in the class comments.
|
* stated in the class comments, or if the source and
|
||||||
|
* destination images differ in size.
|
||||||
*/
|
*/
|
||||||
public final BufferedImage filter (BufferedImage src, BufferedImage dst) {
|
public final BufferedImage filter (BufferedImage src, BufferedImage dst) {
|
||||||
ColorModel srcCM = src.getColorModel();
|
ColorModel srcCM = src.getColorModel();
|
||||||
|
@ -473,7 +474,8 @@ public class RescaleOp implements BufferedImageOp, RasterOp {
|
||||||
* {@code dst} do not have the same number of bands,
|
* {@code dst} do not have the same number of bands,
|
||||||
* or if the number of scaling factors and offsets in this
|
* or if the number of scaling factors and offsets in this
|
||||||
* {@code RescaleOp} do not meet the requirements
|
* {@code RescaleOp} do not meet the requirements
|
||||||
* stated in the class comments.
|
* stated in the class comments, or if the source and
|
||||||
|
* destination rasters differ in size.
|
||||||
*/
|
*/
|
||||||
public final WritableRaster filter (Raster src, WritableRaster dst) {
|
public final WritableRaster filter (Raster src, WritableRaster dst) {
|
||||||
return filterRasterImpl(src, dst, length, true);
|
return filterRasterImpl(src, dst, length, true);
|
||||||
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2017, 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.
|
||||||
|
*
|
||||||
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @test
|
||||||
|
* @bug 8180501
|
||||||
|
* @summary Verify RescaleOp.filter() throws exception for different sized
|
||||||
|
source and destination.
|
||||||
|
* @run main RescaleOpExceptionTest
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.awt.image.BufferedImage;
|
||||||
|
import static java.awt.image.BufferedImage.TYPE_INT_RGB;
|
||||||
|
import java.awt.image.RescaleOp;
|
||||||
|
import java.awt.image.WritableRaster;
|
||||||
|
|
||||||
|
public class RescaleOpExceptionTest {
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
|
||||||
|
RescaleOp op = new RescaleOp(1.0f, 0.0f, null);
|
||||||
|
|
||||||
|
BufferedImage srcI = new BufferedImage(1, 1, TYPE_INT_RGB);
|
||||||
|
BufferedImage dstI = new BufferedImage(1, 2, TYPE_INT_RGB);
|
||||||
|
|
||||||
|
boolean caughtIAE = false;
|
||||||
|
try {
|
||||||
|
op.filter(srcI, dstI);
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
caughtIAE = true;
|
||||||
|
}
|
||||||
|
if (!caughtIAE) {
|
||||||
|
throw new RuntimeException("Expected IllegalArgumentException");
|
||||||
|
}
|
||||||
|
|
||||||
|
WritableRaster srcR = srcI.getRaster();
|
||||||
|
WritableRaster dstR = dstI.getRaster();
|
||||||
|
|
||||||
|
caughtIAE = false;
|
||||||
|
try {
|
||||||
|
op.filter(srcR, dstR);
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
caughtIAE = true;
|
||||||
|
}
|
||||||
|
if (!caughtIAE) {
|
||||||
|
throw new RuntimeException("Expected IllegalArgumentException");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue