mirror of
https://github.com/openjdk/jdk.git
synced 2026-03-03 20:50:19 +00:00
4958064: JPGWriter does not throw UnsupportedException when canWriteSequence retuns false
Reviewed-by: prr, bae
This commit is contained in:
parent
b15e27a0b2
commit
104db62eca
@ -1104,6 +1104,11 @@ public class JPEGImageWriter extends ImageWriter {
|
||||
currentImage++; // After a successful write
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canWriteSequence() {
|
||||
return true;
|
||||
}
|
||||
|
||||
public void prepareWriteSequence(IIOMetadata streamMetadata)
|
||||
throws IOException {
|
||||
setThreadLock();
|
||||
|
||||
78
jdk/test/javax/imageio/plugins/shared/CanWriteSequence.java
Normal file
78
jdk/test/javax/imageio/plugins/shared/CanWriteSequence.java
Normal file
@ -0,0 +1,78 @@
|
||||
/*
|
||||
* Copyright (c) 2015, 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.
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.util.Iterator;
|
||||
|
||||
import javax.imageio.ImageIO;
|
||||
import javax.imageio.ImageWriter;
|
||||
import javax.imageio.metadata.IIOMetadata;
|
||||
import javax.imageio.spi.IIORegistry;
|
||||
import javax.imageio.spi.ImageWriterSpi;
|
||||
import javax.imageio.stream.ImageOutputStream;
|
||||
|
||||
/**
|
||||
* @test
|
||||
* @bug 4958064
|
||||
* @author Sergey Bylokhov
|
||||
*/
|
||||
public final class CanWriteSequence {
|
||||
|
||||
public static void main(final String[] args) throws Exception {
|
||||
final IIORegistry registry = IIORegistry.getDefaultInstance();
|
||||
final Iterator<ImageWriterSpi> iter =
|
||||
registry.getServiceProviders(ImageWriterSpi.class,
|
||||
provider -> true, true);
|
||||
// Validates all supported ImageWriters
|
||||
while (iter.hasNext()) {
|
||||
final ImageWriter writer = iter.next().createWriterInstance();
|
||||
System.out.println("ImageWriter = " + writer);
|
||||
test(writer);
|
||||
}
|
||||
System.out.println("Test passed");
|
||||
}
|
||||
|
||||
private static void test(final ImageWriter writer) throws Exception {
|
||||
final File file = File.createTempFile("temp", ".img");
|
||||
file.deleteOnExit();
|
||||
final FileOutputStream fos = new FileOutputStream(file);
|
||||
final ImageOutputStream ios = ImageIO.createImageOutputStream(fos);
|
||||
writer.setOutput(ios);
|
||||
final IIOMetadata data = writer.getDefaultStreamMetadata(null);
|
||||
|
||||
if (writer.canWriteSequence()) {
|
||||
writer.prepareWriteSequence(data);
|
||||
} else {
|
||||
try {
|
||||
writer.prepareWriteSequence(data);
|
||||
throw new RuntimeException(
|
||||
"UnsupportedOperationException was not thrown");
|
||||
} catch (final UnsupportedOperationException ignored) {
|
||||
// expected
|
||||
}
|
||||
}
|
||||
writer.dispose();
|
||||
ios.close();
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user