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

Minor code clean-up for WMFImageReader

Browse Source
This commit is contained in:
Harald Kuhr 2022-06-10 17:01:55 +02:00
parent 2b04f7205c
commit 00aec2c90e
1 changed files with 143 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/wmf/WMFImageReader.java
View File

@ -33,19 +33,24 @@ package com.twelvemonkeys.imageio.plugins.wmf;
import com.twelvemonkeys.imageio.ImageReaderBase; import com.twelvemonkeys.imageio.ImageReaderBase;
import com.twelvemonkeys.imageio.plugins.svg.SVGImageReader; import com.twelvemonkeys.imageio.plugins.svg.SVGImageReader;
import com.twelvemonkeys.imageio.plugins.svg.SVGReadParam; import com.twelvemonkeys.imageio.plugins.svg.SVGReadParam;
import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
import com.twelvemonkeys.imageio.util.IIOUtil; import com.twelvemonkeys.imageio.util.IIOUtil;
import org.apache.batik.transcoder.TranscoderException; import org.apache.batik.transcoder.TranscoderException;
import org.apache.batik.transcoder.TranscoderInput; import org.apache.batik.transcoder.TranscoderInput;
import org.apache.batik.transcoder.TranscoderOutput; import org.apache.batik.transcoder.TranscoderOutput;
import org.apache.batik.transcoder.wmf.tosvg.WMFTranscoder; import org.apache.batik.transcoder.wmf.tosvg.WMFTranscoder;
import javax.imageio.IIOException; import javax.imageio.IIOException;
import javax.imageio.ImageIO;
import javax.imageio.ImageReadParam; import javax.imageio.ImageReadParam;
import javax.imageio.ImageTypeSpecifier; import javax.imageio.ImageTypeSpecifier;
import javax.imageio.spi.ImageReaderSpi; import javax.imageio.spi.ImageReaderSpi;
import java.awt.image.BufferedImage; import java.awt.image.*;
import java.io.*; import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
import java.nio.charset.StandardCharsets;
import java.util.Iterator; import java.util.Iterator;
/** /**
@ -56,7 +61,6 @@ import java.util.Iterator;
* @version $Id: WMFImageReader.java,v 1.0 29.jul.2004 13:00:59 haku Exp $ * @version $Id: WMFImageReader.java,v 1.0 29.jul.2004 13:00:59 haku Exp $
*/ */
// TODO: Probably possible to do less wrapping/unwrapping of data... // TODO: Probably possible to do less wrapping/unwrapping of data...
// TODO: Consider using temp file instead of in-memory stream
public final class WMFImageReader extends ImageReaderBase { public final class WMFImageReader extends ImageReaderBase {
private SVGImageReader reader = null; private SVGImageReader reader = null;
@ -90,7 +94,7 @@ public final class WMFImageReader extends ImageReaderBase {
return image; return image;
} }
private synchronized void init() throws IOException { private void init() throws IOException {
// Need the extra test, to avoid throwing an IOException from the Transcoder // Need the extra test, to avoid throwing an IOException from the Transcoder
if (imageInput == null) { if (imageInput == null) {
throw new IllegalStateException("input == null"); throw new IllegalStateException("input == null");
@ -98,10 +102,9 @@ public final class WMFImageReader extends ImageReaderBase {
if (reader == null) { if (reader == null) {
WMFTranscoder transcoder = new WMFTranscoder(); WMFTranscoder transcoder = new WMFTranscoder();
ByteArrayOutputStream output = new ByteArrayOutputStream(8192);
ByteArrayOutputStream output = new ByteArrayOutputStream(); try (Writer writer = new OutputStreamWriter(output, StandardCharsets.UTF_8)) {
Writer writer = new OutputStreamWriter(output, "UTF8");
try {
TranscoderInput in = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput)); TranscoderInput in = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput));
TranscoderOutput out = new TranscoderOutput(writer); TranscoderOutput out = new TranscoderOutput(writer);
@ -114,7 +117,7 @@ public final class WMFImageReader extends ImageReaderBase {
} }
reader = new SVGImageReader(getOriginatingProvider()); reader = new SVGImageReader(getOriginatingProvider());
reader.setInput(ImageIO.createImageInputStream(new ByteArrayInputStream(output.toByteArray()))); reader.setInput(new ByteArrayImageInputStream(output.toByteArray()));
} }
} }
@ -137,5 +140,4 @@ public final class WMFImageReader extends ImageReaderBase {
init(); init();
return reader.getImageTypes(pImageIndex); return reader.getImageTypes(pImageIndex);
} }
} }