You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2012/04/01 13:11:50 UTC
svn commit: r1308075 [2/3] - in /commons/proper/sanselan/trunk/src:
main/java/org/apache/commons/sanselan/
main/java/org/apache/commons/sanselan/color/
main/java/org/apache/commons/sanselan/common/
main/java/org/apache/commons/sanselan/common/bytesourc...
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/PngImageParser.java Sun Apr 1 11:11:43 2012
@@ -70,11 +70,13 @@ public class PngImageParser extends Imag
// setDebug(true);
}
+ @Override
public String getName()
{
return "Png-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -84,11 +86,13 @@ public class PngImageParser extends Imag
private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_PNG, //
@@ -266,6 +270,7 @@ public class PngImageParser extends Imag
}
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -287,6 +292,7 @@ public class PngImageParser extends Imag
return (bytes);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -308,11 +314,13 @@ public class PngImageParser extends Imag
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -519,6 +527,7 @@ public class PngImageParser extends Imag
}
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -668,6 +677,7 @@ public class PngImageParser extends Imag
}
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -845,6 +855,7 @@ public class PngImageParser extends Imag
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -888,6 +899,7 @@ public class PngImageParser extends Imag
return true;
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -904,6 +916,7 @@ public class PngImageParser extends Imag
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterInterlaced.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterInterlaced.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterInterlaced.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterInterlaced.java Sun Apr 1 11:11:43 2012
@@ -73,6 +73,7 @@ public class ScanExpediterInterlaced ext
8, 4, 4, 2, 2, 1, 1
};
+ @Override
public void drive() throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/ScanExpediterSimple.java Sun Apr 1 11:11:43 2012
@@ -36,6 +36,7 @@ public class ScanExpediterSimple extends
pngChunkPLTE, gammaCorrection, transparencyFilter);
}
+ @Override
public void drive() throws ImageReadException, IOException
{
int bitsPerScanLine = bitsPerPixel * width;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkItxt.java Sun Apr 1 11:11:43 2012
@@ -109,6 +109,7 @@ public class PngChunkItxt extends PngTex
/**
* @return Returns the keyword.
*/
+ @Override
public String getKeyword()
{
return keyword;
@@ -117,11 +118,13 @@ public class PngChunkItxt extends PngTex
/**
* @return Returns the text.
*/
+ @Override
public String getText()
{
return text;
}
+ @Override
public PngText getContents()
{
return new PngText.iTXt(keyword, text, languageTag, translatedKeyword);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkText.java Sun Apr 1 11:11:43 2012
@@ -52,6 +52,7 @@ public class PngChunkText extends PngTex
/**
* @return Returns the keyword.
*/
+ @Override
public String getKeyword()
{
return keyword;
@@ -60,11 +61,13 @@ public class PngChunkText extends PngTex
/**
* @return Returns the text.
*/
+ @Override
public String getText()
{
return text;
}
+ @Override
public PngText getContents()
{
return new PngText.tEXt(keyword, text);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/chunks/PngChunkZtxt.java Sun Apr 1 11:11:43 2012
@@ -61,6 +61,7 @@ public class PngChunkZtxt extends PngTex
/**
* @return Returns the keyword.
*/
+ @Override
public String getKeyword()
{
return keyword;
@@ -69,11 +70,13 @@ public class PngChunkZtxt extends PngTex
/**
* @return Returns the text.
*/
+ @Override
public String getText()
{
return text;
}
+ @Override
public PngText getContents()
{
return new PngText.zTXt(keyword, text);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterAverage.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterAverage.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterAverage.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterAverage.java Sun Apr 1 11:11:43 2012
@@ -29,6 +29,7 @@ public class ScanlineFilterAverage exten
this.BytesPerPixel = BytesPerPixel;
}
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterNone.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterNone.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterNone.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterNone.java Sun Apr 1 11:11:43 2012
@@ -22,6 +22,7 @@ import org.apache.commons.sanselan.Image
public class ScanlineFilterNone extends ScanlineFilter
{
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterPaeth.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterPaeth.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterPaeth.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterPaeth.java Sun Apr 1 11:11:43 2012
@@ -46,6 +46,7 @@ public class ScanlineFilterPaeth extends
return c;
}
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterSub.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterSub.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterSub.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterSub.java Sun Apr 1 11:11:43 2012
@@ -29,6 +29,7 @@ public class ScanlineFilterSub extends S
this.BytesPerPixel = BytesPerPixel;
}
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterUp.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterUp.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterUp.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/png/scanlinefilters/ScanlineFilterUp.java Sun Apr 1 11:11:43 2012
@@ -29,6 +29,7 @@ public class ScanlineFilterUp extends Sc
this.BytesPerPixel = BytesPerPixel;
}
+ @Override
public void unfilter(byte src[], byte dst[], byte up[])
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmFileInfo.java Sun Apr 1 11:11:43 2012
@@ -29,36 +29,43 @@ public class PbmFileInfo extends FileInf
super(width, height, RAWBITS);
}
+ @Override
public int getNumComponents()
{
return 1;
}
+ @Override
public int getBitDepth()
{
return 1;
}
+ @Override
public ImageFormat getImageType()
{
return ImageFormat.IMAGE_FORMAT_PBM;
}
+ @Override
public int getColorType()
{
return ImageInfo.COLOR_TYPE_BW;
}
+ @Override
public String getImageTypeDescription()
{
return "PBM: portable bitmap fileformat";
}
+ @Override
public String getMIMEType()
{
return "image/x-portable-bitmap";
}
+ @Override
protected void newline()
{
bitcache = 0;
@@ -69,6 +76,7 @@ public class PbmFileInfo extends FileInf
private int bitcache = 0;
private int bits_in_cache = 0;
+ @Override
public int getRGB(InputStream is) throws IOException
{
if (bits_in_cache < 1)
@@ -91,6 +99,7 @@ public class PbmFileInfo extends FileInf
throw new IOException("PBM: bad bit: " + bit);
}
+ @Override
public int getRGB(WhiteSpaceReader wsr) throws IOException
{
int bit = Integer.parseInt(wsr.readtoWhiteSpace());
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PbmWriter.java Sun Apr 1 11:11:43 2012
@@ -30,6 +30,7 @@ public class PbmWriter extends PnmWriter
super(RAWBITS);
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmFileInfo.java Sun Apr 1 11:11:43 2012
@@ -33,36 +33,43 @@ public class PgmFileInfo extends FileInf
this.max = max;
}
+ @Override
public int getNumComponents()
{
return 1;
}
+ @Override
public int getBitDepth()
{
return 8;
}
+ @Override
public ImageFormat getImageType()
{
return ImageFormat.IMAGE_FORMAT_PPM;
}
+ @Override
public String getImageTypeDescription()
{
return "PGM: portable pixmap file format";
}
+ @Override
public String getMIMEType()
{
return "image/x-portable-pixmap";
}
+ @Override
public int getColorType()
{
return ImageInfo.COLOR_TYPE_RGB;
}
+ @Override
public int getRGB(InputStream is) throws IOException
{
int sample = is.read();
@@ -77,6 +84,7 @@ public class PgmFileInfo extends FileInf
return rgb;
}
+ @Override
public int getRGB(WhiteSpaceReader wsr) throws IOException
{
int sample = Integer.parseInt(wsr.readtoWhiteSpace());
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PgmWriter.java Sun Apr 1 11:11:43 2012
@@ -30,6 +30,7 @@ public class PgmWriter extends PnmWriter
super(RAWBITS);
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PnmImageParser.java Sun Apr 1 11:11:43 2012
@@ -47,11 +47,13 @@ public class PnmImageParser extends Imag
// setDebug(true);
}
+ @Override
public String getName()
{
return "Pbm-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -62,11 +64,13 @@ public class PnmImageParser extends Imag
private static final String ACCEPTED_EXTENSIONS[] = { ".pbm", ".pgm",
".ppm", ".pnm", };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_PBM, //
@@ -145,12 +149,14 @@ public class PnmImageParser extends Imag
}
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -167,17 +173,20 @@ public class PnmImageParser extends Imag
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -219,6 +228,7 @@ public class PnmImageParser extends Imag
return result;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -261,6 +271,7 @@ public class PnmImageParser extends Imag
return result;
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -298,6 +309,7 @@ public class PnmImageParser extends Imag
public static final String PARAM_VALUE_PNM_RAWBITS_YES = "YES";
public static final String PARAM_VALUE_PNM_RAWBITS_NO = "NO";
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -358,6 +370,7 @@ public class PnmImageParser extends Imag
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmFileInfo.java Sun Apr 1 11:11:43 2012
@@ -33,36 +33,43 @@ public class PpmFileInfo extends FileInf
this.max = max;
}
+ @Override
public int getNumComponents()
{
return 3;
}
+ @Override
public int getBitDepth()
{
return 8;
}
+ @Override
public ImageFormat getImageType()
{
return ImageFormat.IMAGE_FORMAT_PGM;
}
+ @Override
public String getImageTypeDescription()
{
return "PGM: portable graymap file format";
}
+ @Override
public String getMIMEType()
{
return "image/x-portable-graymap";
}
+ @Override
public int getColorType()
{
return ImageInfo.COLOR_TYPE_GRAYSCALE;
}
+ @Override
public int getRGB(InputStream is) throws IOException
{
int red = is.read();
@@ -80,6 +87,7 @@ public class PpmFileInfo extends FileInf
return rgb;
}
+ @Override
public int getRGB(WhiteSpaceReader wsr) throws IOException
{
int red = Integer.parseInt(wsr.readtoWhiteSpace());
@@ -94,6 +102,7 @@ public class PpmFileInfo extends FileInf
return rgb;
}
+ @Override
public void dump()
{
// System.out.println("count: " + count);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/pnm/PpmWriter.java Sun Apr 1 11:11:43 2012
@@ -30,6 +30,7 @@ public class PpmWriter extends PnmWriter
super(RAWBITS);
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/PsdImageParser.java Sun Apr 1 11:11:43 2012
@@ -55,11 +55,13 @@ public class PsdImageParser extends Imag
// setDebug(true);
}
+ @Override
public String getName()
{
return "PSD-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -69,11 +71,13 @@ public class PsdImageParser extends Imag
private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_PSD, //
@@ -466,6 +470,7 @@ public class PsdImageParser extends Imag
public final static int IMAGE_RESOURCE_ID_ICC_PROFILE = 0x040F;
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -482,6 +487,7 @@ public class PsdImageParser extends Imag
return bytes;
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -498,11 +504,13 @@ public class PsdImageParser extends Imag
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -535,6 +543,7 @@ public class PsdImageParser extends Imag
}
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -615,6 +624,7 @@ public class PsdImageParser extends Imag
return null;
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -666,6 +676,7 @@ public class PsdImageParser extends Imag
private static final int COLOR_MODE_INDEXED = 2;
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -806,6 +817,7 @@ public class PsdImageParser extends Imag
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserBitmap.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserBitmap.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserBitmap.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserBitmap.java Sun Apr 1 11:11:43 2012
@@ -21,6 +21,7 @@ import org.apache.commons.sanselan.forma
public class DataParserBitmap extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -38,6 +39,7 @@ public class DataParserBitmap extends Da
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 1;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserCmyk.java Sun Apr 1 11:11:43 2012
@@ -21,6 +21,7 @@ import org.apache.commons.sanselan.forma
public class DataParserCmyk extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -40,6 +41,7 @@ public class DataParserCmyk extends Data
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 4;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserGrayscale.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserGrayscale.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserGrayscale.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserGrayscale.java Sun Apr 1 11:11:43 2012
@@ -20,6 +20,7 @@ import org.apache.commons.sanselan.forma
public class DataParserGrayscale extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -32,6 +33,7 @@ public class DataParserGrayscale extends
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 1;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserIndexed.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserIndexed.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserIndexed.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserIndexed.java Sun Apr 1 11:11:43 2012
@@ -39,6 +39,7 @@ public class DataParserIndexed extends D
}
}
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -48,6 +49,7 @@ public class DataParserIndexed extends D
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 1;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserLab.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserLab.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserLab.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserLab.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public class DataParserLab extends DataP
}
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -42,11 +43,13 @@ public class DataParserLab extends DataP
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 3;
}
+ @Override
public void dump()
{
// for(int i=0;i<3;i++)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserRgb.java Sun Apr 1 11:11:43 2012
@@ -20,6 +20,7 @@ import org.apache.commons.sanselan.forma
public class DataParserRgb extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
@@ -34,6 +35,7 @@ public class DataParserRgb extends DataP
return rgb;
}
+ @Override
public int getBasicChannelsCount()
{
return 3;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserStub.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserStub.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserStub.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/dataparsers/DataParserStub.java Sun Apr 1 11:11:43 2012
@@ -20,12 +20,14 @@ import org.apache.commons.sanselan.forma
public class DataParserStub extends DataParser
{
+ @Override
protected int getRGB(int data[][][], int x, int y,
ImageContents imageContents)
{
return 0;
}
+ @Override
public int getBasicChannelsCount()
{
return 1;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/CompressedDataReader.java Sun Apr 1 11:11:43 2012
@@ -38,6 +38,7 @@ public class CompressedDataReader extend
super(fDataParser);
}
+ @Override
public void readData(InputStream is, BufferedImage bi,
ImageContents imageContents, BinaryFileParser bfp)
throws ImageReadException, IOException
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/psd/datareaders/UncompressedDataReader.java Sun Apr 1 11:11:43 2012
@@ -35,6 +35,7 @@ public class UncompressedDataReader exte
super(fDataParser);
}
+ @Override
public void readData(InputStream is, BufferedImage bi,
ImageContents imageContents, BinaryFileParser bfp)
throws ImageReadException, IOException
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/rgbe/RgbeImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/rgbe/RgbeImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/rgbe/RgbeImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/rgbe/RgbeImageParser.java Sun Apr 1 11:11:43 2012
@@ -50,22 +50,27 @@ public class RgbeImageParser extends Ima
setByteOrder( BinaryConstants.BYTE_ORDER_BIG_ENDIAN );
}
+ @Override
public String getName() {
return "Radiance HDR";
}
+ @Override
public String getDefaultExtension() {
return ".hdr";
}
+ @Override
protected String[] getAcceptedExtensions() {
return new String[]{ ".hdr", ".pic" };
}
+ @Override
protected ImageFormat[] getAcceptedTypes() {
return new ImageFormat[]{ ImageFormat.IMAGE_FORMAT_RGBE };
}
+ @Override
public IImageMetadata getMetadata( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
RgbeInfo info = new RgbeInfo( byteSource );
@@ -76,6 +81,7 @@ public class RgbeImageParser extends Ima
}
}
+ @Override
public ImageInfo getImageInfo( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
RgbeInfo info = new RgbeInfo( byteSource );
@@ -103,6 +109,7 @@ public class RgbeImageParser extends Ima
}
}
+ @Override
public BufferedImage getBufferedImage( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
RgbeInfo info = new RgbeInfo( byteSource );
@@ -130,6 +137,7 @@ public class RgbeImageParser extends Ima
}
}
+ @Override
public Dimension getImageSize( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
RgbeInfo info = new RgbeInfo( byteSource );
@@ -140,14 +148,17 @@ public class RgbeImageParser extends Ima
}
}
+ @Override
public byte[] getICCProfileBytes( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
return null;
}
+ @Override
public boolean embedICCProfile( File src, File dst, byte[] profile ) {
return false;
}
+ @Override
public String getXmpXml( ByteSource byteSource, Map params ) throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/JpegImageData.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/JpegImageData.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/JpegImageData.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/JpegImageData.java Sun Apr 1 11:11:43 2012
@@ -24,6 +24,7 @@ public class JpegImageData extends TiffE
super(offset, length, data);
}
+ @Override
public String getElementDescription(boolean verbose)
{
return "Jpeg image data: " + data.length + " bytes";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffDirectory.java Sun Apr 1 11:11:43 2012
@@ -50,6 +50,7 @@ public class TiffDirectory extends TiffE
return TiffDirectory.description(type);
}
+ @Override
public String getElementDescription(boolean verbose)
{
if (!verbose)
@@ -354,6 +355,7 @@ public class TiffDirectory extends TiffE
super(offset, length);
}
+ @Override
public String getElementDescription(boolean verbose)
{
if (verbose)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffElement.java Sun Apr 1 11:11:43 2012
@@ -64,6 +64,7 @@ public abstract class TiffElement
super(offset, length);
}
+ @Override
public String getElementDescription(boolean verbose)
{
return "Element, offset: " + offset + ", length: " + length
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffField.java Sun Apr 1 11:11:43 2012
@@ -86,6 +86,7 @@ public class TiffField implements TiffCo
super(offset, length);
}
+ @Override
public String getElementDescription(boolean verbose)
{
if (verbose)
@@ -554,6 +555,7 @@ public class TiffField implements TiffCo
+ "): ";
}
+ @Override
public String toString()
{
StringBuffer result = new StringBuffer();
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffHeader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffHeader.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffHeader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffHeader.java Sun Apr 1 11:11:43 2012
@@ -33,6 +33,7 @@ public class TiffHeader extends TiffElem
this.offsetToFirstIFD = offsetToFirstIFD;
}
+ @Override
public String getElementDescription(boolean verbose)
{
if (verbose)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageData.java Sun Apr 1 11:11:43 2012
@@ -42,16 +42,19 @@ public abstract class TiffImageData
this.tileLength = tileLength;
}
+ @Override
public TiffElement.DataElement[] getImageData()
{
return tiles;
}
+ @Override
public boolean stripsNotTiles()
{
return false;
}
+ @Override
public DataReader getDataReader(TiffDirectory directory,
PhotometricInterpreter photometricInterpreter,
int bitsPerPixel, int bitsPerSample[], int predictor,
@@ -82,16 +85,19 @@ public abstract class TiffImageData
this.rowsPerStrip = rowsPerStrip;
}
+ @Override
public TiffElement.DataElement[] getImageData()
{
return strips;
}
+ @Override
public boolean stripsNotTiles()
{
return true;
}
+ @Override
public DataReader getDataReader(TiffDirectory directory,
PhotometricInterpreter photometricInterpreter,
int bitsPerPixel, int bitsPerSample[], int predictor,
@@ -128,6 +134,7 @@ public abstract class TiffImageData
super(offset, length, data);
}
+ @Override
public String getElementDescription(boolean verbose)
{
return "Tiff image data: " + data.length + " bytes";
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageMetadata.java Sun Apr 1 11:11:43 2012
@@ -127,6 +127,7 @@ public class TiffImageMetadata extends I
return directory.getJpegImageData();
}
+ @Override
public String toString(String prefix)
{
return (prefix != null ? prefix : "") + directory.description()
@@ -205,6 +206,7 @@ public class TiffImageMetadata extends I
return super.getItems();
}
+ @Override
public List<? extends IImageMetadataItem> getItems()
{
List<IImageMetadataItem> result = new ArrayList<IImageMetadataItem>();
@@ -574,6 +576,7 @@ public class TiffImageMetadata extends I
this.longitudeSeconds = longitudeSeconds;
}
+ @Override
public String toString()
{
// This will format the gps info like so:
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffImageParser.java Sun Apr 1 11:11:43 2012
@@ -58,11 +58,13 @@ public class TiffImageParser extends Ima
// setDebug(true);
}
+ @Override
public String getName()
{
return "Tiff-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -72,17 +74,20 @@ public class TiffImageParser extends Ima
private static final String ACCEPTED_EXTENSIONS[] = { ".tif", ".tiff", };
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_TIFF, //
};
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -94,6 +99,7 @@ public class TiffImageParser extends Ima
return directory.getFieldValue(AllTagConstants.EXIF_TAG_ICC_PROFILE);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -120,11 +126,13 @@ public class TiffImageParser extends Ima
return null;
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -157,6 +165,7 @@ public class TiffImageParser extends Ima
return result;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -313,6 +322,7 @@ public class TiffImageParser extends Ima
return result;
}
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -337,6 +347,7 @@ public class TiffImageParser extends Ima
}
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -403,6 +414,7 @@ public class TiffImageParser extends Ima
}
}
+ @Override
public FormatCompliance getFormatCompliance(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -438,6 +450,7 @@ public class TiffImageParser extends Ima
return result;
}
+ @Override
public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -452,6 +465,7 @@ public class TiffImageParser extends Ima
return result;
}
+ @Override
public List<BufferedImage> getAllBufferedImages(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -611,6 +625,7 @@ public class TiffImageParser extends Ima
}
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/TiffReader.java Sun Apr 1 11:11:43 2012
@@ -382,12 +382,14 @@ public class TiffReader extends BinaryFi
this.readImageData = readImageData;
}
+ @Override
public boolean addDirectory(TiffDirectory directory)
{
super.addDirectory(directory);
return false;
}
+ @Override
public boolean readImageData()
{
return readImageData;
@@ -403,12 +405,14 @@ public class TiffReader extends BinaryFi
this.readImageData = readImageData;
}
+ @Override
public boolean addDirectory(TiffDirectory directory)
{
super.addDirectory(directory);
return false;
}
+ @Override
public boolean readImageData()
{
return readImageData;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderStrips.java Sun Apr 1 11:11:43 2012
@@ -86,6 +86,7 @@ public final class DataReaderStrips exte
private int x = 0, y = 0;
+ @Override
public void readImageData(ImageBuilder imageBuilder) throws ImageReadException,
IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderTiled.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderTiled.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderTiled.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/datareaders/DataReaderTiled.java Sun Apr 1 11:11:43 2012
@@ -96,6 +96,7 @@ public final class DataReaderTiled exten
}
}
+ @Override
public void readImageData(ImageBuilder imageBuilder) throws ImageReadException,
IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldType.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldType.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldType.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldType.java Sun Apr 1 11:11:43 2012
@@ -106,6 +106,7 @@ public abstract class FieldType extends
//
// public abstract Object[] getValueArray(TiffField entry);
+ @Override
public String toString()
{
return "[" + getClass().getName() + ". type: " + type + ", name: "
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeAscii.java Sun Apr 1 11:11:43 2012
@@ -28,6 +28,7 @@ public class FieldTypeAscii extends Fiel
super(type, 1, name);
}
+ @Override
public Object getSimpleValue(TiffField entry) {
// According to EXIF specification "2 = ASCII An 8-bit byte containing one 7-bit ASCII code. The final byte is terminated with NULL."
byte bytes[] = getRawBytes(entry);
@@ -69,6 +70,7 @@ public class FieldTypeAscii extends Fiel
}
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof byte[]) {
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeByte.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeByte.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeByte.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeByte.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public class FieldTypeByte extends Field
super(type, 1, name);
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
if (entry.length == 1)
@@ -35,6 +36,7 @@ public class FieldTypeByte extends Field
return getRawBytes(entry);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Byte)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeDouble.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeDouble.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeDouble.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeDouble.java Sun Apr 1 11:11:43 2012
@@ -27,11 +27,13 @@ public class FieldTypeDouble extends Fie
super(12, 8, "Double");
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
return "?";
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Double)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeFloat.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeFloat.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeFloat.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeFloat.java Sun Apr 1 11:11:43 2012
@@ -29,6 +29,7 @@ public class FieldTypeFloat extends Fiel
// = new FieldType(11, 4, "Float")
+ @Override
public Object getSimpleValue(TiffField entry)
{
if (entry.length == 1)
@@ -40,6 +41,7 @@ public class FieldTypeFloat extends Fiel
+ ")", getRawBytes(entry), 0, entry.length, entry.byteOrder);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Float)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeLong.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeLong.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeLong.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeLong.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public class FieldTypeLong extends Field
super(type, 4, name);
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
if (entry.length == 1)
@@ -38,6 +39,7 @@ public class FieldTypeLong extends Field
+ ")", getRawBytes(entry), 0, entry.length, entry.byteOrder);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Integer)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeRational.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeRational.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeRational.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeRational.java Sun Apr 1 11:11:43 2012
@@ -29,6 +29,7 @@ public class FieldTypeRational extends F
super(type, 8, name);
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
if (entry.length == 1)
@@ -39,6 +40,7 @@ public class FieldTypeRational extends F
+ ")", getRawBytes(entry), 0, entry.length, entry.byteOrder);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof RationalNumber)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeShort.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeShort.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeShort.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeShort.java Sun Apr 1 11:11:43 2012
@@ -43,6 +43,7 @@ public class FieldTypeShort extends Fiel
// + ")", getRawBytes(entry), 0, entry.length, entry.byteOrder);
// }
+ @Override
public Object getSimpleValue(TiffField entry) throws ImageReadException
{
if (entry.length == 1)
@@ -51,6 +52,7 @@ public class FieldTypeShort extends Fiel
return BinaryConversions.convertToShortArray(getRawBytes(entry), entry.byteOrder);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Short)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeUnknown.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeUnknown.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeUnknown.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/fieldtypes/FieldTypeUnknown.java Sun Apr 1 11:11:43 2012
@@ -27,6 +27,7 @@ public class FieldTypeUnknown extends Fi
super(-1, 1, "Unknown");
}
+ @Override
public Object getSimpleValue(TiffField entry)
{
// Debug.debug("unknown field type. entry", entry.tagInfo.name);
@@ -42,6 +43,7 @@ public class FieldTypeUnknown extends Fi
return getRawBytes(entry);
}
+ @Override
public byte[] writeData(Object o, int byteOrder) throws ImageWriteException
{
if (o instanceof Byte)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java Sun Apr 1 11:11:43 2012
@@ -37,6 +37,7 @@ public class PhotometricInterpreterBiLev
// this.bitsPerPixel = fBitsPerPixel;
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java Sun Apr 1 11:11:43 2012
@@ -30,10 +30,12 @@ public class PhotometricInterpreterCieLa
super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
}
+ @Override
public void dumpstats() throws ImageReadException, IOException
{
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java Sun Apr 1 11:11:43 2012
@@ -30,6 +30,7 @@ public class PhotometricInterpreterCmyk
super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java Sun Apr 1 11:11:43 2012
@@ -34,6 +34,7 @@ public class PhotometricInterpreterLogLu
// this.yOnly = yonly;
}
+ @Override
public void dumpstats() throws ImageReadException, IOException
{
}
@@ -45,6 +46,7 @@ public class PhotometricInterpreterLogLu
// private float function_f(float value, )
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java Sun Apr 1 11:11:43 2012
@@ -34,6 +34,7 @@ public class PhotometricInterpreterPalet
this.fColorMap = fColorMap;
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java Sun Apr 1 11:11:43 2012
@@ -29,6 +29,7 @@ public class PhotometricInterpreterRgb e
super(fSamplesPerPixel, fBitsPerSample, Predictor, width, height);
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java Sun Apr 1 11:11:43 2012
@@ -65,6 +65,7 @@ public class PhotometricInterpreterYCbCr
return rgb;
}
+ @Override
public void interpretPixel(ImageBuilder imageBuilder, int samples[], int x, int y)
throws ImageReadException, IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfo.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfo.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfo.java Sun Apr 1 11:11:43 2012
@@ -98,6 +98,7 @@ public abstract class TagInfo implements
return tag + " (0x" + Integer.toHexString(tag) + ": " + name + "): ";
}
+ @Override
public String toString()
{
return "[TagInfo. tag: " + tag + " (0x" + Integer.toHexString(tag)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfoGpsText.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfoGpsText.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfoGpsText.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/taginfos/TagInfoGpsText.java Sun Apr 1 11:11:43 2012
@@ -35,6 +35,7 @@ public final class TagInfoGpsText extend
super(name, tag, dataType, length, exifDirectory);
}
+ @Override
public boolean isText()
{
return true;
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossless.java Sun Apr 1 11:11:43 2012
@@ -222,6 +222,7 @@ public class TiffImageWriterLossless ext
}
}
+ @Override
public void write(OutputStream os, TiffOutputSet outputSet)
throws IOException, ImageWriteException
{
@@ -390,6 +391,7 @@ public class TiffImageWriterLossless ext
this.index = index;
}
+ @Override
public void write(int b) throws IOException
{
if (index >= buffer.length)
@@ -398,6 +400,7 @@ public class TiffImageWriterLossless ext
buffer[index++] = (byte) b;
}
+ @Override
public void write(byte b[], int off, int len) throws IOException
{
if (index + len > buffer.length)
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffImageWriterLossy.java Sun Apr 1 11:11:43 2012
@@ -35,6 +35,7 @@ public class TiffImageWriterLossy extend
super(byteOrder);
}
+ @Override
public void write(OutputStream os, TiffOutputSet outputSet)
throws IOException, ImageWriteException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputDirectory.java Sun Apr 1 11:11:43 2012
@@ -414,6 +414,7 @@ public final class TiffOutputDirectory e
return TiffDirectory.description(type);
}
+ @Override
public void writeItem(BinaryOutputStream bos) throws IOException,
ImageWriteException
{
@@ -467,12 +468,14 @@ public final class TiffOutputDirectory e
return tiffImageData;
}
+ @Override
public int getItemLength()
{
return TIFF_ENTRY_LENGTH * fields.size() + TIFF_DIRECTORY_HEADER_LENGTH
+ TIFF_DIRECTORY_FOOTER_LENGTH;
}
+ @Override
public String getItemDescription()
{
TiffDirectoryType dirType = TagConstantsUtils
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputField.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputField.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputField.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputField.java Sun Apr 1 11:11:43 2012
@@ -127,6 +127,7 @@ public class TiffOutputField implements
private static final String newline = System.getProperty("line.separator");
+ @Override
public String toString()
{
return toString(null);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputItem.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputItem.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputItem.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputItem.java Sun Apr 1 11:11:43 2012
@@ -56,11 +56,13 @@ abstract class TiffOutputItem implements
this.bytes = bytes;
}
+ @Override
public int getItemLength()
{
return bytes.length;
}
+ @Override
public String getItemDescription()
{
return name;
@@ -74,6 +76,7 @@ abstract class TiffOutputItem implements
System.arraycopy(bytes, 0, this.bytes, 0, bytes.length);
}
+ @Override
public void writeItem(BinaryOutputStream bos) throws IOException,
ImageWriteException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/tiff/write/TiffOutputSet.java Sun Apr 1 11:11:43 2012
@@ -266,6 +266,7 @@ public final class TiffOutputSet impleme
private static final String newline = System.getProperty("line.separator");
+ @Override
public String toString()
{
return toString(null);
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterGrayscale.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterGrayscale.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterGrayscale.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterGrayscale.java Sun Apr 1 11:11:43 2012
@@ -35,6 +35,7 @@ public class TransparencyFilterGrayscale
"tRNS: Missing transparent_color");
}
+ @Override
public int filter(int rgb, int index) throws ImageReadException,
IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterIndexedColor.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterIndexedColor.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterIndexedColor.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterIndexedColor.java Sun Apr 1 11:11:43 2012
@@ -30,6 +30,7 @@ public class TransparencyFilterIndexedCo
int count = 0;
+ @Override
public int filter(int rgb, int index) throws ImageReadException,
IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterTrueColor.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterTrueColor.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterTrueColor.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/transparencyfilters/TransparencyFilterTrueColor.java Sun Apr 1 11:11:43 2012
@@ -47,6 +47,7 @@ public class TransparencyFilterTrueColor
}
+ @Override
public int filter(int rgb, int sample) throws ImageReadException,
IOException
{
Modified: commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java?rev=1308075&r1=1308074&r2=1308075&view=diff
==============================================================================
--- commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java (original)
+++ commons/proper/sanselan/trunk/src/main/java/org/apache/commons/sanselan/formats/wbmp/WbmpImageParser.java Sun Apr 1 11:11:43 2012
@@ -45,11 +45,13 @@ public class WbmpImageParser extends Ima
{
}
+ @Override
public String getName()
{
return "Wbmp-Custom";
}
+ @Override
public String getDefaultExtension()
{
return DEFAULT_EXTENSION;
@@ -60,11 +62,13 @@ public class WbmpImageParser extends Ima
".wbmp",
};
+ @Override
protected String[] getAcceptedExtensions()
{
return ACCEPTED_EXTENSIONS;
}
+ @Override
protected ImageFormat[] getAcceptedTypes()
{
return new ImageFormat[]
@@ -73,17 +77,20 @@ public class WbmpImageParser extends Ima
};
}
+ @Override
public boolean embedICCProfile(File src, File dst, byte profile[])
{
return false;
}
+ @Override
public IImageMetadata getMetadata(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
return null;
}
+ @Override
public ImageInfo getImageInfo(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{
@@ -98,6 +105,7 @@ public class WbmpImageParser extends Ima
ImageInfo.COMPRESSION_ALGORITHM_NONE);
}
+ @Override
public Dimension getImageSize(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -106,6 +114,7 @@ public class WbmpImageParser extends Ima
return new Dimension(wbmpHeader.width, wbmpHeader.height);
}
+ @Override
public byte[] getICCProfileBytes(ByteSource byteSource,
Map params)
throws ImageReadException, IOException
@@ -213,6 +222,7 @@ public class WbmpImageParser extends Ima
return new WbmpHeader(typeField, fixHeaderField, width, height);
}
+ @Override
public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -236,6 +246,7 @@ public class WbmpImageParser extends Ima
colorModel.isAlphaPremultiplied(), new Properties());
}
+ @Override
public final BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException
{
@@ -259,6 +270,7 @@ public class WbmpImageParser extends Ima
}
}
+ @Override
public void writeImage(BufferedImage src, OutputStream os, Map params)
throws ImageWriteException, IOException
{
@@ -316,6 +328,7 @@ public class WbmpImageParser extends Ima
* Map of optional parameters, defined in SanselanConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
+ @Override
public String getXmpXml(ByteSource byteSource, Map params)
throws ImageReadException, IOException
{