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

New code style. No functional changes.

Browse Source
This commit is contained in:
Harald Kuhr 2011-02-17 17:58:55 +01:00
parent 770f948e1a
commit 87118aecee
5 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGImageReader.java
View File

@ -74,7 +74,7 @@ import java.util.Map;
* @see <A href="http://www.mail-archive.com/batik-dev@xml.apache.org/msg00992.html">batik-dev</A>
*/
public class SVGImageReader extends ImageReaderBase {
private Rasterizer mRasterizer = new Rasterizer();
private Rasterizer rasterizer = new Rasterizer();
/**
* Creates an {@code SVGImageReader}.
@ -91,7 +91,7 @@ public class SVGImageReader extends ImageReaderBase {
@Override
public void dispose() {
super.dispose();
mRasterizer = null;
rasterizer = null;
}
@Override
@ -100,7 +100,7 @@ public class SVGImageReader extends ImageReaderBase {
if (imageInput != null) {
TranscoderInput input = new TranscoderInput(IIOUtil.createStreamAdapter(imageInput));
mRasterizer.setInput(input);
rasterizer.setInput(input);
}
}
@ -114,7 +114,7 @@ public class SVGImageReader extends ImageReaderBase {
// Set IIOParams as hints
// Note: The cast to Map invokes a different method that preserves
// unset defaults, DO NOT REMOVE!
mRasterizer.setTranscodingHints((Map) paramsToHints(svgParam));
rasterizer.setTranscodingHints((Map) paramsToHints(svgParam));
// Get the base URI (not a hint)
baseURI = svgParam.getBaseURI();
@ -134,8 +134,8 @@ public class SVGImageReader extends ImageReaderBase {
try {
processImageStarted(pIndex);
mRasterizer.mTranscoderInput.setURI(baseURI);
BufferedImage image = mRasterizer.getImage();
rasterizer.mTranscoderInput.setURI(baseURI);
BufferedImage image = rasterizer.getImage();
Graphics2D g = destination.createGraphics();
try {
@ -223,7 +223,7 @@ public class SVGImageReader extends ImageReaderBase {
public int getWidth(int pIndex) throws IOException {
checkBounds(pIndex);
try {
return mRasterizer.getDefaultWidth();
return rasterizer.getDefaultWidth();
}
catch (TranscoderException e) {
throw new IIOException(e.getMessage(), e);
@ -233,7 +233,7 @@ public class SVGImageReader extends ImageReaderBase {
public int getHeight(int pIndex) throws IOException {
checkBounds(pIndex);
try {
return mRasterizer.getDefaultHeight();
return rasterizer.getDefaultHeight();
}
catch (TranscoderException e) {
throw new IIOException(e.getMessage(), e);
@ -241,7 +241,7 @@ public class SVGImageReader extends ImageReaderBase {
}
public Iterator<ImageTypeSpecifier> getImageTypes(int imageIndex) throws IOException {
return Collections.singleton(ImageTypeSpecifier.createFromRenderedImage(mRasterizer.createImage(1, 1))).iterator();
return Collections.singleton(ImageTypeSpecifier.createFromRenderedImage(rasterizer.createImage(1, 1))).iterator();
}
/**

12
imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/svg/SVGReadParam.java
View File

@ -37,23 +37,23 @@ import java.awt.*;
*
*/
public class SVGReadParam extends ImageReadParam {
private Paint mBackground;
private String mBaseURI;
private Paint background;
private String baseURI;
public Paint getBackgroundColor() {
return mBackground;
return background;
}
public void setBackgroundColor(Paint pColor) {
mBackground = pColor;
background = pColor;
}
public String getBaseURI() {
return mBaseURI;
return baseURI;
}
public void setBaseURI(String pBaseURI) {
mBaseURI = pBaseURI;
baseURI = pBaseURI;
}
@Override

32
imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageReader.java
View File

@ -55,15 +55,15 @@ import java.util.List;
// TODO: Support raster decoding...
public class TIFFImageReader extends ImageReaderBase {
private TIFFImageDecoder mDecoder = null;
private List<RenderedImage> mImages = new ArrayList<RenderedImage>();
private TIFFImageDecoder decoder = null;
private List<RenderedImage> images = new ArrayList<RenderedImage>();
protected TIFFImageReader(final ImageReaderSpi pOriginatingProvider) {
super(pOriginatingProvider);
}
protected void resetMembers() {
mDecoder = null;
decoder = null;
}
public BufferedImage read(int pIndex, ImageReadParam pParam) throws IOException {
@ -80,18 +80,18 @@ public class TIFFImageReader extends ImageReaderBase {
if (pParam == null) {
// Cache image for use by getWidth and getHeight methods
RenderedImage image;
if (mImages.size() > pIndex && mImages.get(pIndex) != null) {
image = mImages.get(pIndex);
if (images.size() > pIndex && images.get(pIndex) != null) {
image = images.get(pIndex);
}
else {
// Decode
image = mDecoder.decodeAsRenderedImage(pIndex);
image = decoder.decodeAsRenderedImage(pIndex);
// Make room
for (int i = mImages.size(); i < pIndex; i++) {
mImages.add(pIndex, null);
for (int i = images.size(); i < pIndex; i++) {
images.add(pIndex, null);
}
mImages.add(pIndex, image);
images.add(pIndex, image);
}
if (abortRequested()) {
@ -104,9 +104,9 @@ public class TIFFImageReader extends ImageReaderBase {
}
else {
// TODO: Parameter conversion
mDecoder.setParam(new TIFFDecodeParam());
decoder.setParam(new TIFFDecodeParam());
RenderedImage image = mDecoder.decodeAsRenderedImage(pIndex);
RenderedImage image = decoder.decodeAsRenderedImage(pIndex);
// Subsample and apply AOI
if (pParam.getSourceRegion() != null) {
@ -136,12 +136,12 @@ public class TIFFImageReader extends ImageReaderBase {
}
private synchronized void init() {
if (mDecoder == null) {
if (decoder == null) {
if (imageInput == null) {
throw new IllegalStateException("input == null");
}
mDecoder = new TIFFImageDecoder(new SeekableStream() {
decoder = new TIFFImageDecoder(new SeekableStream() {
public int read() throws IOException {
return imageInput.read();
}
@ -165,14 +165,14 @@ public class TIFFImageReader extends ImageReaderBase {
init(pIndex);
// TODO: Use cache...
return mDecoder.decodeAsRenderedImage(pIndex).getWidth();
return decoder.decodeAsRenderedImage(pIndex).getWidth();
}
public int getHeight(int pIndex) throws IOException {
init(pIndex);
// TODO: Use cache...
return mDecoder.decodeAsRenderedImage(pIndex).getHeight();
return decoder.decodeAsRenderedImage(pIndex).getHeight();
}
public Iterator<ImageTypeSpecifier> getImageTypes(final int imageIndex) throws IOException {
@ -182,7 +182,7 @@ public class TIFFImageReader extends ImageReaderBase {
public int getNumImages(boolean allowSearch) throws IOException {
init();
if (allowSearch) {
return mDecoder.getNumPages();
return decoder.getNumPages();
}
return -1;
}

14
imageio/imageio-batik/src/main/java/com/twelvemonkeys/imageio/plugins/tiff/TIFFImageWriter.java
View File

@ -53,7 +53,7 @@ import java.io.IOException;
*/
public class TIFFImageWriter extends ImageWriterBase {
private TIFFImageEncoder mEncoder = null;
private TIFFImageEncoder encoder;
protected TIFFImageWriter(final ImageWriterSpi pProvider) {
super(pProvider);
@ -61,7 +61,7 @@ public class TIFFImageWriter extends ImageWriterBase {
@Override
public void setOutput(final Object output) {
mEncoder = null;
encoder = null;
super.setOutput(output);
}
@ -82,7 +82,7 @@ public class TIFFImageWriter extends ImageWriterBase {
param = new TIFFEncodeParam();
// TODO: Convert params
mEncoder.setParam(param);
encoder.setParam(param);
}
BufferedImage image;
@ -123,7 +123,7 @@ public class TIFFImageWriter extends ImageWriterBase {
processImageStarted(0);
mEncoder.encode(image);
encoder.encode(image);
imageOutput.flush();
processImageComplete();
@ -131,15 +131,15 @@ public class TIFFImageWriter extends ImageWriterBase {
public void dispose() {
super.dispose();
mEncoder = null;
encoder = null;
}
private synchronized void init() {
if (mEncoder == null) {
if (encoder == null) {
if (imageOutput == null) {
throw new IllegalStateException("output == null");
}
mEncoder = new TIFFImageEncoder(IIOUtil.createStreamAdapter(imageOutput), null);
encoder = new TIFFImageEncoder(IIOUtil.createStreamAdapter(imageOutput), null);
}
}
}

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

@ -57,17 +57,18 @@ import java.util.Iterator;
// TODO: Consider using temp file instead of in-memory stream
public class WMFImageReader extends ImageReaderBase {
private SVGImageReader mReader = null;
private SVGImageReader reader = null;
public WMFImageReader(final ImageReaderSpi pProvider) {
super(pProvider);
}
protected void resetMembers() {
if (mReader != null) {
mReader.dispose();
if (reader != null) {
reader.dispose();
}
mReader = null;
reader = null;
}
public BufferedImage read(int pIndex, ImageReadParam pParam) throws IOException {
@ -75,7 +76,7 @@ public class WMFImageReader extends ImageReaderBase {
processImageStarted(pIndex);
BufferedImage image = mReader.read(pIndex, pParam);
BufferedImage image = reader.read(pIndex, pParam);
if (abortRequested()) {
processReadAborted();
return image;
@ -92,7 +93,7 @@ public class WMFImageReader extends ImageReaderBase {
throw new IllegalStateException("input == null");
}
if (mReader == null) {
if (reader == null) {
WMFTranscoder transcoder = new WMFTranscoder();
ByteArrayOutputStream output = new ByteArrayOutputStream();
@ -109,8 +110,8 @@ public class WMFImageReader extends ImageReaderBase {
throw new IIOException(e.getMessage(), e);
}
mReader = new SVGImageReader(getOriginatingProvider());
mReader.setInput(ImageIO.createImageInputStream(new ByteArrayInputStream(output.toByteArray())));
reader = new SVGImageReader(getOriginatingProvider());
reader.setInput(ImageIO.createImageInputStream(new ByteArrayInputStream(output.toByteArray())));
}
}
@ -121,17 +122,17 @@ public class WMFImageReader extends ImageReaderBase {
public int getWidth(int pIndex) throws IOException {
init();
return mReader.getWidth(pIndex);
return reader.getWidth(pIndex);
}
public int getHeight(int pIndex) throws IOException {
init();
return mReader.getHeight(pIndex);
return reader.getHeight(pIndex);
}
public Iterator<ImageTypeSpecifier> getImageTypes(final int pImageIndex) throws IOException {
init();
return mReader.getImageTypes(pImageIndex);
return reader.getImageTypes(pImageIndex);
}
}