You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by eb...@apache.org on 2013/11/27 01:51:21 UTC
svn commit: r1545891 [1/3] - in /commons/proper/imaging/trunk/src:
main/java/org/apache/commons/imaging/
main/java/org/apache/commons/imaging/common/
main/java/org/apache/commons/imaging/formats/bmp/
main/java/org/apache/commons/imaging/formats/dcx/ ma...
Author: ebourg
Date: Wed Nov 27 00:51:19 2013
New Revision: 1545891
URL: http://svn.apache.org/r1545891
Log:
Missing spaces
Modified:
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageBuilder.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PpmWriter.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeInfo.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffDirectory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffElement.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffReader.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeShort.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterBase.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffImageWriterLossless.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputDirectory.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/wbmp/WbmpImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xbm/XbmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/xpm/XpmImageParser.java
commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutMostPopulatedBoxesImplementation.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceImageTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ApacheImagingSpeedAndMemoryTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageReadExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/ImageWriteExample.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/examples/SampleUsage.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/dcx/DcxReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegWithJpegThumbnailTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/AsciiFieldTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/ExifDumpTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/GpsTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/MicrosoftTagTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/SpecificExifTagTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcDumpTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcUpdateTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpDumpTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriteTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pam/PamReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/pcx/PcxReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/ConvertPngToGifTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngMultipleRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngTextTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteForceTrueColorText.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/png/PngWriteReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/psd/PsdReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffCcittTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadWriteTagsTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffRoundtripTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffSubImageTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xbm/XbmReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xmp/XmpUpdateTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/xpm/XpmReadTest.java
commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/roundtrip/RoundtripTest.java
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/ImageParser.java Wed Nov 27 00:51:19 2013
@@ -159,7 +159,7 @@ public abstract class ImageParser extend
* implementation.
* @throws IOException In the event of unsuccessful data read operation.
*/
- public abstract IImageMetadata getMetadata(ByteSource byteSource, Map<String,Object> params)
+ public abstract IImageMetadata getMetadata(ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException;
@@ -205,7 +205,7 @@ public abstract class ImageParser extend
* implementation.
* @throws IOException In the event of unsuccessful data read operation.
*/
- public final IImageMetadata getMetadata(final byte[] bytes, final Map<String,Object> params)
+ public final IImageMetadata getMetadata(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getMetadata(new ByteSourceArray(bytes), params);
}
@@ -255,7 +255,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful file read or
* access operation.
*/
- public final IImageMetadata getMetadata(final File file, final Map<String,Object> params)
+ public final IImageMetadata getMetadata(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
if (getDebug()) {
System.out.println(getName() + ".getMetadata" + ": "
@@ -294,7 +294,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful data
* access operation.
*/
- public abstract ImageInfo getImageInfo(ByteSource byteSource, Map<String,Object> params)
+ public abstract ImageInfo getImageInfo(ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException;
@@ -343,7 +343,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful data
* access operation.
*/
- public final ImageInfo getImageInfo(final byte[] bytes, final Map<String,Object> params)
+ public final ImageInfo getImageInfo(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getImageInfo(new ByteSourceArray(bytes), params);
}
@@ -371,7 +371,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful file read or
* access operation.
*/
- public final ImageInfo getImageInfo(final File file, final Map<String,Object> params)
+ public final ImageInfo getImageInfo(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
if (!canAcceptExtension(file)) {
return null;
@@ -506,7 +506,7 @@ public abstract class ImageParser extend
* access operation.
*/
public abstract BufferedImage getBufferedImage(ByteSource byteSource,
- Map<String,Object> params) throws ImageReadException, IOException;
+ Map<String, Object> params) throws ImageReadException, IOException;
/**
* Gets a buffered image specified by the byte array (for
@@ -523,7 +523,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final BufferedImage getBufferedImage(final byte[] bytes, final Map<String,Object> params)
+ public final BufferedImage getBufferedImage(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getBufferedImage(new ByteSourceArray(bytes), params);
}
@@ -543,7 +543,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final BufferedImage getBufferedImage(final File file, final Map<String,Object> params)
+ public final BufferedImage getBufferedImage(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
if (!canAcceptExtension(file)) {
return null;
@@ -573,7 +573,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of an write error from
* the output stream.
*/
- public void writeImage(final BufferedImage src, final OutputStream os, final Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
throws ImageWriteException, IOException {
os.close(); // we are obligated to close stream.
@@ -608,7 +608,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final Dimension getImageSize(final byte[] bytes, final Map<String,Object> params)
+ public final Dimension getImageSize(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getImageSize(new ByteSourceArray(bytes), params);
}
@@ -641,7 +641,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final Dimension getImageSize(final File file, final Map<String,Object> params)
+ public final Dimension getImageSize(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
if (!canAcceptExtension(file)) {
@@ -663,7 +663,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public abstract Dimension getImageSize(ByteSource byteSource, Map<String,Object> params)
+ public abstract Dimension getImageSize(ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException;
@@ -684,7 +684,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public abstract String getXmpXml(ByteSource byteSource, Map<String,Object> params)
+ public abstract String getXmpXml(ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException;
@@ -720,7 +720,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final byte[] getICCProfileBytes(final byte[] bytes, final Map<String,Object> params)
+ public final byte[] getICCProfileBytes(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getICCProfileBytes(new ByteSourceArray(bytes), params);
}
@@ -756,7 +756,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public final byte[] getICCProfileBytes(final File file, final Map<String,Object> params)
+ public final byte[] getICCProfileBytes(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
if (!canAcceptExtension(file)) {
return null;
@@ -784,7 +784,7 @@ public abstract class ImageParser extend
* @throws IOException In the event of unsuccessful read or
* access operation.
*/
- public abstract byte[] getICCProfileBytes(ByteSource byteSource, Map<String,Object> params)
+ public abstract byte[] getICCProfileBytes(ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException;
@@ -971,7 +971,7 @@ public abstract class ImageParser extend
* @return A valid instance of an implementation of a
* IBufferedImageFactory.
*/
- protected IBufferedImageFactory getBufferedImageFactory(final Map<String,Object> params) {
+ protected IBufferedImageFactory getBufferedImageFactory(final Map<String, Object> params) {
if (params == null) {
return new SimpleBufferedImageFactory();
}
@@ -995,7 +995,7 @@ public abstract class ImageParser extend
* @return If the params specify strict format compliance, true;
* otherwise, false.
*/
- public static boolean isStrict(final Map<String,Object> params) {
+ public static boolean isStrict(final Map<String, Object> params) {
if (params == null || !params.containsKey(PARAM_KEY_STRICT)) {
return false;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/Imaging.java Wed Nov 27 00:51:19 2013
@@ -116,7 +116,7 @@ public abstract class Imaging implements
* format file extension; otherwise, false.
*/
public static boolean hasImageFileExtension(final File file) {
- if (file==null || !file.isFile()) {
+ if (file == null || !file.isFile()) {
return false;
}
return hasImageFileExtension(file.getName());
@@ -132,7 +132,7 @@ public abstract class Imaging implements
* @return true if the filename has an image format file extension.
*/
public static boolean hasImageFileExtension(String filename) {
- if(filename==null) {
+ if (filename == null) {
return false;
}
@@ -221,8 +221,8 @@ public abstract class Imaging implements
*/
public static ImageFormat guessFormat(final ByteSource byteSource)
throws ImageReadException, IOException {
-
- if (byteSource==null) {
+
+ if (byteSource == null) {
return ImageFormats.UNKNOWN;
}
@@ -348,7 +348,7 @@ public abstract class Imaging implements
* @return An instance of ICC_Profile or null if the image contains no ICC
* profile..
*/
- public static ICC_Profile getICCProfile(final byte[] bytes, final Map<String,Object> params)
+ public static ICC_Profile getICCProfile(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getICCProfile(new ByteSourceArray(bytes), params);
}
@@ -385,7 +385,7 @@ public abstract class Imaging implements
* profile..
*/
public static ICC_Profile getICCProfile(final InputStream is, final String filename,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
return getICCProfile(new ByteSourceInputStream(is, filename), params);
}
@@ -416,12 +416,12 @@ public abstract class Imaging implements
* @return An instance of ICC_Profile or null if the image contains no ICC
* profile..
*/
- public static ICC_Profile getICCProfile(final File file, final Map<String,Object> params)
+ public static ICC_Profile getICCProfile(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
return getICCProfile(new ByteSourceFile(file), params);
}
- protected static ICC_Profile getICCProfile(final ByteSource byteSource, final Map<String,Object> params)
+ protected static ICC_Profile getICCProfile(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final byte[] bytes = getICCProfileBytes(byteSource, params);
if (bytes == null) {
@@ -475,7 +475,7 @@ public abstract class Imaging implements
* @see IccProfileParser
* @see ICC_Profile
*/
- public static byte[] getICCProfileBytes(final byte[] bytes, final Map<String,Object> params)
+ public static byte[] getICCProfileBytes(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getICCProfileBytes(new ByteSourceArray(bytes), params);
}
@@ -515,12 +515,12 @@ public abstract class Imaging implements
* @see IccProfileParser
* @see ICC_Profile
*/
- public static byte[] getICCProfileBytes(final File file, final Map<String,Object> params)
+ public static byte[] getICCProfileBytes(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
return getICCProfileBytes(new ByteSourceFile(file), params);
}
- private static byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ private static byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final ImageParser imageParser = getImageParser(byteSource);
@@ -546,7 +546,7 @@ public abstract class Imaging implements
* @see ImageInfo
*/
public static ImageInfo getImageInfo(final String filename, final byte[] bytes,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
return getImageInfo(new ByteSourceArray(filename, bytes), params);
}
@@ -611,7 +611,7 @@ public abstract class Imaging implements
* @see ImageInfo
*/
public static ImageInfo getImageInfo(final InputStream is, final String filename,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
return getImageInfo(new ByteSourceInputStream(is, filename), params);
}
@@ -650,7 +650,7 @@ public abstract class Imaging implements
* @return An instance of ImageInfo.
* @see ImageInfo
*/
- public static ImageInfo getImageInfo(final byte[] bytes, final Map<String,Object> params)
+ public static ImageInfo getImageInfo(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getImageInfo(new ByteSourceArray(bytes), params);
}
@@ -671,7 +671,7 @@ public abstract class Imaging implements
* @return An instance of ImageInfo.
* @see ImageInfo
*/
- public static ImageInfo getImageInfo(final File file, final Map<String,Object> params)
+ public static ImageInfo getImageInfo(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
return getImageInfo(new ByteSourceFile(file), params);
}
@@ -695,7 +695,7 @@ public abstract class Imaging implements
return getImageInfo(file, null);
}
- private static ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+ private static ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final ImageParser imageParser = getImageParser(byteSource);
@@ -758,7 +758,7 @@ public abstract class Imaging implements
* @return The width and height of the image.
*/
public static Dimension getImageSize(final InputStream is, final String filename,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
return getImageSize(new ByteSourceInputStream(is, filename), params);
}
@@ -785,7 +785,7 @@ public abstract class Imaging implements
* Map of optional parameters, defined in ImagingConstants.
* @return The width and height of the image.
*/
- public static Dimension getImageSize(final byte[] bytes, final Map<String,Object> params)
+ public static Dimension getImageSize(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getImageSize(new ByteSourceArray(bytes), params);
}
@@ -813,12 +813,12 @@ public abstract class Imaging implements
* Map of optional parameters, defined in ImagingConstants.
* @return The width and height of the image.
*/
- public static Dimension getImageSize(final File file, final Map<String,Object> params)
+ public static Dimension getImageSize(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
return getImageSize(new ByteSourceFile(file), params);
}
- public static Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+ public static Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final ImageParser imageParser = getImageParser(byteSource);
@@ -852,7 +852,7 @@ public abstract class Imaging implements
* Map of optional parameters, defined in ImagingConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
- public static String getXmpXml(final InputStream is, final String filename, final Map<String,Object> params)
+ public static String getXmpXml(final InputStream is, final String filename, final Map<String, Object> params)
throws ImageReadException, IOException {
return getXmpXml(new ByteSourceInputStream(is, filename), params);
}
@@ -880,7 +880,7 @@ public abstract class Imaging implements
* Map of optional parameters, defined in ImagingConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
- public static String getXmpXml(final byte[] bytes, final Map<String,Object> params)
+ public static String getXmpXml(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getXmpXml(new ByteSourceArray(bytes), params);
}
@@ -908,7 +908,7 @@ public abstract class Imaging implements
* Map of optional parameters, defined in ImagingConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
- public static String getXmpXml(final File file, final Map<String,Object> params)
+ public static String getXmpXml(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
return getXmpXml(new ByteSourceFile(file), params);
}
@@ -923,7 +923,7 @@ public abstract class Imaging implements
* Map of optional parameters, defined in ImagingConstants.
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
- public static String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public static String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final ImageParser imageParser = getImageParser(byteSource);
@@ -973,7 +973,7 @@ public abstract class Imaging implements
* @return An instance of IImageMetadata.
* @see IImageMetadata
*/
- public static IImageMetadata getMetadata(final byte[] bytes, final Map<String,Object> params)
+ public static IImageMetadata getMetadata(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getMetadata(new ByteSourceArray(bytes), params);
}
@@ -1026,7 +1026,7 @@ public abstract class Imaging implements
* @see IImageMetadata
*/
public static IImageMetadata getMetadata(final InputStream is, final String filename,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
return getMetadata(new ByteSourceInputStream(is, filename), params);
}
@@ -1073,12 +1073,12 @@ public abstract class Imaging implements
* @return An instance of IImageMetadata.
* @see IImageMetadata
*/
- public static IImageMetadata getMetadata(final File file, final Map<String,Object> params)
+ public static IImageMetadata getMetadata(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
return getMetadata(new ByteSourceFile(file), params);
}
- private static IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ private static IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final ImageParser imageParser = getImageParser(byteSource);
@@ -1261,7 +1261,7 @@ public abstract class Imaging implements
* while reading an image (i.e. a format violation, etc.).
* @throws IOException in the event of an unrecoverable I/O exception.
*/
- public static BufferedImage getBufferedImage(final InputStream is, final Map<String,Object> params)
+ public static BufferedImage getBufferedImage(final InputStream is, final Map<String, Object> params)
throws ImageReadException, IOException {
String filename = null;
if (params != null && params.containsKey(PARAM_KEY_FILENAME)) {
@@ -1311,7 +1311,7 @@ public abstract class Imaging implements
* while reading an image (i.e. a format violation, etc.).
* @throws IOException in the event of an unrecoverable I/O exception.
*/
- public static BufferedImage getBufferedImage(final byte[] bytes, final Map<String,Object> params)
+ public static BufferedImage getBufferedImage(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
return getBufferedImage(new ByteSourceArray(bytes), params);
}
@@ -1359,7 +1359,7 @@ public abstract class Imaging implements
* while reading an image (i.e. a format violation, etc.).
* @throws IOException in the event of an unrecoverable I/O exception.
*/
- public static BufferedImage getBufferedImage(final File file, final Map<String,Object> params)
+ public static BufferedImage getBufferedImage(final File file, final Map<String, Object> params)
throws ImageReadException, IOException {
return getBufferedImage(new ByteSourceFile(file), params);
}
@@ -1367,10 +1367,10 @@ public abstract class Imaging implements
private static BufferedImage getBufferedImage(final ByteSource byteSource,
- Map<String,Object> params) throws ImageReadException, IOException {
+ Map<String, Object> params) throws ImageReadException, IOException {
final ImageParser imageParser = getImageParser(byteSource);
if (null == params) {
- params = new HashMap<String,Object>();
+ params = new HashMap<String, Object>();
}
return imageParser.getBufferedImage(byteSource, params);
@@ -1400,7 +1400,7 @@ public abstract class Imaging implements
* @see ImagingConstants
*/
public static void writeImage(final BufferedImage src, final File file,
- final ImageFormat format, final Map<String,Object> params) throws ImageWriteException,
+ final ImageFormat format, final Map<String, Object> params) throws ImageWriteException,
IOException {
OutputStream os = null;
boolean canThrow = false;
@@ -1440,7 +1440,7 @@ public abstract class Imaging implements
* @see ImagingConstants
*/
public static byte[] writeImageToBytes(final BufferedImage src,
- final ImageFormat format, final Map<String,Object> params) throws ImageWriteException,
+ final ImageFormat format, final Map<String, Object> params) throws ImageWriteException,
IOException {
final ByteArrayOutputStream os = new ByteArrayOutputStream();
@@ -1474,13 +1474,13 @@ public abstract class Imaging implements
* @see ImagingConstants
*/
public static void writeImage(final BufferedImage src, final OutputStream os,
- final ImageFormat format, Map<String,Object> params) throws ImageWriteException,
+ final ImageFormat format, Map<String, Object> params) throws ImageWriteException,
IOException {
final ImageParser[] imageParsers = ImageParser.getAllImageParsers();
// make sure params are non-null
if (params == null) {
- params = new HashMap<String,Object>();
+ params = new HashMap<String, Object>();
}
params.put(PARAM_KEY_FORMAT, format);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageBuilder.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageBuilder.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageBuilder.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/common/ImageBuilder.java Wed Nov 27 00:51:19 2013
@@ -68,10 +68,10 @@ public class ImageBuilder {
* requirements for the ImageBuilder or resulting BufferedImage.
*/
public ImageBuilder(final int width, final int height, final boolean hasAlpha) {
- if(width<=0){
+ if (width <= 0) {
throw new RasterFormatException("zero or negative width value");
}
- if(height<=0){
+ if (height <= 0) {
throw new RasterFormatException("zero or negative height value");
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpImageParser.java Wed Nov 27 00:51:19 2013
@@ -511,16 +511,16 @@ public class BmpImageParser extends Imag
}
@Override
- public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public Dimension getImageSize(final ByteSource byteSource, Map<String,Object> params)
+ public Dimension getImageSize(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
@@ -553,7 +553,7 @@ public class BmpImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@@ -582,10 +582,10 @@ public class BmpImageParser extends Imag
}
@Override
- public ImageInfo getImageInfo(final ByteSource byteSource, Map<String,Object> params)
+ public ImageInfo getImageInfo(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
@@ -696,7 +696,7 @@ public class BmpImageParser extends Imag
}
@Override
- public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String,Object> params)
+ public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
InputStream is = null;
boolean canThrow = false;
@@ -710,10 +710,10 @@ public class BmpImageParser extends Imag
}
}
- public BufferedImage getBufferedImage(final InputStream inputStream, Map<String,Object> params)
+ public BufferedImage getBufferedImage(final InputStream inputStream, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
@@ -758,10 +758,10 @@ public class BmpImageParser extends Imag
}
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
PixelDensity pixelDensity = null;
@@ -846,7 +846,7 @@ public class BmpImageParser extends Imag
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
@Override
- public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/dcx/DcxImageParser.java Wed Nov 27 00:51:19 2013
@@ -81,25 +81,25 @@ public class DcxImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+ public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+ public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@@ -172,7 +172,7 @@ public class DcxImageParser extends Imag
@Override
public final BufferedImage getBufferedImage(final ByteSource byteSource,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
final List<BufferedImage> list = getAllBufferedImages(byteSource);
if (list.isEmpty()) {
return null;
@@ -194,7 +194,7 @@ public class DcxImageParser extends Imag
final ByteSourceInputStream pcxSource = new ByteSourceInputStream(
stream, null);
final BufferedImage image = pcxImageParser.getBufferedImage(
- pcxSource, new HashMap<String,Object>());
+ pcxSource, new HashMap<String, Object>());
images.add(image);
canThrow = true;
} finally {
@@ -205,12 +205,12 @@ public class DcxImageParser extends Imag
}
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
- final HashMap<String,Object> pcxParams = new HashMap<String,Object>();
+ final HashMap<String, Object> pcxParams = new HashMap<String, Object>();
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
@@ -265,7 +265,7 @@ public class DcxImageParser extends Imag
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
@Override
- public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java Wed Nov 27 00:51:19 2013
@@ -252,7 +252,7 @@ public class GifImageParser extends Imag
final ImageDescriptor id = readImageDescriptor(ghi, code, is,
stopBeforeImageData, formatCompliance);
result.add(id);
- // if(stopBeforeImageData)
+ // if (stopBeforeImageData)
// return result;
break;
@@ -474,13 +474,13 @@ public class GifImageParser extends Imag
}
@Override
- public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+ public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final ImageContents blocks = readFile(byteSource, false);
@@ -515,7 +515,7 @@ public class GifImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@@ -535,7 +535,7 @@ public class GifImageParser extends Imag
}
@Override
- public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+ public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final ImageContents blocks = readFile(byteSource, false);
@@ -659,7 +659,7 @@ public class GifImageParser extends Imag
}
@Override
- public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String,Object> params)
+ public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final ImageContents imageContents = readFile(byteSource, false);
@@ -774,10 +774,10 @@ public class GifImageParser extends Imag
}
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = new HashMap<String,Object>(params);
+ params = new HashMap<String, Object>(params);
final boolean verbose = Boolean.TRUE.equals(params.get(PARAM_KEY_VERBOSE));
@@ -1027,7 +1027,7 @@ public class GifImageParser extends Imag
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
@Override
- public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
InputStream is = null;
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsImageParser.java Wed Nov 27 00:51:19 2013
@@ -75,16 +75,16 @@ public class IcnsImageParser extends Ima
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public ImageInfo getImageInfo(final ByteSource byteSource, Map<String,Object> params)
+ public ImageInfo getImageInfo(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
@@ -111,10 +111,10 @@ public class IcnsImageParser extends Ima
}
@Override
- public Dimension getImageSize(final ByteSource byteSource, Map<String,Object> params)
+ public Dimension getImageSize(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
if (params.containsKey(PARAM_KEY_VERBOSE)) {
params.remove(PARAM_KEY_VERBOSE);
@@ -136,7 +136,7 @@ public class IcnsImageParser extends Ima
}
@Override
- public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@@ -270,7 +270,7 @@ public class IcnsImageParser extends Ima
@Override
public final BufferedImage getBufferedImage(final ByteSource byteSource,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
final IcnsContents icnsContents = readImage(byteSource);
final List<BufferedImage> result = IcnsDecoder
.decodeAllImages(icnsContents.icnsElements);
@@ -288,10 +288,10 @@ public class IcnsImageParser extends Ima
}
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
@@ -359,7 +359,7 @@ public class IcnsImageParser extends Ima
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
@Override
- public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/ico/IcoImageParser.java Wed Nov 27 00:51:19 2013
@@ -82,25 +82,25 @@ public class IcoImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+ public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+ public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@@ -594,7 +594,7 @@ public class IcoImageParser extends Imag
@Override
public final BufferedImage getBufferedImage(final ByteSource byteSource,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
final ImageContents contents = readImage(byteSource);
final FileHeader fileHeader = contents.fileHeader;
if (fileHeader.iconCount > 0) {
@@ -646,10 +646,10 @@ public class IcoImageParser extends Imag
// }
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
// clear format key.
if (params.containsKey(PARAM_KEY_FORMAT)) {
@@ -727,8 +727,8 @@ public class IcoImageParser extends Imag
bos.write2Bytes(bitCount);
bos.write4Bytes(0); // compression
bos.write4Bytes(0); // image size
- bos.write4Bytes(pixelDensity == null ? 0 : (int)Math.round(pixelDensity.horizontalDensityMetres())); // x pixels per meter
- bos.write4Bytes(pixelDensity == null ? 0 : (int)Math.round(pixelDensity.horizontalDensityMetres())); // y pixels per meter
+ bos.write4Bytes(pixelDensity == null ? 0 : (int) Math.round(pixelDensity.horizontalDensityMetres())); // x pixels per meter
+ bos.write4Bytes(pixelDensity == null ? 0 : (int) Math.round(pixelDensity.horizontalDensityMetres())); // y pixels per meter
bos.write4Bytes(0); // colors used, 0 = (1 << bitCount) (ignored)
bos.write4Bytes(0); // colors important
@@ -835,7 +835,7 @@ public class IcoImageParser extends Imag
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
@Override
- public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageParser.java Wed Nov 27 00:51:19 2013
@@ -91,7 +91,7 @@ public class JpegImageParser extends Ima
@Override
public final BufferedImage getBufferedImage(final ByteSource byteSource,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
final JpegDecoder jpegDecoder = new JpegDecoder();
return jpegDecoder.decode(byteSource);
}
@@ -272,7 +272,7 @@ public class JpegImageParser extends Ima
}
@Override
- public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final List<Segment> segments = readSegments(byteSource,
new int[] { JpegConstants.JPEG_APP2_Marker, }, false);
@@ -306,7 +306,7 @@ public class JpegImageParser extends Ima
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final TiffImageMetadata exif = getExifMetadata(byteSource, params);
@@ -337,7 +337,7 @@ public class JpegImageParser extends Ima
return result;
}
- public TiffImageMetadata getExifMetadata(final ByteSource byteSource, Map<String,Object> params)
+ public TiffImageMetadata getExifMetadata(final ByteSource byteSource, Map<String, Object> params)
throws ImageReadException, IOException {
final byte[] bytes = getExifRawData(byteSource);
if (null == bytes) {
@@ -345,7 +345,7 @@ public class JpegImageParser extends Ima
}
if (params == null) {
- params = new HashMap<String,Object>();
+ params = new HashMap<String, Object>();
}
if (!params.containsKey(PARAM_KEY_READ_THUMBNAILS)) {
params.put(PARAM_KEY_READ_THUMBNAILS, Boolean.TRUE);
@@ -520,7 +520,7 @@ public class JpegImageParser extends Ima
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
@Override
- public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final List<String> result = new ArrayList<String>();
@@ -568,7 +568,7 @@ public class JpegImageParser extends Ima
}
public JpegPhotoshopMetadata getPhotoshopMetadata(final ByteSource byteSource,
- final Map<String,Object> params) throws ImageReadException, IOException {
+ final Map<String, Object> params) throws ImageReadException, IOException {
final List<Segment> segments = readSegments(byteSource,
new int[] { JpegConstants.JPEG_APP13_Marker, }, false);
@@ -597,7 +597,7 @@ public class JpegImageParser extends Ima
}
@Override
- public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+ public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final List<Segment> segments = readSegments(byteSource, new int[] {
// kJFIFMarker,
@@ -640,7 +640,7 @@ public class JpegImageParser extends Ima
}
@Override
- public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+ public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
// List allSegments = readSegments(byteSource, null, false);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/YCbCrConverter.java Wed Nov 27 00:51:19 2013
@@ -53,9 +53,9 @@ final class YCbCrConverter {
}
}
// green is the hardest
- // Math.round((float)(Y - 0.34414*(Cb-128) - 0.71414*(Cr-128)))
+ // Math.round((float) (Y - 0.34414*(Cb-128) - 0.71414*(Cr-128)))
// but Y is integral
- // = Y - Math.round((float)(0.34414*(Cb-128) + 0.71414*(Cr-128)))
+ // = Y - Math.round((float) (0.34414*(Cb-128) + 0.71414*(Cr-128)))
// = Y - Math.round(f(Cb, Cr))
// where
// f(Cb, Cr) = 0.34414*(Cb-128) + 0.71414*(Cr-128)
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/exif/ExifRewriter.java Wed Nov 27 00:51:19 2013
@@ -508,13 +508,13 @@ public class ExifRewriter extends Binary
}
if (!hasExif && newBytes != null) {
- final byte[] markerBytes = toBytes((short)JpegConstants.JPEG_APP1_Marker);
+ final byte[] markerBytes = toBytes((short) JpegConstants.JPEG_APP1_Marker);
if (newBytes.length > 0xffff) {
throw new ExifOverflowException(
"APP1 Segment is too long: " + newBytes.length);
}
final int markerLength = newBytes.length + 2;
- final byte[] markerLengthBytes = toBytes((short)markerLength);
+ final byte[] markerLengthBytes = toBytes((short) markerLength);
int index = 0;
final JFIFPieceSegment firstSegment = (JFIFPieceSegment) segments
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParser.java Wed Nov 27 00:51:19 2013
@@ -93,7 +93,7 @@ public class IptcParser extends BinaryFi
* Some IPTC blocks are missing this first "record version" record, so we
* don't require it.
*/
- public PhotoshopApp13Data parsePhotoshopSegment(final byte[] bytes, final Map<String,Object> params)
+ public PhotoshopApp13Data parsePhotoshopSegment(final byte[] bytes, final Map<String, Object> params)
throws ImageReadException, IOException {
final boolean strict = params != null && Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_STRICT));
final boolean verbose = params != null && Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_VERBOSE));
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/JpegIptcRewriter.java Wed Nov 27 00:51:19 2013
@@ -119,7 +119,7 @@ public class JpegIptcRewriter extends Jp
if (photoshopApp13Segments.size() == 1) {
final JFIFPieceSegment oldSegment = (JFIFPieceSegment) photoshopApp13Segments
.get(0);
- final Map<String,Object> params = new HashMap<String,Object>();
+ final Map<String, Object> params = new HashMap<String, Object>();
final PhotoshopApp13Data oldData = new IptcParser()
.parsePhotoshopSegment(oldSegment.segmentData, params);
final List<IptcBlock> newBlocks = oldData.getNonIptcBlocks();
@@ -223,7 +223,7 @@ public class JpegIptcRewriter extends Jp
final int blockType = IptcConstants.IMAGE_RESOURCE_BLOCK_IPTC_DATA;
final byte[] blockNameBytes = new byte[0];
- final IptcBlock newBlock = new IptcBlock(blockType, blockNameBytes,newBlockBytes);
+ final IptcBlock newBlock = new IptcBlock(blockType, blockNameBytes, newBlockBytes);
newBlocks.add(newBlock);
newData = new PhotoshopApp13Data(newData.getRecords(), newBlocks);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/App13Segment.java Wed Nov 27 00:51:19 2013
@@ -62,7 +62,7 @@ public class App13Segment extends AppnSe
return new IptcParser().isPhotoshopJpegSegment(getSegmentData());
}
- public PhotoshopApp13Data parsePhotoshopSegment(final Map<String,Object> params)
+ public PhotoshopApp13Data parsePhotoshopSegment(final Map<String, Object> params)
throws ImageReadException, IOException {
/*
* In practice, App13 segments are only used for Photoshop/IPTC
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegRewriter.java Wed Nov 27 00:51:19 2013
@@ -90,8 +90,8 @@ public class JpegRewriter extends Binary
public JFIFPieceSegment(final int marker, final byte[] segmentData) {
this(marker,
- ByteConversions.toBytes((short)marker, JPEG_BYTE_ORDER),
- ByteConversions.toBytes((short)(segmentData.length + 2), JPEG_BYTE_ORDER),
+ ByteConversions.toBytes((short) marker, JPEG_BYTE_ORDER),
+ ByteConversions.toBytes((short) (segmentData.length + 2), JPEG_BYTE_ORDER),
segmentData);
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxImageParser.java Wed Nov 27 00:51:19 2013
@@ -96,13 +96,13 @@ public class PcxImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+ public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final PcxHeader pcxHeader = readPcxHeader(byteSource);
final Dimension size = getImageSize(byteSource, params);
@@ -129,7 +129,7 @@ public class PcxImageParser extends Imag
}
@Override
- public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+ public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final PcxHeader pcxHeader = readPcxHeader(byteSource);
final int xSize = pcxHeader.xMax - pcxHeader.xMin + 1;
@@ -144,7 +144,7 @@ public class PcxImageParser extends Imag
}
@Override
- public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@@ -516,8 +516,8 @@ public class PcxImageParser extends Imag
@Override
public final BufferedImage getBufferedImage(final ByteSource byteSource,
- Map<String,Object> params) throws ImageReadException, IOException {
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ Map<String, Object> params) throws ImageReadException, IOException {
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
boolean isStrict = false;
final Object strictness = params.get(PARAM_KEY_STRICT);
if (strictness != null) {
@@ -538,7 +538,7 @@ public class PcxImageParser extends Imag
}
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, final Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
throws ImageWriteException, IOException {
new PcxWriter(params).writeImage(src, os);
}
@@ -554,7 +554,7 @@ public class PcxImageParser extends Imag
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
@Override
- public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxWriter.java Wed Nov 27 00:51:19 2013
@@ -35,9 +35,9 @@ public class PcxWriter {
private int bitDepth = -1;
private PixelDensity pixelDensity = null;
- public PcxWriter(Map<String,Object> params) throws ImageWriteException {
+ public PcxWriter(Map<String, Object> params) throws ImageWriteException {
// make copy of params; we'll clear keys as we consume them.
- params = (params == null) ? new HashMap<String,Object>() : new HashMap<String,Object>(params);
+ params = (params == null) ? new HashMap<String, Object>() : new HashMap<String, Object>(params);
// clear format key.
if (params.containsKey(ImagingConstants.PARAM_KEY_FORMAT)) {
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageParser.java Wed Nov 27 00:51:19 2013
@@ -238,7 +238,7 @@ public class PngImageParser extends Imag
}
@Override
- public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(byteSource, new int[] { PngConstants.iCCP, },
true);
@@ -260,7 +260,7 @@ public class PngImageParser extends Imag
}
@Override
- public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+ public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(byteSource, new int[] { PngConstants.IHDR, },
true);
@@ -288,7 +288,7 @@ public class PngImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(byteSource,
new int[] { PngConstants.tEXt, PngConstants.zTXt, }, true);
@@ -483,7 +483,7 @@ public class PngImageParser extends Imag
}
@Override
- public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+ public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(byteSource, new int[] {
PngConstants.IHDR,
@@ -631,7 +631,7 @@ public class PngImageParser extends Imag
}
@Override
- public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String,Object> params)
+ public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
if (params.containsKey(PARAM_KEY_VERBOSE)) {
@@ -864,7 +864,7 @@ public class PngImageParser extends Imag
}
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, final Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
throws ImageWriteException, IOException {
new PngWriter(params).writeImage(src, os, params);
}
@@ -880,7 +880,7 @@ public class PngImageParser extends Imag
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
@Override
- public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final List<PngChunk> chunks = readChunks(byteSource, new int[] { PngConstants.iTXt, },
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngWriter.java Wed Nov 27 00:51:19 2013
@@ -42,7 +42,7 @@ public class PngWriter {
this.verbose = verbose;
}
- public PngWriter(final Map<String,Object> params) {
+ public PngWriter(final Map<String, Object> params) {
this.verbose = params != null && Boolean.TRUE.equals(params.get(ImagingConstants.PARAM_KEY_VERBOSE));
}
@@ -322,7 +322,7 @@ public class PngWriter {
return result;
}
- private byte getBitDepth(final byte colorType, final Map<String,Object> params) {
+ private byte getBitDepth(final byte colorType, final Map<String, Object> params) {
byte result = 8;
final Object o = params.get(PngConstants.PARAM_KEY_PNG_BIT_DEPTH);
@@ -419,10 +419,10 @@ public class PngWriter {
tEXt Yes None
zTXt Yes None
*/
- public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
// make copy of params; we'll clear keys as we consume them.
- params = new HashMap<String,Object>(params);
+ params = new HashMap<String, Object>(params);
// clear format key.
if (params.containsKey(ImagingConstants.PARAM_KEY_FORMAT)) {
@@ -433,7 +433,7 @@ public class PngWriter {
params.remove(ImagingConstants.PARAM_KEY_VERBOSE);
}
- final Map<String,Object> rawParams = new HashMap<String,Object>(params);
+ final Map<String, Object> rawParams = new HashMap<String, Object>(params);
if (params.containsKey(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR)) {
params.remove(PngConstants.PARAM_KEY_PNG_FORCE_TRUE_COLOR);
}
@@ -627,7 +627,7 @@ public class PngWriter {
if (isGrayscale) {
final int gray = (red + green + blue) / 3;
- // if(y==0)
+ // if (y == 0)
// {
// Debug.debug("gray: " + x + ", " + y +
// " argb: 0x"
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java Wed Nov 27 00:51:19 2013
@@ -75,7 +75,7 @@ public abstract class FileInfo {
// invalid values -> black
sample = 0;
}
- return (int)((sample * scale / max) + 0.5f);
+ return (int) ((sample * scale / max) + 0.5f);
}
public void readImage(final ImageBuilder imageBuilder, final InputStream is)
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java Wed Nov 27 00:51:19 2013
@@ -29,7 +29,7 @@ public class PbmWriter extends PnmWriter
}
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, final Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
throws ImageWriteException, IOException {
os.write(PnmConstants.PNM_PREFIX_BYTE);
os.write(RAWBITS ? PnmConstants.PBM_RAW_CODE : PnmConstants.PBM_TEXT_CODE);
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java Wed Nov 27 00:51:19 2013
@@ -29,7 +29,7 @@ public class PgmWriter extends PnmWriter
}
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, final Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, final Map<String, Object> params)
throws ImageWriteException, IOException {
// System.out.println
// (b1 == 0x50 && b2 == 0x36)
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmImageParser.java Wed Nov 27 00:51:19 2013
@@ -199,13 +199,13 @@ public class PnmImageParser extends Imag
}
@Override
- public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String,Object> params)
+ public byte[] getICCProfileBytes(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public Dimension getImageSize(final ByteSource byteSource, final Map<String,Object> params)
+ public Dimension getImageSize(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final FileInfo info = readHeader(byteSource);
@@ -226,13 +226,13 @@ public class PnmImageParser extends Imag
}
@Override
- public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String,Object> params)
+ public IImageMetadata getMetadata(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
@Override
- public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String,Object> params)
+ public ImageInfo getImageInfo(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
final FileInfo info = readHeader(byteSource);
@@ -289,7 +289,7 @@ public class PnmImageParser extends Imag
}
@Override
- public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String,Object> params)
+ public BufferedImage getBufferedImage(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
InputStream is = null;
boolean canThrow = false;
@@ -315,7 +315,7 @@ public class PnmImageParser extends Imag
}
@Override
- public void writeImage(final BufferedImage src, final OutputStream os, Map<String,Object> params)
+ public void writeImage(final BufferedImage src, final OutputStream os, Map<String, Object> params)
throws ImageWriteException, IOException {
PnmWriter writer = null;
boolean useRawbits = true;
@@ -353,9 +353,9 @@ public class PnmImageParser extends Imag
// make copy of params; we'll clear keys as we consume them.
if (params != null) {
- params = new HashMap<String,Object>(params);
+ params = new HashMap<String, Object>(params);
} else {
- params = new HashMap<String,Object>();
+ params = new HashMap<String, Object>();
}
// clear format key.
@@ -382,7 +382,7 @@ public class PnmImageParser extends Imag
* @return Xmp Xml as String, if present. Otherwise, returns null.
*/
@Override
- public String getXmpXml(final ByteSource byteSource, final Map<String,Object> params)
+ public String getXmpXml(final ByteSource byteSource, final Map<String, Object> params)
throws ImageReadException, IOException {
return null;
}
Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmWriter.java?rev=1545891&r1=1545890&r2=1545891&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pnm/PnmWriter.java Wed Nov 27 00:51:19 2013
@@ -31,5 +31,5 @@ public abstract class PnmWriter {
}
public abstract void writeImage(BufferedImage src, OutputStream os,
- Map<String,Object> params) throws ImageWriteException, IOException;
+ Map<String, Object> params) throws ImageWriteException, IOException;
}