You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sanselan-commits@incubator.apache.org by cm...@apache.org on 2008/01/07 03:45:24 UTC
svn commit: r609506 [1/3] - in /incubator/sanselan/trunk/src:
main/java/org/apache/sanselan/ main/java/org/apache/sanselan/color/
main/java/org/apache/sanselan/common/
main/java/org/apache/sanselan/common/byteSources/
main/java/org/apache/sanselan/comm...
Author: cmchen
Date: Sun Jan 6 19:45:20 2008
New Revision: 609506
URL: http://svn.apache.org/viewvc?rev=609506&view=rev
Log:
general code cleanup.
Added:
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagInfo.java (with props)
Removed:
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagInfo2.java
Modified:
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageInfo.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/SanselanConstants.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/color/ColorConversions.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileFunctions.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BitInputStreamFlexible.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/IBufferedImageFactory.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/SimpleBufferedImageFactory.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSource.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceArray.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceFile.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceInputStream.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/mylzw/MyLZWCompressor.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/bmp/BmpImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/gif/GifImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageMetadata.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegUtils.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/GammaCorrection.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngWriter.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediter.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediterSimple.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/pnm/PNMImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/psd/PsdImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffContents.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffDirectory.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffField.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageMetadata.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/AllTagConstants.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/ExifTagConstants.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/GPSTagConstants.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TagConstantsUtils.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/TiffTagConstants.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/datareaders/DataReaderTiled.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/fieldtypes/FieldType.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/PointerDirectoriesInfo.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriter.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffImageWriterBase.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputDirectory.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputField.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputSet.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/icc/IccProfileParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/MedianCutQuantizer.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/palette/PaletteFactory.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/ImageReadExample.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/CachingInputStream.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/Debug.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugInputStream.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/DebugOutputStream.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceDataTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/common/byteSources/ByteSourceTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifBaseTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifDumpTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/ExifRewriteTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegBaseTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/JpegReadTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/test/util/FSTraversal.java
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageInfo.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageInfo.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageInfo.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageInfo.java Sun Jan 6 19:45:20 2008
@@ -71,13 +71,13 @@
private final String compressionAlgorithm;
- public ImageInfo(String FormatDetails, int BitsPerPixel, ArrayList Comments,
- ImageFormat Format, String FormatName, int Height, String MimeType,
- int NumberOfImages, int PhysicalHeightDpi,
- float PhysicalHeightInch, int PhysicalWidthDpi,
- float PhysicalWidthInch, int Width, boolean isProgressive,
- boolean isTransparent, boolean usesPalette, int ColorType,
- String compressionAlgorithm)
+ public ImageInfo(String FormatDetails, int BitsPerPixel,
+ ArrayList Comments, ImageFormat Format, String FormatName,
+ int Height, String MimeType, int NumberOfImages,
+ int PhysicalHeightDpi, float PhysicalHeightInch,
+ int PhysicalWidthDpi, float PhysicalWidthInch, int Width,
+ boolean isProgressive, boolean isTransparent, boolean usesPalette,
+ int ColorType, String compressionAlgorithm)
{
this.formatDetails = FormatDetails;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/ImageParser.java Sun Jan 6 19:45:20 2008
@@ -23,8 +23,8 @@
import java.io.OutputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
-import java.util.Map;
import java.util.ArrayList;
+import java.util.Map;
import org.apache.sanselan.common.BinaryFileParser;
import org.apache.sanselan.common.IBufferedImageFactory;
@@ -55,7 +55,7 @@
new PngImageParser(), new BmpImageParser(),
new GifImageParser(), new PsdImageParser(),
new PNMImageParser(), new IcoImageParser(),
-// new TgaImageParser(),
+ // new TgaImageParser(),
};
return result;
@@ -167,46 +167,46 @@
return getAllBufferedImages(new ByteSourceFile(file));
}
-// public boolean extractImages(ByteSource byteSource, File dstDir,
-// String dstRoot, ImageParser encoder) throws ImageReadException,
-// IOException, ImageWriteException
-// {
-// ArrayList v = getAllBufferedImages(byteSource);
-//
-// if (v == null)
-// return false;
-//
-// for (int i = 0; i < v.size(); i++)
-// {
-// BufferedImage image = (BufferedImage) v.get(i);
-// File file = new File(dstDir, dstRoot + "_" + i
-// + encoder.getDefaultExtension());
-// encoder.writeImage(image, new FileOutputStream(file), null);
-// }
-//
-// return false;
-// }
-//
-// public final boolean extractImages(byte bytes[], File dstDir,
-// String dstRoot, ImageParser encoder)
-//
-// throws ImageReadException, IOException, ImageWriteException
-// {
-// return extractImages(new ByteSourceArray(bytes), dstDir, dstRoot,
-// encoder);
-// }
-//
-// public final boolean extractImages(File file, File dstDir,
-// String dstRoot, ImageParser encoder)
-//
-// throws ImageReadException, IOException, ImageWriteException
-// {
-// if (!canAcceptExtension(file))
-// return false;
-//
-// return extractImages(new ByteSourceFile(file), dstDir, dstRoot,
-// encoder);
-// }
+ // public boolean extractImages(ByteSource byteSource, File dstDir,
+ // String dstRoot, ImageParser encoder) throws ImageReadException,
+ // IOException, ImageWriteException
+ // {
+ // ArrayList v = getAllBufferedImages(byteSource);
+ //
+ // if (v == null)
+ // return false;
+ //
+ // for (int i = 0; i < v.size(); i++)
+ // {
+ // BufferedImage image = (BufferedImage) v.get(i);
+ // File file = new File(dstDir, dstRoot + "_" + i
+ // + encoder.getDefaultExtension());
+ // encoder.writeImage(image, new FileOutputStream(file), null);
+ // }
+ //
+ // return false;
+ // }
+ //
+ // public final boolean extractImages(byte bytes[], File dstDir,
+ // String dstRoot, ImageParser encoder)
+ //
+ // throws ImageReadException, IOException, ImageWriteException
+ // {
+ // return extractImages(new ByteSourceArray(bytes), dstDir, dstRoot,
+ // encoder);
+ // }
+ //
+ // public final boolean extractImages(File file, File dstDir,
+ // String dstRoot, ImageParser encoder)
+ //
+ // throws ImageReadException, IOException, ImageWriteException
+ // {
+ // if (!canAcceptExtension(file))
+ // return false;
+ //
+ // return extractImages(new ByteSourceFile(file), dstDir, dstRoot,
+ // encoder);
+ // }
public abstract BufferedImage getBufferedImage(ByteSource byteSource,
Map params) throws ImageReadException, IOException;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/Sanselan.java Sun Jan 6 19:45:20 2008
@@ -26,9 +26,9 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import java.util.ArrayList;
import org.apache.sanselan.common.IImageMetadata;
import org.apache.sanselan.common.byteSources.ByteSource;
@@ -480,8 +480,6 @@
return imageParser.getImageSize(byteSource);
}
-
-
/**
* Parses the metadata of an image. This metadata depends on the format of the image.
* <p>
@@ -564,14 +562,11 @@
* @return An instance of IImageMetadata.
* @see IImageMetadata
*/
- public static IImageMetadata getMetadata(InputStream is, String filename, Map params)
- throws ImageReadException, IOException
+ public static IImageMetadata getMetadata(InputStream is, String filename,
+ Map params) throws ImageReadException, IOException
{
return getMetadata(new ByteSourceInputStream(is, filename), params);
}
-
-
-
/**
* Parses the metadata of an image file. This metadata depends on the format of the image.
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/SanselanConstants.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/SanselanConstants.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/SanselanConstants.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/SanselanConstants.java Sun Jan 6 19:45:20 2008
@@ -16,6 +16,8 @@
*/
package org.apache.sanselan;
+import java.io.InputStream;
+
import org.apache.sanselan.formats.tiff.constants.TiffConstants;
public interface SanselanConstants
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/color/ColorConversions.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/color/ColorConversions.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/color/ColorConversions.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/color/ColorConversions.java Sun Jan 6 19:45:20 2008
@@ -31,10 +31,9 @@
for (int K = 0; K <= 256; K += 64)
{
- int rgb1 = ColorConversions
- .convertCMYKtoRGB(Math.min(255, C),
- Math.min(255, M), Math.min(255,
- Y), Math.min(255, K));
+ int rgb1 = ColorConversions.convertCMYKtoRGB(
+ Math.min(255, C), Math.min(255, M),
+ Math.min(255, Y), Math.min(255, K));
int rgb2 = ColorConversions
.convertCMYKtoRGB_old(Math.min(255, C),
Math.min(255, M), Math.min(255,
@@ -118,10 +117,8 @@
{
ColorCMY cmy = ColorConversions.convertRGBtoCMY(rgb);
- ColorCMYK cmyk = ColorConversions
- .convertCMYtoCMYK(cmy);
- ColorCMY cmyk_cmy = ColorConversions
- .convertCMYKtoCMY(cmyk);
+ ColorCMYK cmyk = ColorConversions.convertCMYtoCMYK(cmy);
+ ColorCMY cmyk_cmy = ColorConversions.convertCMYKtoCMY(cmyk);
int cmyk_cmy_rgb = ColorConversions
.convertCMYtoRGB(cmyk_cmy);
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileFunctions.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileFunctions.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileFunctions.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileFunctions.java Sun Jan 6 19:45:20 2008
@@ -26,7 +26,6 @@
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.ImageWriteException;
-import org.apache.sanselan.util.Debug;
public class BinaryFileFunctions implements BinaryConstants
{
@@ -468,7 +467,7 @@
while (read < length)
{
int count = is.read(result, read, length - read);
-// Debug.debug("count", count);
+ // Debug.debug("count", count);
if (count < 1)
throw new IOException(exception);
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BinaryFileParser.java Sun Jan 6 19:45:20 2008
@@ -96,8 +96,7 @@
{
return read2Bytes(name, is, exception, byteOrder);
}
-
-
+
public static boolean byteArrayHasPrefix(byte bytes[], byte prefix[])
{
if ((bytes == null) || (bytes.length < prefix.length))
@@ -109,6 +108,5 @@
return true;
}
-
}
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BitInputStreamFlexible.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BitInputStreamFlexible.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BitInputStreamFlexible.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/BitInputStreamFlexible.java Sun Jan 6 19:45:20 2008
@@ -64,8 +64,7 @@
{
// cache >>= count;
cacheBitsRemaining -= count;
- result = ((1 << count) - 1)
- & (cache >> cacheBitsRemaining);
+ result = ((1 << count) - 1) & (cache >> cacheBitsRemaining);
count = 0;
}
}
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/IBufferedImageFactory.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/IBufferedImageFactory.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/IBufferedImageFactory.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/IBufferedImageFactory.java Sun Jan 6 19:45:20 2008
@@ -4,7 +4,9 @@
public interface IBufferedImageFactory
{
- public BufferedImage getColorBufferedImage(int width, int height, boolean hasAlpha);
+ public BufferedImage getColorBufferedImage(int width, int height,
+ boolean hasAlpha);
- public BufferedImage getGrayscaleBufferedImage(int width, int height, boolean hasAlpha);
+ public BufferedImage getGrayscaleBufferedImage(int width, int height,
+ boolean hasAlpha);
}
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/SimpleBufferedImageFactory.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/SimpleBufferedImageFactory.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/SimpleBufferedImageFactory.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/SimpleBufferedImageFactory.java Sun Jan 6 19:45:20 2008
@@ -2,8 +2,6 @@
import java.awt.image.BufferedImage;
-import org.apache.sanselan.util.Debug;
-
public class SimpleBufferedImageFactory implements IBufferedImageFactory
{
public BufferedImage getColorBufferedImage(int width, int height,
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSource.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSource.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSource.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSource.java Sun Jan 6 19:45:20 2008
@@ -45,12 +45,12 @@
public abstract byte[] getAll() throws IOException;
-// public abstract long getLength();
-//
-// public byte[] getAll() throws IOException
-// {
-// return getBlock(0, (int) getLength());
-// }
+ // public abstract long getLength();
+ //
+ // public byte[] getAll() throws IOException
+ // {
+ // return getBlock(0, (int) getLength());
+ // }
public abstract String getDescription();
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceArray.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceArray.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceArray.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceArray.java Sun Jan 6 19:45:20 2008
@@ -51,16 +51,15 @@
return result;
}
-// public long getLength()
-// {
-// return bytes.length;
-// }
-
+ // public long getLength()
+ // {
+ // return bytes.length;
+ // }
+
public byte[] getAll() throws IOException
{
return bytes;
}
-
public String getDescription()
{
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceFile.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceFile.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceFile.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceFile.java Sun Jan 6 19:45:20 2008
@@ -70,12 +70,12 @@
}
}
-// public long getLength()
-// {
-// // System.out.println("file.length(): " + file.length());
-//
-// return file.length();
-// }
+ // public long getLength()
+ // {
+ // // System.out.println("file.length(): " + file.length());
+ //
+ // return file.length();
+ // }
public byte[] getAll() throws IOException
{
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceInputStream.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceInputStream.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceInputStream.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/byteSources/ByteSourceInputStream.java Sun Jan 6 19:45:20 2008
@@ -21,8 +21,6 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.sanselan.util.Debug;
-
public class ByteSourceInputStream extends ByteSource
{
private final InputStream is;
@@ -135,7 +133,7 @@
return 0;
// optimized block read
-
+
if (null == block)
{
if (readFirst)
@@ -155,8 +153,8 @@
if (blockIndex >= block.bytes.length)
return -1;
-
- int readSize = Math.min(len, block.bytes.length-blockIndex);
+
+ int readSize = Math.min(len, block.bytes.length - blockIndex);
System.arraycopy(block.bytes, blockIndex, b, off, readSize);
blockIndex += readSize;
return readSize;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/mylzw/MyLZWCompressor.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/mylzw/MyLZWCompressor.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/mylzw/MyLZWCompressor.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/common/mylzw/MyLZWCompressor.java Sun Jan 6 19:45:20 2008
@@ -20,12 +20,11 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import java.util.ArrayList;
public class MyLZWCompressor
{
-// private static final int MAX_TABLE_SIZE = 1 << 12;
+ // private static final int MAX_TABLE_SIZE = 1 << 12;
private int codeSize;
private final int initialCodeSize;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/bmp/BmpImageParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/bmp/BmpImageParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/bmp/BmpImageParser.java Sun Jan 6 19:45:20 2008
@@ -24,9 +24,9 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import java.util.ArrayList;
import org.apache.sanselan.FormatCompliance;
import org.apache.sanselan.ImageFormat;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/gif/GifImageParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/gif/GifImageParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/gif/GifImageParser.java Sun Jan 6 19:45:20 2008
@@ -25,9 +25,9 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import java.util.ArrayList;
import org.apache.sanselan.FormatCompliance;
import org.apache.sanselan.ImageFormat;
@@ -559,7 +559,8 @@
return null;
}
- private ArrayList getComments(ArrayList v) throws ImageReadException, IOException
+ private ArrayList getComments(ArrayList v) throws ImageReadException,
+ IOException
{
ArrayList result = new ArrayList();
int code = 0x21fe;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/ico/IcoImageParser.java Sun Jan 6 19:45:20 2008
@@ -26,8 +26,8 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Map;
import java.util.ArrayList;
+import java.util.Map;
import org.apache.sanselan.ImageFormat;
import org.apache.sanselan.ImageInfo;
@@ -420,7 +420,6 @@
"Use getAllBufferedImages() instead for .ico images.");
}
-
private BufferedImage readBufferedImage(IconData fIconData)
throws ImageReadException
{
@@ -495,7 +494,6 @@
return result;
}
-
public ArrayList getAllBufferedImages(ByteSource byteSource)
throws ImageReadException, IOException
{
@@ -515,28 +513,28 @@
return result;
}
-// public boolean extractImages(ByteSource byteSource, File dst_dir,
-// String dst_root, ImageParser encoder) throws ImageReadException,
-// IOException, ImageWriteException
-// {
-// ImageContents contents = readImage(byteSource);
-//
-// FileHeader fileHeader = contents.fileHeader;
-// for (int i = 0; i < fileHeader.iconCount; i++)
-// {
-// IconData iconData = contents.iconDatas[i];
-//
-// BufferedImage image = readBufferedImage(iconData);
-//
-// int size = Math.max(iconData.iconInfo.Width,
-// iconData.iconInfo.Height);
-// File file = new File(dst_dir, dst_root + "_" + size + "_"
-// + iconData.iconInfo.BitCount
-// + encoder.getDefaultExtension());
-// encoder.writeImage(image, new FileOutputStream(file), null);
-// }
-//
-// return true;
-// }
+ // public boolean extractImages(ByteSource byteSource, File dst_dir,
+ // String dst_root, ImageParser encoder) throws ImageReadException,
+ // IOException, ImageWriteException
+ // {
+ // ImageContents contents = readImage(byteSource);
+ //
+ // FileHeader fileHeader = contents.fileHeader;
+ // for (int i = 0; i < fileHeader.iconCount; i++)
+ // {
+ // IconData iconData = contents.iconDatas[i];
+ //
+ // BufferedImage image = readBufferedImage(iconData);
+ //
+ // int size = Math.max(iconData.iconInfo.Width,
+ // iconData.iconInfo.Height);
+ // File file = new File(dst_dir, dst_root + "_" + size + "_"
+ // + iconData.iconInfo.BitCount
+ // + encoder.getDefaultExtension());
+ // encoder.writeImage(image, new FileOutputStream(file), null);
+ // }
+ //
+ // return true;
+ // }
}
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegConstants.java Sun Jan 6 19:45:20 2008
@@ -73,7 +73,6 @@
SOF13Marker, SOF14Marker, SOF15Marker,
};
-
public static final byte icc_profile_label[] = {
0x49, 0x43, 0x43, 0x5F, 0x50, 0x52, 0x4F, 0x46, 0x49, 0x4C, 0x45,
0x0
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageMetadata.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageMetadata.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageMetadata.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageMetadata.java Sun Jan 6 19:45:20 2008
@@ -24,7 +24,7 @@
import org.apache.sanselan.formats.tiff.RawTiffImageData;
import org.apache.sanselan.formats.tiff.TiffField;
import org.apache.sanselan.formats.tiff.TiffImageMetadata;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
import org.apache.sanselan.util.Debug;
public class JpegImageMetadata implements IImageMetadata
@@ -53,7 +53,7 @@
return photoshop;
}
- public TiffField findEXIFValue(TagInfo2 tagInfo)
+ public TiffField findEXIFValue(TagInfo tagInfo)
{
ArrayList items = getItems();
for (int i = 0; i < items.size(); i++)
@@ -155,8 +155,6 @@
return result.toString();
}
-
-
public void dump()
{
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegImageParser.java Sun Jan 6 19:45:20 2008
@@ -20,18 +20,16 @@
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.PrintWriter;
import java.text.NumberFormat;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Map;
-import java.util.ArrayList;
import org.apache.sanselan.ImageFormat;
import org.apache.sanselan.ImageInfo;
import org.apache.sanselan.ImageParser;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.common.IImageMetadata;
import org.apache.sanselan.common.byteSources.ByteSource;
import org.apache.sanselan.formats.jpeg.segments.App13Segment;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegUtils.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegUtils.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegUtils.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/jpeg/JpegUtils.java Sun Jan 6 19:45:20 2008
@@ -42,14 +42,14 @@
// return false to exit traversal.
public boolean visitSegment(int marker, byte markerBytes[],
int markerLength, byte markerLengthBytes[], byte segmentData[])
- throws ImageReadException,
-// ImageWriteException,
+ throws ImageReadException,
+ // ImageWriteException,
IOException;
}
public void traverseJFIF(ByteSource byteSource, Visitor visitor)
- throws ImageReadException,
-// ImageWriteException,
+ throws ImageReadException,
+ // ImageWriteException,
IOException
{
InputStream is = null;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/GammaCorrection.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/GammaCorrection.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/GammaCorrection.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/GammaCorrection.java Sun Jan 6 19:45:20 2008
@@ -18,7 +18,7 @@
public class GammaCorrection
{
- private static final boolean DEBUG = false;
+ private static final boolean DEBUG = false;
// private final double src_gamma, dst_gamma;
private final int lookup_table[];
@@ -27,17 +27,20 @@
{
// this.src_gamma = src_gamma;
// this.dst_gamma = dst_gamma;
- if (DEBUG) {
- System.out.println("src_gamma: " + src_gamma);
- System.out.println("dst_gamma: " + dst_gamma);
- }
+ if (DEBUG)
+ {
+ System.out.println("src_gamma: " + src_gamma);
+ System.out.println("dst_gamma: " + dst_gamma);
+ }
lookup_table = new int[256];
for (int i = 0; i < 256; i++)
{
lookup_table[i] = correctSample(i, src_gamma, dst_gamma);
- if (DEBUG) {
- System.out.println("lookup_table[" + i + "]: " + lookup_table[i]);
+ if (DEBUG)
+ {
+ System.out.println("lookup_table[" + i + "]: "
+ + lookup_table[i]);
}
}
}
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngImageParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngImageParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngImageParser.java Sun Jan 6 19:45:20 2008
@@ -22,7 +22,6 @@
import java.awt.color.ICC_Profile;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
-import java.awt.image.DataBuffer;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -30,8 +29,8 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
-import java.util.Map;
import java.util.ArrayList;
+import java.util.Map;
import java.util.zip.InflaterInputStream;
import org.apache.sanselan.ColorTools;
@@ -721,7 +720,7 @@
// System.out.println("color_type: " + color_type);
// System.out.println("BitDepth: " + BitDepth);
-// int transfer_type;
+ // int transfer_type;
// int BytesPerSample;
int bitsPerSample = bitDepth;
@@ -729,7 +728,7 @@
throw new ImageReadException("PNG: unknown FilterMethod: "
+ pngChunkIHDR.filterMethod);
-// transfer_type = DataBuffer.TYPE_BYTE;
+ // transfer_type = DataBuffer.TYPE_BYTE;
// switch (BitDepth)
// {
// case 1 :
@@ -825,8 +824,8 @@
//
int bitsPerPixel = bitsPerSample * samplesPerPixel;
-// Debug.debug("bitsPerSample", bitsPerSample);
-// Debug.debug("samplesPerPixel", samplesPerPixel);
+ // Debug.debug("bitsPerSample", bitsPerSample);
+ // Debug.debug("samplesPerPixel", samplesPerPixel);
boolean hasAlpha = colorType == COLOR_TYPE_GREYSCALE_WITH_ALPHA
|| colorType == COLOR_TYPE_TRUE_COLOR_WITH_ALPHA;
@@ -850,10 +849,10 @@
// ZInputStream iis = new ZInputStream(bais);
// ByteArrayInputStream iis = new ByteArrayInputStream(uncompressed);
-// int bitsPerScanLine = bitsPerPixel * width;
+ // int bitsPerScanLine = bitsPerPixel * width;
-// Debug.debug("bitsPerScanLine", bitsPerScanLine);
-// Debug.debug("bitsPerPixel", bitsPerPixel);
+ // Debug.debug("bitsPerScanLine", bitsPerScanLine);
+ // Debug.debug("bitsPerPixel", bitsPerPixel);
ScanExpediter scanExpediter;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngWriter.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngWriter.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngWriter.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngWriter.java Sun Jan 6 19:45:20 2008
@@ -21,7 +21,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.HashMap;
-import java.util.HashMap;
import java.util.Map;
import java.util.zip.DeflaterOutputStream;
@@ -403,7 +402,6 @@
boolean useAlpha = colorType == COLOR_TYPE_GREYSCALE_WITH_ALPHA
|| colorType == COLOR_TYPE_TRUE_COLOR_WITH_ALPHA;
-
int row[] = new int[width];
for (int y = 0; y < height; y++)
{
@@ -450,13 +448,12 @@
if (useAlpha)
baos.write(alpha);
-
}
}
}
uncompressed = baos.toByteArray();
}
-// Debug.debug("uncompressed", uncompressed.length);
+ // Debug.debug("uncompressed", uncompressed.length);
ByteArrayOutputStream baos = new ByteArrayOutputStream();
DeflaterOutputStream dos = new DeflaterOutputStream(baos);
@@ -466,7 +463,6 @@
int end = Math.min(uncompressed.length, index + chunk_size);
int length = end - index;
-
dos.write(uncompressed, index, length);
dos.flush();
baos.flush();
@@ -475,7 +471,7 @@
baos.reset();
if (compressed.length > 0)
{
-// Debug.debug("compressed", compressed.length);
+ // Debug.debug("compressed", compressed.length);
writeChunkIDAT(os, compressed);
}
@@ -485,7 +481,7 @@
byte compressed[] = baos.toByteArray();
if (compressed.length > 0)
{
-// Debug.debug("compressed final", compressed.length);
+ // Debug.debug("compressed final", compressed.length);
writeChunkIDAT(os, compressed);
}
}
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediter.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediter.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediter.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediter.java Sun Jan 6 19:45:20 2008
@@ -30,7 +30,6 @@
import org.apache.sanselan.formats.png.scanlinefilters.ScanlineFilterSub;
import org.apache.sanselan.formats.png.scanlinefilters.ScanlineFilterUp;
import org.apache.sanselan.formats.transparencyfilters.TransparencyFilter;
-import org.apache.sanselan.util.Debug;
public abstract class ScanExpediter extends BinaryFileParser
{
@@ -64,8 +63,8 @@
this.gammaCorrection = gammaCorrection;
this.transparencyFilter = transparencyFilter;
-// Debug.debug("BitDepth", bitDepth);
-// Debug.debug("bitsPerPixel", bitsPerPixel);
+ // Debug.debug("BitDepth", bitDepth);
+ // Debug.debug("bitsPerPixel", bitsPerPixel);
// Debug.debug("colorType", colorType);
// buffer = bi.getRaster().getDataBuffer();
@@ -275,7 +274,6 @@
throw new ImageReadException("PNG: missing filter type");
// System.out.println("\t" + "filter: " + filter_type);
-
// byte unfiltered[] = new byte[length];
byte scanline[] = this.readByteArray("scanline", length, is,
"PNG: missing image data");
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediterSimple.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediterSimple.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediterSimple.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/ScanExpediterSimple.java Sun Jan 6 19:45:20 2008
@@ -23,7 +23,6 @@
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.formats.png.chunks.PNGChunkPLTE;
import org.apache.sanselan.formats.transparencyfilters.TransparencyFilter;
-import org.apache.sanselan.util.Debug;
public class ScanExpediterSimple extends ScanExpediter
{
@@ -39,17 +38,17 @@
public void drive() throws ImageReadException, IOException
{
-// Debug.debug("width", width);
+ // Debug.debug("width", width);
int bitsPerScanLine = bitsPerPixel * width;
-// Debug.debug("bitsPerPixel", bitsPerPixel);
-// Debug.debug("bitsPerScanLine", bitsPerScanLine);
+ // Debug.debug("bitsPerPixel", bitsPerPixel);
+ // Debug.debug("bitsPerScanLine", bitsPerScanLine);
int pixelBytesPerScanLine = getBitsToBytesRoundingUp(bitsPerScanLine);
-// Debug.debug("pixelBytesPerScanLine", pixelBytesPerScanLine);
+ // Debug.debug("pixelBytesPerScanLine", pixelBytesPerScanLine);
byte prev[] = null;
for (int y = 0; y < height; y++)
{
-// Debug.debug("getNextScanline", y + "/" + height + ", " + pixelBytesPerScanLine);
+ // Debug.debug("getNextScanline", y + "/" + height + ", " + pixelBytesPerScanLine);
byte unfiltered[] = getNextScanline(is, pixelBytesPerScanLine,
prev, bytesPerPixel);
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/pnm/PNMImageParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/pnm/PNMImageParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/pnm/PNMImageParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/pnm/PNMImageParser.java Sun Jan 6 19:45:20 2008
@@ -23,9 +23,9 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import java.util.ArrayList;
import org.apache.sanselan.ImageFormat;
import org.apache.sanselan.ImageInfo;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/psd/PsdImageParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/psd/PsdImageParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/psd/PsdImageParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/psd/PsdImageParser.java Sun Jan 6 19:45:20 2008
@@ -23,8 +23,8 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
-import java.util.Map;
import java.util.ArrayList;
+import java.util.Map;
import org.apache.sanselan.ImageFormat;
import org.apache.sanselan.ImageInfo;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffContents.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffContents.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffContents.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffContents.java Sun Jan 6 19:45:20 2008
@@ -20,7 +20,7 @@
import java.util.Collections;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
import org.apache.sanselan.util.Debug;
public class TiffContents
@@ -64,7 +64,7 @@
return result;
}
- public TiffField findField(TagInfo2 tag)
+ public TiffField findField(TagInfo tag)
{
for (int i = 0; i < directories.size(); i++)
{
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffDirectory.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffDirectory.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffDirectory.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffDirectory.java Sun Jan 6 19:45:20 2008
@@ -21,7 +21,7 @@
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.common.byteSources.ByteSource;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
import org.apache.sanselan.formats.tiff.constants.TiffConstants;
public class TiffDirectory extends TiffElement implements TiffConstants
@@ -145,7 +145,7 @@
return false;
}
- public TiffField findField(TagInfo2 tag)
+ public TiffField findField(TagInfo tag)
{
if (entries == null)
return null;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffField.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffField.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffField.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffField.java Sun Jan 6 19:45:20 2008
@@ -27,14 +27,13 @@
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.common.byteSources.ByteSource;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
import org.apache.sanselan.formats.tiff.constants.TiffConstants;
import org.apache.sanselan.formats.tiff.fieldtypes.FieldType;
-import org.apache.sanselan.util.Debug;
public class TiffField implements TiffConstants
{
- public final TagInfo2 tagInfo;
+ public final TagInfo tagInfo;
public final FieldType fieldType;
public final int tag;
@@ -110,7 +109,7 @@
return FIELD_TYPE_UNKNOWN;
}
- private static TagInfo2 getTag(int directoryType, int value)
+ private static TagInfo getTag(int directoryType, int value)
{
Object key = new Integer(value);
@@ -118,21 +117,21 @@
|| directoryType == DIRECTORY_TYPE_INTEROPERABILITY)
{
if (EXIF_TAG_MAP.containsKey(key))
- return (TagInfo2) EXIF_TAG_MAP.get(key);
+ return (TagInfo) EXIF_TAG_MAP.get(key);
}
else if (directoryType == DIRECTORY_TYPE_GPS)
{
if (GPS_TAG_MAP.containsKey(key))
- return (TagInfo2) GPS_TAG_MAP.get(key);
+ return (TagInfo) GPS_TAG_MAP.get(key);
}
else
{
if (TIFF_TAG_MAP.containsKey(key))
- return (TagInfo2) TIFF_TAG_MAP.get(key);
+ return (TagInfo) TIFF_TAG_MAP.get(key);
}
if (ALL_TAG_MAP.containsKey(key))
- return (TagInfo2) ALL_TAG_MAP.get(key);
+ return (TagInfo) ALL_TAG_MAP.get(key);
// public static final int DIRECTORY_TYPE_EXIF = -2;
// // public static final int DIRECTORY_TYPE_SUB = 5;
@@ -453,7 +452,7 @@
return tagInfo.getValue(this);
}
- private static final Map makeTagMap(TagInfo2 tags[],
+ private static final Map makeTagMap(TagInfo tags[],
boolean ignoreDuplicates, String name)
{
// make sure to use the thread-safe version; this is shared state.
@@ -461,7 +460,7 @@
for (int i = 0; i < tags.length; i++)
{
- TagInfo2 tag = tags[i];
+ TagInfo tag = tags[i];
Object key = new Integer(tag.tag);
if (map.get(key) == null)
@@ -472,7 +471,7 @@
+ " (0x" + Integer.toHexString(tag.tag) + ")");
System.out.println("\t" + "New name: " + tag.name);
System.out.println("\t" + "Old name: "
- + ((TagInfo2) map.get(key)).name);
+ + ((TagInfo) map.get(key)).name);
}
}
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageMetadata.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageMetadata.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageMetadata.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageMetadata.java Sun Jan 6 19:45:20 2008
@@ -21,7 +21,7 @@
import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.common.ImageMetadata;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
import org.apache.sanselan.formats.tiff.fieldtypes.FieldType;
import org.apache.sanselan.formats.tiff.write.TiffOutputDirectory;
import org.apache.sanselan.formats.tiff.write.TiffOutputField;
@@ -112,7 +112,7 @@
.get(i);
TiffField srcField = item.getTiffField();
- TagInfo2 tagInfo = srcField.tagInfo;
+ TagInfo tagInfo = srcField.tagInfo;
FieldType fieldType = srcField.fieldType;
int count = srcField.length;
// byte bytes[] = srcField.fieldType.getRawBytes(srcField);
@@ -125,8 +125,8 @@
bytes2 = fieldType.writeData(value, byteOrder);
// Debug.debug("\t" + "bytes2", bytes2);
- TiffOutputField dstField = new TiffOutputField(srcField.tag, tagInfo, fieldType,
- count, bytes2);
+ TiffOutputField dstField = new TiffOutputField(srcField.tag,
+ tagInfo, fieldType, count, bytes2);
dstDir.add(dstField);
}
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageParser.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageParser.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageParser.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/TiffImageParser.java Sun Jan 6 19:45:20 2008
@@ -37,7 +37,7 @@
import org.apache.sanselan.common.byteSources.ByteSourceArray;
import org.apache.sanselan.common.byteSources.ByteSourceFile;
import org.apache.sanselan.formats.tiff.TiffDirectory.ImageDataElement;
-import org.apache.sanselan.formats.tiff.constants.TagInfo2;
+import org.apache.sanselan.formats.tiff.constants.TagInfo;
import org.apache.sanselan.formats.tiff.constants.TiffConstants;
import org.apache.sanselan.formats.tiff.datareaders.DataReader;
import org.apache.sanselan.formats.tiff.datareaders.DataReaderStrips;
@@ -327,7 +327,7 @@
return null;
}
- private TiffField findField(ArrayList entries, TagInfo2 tag)
+ private TiffField findField(ArrayList entries, TagInfo tag)
{
if (entries == null)
return null;
@@ -842,7 +842,7 @@
return true;
}
- private Number getTagAsNumber(ArrayList entries, TagInfo2 tag)
+ private Number getTagAsNumber(ArrayList entries, TagInfo tag)
throws ImageReadException, IOException
{
TiffField entry = findField(entries, tag);
@@ -864,7 +864,7 @@
return result;
}
- private int getTagAsValueOrArraySum(ArrayList entries, TagInfo2 tag)
+ private int getTagAsValueOrArraySum(ArrayList entries, TagInfo tag)
throws ImageReadException, IOException
{
TiffField entry = findField(entries, tag);
@@ -880,7 +880,7 @@
return result;
}
- private double[] getTagAsDoubleArray(ArrayList entries, TagInfo2 tag,
+ private double[] getTagAsDoubleArray(ArrayList entries, TagInfo tag,
boolean throwExceptionIfMissing) throws ImageReadException,
IOException
{
@@ -899,7 +899,7 @@
return result;
}
- private int[] getTagAsIntArray(ArrayList entries, TagInfo2 tag,
+ private int[] getTagAsIntArray(ArrayList entries, TagInfo tag,
boolean throwExceptionIfMissing) throws ImageReadException,
IOException
{
@@ -921,7 +921,7 @@
return result;
}
- private int dumpOptionalNumberTag(ArrayList entries, TagInfo2 tag)
+ private int dumpOptionalNumberTag(ArrayList entries, TagInfo tag)
{
TiffField entry = findField(entries, tag);
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/AllTagConstants.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/AllTagConstants.java?rev=609506&r1=609505&r2=609506&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/AllTagConstants.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/constants/AllTagConstants.java Sun Jan 6 19:45:20 2008
@@ -25,9 +25,9 @@
ExifTagConstants,
GPSTagConstants
{
- public static final TagInfo2 ALL_TAGS[] = TagConstantsUtils
- .mergeTagLists(new TagInfo2[][]{
- ALL_TIFF_TAGS, ALL_EXIF_TAGS, ALL_GPS_TAGS,
+ public static final TagInfo ALL_TAGS[] = TagConstantsUtils
+ .mergeTagLists(new TagInfo[][]{
+ ALL_TIFF_TAGS, ALL_EXIF_TAGS, ALL_GPS_TAGS,
});
}