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 cz...@apache.org on 2008/03/03 18:01:05 UTC
svn commit: r633208 - in /incubator/sanselan/trunk: ./
src/main/java/org/apache/sanselan/formats/gif/
src/main/java/org/apache/sanselan/formats/png/
src/main/java/org/apache/sanselan/formats/tiff/
src/main/java/org/apache/sanselan/formats/tiff/debug/ s...
Author: cziegeler
Date: Mon Mar 3 10:01:02 2008
New Revision: 633208
URL: http://svn.apache.org/viewvc?rev=633208&view=rev
Log:
Clean up code (remove unused imports etc), remove empty dirs and update maven bundle plugin to latest release.
Removed:
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/debug/
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/AppTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/app/
Modified:
incubator/sanselan/trunk/pom.xml
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/gif/GifImageParser.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/png/PngImageParser.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/write/TiffOutputSet.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/WriteExifMetadataExample.java
incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/IOUtils.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java
incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java
Modified: incubator/sanselan/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/pom.xml?rev=633208&r1=633207&r2=633208&view=diff
==============================================================================
--- incubator/sanselan/trunk/pom.xml (original)
+++ incubator/sanselan/trunk/pom.xml Mon Mar 3 10:01:02 2008
@@ -118,7 +118,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.4.0</version>
</plugin>
</plugins>
</pluginManagement>
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=633208&r1=633207&r2=633208&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 Mon Mar 3 10:01:02 2008
@@ -293,9 +293,9 @@
+ new String(label) + ")",
complete_code);
- // if (label == new String("ICCRGBG1"))
+ // if (label == new String("ICCRGBG1"))
{
- // GIF's can have embedded ICC Profiles - who knew?
+ // GIF's can have embedded ICC Profiles - who knew?
}
if ((label != null) && (label.length > 0))
@@ -749,11 +749,8 @@
throw new ImageReadException("Gif: No Color Table");
int transparentIndex = -1;
- if (gce != null)
- {
- if (gce.transparency)
- transparentIndex = gce.transparentColorIndex;
- }
+ if (gce.transparency)
+ transparentIndex = gce.transparentColorIndex;
// Debug.debug("charles TransparentIndex", TransparentIndex);
@@ -834,7 +831,7 @@
os.write(bytes, index, block_size);
index += block_size;
}
- os.write(0); // last block
+ os.write(0); // last block
}
private static final int LOCAL_COLOR_TABLE_FLAG_MASK = 1 << 7;
@@ -888,11 +885,11 @@
{
// write Header
os.write(0x47); // G magic numbers
- os.write(0x49); // I
+ os.write(0x49); // I
os.write(0x46); // F
os.write(0x38); // 8 version magic numbers
- os.write(0x39); // 9
+ os.write(0x39); // 9
os.write(0x61); // a
// Logical Screen Descriptor.
@@ -913,7 +910,7 @@
int colorTableSizeInFormat = 1 << (colorTableScaleLessOne + 1);
int actual_size = 3 * simple_pow(2, colorTableScaleLessOne + 1);
{
- byte colorResolution = (byte) colorTableScaleLessOne; // TODO:
+ byte colorResolution = (byte) colorTableScaleLessOne; // TODO:
boolean globalColorTableFlag = false;
boolean sortFlag = false;
@@ -959,10 +956,10 @@
{ // Image Descriptor.
bos.write(IMAGE_SEPARATOR);
- bos.write2Bytes(0); // Image Left Position
- bos.write2Bytes(0); // Image Top Position
- bos.write2Bytes(width); // Image Width
- bos.write2Bytes(height); // Image Height
+ bos.write2Bytes(0); // Image Left Position
+ bos.write2Bytes(0); // Image Top Position
+ bos.write2Bytes(width); // Image Width
+ bos.write2Bytes(height); // Image Height
{
boolean LocalColorTableFlag = true;
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=633208&r1=633207&r2=633208&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 Mon Mar 3 10:01:02 2008
@@ -292,28 +292,28 @@
private boolean isGrayscale(int colorType) throws ImageReadException
{
- // Color type is a single-byte integer that describes the interpretation of the
- // image data. Color type codes represent sums of the following values:
- // 1 (palette used), 2 (color used), and 4 (alpha channel used).
+ // Color type is a single-byte integer that describes the interpretation of the
+ // image data. Color type codes represent sums of the following values:
+ // 1 (palette used), 2 (color used), and 4 (alpha channel used).
// Valid values are 0, 2, 3, 4, and 6.
//
- // Bit depth restrictions for each color type are imposed to simplify implementations
- // and to prohibit combinations that do not compress well. Decoders must support all
+ // Bit depth restrictions for each color type are imposed to simplify implementations
+ // and to prohibit combinations that do not compress well. Decoders must support all
// valid combinations of bit depth and color type. The allowed combinations are:
//
// Color Allowed Interpretation
// Type Bit Depths
- //
+ //
// 0 1,2,4,8,16 Each pixel is a grayscale sample.
- //
+ //
// 2 8,16 Each pixel is an R,G,B triple.
- //
+ //
// 3 1,2,4,8 Each pixel is a palette index;
// a PLTE chunk must appear.
- //
+ //
// 4 8,16 Each pixel is a grayscale sample,
// followed by an alpha sample.
- //
+ //
// 6 8,16 Each pixel is an R,G,B triple,
// followed by an alpha sample.
switch (colorType)
@@ -336,28 +336,28 @@
private int samplesPerPixel(int colorType) throws ImageReadException
{
- // Color type is a single-byte integer that describes the interpretation of the
- // image data. Color type codes represent sums of the following values:
- // 1 (palette used), 2 (color used), and 4 (alpha channel used).
+ // Color type is a single-byte integer that describes the interpretation of the
+ // image data. Color type codes represent sums of the following values:
+ // 1 (palette used), 2 (color used), and 4 (alpha channel used).
// Valid values are 0, 2, 3, 4, and 6.
//
- // Bit depth restrictions for each color type are imposed to simplify implementations
- // and to prohibit combinations that do not compress well. Decoders must support all
+ // Bit depth restrictions for each color type are imposed to simplify implementations
+ // and to prohibit combinations that do not compress well. Decoders must support all
// valid combinations of bit depth and color type. The allowed combinations are:
//
// Color Allowed Interpretation
// Type Bit Depths
- //
+ //
// 0 1,2,4,8,16 Each pixel is a grayscale sample.
- //
+ //
// 2 8,16 Each pixel is an R,G,B triple.
- //
+ //
// 3 1,2,4,8 Each pixel is a palette index;
// a PLTE chunk must appear.
- //
+ //
// 4 8,16 Each pixel is a grayscale sample,
// followed by an alpha sample.
- //
+ //
// 6 8,16 Each pixel is an R,G,B triple,
// followed by an alpha sample.
switch (colorType)
@@ -434,7 +434,7 @@
}
// TODO: I have been too casual about making inner classes subclass of BinaryFileParser
- // I may not have always preserved byte order correctly.
+ // I may not have always preserved byte order correctly.
private TransparencyFilter getTransparencyFilter(int ColorType,
PNGChunk pngChunktRNS) throws ImageReadException, IOException
@@ -558,12 +558,12 @@
double meters_per_inch = 0.0254;
PhysicalWidthDpi = (int) Math
- .round((double) pngChunkpHYs.PixelsPerUnitXAxis
+ .round(pngChunkpHYs.PixelsPerUnitXAxis
* meters_per_inch);
PhysicalWidthInch = (float) ((double) Width
* (double) pngChunkpHYs.PixelsPerUnitXAxis * meters_per_inch);
PhysicalHeightDpi = (int) Math
- .round((double) pngChunkpHYs.PixelsPerUnitYAxis
+ .round(pngChunkpHYs.PixelsPerUnitYAxis
* meters_per_inch);
PhysicalHeightInch = (float) ((double) Height
* (double) pngChunkpHYs.PixelsPerUnitYAxis * meters_per_inch);
@@ -773,7 +773,7 @@
// // cm = ColorModel.getRGBdefault();
// break;
// }
- // //
+ // //
// case 3 : // 1,2,4,8 Each pixel is a palette index;
// // a PLTE chunk must appear.
// {
@@ -917,7 +917,7 @@
pw.println("chunks: " + chunks.size());
- if ((chunks == null) || (chunks.size() < 1))
+ if ((chunks.size() < 1))
return false;
for (int i = 0; i < chunks.size(); i++)
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=633208&r1=633207&r2=633208&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 Mon Mar 3 10:01:02 2008
@@ -32,7 +32,6 @@
import org.apache.sanselan.formats.tiff.write.TiffOutputDirectory;
import org.apache.sanselan.formats.tiff.write.TiffOutputField;
import org.apache.sanselan.formats.tiff.write.TiffOutputSet;
-import org.apache.sanselan.util.Debug;
public class TiffImageMetadata extends ImageMetadata
implements
@@ -215,7 +214,7 @@
if (null != result.findDirectory(srcDir.type))
{
- // Certain cameras right directories more than once.
+ // Certain cameras right directories more than once.
// This is a bug.
// Ignore second directory of a given type.
continue;
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=633208&r1=633207&r2=633208&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 Mon Mar 3 10:01:02 2008
@@ -92,7 +92,7 @@
TiffField field = directory.findField(EXIF_TAG_ICC_PROFILE);
if (null == field)
return null;
- return (byte[]) field.oversizeValue;
+ return field.oversizeValue;
}
public Dimension getImageSize(ByteSource byteSource)
@@ -210,7 +210,7 @@
double XResolutionPixelsPerUnit = xResolutionField
.getDoubleValue();
physicalWidthDpi = (int) (XResolutionPixelsPerUnit / unitsPerInch);
- physicalWidthInch = (float) ((double) width / (XResolutionPixelsPerUnit * unitsPerInch));
+ physicalWidthInch = (float) (width / (XResolutionPixelsPerUnit * unitsPerInch));
}
if ((yResolutionField != null)
&& (yResolutionField.getValue() != null))
@@ -218,7 +218,7 @@
double YResolutionPixelsPerUnit = yResolutionField
.getDoubleValue();
physicalHeightDpi = (int) (YResolutionPixelsPerUnit / unitsPerInch);
- physicalHeightInch = (float) ((double) height / (YResolutionPixelsPerUnit * unitsPerInch));
+ physicalHeightInch = (float) (height / (YResolutionPixelsPerUnit * unitsPerInch));
}
}
@@ -498,7 +498,7 @@
case 5 : // CMYK
return new PhotometricInterpreterCMYK(samplesPerPixel,
bitsPerSample, predictor, width, height);
- case 6 : //
+ case 6 : //
{
double yCbCrCoefficients[] = directory.findField(
TIFF_TAG_YCBCR_COEFFICIENTS, true)
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputSet.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputSet.java?rev=633208&r1=633207&r2=633208&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputSet.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/formats/tiff/write/TiffOutputSet.java Mon Mar 3 10:01:02 2008
@@ -20,8 +20,6 @@
import java.util.List;
import org.apache.sanselan.ImageWriteException;
-import org.apache.sanselan.common.RationalNumber;
-import org.apache.sanselan.formats.tiff.TiffField;
import org.apache.sanselan.formats.tiff.constants.TagInfo;
import org.apache.sanselan.formats.tiff.constants.TiffConstants;
import org.apache.sanselan.util.Debug;
@@ -96,7 +94,7 @@
{
// EXIF directory requires root directory.
getOrCreateRootDirectory();
-
+
TiffOutputDirectory result = findDirectory(DIRECTORY_TYPE_EXIF);
if (null != result)
return result;
@@ -108,7 +106,7 @@
{
// GPS directory requires EXIF directory
getOrCreateExifDirectory();
-
+
TiffOutputDirectory result = findDirectory(DIRECTORY_TYPE_GPS);
if (null != result)
return result;
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java?rev=633208&r1=633207&r2=633208&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/MetadataExample.java Mon Mar 3 10:01:02 2008
@@ -29,7 +29,6 @@
import org.apache.sanselan.formats.tiff.TiffImageMetadata;
import org.apache.sanselan.formats.tiff.constants.TagInfo;
import org.apache.sanselan.formats.tiff.constants.TiffConstants;
-import org.apache.sanselan.util.Debug;
public class MetadataExample
{
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/WriteExifMetadataExample.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/WriteExifMetadataExample.java?rev=633208&r1=633207&r2=633208&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/WriteExifMetadataExample.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/sampleUsage/WriteExifMetadataExample.java Mon Mar 3 10:01:02 2008
@@ -21,18 +21,14 @@
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.util.ArrayList;
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.ImageWriteException;
import org.apache.sanselan.Sanselan;
import org.apache.sanselan.common.IImageMetadata;
-import org.apache.sanselan.common.RationalNumber;
import org.apache.sanselan.formats.jpeg.JpegImageMetadata;
import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter;
-import org.apache.sanselan.formats.tiff.TiffField;
import org.apache.sanselan.formats.tiff.TiffImageMetadata;
-import org.apache.sanselan.formats.tiff.constants.TagInfo;
import org.apache.sanselan.formats.tiff.constants.TiffConstants;
import org.apache.sanselan.formats.tiff.write.TiffOutputDirectory;
import org.apache.sanselan.formats.tiff.write.TiffOutputField;
@@ -85,22 +81,22 @@
{
// TiffImageMetadata class is immutable (read-only).
// TiffOutputSet class represents the Exif data to write.
- //
- // Usually, we want to update existing Exif metadata by changing
+ //
+ // Usually, we want to update existing Exif metadata by changing
// the values of a few fields, or adding a field.
- // In these cases, it is easiest to use getOutputSet() to
+ // In these cases, it is easiest to use getOutputSet() to
// start with a "copy" of the fields read from the image.
outputSet = exif.getOutputSet();
}
}
-
+
if(null==outputSet)
outputSet = new TiffOutputSet();
{
// Example of how to remove a single tag/field.
- //
- // Note that this approach is crude: Exif data is organized in
+ //
+ // Note that this approach is crude: Exif data is organized in
// directories. The same tag/field may appear in more than one
// directory.
TiffOutputField aperture = outputSet
@@ -116,7 +112,7 @@
{
// Example of how to add a field/tag to the output set.
//
- // Note that you should first remove the field/tag if it already exists
+ // Note that you should first remove the field/tag if it already exists
// in this directory. See above.
//
// Certain fields/tags are expected in certain Exif directories;
@@ -125,7 +121,7 @@
//
// TagInfo constants often contain a description of what directories
// are associated with a given tag.
- //
+ //
// see org.apache.sanselan.formats.tiff.constants.AllTagConstants
//
TiffOutputField aperture = TiffOutputField.create(
Modified: incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/IOUtils.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/IOUtils.java?rev=633208&r1=633207&r2=633208&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/IOUtils.java (original)
+++ incubator/sanselan/trunk/src/main/java/org/apache/sanselan/util/IOUtils.java Mon Mar 3 10:01:02 2008
@@ -32,7 +32,7 @@
public abstract class IOUtils implements SanselanConstants
{
- /**
+ /**
* Reads an InputStream to the end.
* <p>
* @param is The InputStream to read.
@@ -74,10 +74,10 @@
}
}
- /**
+ /**
* Reads a File into memory.
* <p>
- * @param is The File to read.
+ * @param file The File to read.
* @return A byte array containing the contents of the File
* @see InputStream
*/
Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java?rev=633208&r1=633207&r2=633208&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifBaseTest.java Mon Mar 3 10:01:02 2008
@@ -21,9 +21,7 @@
import java.io.IOException;
import java.util.List;
-import org.apache.sanselan.ImageFormat;
import org.apache.sanselan.ImageReadException;
-import org.apache.sanselan.Sanselan;
import org.apache.sanselan.SanselanTest;
import org.apache.sanselan.common.byteSources.ByteSource;
import org.apache.sanselan.common.byteSources.ByteSourceFile;
Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java?rev=633208&r1=633207&r2=633208&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/ExifRewriteTest.java Mon Mar 3 10:01:02 2008
@@ -505,7 +505,7 @@
// + (ba == bb) + " " + eq);
// if(ba != bb)
// assertFalse(true);
- //
+ //
// Debug.debug("i: " + i + ", a[i]: " + ba + ", b[i]: " + bb + " = "
// + (ba == bb) + " " + eq);
// assertTrue(eq == true);
@@ -536,18 +536,5 @@
assertEquals(a.length, b.length);
for (int i = 0; i < a.length; i++)
assertEquals(a[i], b[i]);
- }
-
- private void dump(String name, Set set)
- {
- dump(name, new ArrayList(set));
- }
-
- private void dump(String name, List list)
- {
- Debug.debug(name, list.size());
- for (int i = 0; i < list.size(); i++)
- Debug.debug("\t" + list.get(i));
- Debug.debug();
}
}
Modified: incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java
URL: http://svn.apache.org/viewvc/incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java?rev=633208&r1=633207&r2=633208&view=diff
==============================================================================
--- incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java (original)
+++ incubator/sanselan/trunk/src/test/java/org/apache/sanselan/formats/jpeg/exif/WriteExifMetadataExampleTest.java Mon Mar 3 10:01:02 2008
@@ -23,7 +23,6 @@
import org.apache.sanselan.ImageReadException;
import org.apache.sanselan.ImageWriteException;
-import org.apache.sanselan.formats.jpeg.JpegBaseTest;
import org.apache.sanselan.formats.jpeg.exifRewrite.ExifRewriter;
import org.apache.sanselan.formats.tiff.constants.AllTagConstants;
import org.apache.sanselan.sampleUsage.WriteExifMetadataExample;