diff --git a/bom/pom.xml b/bom/pom.xml index 42a7ed3c..57f07c35 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -58,6 +58,16 @@ imageio-bmp ${project.version} + + com.twelvemonkeys.imageio + imageio-cr2 + ${project.version} + + + com.twelvemonkeys.imageio + imageio-dng + ${project.version} + com.twelvemonkeys.imageio imageio-hdr @@ -78,6 +88,11 @@ imageio-jpeg ${project.version} + + com.twelvemonkeys.imageio + imageio-nef + ${project.version} + com.twelvemonkeys.imageio imageio-pcx diff --git a/imageio/imageio-cr2/pom.xml b/imageio/imageio-cr2/pom.xml index 6116f59a..18d7fa65 100644 --- a/imageio/imageio-cr2/pom.xml +++ b/imageio/imageio-cr2/pom.xml @@ -33,7 +33,7 @@ imageio com.twelvemonkeys.imageio - 3.1-SNAPSHOT + 3.4-SNAPSHOT 4.0.0 diff --git a/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReader.java b/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReader.java index 3ce377c9..cd0bc6c6 100644 --- a/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReader.java +++ b/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReader.java @@ -32,10 +32,10 @@ import com.twelvemonkeys.imageio.ImageReaderBase; import com.twelvemonkeys.imageio.metadata.CompoundDirectory; import com.twelvemonkeys.imageio.metadata.Directory; import com.twelvemonkeys.imageio.metadata.Entry; -import com.twelvemonkeys.imageio.metadata.exif.EXIFReader; -import com.twelvemonkeys.imageio.metadata.exif.TIFF; import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegment; import com.twelvemonkeys.imageio.metadata.jpeg.JPEGSegmentUtil; +import com.twelvemonkeys.imageio.metadata.tiff.TIFF; +import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader; import com.twelvemonkeys.imageio.stream.SubImageInputStream; import javax.imageio.IIOException; @@ -111,7 +111,7 @@ public final class CR2ImageReader extends ImageReaderBase { imageInput.seek(0); - IFDs = (CompoundDirectory) new EXIFReader().read(imageInput); // NOTE: Sets byte order as a side effect + IFDs = (CompoundDirectory) new TIFFReader().read(imageInput); // NOTE: Sets byte order as a side effect if (DEBUG) { System.err.println("Byte order: " + imageInput.getByteOrder()); diff --git a/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderSpi.java b/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderSpi.java index 3f57f441..215c85b4 100644 --- a/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderSpi.java +++ b/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderSpi.java @@ -28,12 +28,10 @@ package com.twelvemonkeys.imageio.plugins.cr2; -import com.twelvemonkeys.imageio.metadata.exif.TIFF; -import com.twelvemonkeys.imageio.spi.ProviderInfo; -import com.twelvemonkeys.imageio.util.IIOUtil; +import com.twelvemonkeys.imageio.metadata.tiff.TIFF; +import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase; import javax.imageio.ImageReader; -import javax.imageio.spi.ImageReaderSpi; import javax.imageio.stream.ImageInputStream; import java.io.IOException; import java.nio.ByteOrder; @@ -46,28 +44,9 @@ import java.util.Locale; * @author last modified by $Author: haraldk$ * @version $Id: CR2ImageReaderSpi.java,v 1.0 07.04.14 21:26 haraldk Exp$ */ -public final class CR2ImageReaderSpi extends ImageReaderSpi { +public final class CR2ImageReaderSpi extends ImageReaderSpiBase { public CR2ImageReaderSpi() { - this(IIOUtil.getProviderInfo(CR2ImageReaderSpi.class)); - } - - private CR2ImageReaderSpi(final ProviderInfo pProviderInfo) { - super( - pProviderInfo.getVendorName(), - pProviderInfo.getVersion(), - new String[]{"cr2", "CR2"}, - new String[]{"cr2"}, - new String[]{ - "image/x-canon-raw", // TODO: Look up - }, - "com.twelvemonkeys.imageio.plugins.cr2.CR2ImageReader", - new Class[] {ImageInputStream.class}, - null, - true, null, null, null, null, - true, - null, null, - null, null - ); + super(new CR2ProviderInfo()); } public boolean canDecodeInput(final Object pSource) throws IOException { diff --git a/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ProviderInfo.java b/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ProviderInfo.java new file mode 100644 index 00000000..d7d891c3 --- /dev/null +++ b/imageio/imageio-cr2/src/main/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ProviderInfo.java @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2018, Oleg Ermolaev + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name "TwelveMonkeys" nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package com.twelvemonkeys.imageio.plugins.cr2; + +import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo; + +/** + * @author Oleg Ermolaev Date: 04.05.2018 1:50 + */ +class CR2ProviderInfo extends ReaderWriterProviderInfo { + protected CR2ProviderInfo() { + super( + CR2ProviderInfo.class, + new String[]{"cr2", "CR2"}, + new String[]{"cr2"}, + new String[]{"image/x-canon-raw", // TODO: Look up + }, + "com.twelvemonkeys.imageio.plugins.cr2.CR2ImageReader", + new String[]{"com.twelvemonkeys.imageio.plugins.cr2.CR2ImageReaderSpi"}, + null, + null, + true, + null, + null, + null, + null, + true, + null, + null, + null, + null + ); + } +} diff --git a/imageio/imageio-cr2/src/test/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderTest.java b/imageio/imageio-cr2/src/test/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderTest.java index e6431642..d61b7a43 100644 --- a/imageio/imageio-cr2/src/test/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderTest.java +++ b/imageio/imageio-cr2/src/test/java/com/twelvemonkeys/imageio/plugins/cr2/CR2ImageReaderTest.java @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.cr2; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Ignore; import org.junit.Test; @@ -47,7 +47,7 @@ import java.util.List; * @version $Id: CR2ImageReaderTest.java,v 1.0 07.04.14 21:52 haraldk Exp$ */ @Ignore -public class CR2ImageReaderTest extends ImageReaderAbstractTestCase { +public class CR2ImageReaderTest extends ImageReaderAbstractTest { @Override protected List getTestData() { return Arrays.asList( diff --git a/imageio/imageio-dng/pom.xml b/imageio/imageio-dng/pom.xml index 8b7a74f1..7ddfb2fb 100644 --- a/imageio/imageio-dng/pom.xml +++ b/imageio/imageio-dng/pom.xml @@ -33,7 +33,7 @@ imageio com.twelvemonkeys.imageio - 3.1-SNAPSHOT + 3.4-SNAPSHOT 4.0.0 diff --git a/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReader.java b/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReader.java index fe4c86b1..cf33ef63 100644 --- a/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReader.java +++ b/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReader.java @@ -32,8 +32,8 @@ import com.twelvemonkeys.imageio.ImageReaderBase; import com.twelvemonkeys.imageio.metadata.CompoundDirectory; import com.twelvemonkeys.imageio.metadata.Directory; import com.twelvemonkeys.imageio.metadata.Entry; -import com.twelvemonkeys.imageio.metadata.exif.EXIFReader; -import com.twelvemonkeys.imageio.metadata.exif.TIFF; +import com.twelvemonkeys.imageio.metadata.tiff.TIFF; +import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader; import com.twelvemonkeys.imageio.stream.SubImageInputStream; import com.twelvemonkeys.imageio.util.IIOUtil; import com.twelvemonkeys.io.LittleEndianDataInputStream; @@ -101,7 +101,7 @@ public final class DNGImageReader extends ImageReaderBase { if (IFDs == null) { imageInput.seek(0); - IFDs = (CompoundDirectory) new EXIFReader().read(imageInput); // NOTE: Sets byte order as a side effect + IFDs = (CompoundDirectory) new TIFFReader().read(imageInput); // NOTE: Sets byte order as a side effect // Pull up the sub-ifds now, as the DNG spec "recommends the use of SubIFD trees, // as described in the TIFF-EP specification. SubIFD chains are not supported". diff --git a/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderSpi.java b/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderSpi.java index fba4ac76..567f1502 100644 --- a/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderSpi.java +++ b/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderSpi.java @@ -28,12 +28,10 @@ package com.twelvemonkeys.imageio.plugins.dng; -import com.twelvemonkeys.imageio.metadata.exif.TIFF; -import com.twelvemonkeys.imageio.spi.ProviderInfo; -import com.twelvemonkeys.imageio.util.IIOUtil; +import com.twelvemonkeys.imageio.metadata.tiff.TIFF; +import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase; import javax.imageio.ImageReader; -import javax.imageio.spi.ImageReaderSpi; import javax.imageio.stream.ImageInputStream; import java.io.IOException; import java.nio.ByteOrder; @@ -46,28 +44,9 @@ import java.util.Locale; * @author last modified by $Author: haraldk$ * @version $Id: CR2ImageReaderSpi.java,v 1.0 07.04.14 21:26 haraldk Exp$ */ -public final class DNGImageReaderSpi extends ImageReaderSpi { +public final class DNGImageReaderSpi extends ImageReaderSpiBase { public DNGImageReaderSpi() { - this(IIOUtil.getProviderInfo(DNGImageReaderSpi.class)); - } - - private DNGImageReaderSpi(final ProviderInfo pProviderInfo) { - super( - pProviderInfo.getVendorName(), - pProviderInfo.getVersion(), - new String[]{"dng", "NDG"}, - new String[]{"dng"}, - new String[]{ - "image/x-adobe-dng", // TODO: Look up - }, - "com.twelvemonkeys.imageio.plugins.dng.DNGImageReader", - new Class[] {ImageInputStream.class}, - null, - true, null, null, null, null, - true, - null, null, - null, null - ); + super(new DNGProviderInfo()); } public boolean canDecodeInput(final Object pSource) throws IOException { diff --git a/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGProviderInfo.java b/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGProviderInfo.java new file mode 100644 index 00000000..a963f1ca --- /dev/null +++ b/imageio/imageio-dng/src/main/java/com/twelvemonkeys/imageio/plugins/dng/DNGProviderInfo.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2018, Oleg Ermolaev + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name "TwelveMonkeys" nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package com.twelvemonkeys.imageio.plugins.dng; + +import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo; + +/** + * @author Oleg Ermolaev Date: 04.05.2018 1:50 + */ +class DNGProviderInfo extends ReaderWriterProviderInfo { + protected DNGProviderInfo() { + super( + DNGProviderInfo.class, + new String[]{"dng", "NDG"}, + new String[]{"dng"}, + new String[]{ + "image/x-adobe-dng", // TODO: Look up + }, + "com.twelvemonkeys.imageio.plugins.dng.DNGImageReader", + new String[]{"com.twelvemonkeys.imageio.plugins.dng.DNGImageReaderSpi"}, + null, + null, + true, + null, + null, + null, + null, + true, + null, + null, + null, + null + ); + } +} diff --git a/imageio/imageio-dng/src/test/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderTest.java b/imageio/imageio-dng/src/test/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderTest.java index cab1ff76..bce7da61 100644 --- a/imageio/imageio-dng/src/test/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderTest.java +++ b/imageio/imageio-dng/src/test/java/com/twelvemonkeys/imageio/plugins/dng/DNGImageReaderTest.java @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.dng; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Ignore; import org.junit.Test; @@ -47,7 +47,7 @@ import java.util.List; * @version $Id: CR2ImageReaderTest.java,v 1.0 07.04.14 21:52 haraldk Exp$ */ @Ignore -public class DNGImageReaderTest extends ImageReaderAbstractTestCase { +public class DNGImageReaderTest extends ImageReaderAbstractTest { @Override protected List getTestData() { return Arrays.asList( diff --git a/imageio/imageio-nef/pom.xml b/imageio/imageio-nef/pom.xml index 62d601fa..819a8517 100644 --- a/imageio/imageio-nef/pom.xml +++ b/imageio/imageio-nef/pom.xml @@ -33,7 +33,7 @@ imageio com.twelvemonkeys.imageio - 3.1-SNAPSHOT + 3.4-SNAPSHOT 4.0.0 diff --git a/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReader.java b/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReader.java index cc29b4f6..5d584545 100644 --- a/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReader.java +++ b/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReader.java @@ -32,8 +32,8 @@ import com.twelvemonkeys.imageio.ImageReaderBase; import com.twelvemonkeys.imageio.metadata.CompoundDirectory; import com.twelvemonkeys.imageio.metadata.Directory; import com.twelvemonkeys.imageio.metadata.Entry; -import com.twelvemonkeys.imageio.metadata.exif.EXIFReader; -import com.twelvemonkeys.imageio.metadata.exif.TIFF; +import com.twelvemonkeys.imageio.metadata.tiff.TIFF; +import com.twelvemonkeys.imageio.metadata.tiff.TIFFReader; import com.twelvemonkeys.imageio.stream.SubImageInputStream; import javax.imageio.*; @@ -102,7 +102,7 @@ public final class NEFImageReader extends ImageReaderBase { if (IFDs == null) { imageInput.seek(0); - IFDs = (CompoundDirectory) new EXIFReader().read(imageInput); // NOTE: Sets byte order as a side effect + IFDs = (CompoundDirectory) new TIFFReader().read(imageInput); // NOTE: Sets byte order as a side effect // Pull up the sub-ifds now Entry subIFDEntry = IFDs.getEntryById(TIFF.TAG_SUB_IFD); diff --git a/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderSpi.java b/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderSpi.java index fac1efc0..ce87f0a8 100644 --- a/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderSpi.java +++ b/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderSpi.java @@ -28,12 +28,10 @@ package com.twelvemonkeys.imageio.plugins.nef; -import com.twelvemonkeys.imageio.metadata.exif.TIFF; -import com.twelvemonkeys.imageio.spi.ProviderInfo; -import com.twelvemonkeys.imageio.util.IIOUtil; +import com.twelvemonkeys.imageio.metadata.tiff.TIFF; +import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase; import javax.imageio.ImageReader; -import javax.imageio.spi.ImageReaderSpi; import javax.imageio.stream.ImageInputStream; import java.io.IOException; import java.nio.ByteOrder; @@ -46,28 +44,9 @@ import java.util.Locale; * @author last modified by $Author: haraldk$ * @version $Id: CR2ImageReaderSpi.java,v 1.0 07.04.14 21:26 haraldk Exp$ */ -public final class NEFImageReaderSpi extends ImageReaderSpi { +public final class NEFImageReaderSpi extends ImageReaderSpiBase { public NEFImageReaderSpi() { - this(IIOUtil.getProviderInfo(NEFImageReaderSpi.class)); - } - - private NEFImageReaderSpi(final ProviderInfo pProviderInfo) { - super( - pProviderInfo.getVendorName(), - pProviderInfo.getVersion(), - new String[]{"nef", "NEF"}, - new String[]{"nef"}, - new String[]{ - "image/x-nikon-nef", // TODO: Look up - }, - "com.twelvemonkeys.imageio.plugins.nef.NEFImageReader", - new Class[] {ImageInputStream.class}, - null, - true, null, null, null, null, - true, - null, null, - null, null - ); + super(new NEFProviderInfo()); } public boolean canDecodeInput(final Object pSource) throws IOException { diff --git a/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFProviderInfo.java b/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFProviderInfo.java new file mode 100644 index 00000000..bc4669d8 --- /dev/null +++ b/imageio/imageio-nef/src/main/java/com/twelvemonkeys/imageio/plugins/nef/NEFProviderInfo.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2018, Oleg Ermolaev + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name "TwelveMonkeys" nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package com.twelvemonkeys.imageio.plugins.nef; + +import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo; + +/** + * @author Oleg Ermolaev Date: 04.05.2018 1:50 + */ +class NEFProviderInfo extends ReaderWriterProviderInfo { + protected NEFProviderInfo() { + super( + NEFProviderInfo.class, + new String[]{"nef", "NEF"}, + new String[]{"nef"}, + new String[]{ + "image/x-nikon-nef", // TODO: Look up + }, + "com.twelvemonkeys.imageio.plugins.nef.NEFImageReader", + new String[]{"com.twelvemonkeys.imageio.plugins.nef.NEFImageReaderSpi"}, + null, + null, + true, + null, + null, + null, + null, + true, + null, + null, + null, + null + ); + } +} diff --git a/imageio/imageio-nef/src/test/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderTest.java b/imageio/imageio-nef/src/test/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderTest.java index d013d117..03ca5f33 100644 --- a/imageio/imageio-nef/src/test/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderTest.java +++ b/imageio/imageio-nef/src/test/java/com/twelvemonkeys/imageio/plugins/nef/NEFImageReaderTest.java @@ -28,7 +28,7 @@ package com.twelvemonkeys.imageio.plugins.nef; -import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase; +import com.twelvemonkeys.imageio.util.ImageReaderAbstractTest; import org.junit.Ignore; import org.junit.Test; @@ -47,7 +47,7 @@ import java.util.List; * @version $Id: CR2ImageReaderTest.java,v 1.0 07.04.14 21:52 haraldk Exp$ */ @Ignore -public class NEFImageReaderTest extends ImageReaderAbstractTestCase { +public class NEFImageReaderTest extends ImageReaderAbstractTest { @Override protected List getTestData() { return Arrays.asList( diff --git a/imageio/pom.xml b/imageio/pom.xml index 14d60f15..d544c9c0 100644 --- a/imageio/pom.xml +++ b/imageio/pom.xml @@ -32,7 +32,6 @@ imageio-cr2 imageio-dng - imageio-ico imageio-bmp imageio-hdr imageio-icns @@ -132,6 +131,12 @@ imageio-core ${project.version} + + ${project.groupId} + imageio-core + ${project.version} + tests + ${project.groupId}