Backups/TwelveMonkeys
2
0
Fork 0
mirror of https://github.com/haraldk/TwelveMonkeys.git synced 2025-08-04 20:15:28 -04:00
Code Issues Projects Releases Wiki Activity

#360 JPEG-LOSSLESS/jpeg-lossless now part of format names.

Browse Source
This commit is contained in:
Harald Kuhr 2017-12-19 19:52:25 +01:00
parent c2fe5ab736
commit 73e4eb8627
4 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderSpi.java
View File

@ -113,21 +113,6 @@ public final class JPEGImageReaderSpi extends ImageReaderSpiBase {
return delegateProvider.canDecodeInput(source);
}
@Override
public String[] getFormatNames() {
return delegateProvider.getFormatNames();
}
@Override
public String[] getFileSuffixes() {
return delegateProvider.getFileSuffixes();
}
@Override
public String[] getMIMETypes() {
return delegateProvider.getMIMETypes();
}
@Override
public boolean isStandardStreamMetadataFormatSupported() {
return delegateProvider.isStandardStreamMetadataFormatSupported();

11
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageWriterSpi.java
View File

@ -107,19 +107,10 @@ public class JPEGImageWriterSpi extends ImageWriterSpiBase {
@Override
public String[] getFormatNames() {
// NOTE: Can't use super.getFormatNames() which includes JPEG-Lossless
return delegateProvider.getFormatNames();
}
@Override
public String[] getFileSuffixes() {
return delegateProvider.getFileSuffixes();
}
@Override
public String[] getMIMETypes() {
return delegateProvider.getMIMETypes();
}
@Override
public boolean isStandardStreamMetadataFormatSupported() {
return delegateProvider.isStandardStreamMetadataFormatSupported();

2
imageio/imageio-jpeg/src/main/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGProviderInfo.java
View File

@ -41,7 +41,7 @@ final class JPEGProviderInfo extends ReaderWriterProviderInfo {
JPEGProviderInfo() {
super(
JPEGProviderInfo.class,
new String[] {"JPEG", "jpeg", "JPG", "jpg"},
new String[] {"JPEG", "jpeg", "JPG", "jpg", "JPEG-LOSSLESS", "jpeg-lossless"},
new String[] {"jpg", "jpeg"},
new String[] {"image/jpeg"},
"com.twelvemonkeys.imageio.plugins.jpeg.JPEGImageReader",

17
imageio/imageio-jpeg/src/test/java/com/twelvemonkeys/imageio/plugins/jpeg/JPEGImageReaderTest.java
View File

@ -150,7 +150,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
@Override
protected List<String> getFormatNames() {
return Arrays.asList("JPEG", "jpeg", "JPG", "jpg");
return Arrays.asList("JPEG", "jpeg", "JPG", "jpg",
"jpeg-lossless", "JPEG-LOSSLESS");
}
@Override
@ -1206,9 +1207,8 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
for (String resource : resources) {
// Just test that we can read the metadata without exceptions
JPEGImageReader reader = createReader();
ImageInputStream stream = ImageIO.createImageInputStream(getClassLoaderResource(resource));
try {
try (ImageInputStream stream = ImageIO.createImageInputStream(getClassLoaderResource(resource))) {
reader.setInput(stream);
IIOMetadata metadata = reader.getImageMetadata(0);
assertNotNull(String.format("%s: null metadata", resource), metadata);
@ -1219,12 +1219,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
}
catch (IIOException e) {
AssertionError fail = new AssertionError(String.format("Reading metadata failed for %ss: %s", resource, e.getMessage()));
fail.initCause(e);
throw fail;
}
finally {
stream.close();
throw new AssertionError(String.format("Reading metadata failed for %ss: %s", resource, e.getMessage()), e);
}
}
}
@ -1256,9 +1251,7 @@ public class JPEGImageReaderTest extends ImageReaderAbstractTest<JPEGImageReader
}
}
catch (IIOException e) {
AssertionError fail = new AssertionError(String.format("Reading metadata failed for %s image %s: %s", testData, i, e.getMessage()));
fail.initCause(e);
throw fail;
throw new AssertionError(String.format("Reading metadata failed for %s image %s: %s", testData, i, e.getMessage()), e);
}
}
catch (IIOException ignore) {