commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1342971 [1/20] - in /commons/proper/imaging/trunk/src: main/java/org/apache/commons/imaging/formats/bmp/ main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/ main/java/org/apache/commons/imaging/formats/bmp/writers/ main/java/org...
Date Sat, 26 May 2012 21:19:22 GMT
Author: damjan
Date: Sat May 26 21:19:03 2012
New Revision: 1342971

URL: http://svn.apache.org/viewvc?rev=1342971&view=rev
Log:
Reformat all files to a common coding style.


Modified:
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpHeaderInfo.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/bmp/ImageContents.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriter.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterPalette.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterRgb.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/GenericGifBlock.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifBlock.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/GifHeaderInfo.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/gif/GraphicControlExtension.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageContents.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/gif/ImageDescriptor.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/IcnsDecoder.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/icns/IcnsType.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/icns/Rle24Compression.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/Block.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegImageMetadata.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/JpegPhotoshopMetadata.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/JpegUtils.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/ZigZag.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegDecoder.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/JpegInputStream.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/IptcBlock.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcConstants.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/IptcRecord.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcType.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypeLookup.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcTypes.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/iptc/PhotoshopApp13Data.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/segments/App2Segment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/AppnSegment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/ComSegment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DhtSegment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/DqtSegment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/GenericSegment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/JfifSegment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/Segment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SofnSegment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegment.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/UnknownSegment.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/jpeg/xmp/JpegXmpParser.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/jpeg/xmp/JpegXmpRewriter.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/pcx/PcxConstants.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/BitParser.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/GammaCorrection.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngCrc.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/PngImageInfo.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/PngText.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/png/ScanExpediter.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterInterlaced.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/ScanExpediterSimple.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunk.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkGama.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIccp.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIdat.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkIhdr.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkItxt.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPhys.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkPlte.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkText.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngChunkZtxt.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/chunks/PngTextChunk.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilter.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterAverage.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterNone.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterSub.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterUp.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/PbmFileInfo.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/PgmFileInfo.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/PnmConstants.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/PpmFileInfo.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/pnm/WhiteSpaceReader.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageContents.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceBlock.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/ImageResourceType.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/PsdHeaderInfo.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/psd/dataparsers/DataParser.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserBitmap.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserCmyk.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserGrayscale.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserIndexed.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserLab.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserRgb.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/dataparsers/DataParserStub.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/DataReader.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/UncompressedDataReader.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/InfoHeaderReader.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/rgbe/RgbeConstants.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/tga/TgaConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tga/TgaImageParser.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/JpegImageData.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffContents.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/TiffHeader.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageData.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/TiffImageMetadata.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/AllTagConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/GpsTagConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TagConstantsUtils.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffDirectoryConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffFieldTypeConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/constants/TiffTagConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReader.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldType.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeAscii.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeByte.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeDouble.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeFloat.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeLong.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/fieldtypes/FieldTypeRational.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/fieldtypes/FieldTypeUnknown.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreter.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterBiLevel.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCieLab.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterCmyk.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterLogLuv.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterPalette.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterRgb.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/photometricinterpreters/PhotometricInterpreterYCbCr.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfo.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoAny.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoAscii.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoAsciiOrByte.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoAsciiOrRational.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoGpsText.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoUnknown.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/taginfos/TagInfoXpString.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/ImageDataOffsets.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/TiffImageWriterLossy.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/tiff/write/TiffOutputItem.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSet.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputSummary.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/transparencyfilters/TransparencyFilter.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/transparencyfilters/TransparencyFilterGrayscale.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/transparencyfilters/TransparencyFilterIndexedColor.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/transparencyfilters/TransparencyFilterTrueColor.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/icc/IccConstants.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileInfo.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccProfileParser.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTag.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataType.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagType.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/icc/IccTagTypes.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/ColorSpaceSubset.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/MedianCutQuantizer.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/Palette.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/PaletteFactory.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/QuantizedPalette.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/palette/SimplePalette.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/CachingInputStream.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/CachingOutputStream.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/Debug.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/DebugInputStream.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/DebugOutputStream.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/IoUtils.java
    commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/util/UnicodeUtils.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingGuessFormatTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/ImagingTestConstants.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/color/ColorConversionsTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/BinaryFileFunctionsTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/RationalNumberTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/common/bytesource/ByteSourceDataTest.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/common/bytesource/ByteSourceTest.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/MetadataExample.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/examples/WriteExifMetadataExample.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/bmp/BmpBaseTest.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/DcxBaseTest.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/gif/GifBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/gif/GifReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/icns/IcnsBaseTest.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/icns/IcnsRoundTripTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/ico/IcoBaseTest.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/ico/IcoRoundtripTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/JpegBaseTest.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/decoder/DctTest.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/ExifBaseTest.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/ExifRewriteTest.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/MakerNoteFieldTest.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/exif/TextFieldTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/exif/WriteExifMetadataExampleTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcBaseTest.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/JpegXmpBaseTest.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/pcx/PcxBaseTest.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/PngBaseTest.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/PngReadTest.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/rgbe/RgbeBaseTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/rgbe/RgbeReadTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffBaseTest.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/TiffLzwTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/tiff/TiffReadTest.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/TiffTagIntegrityTest.java
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/formats/wbmp/WbmpBaseTest.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/XbmBaseTest.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/XmpDumpTest.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/XpmBaseTest.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
    commons/proper/imaging/trunk/src/test/java/org/apache/commons/imaging/test/util/FileSystemTraversal.java

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpHeaderInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpHeaderInfo.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpHeaderInfo.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/BmpHeaderInfo.java Sat May 26 21:19:03 2012
@@ -16,14 +16,13 @@
  */
 package org.apache.commons.imaging.formats.bmp;
 
-public class BmpHeaderInfo
-{
-    //        ‘BM’ - Windows 3.1x, 95, NT, …
-    //        ‘BA’ - OS/2 Bitmap Array
-    //        ‘CI’ - OS/2 Color Icon‘
-    //        CP’ - OS/2 Color Pointer
-    //        ‘IC’ - OS/2 Icon
-    //        ‘PT’ - OS/2 Pointer
+public class BmpHeaderInfo {
+    // ‘BM’ - Windows 3.1x, 95, NT, …
+    // ‘BA’ - OS/2 Bitmap Array
+    // ‘CI’ - OS/2 Color Icon‘
+    // CP’ - OS/2 Color Pointer
+    // ‘IC’ - OS/2 Icon
+    // ‘PT’ - OS/2 Pointer
     public final byte identifier1;
     public final byte identifier2;
 
@@ -58,29 +57,24 @@ public class BmpHeaderInfo
     public final int profileSize;
     public final int reservedV5;
 
-    public static class ColorSpaceCoordinate
-    {
+    public static class ColorSpaceCoordinate {
         public int x, y, z;
     }
 
-    public static class ColorSpace
-    {
+    public static class ColorSpace {
         public ColorSpaceCoordinate red;
         public ColorSpaceCoordinate green;
         public ColorSpaceCoordinate blue;
     }
 
     public BmpHeaderInfo(byte identifier1, byte identifier2, int fileSize,
-            int reserved, int bitmapDataOffset,
-            int bitmapHeaderSize, int width, int height, int planes,
-            int bitsPerPixel, int compression, int bitmapDataSize,
-            int hResolution, int vResolution, int colorsUsed,
-            int colorsImportant, int redMask, int greenMask,
-            int blueMask, int alphaMask, int colorSpaceType,
-            ColorSpace colorSpace, int gammaRed, int gammaGreen,
-            int gammaBlue, int intent, int profileData,
-            int profileSize, int reservedV5)
-    {
+            int reserved, int bitmapDataOffset, int bitmapHeaderSize,
+            int width, int height, int planes, int bitsPerPixel,
+            int compression, int bitmapDataSize, int hResolution,
+            int vResolution, int colorsUsed, int colorsImportant, int redMask,
+            int greenMask, int blueMask, int alphaMask, int colorSpaceType,
+            ColorSpace colorSpace, int gammaRed, int gammaGreen, int gammaBlue,
+            int intent, int profileData, int profileSize, int reservedV5) {
         this.identifier1 = identifier1;
         this.identifier2 = identifier2;
         this.fileSize = fileSize;
@@ -114,4 +108,4 @@ public class BmpHeaderInfo
         this.reservedV5 = reservedV5;
     }
 
-}
\ No newline at end of file
+}

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=1342971&r1=1342970&r2=1342971&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 Sat May 26 21:19:03 2012
@@ -52,23 +52,19 @@ import org.apache.commons.imaging.palett
 import org.apache.commons.imaging.util.Debug;
 import org.apache.commons.imaging.util.ParamMap;
 
-public class BmpImageParser extends ImageParser
-{
+public class BmpImageParser extends ImageParser {
 
-    public BmpImageParser()
-    {
+    public BmpImageParser() {
         super.setByteOrder(BYTE_ORDER_INTEL);
     }
 
     @Override
-    public String getName()
-    {
+    public String getName() {
         return "Bmp-Custom";
     }
 
     @Override
-    public String getDefaultExtension()
-    {
+    public String getDefaultExtension() {
         return DEFAULT_EXTENSION;
     }
 
@@ -77,14 +73,12 @@ public class BmpImageParser extends Imag
     private static final String ACCEPTED_EXTENSIONS[] = { DEFAULT_EXTENSION, };
 
     @Override
-    protected String[] getAcceptedExtensions()
-    {
+    protected String[] getAcceptedExtensions() {
         return ACCEPTED_EXTENSIONS;
     }
 
     @Override
-    protected ImageFormat[] getAcceptedTypes()
-    {
+    protected ImageFormat[] getAcceptedTypes() {
         return new ImageFormat[] { ImageFormat.IMAGE_FORMAT_BMP, //
         };
     }
@@ -93,13 +87,11 @@ public class BmpImageParser extends Imag
 
     private BmpHeaderInfo readBmpHeaderInfo(InputStream is,
             FormatCompliance formatCompliance, boolean verbose)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         byte identifier1 = readByte("Identifier1", is, "Not a Valid BMP File");
         byte identifier2 = readByte("Identifier2", is, "Not a Valid BMP File");
 
-        if (formatCompliance != null)
-        {
+        if (formatCompliance != null) {
             formatCompliance.compare_bytes("Signature", BMP_HEADER_SIGNATURE,
                     new byte[] { identifier1, identifier2, });
         }
@@ -137,9 +129,8 @@ public class BmpImageParser extends Imag
         int profileData = 0;
         int profileSize = 0;
         int reservedV5 = 0;
-        
-        if (bitmapHeaderSize >= 40)
-        {
+
+        if (bitmapHeaderSize >= 40) {
             // BITMAPINFOHEADER
             width = read4Bytes("Width", is, "Not a Valid BMP File");
             height = read4Bytes("Height", is, "Not a Valid BMP File");
@@ -154,53 +145,60 @@ public class BmpImageParser extends Imag
             colorsUsed = read4Bytes("ColorsUsed", is, "Not a Valid BMP File");
             colorsImportant = read4Bytes("ColorsImportant", is,
                     "Not a Valid BMP File");
-            if (bitmapHeaderSize >= 52 || compression == BI_BITFIELDS)
-            {
+            if (bitmapHeaderSize >= 52 || compression == BI_BITFIELDS) {
                 // 52 = BITMAPV2INFOHEADER, now undocumented
                 // see http://en.wikipedia.org/wiki/BMP_file_format
                 redMask = read4Bytes("RedMask", is, "Not a Valid BMP File");
                 greenMask = read4Bytes("GreenMask", is, "Not a Valid BMP File");
                 blueMask = read4Bytes("BlueMask", is, "Not a Valid BMP File");
             }
-            if (bitmapHeaderSize >= 56)
-            {
-                // 56 = the now undocumented BITMAPV3HEADER sometimes used by Photoshop
+            if (bitmapHeaderSize >= 56) {
+                // 56 = the now undocumented BITMAPV3HEADER sometimes used by
+                // Photoshop
                 // see http://forums.adobe.com/thread/751592?tstart=1
                 alphaMask = read4Bytes("AlphaMask", is, "Not a Valid BMP File");
             }
-            if (bitmapHeaderSize >= 108)
-            {
+            if (bitmapHeaderSize >= 108) {
                 // BITMAPV4HEADER
-                colorSpaceType = read4Bytes("ColorSpaceType", is, "Not a Valid BMP File");
-                colorSpace.red.x = read4Bytes("ColorSpaceRedX", is, "Not a Valid BMP File");
-                colorSpace.red.y = read4Bytes("ColorSpaceRedY", is, "Not a Valid BMP File");
-                colorSpace.red.z = read4Bytes("ColorSpaceRedZ", is, "Not a Valid BMP File");
-                colorSpace.green.x = read4Bytes("ColorSpaceGreenX", is, "Not a Valid BMP File");
-                colorSpace.green.y = read4Bytes("ColorSpaceGreenY", is, "Not a Valid BMP File");
-                colorSpace.green.z = read4Bytes("ColorSpaceGreenZ", is, "Not a Valid BMP File");
-                colorSpace.blue.x = read4Bytes("ColorSpaceBlueX", is, "Not a Valid BMP File");
-                colorSpace.blue.y = read4Bytes("ColorSpaceBlueY", is, "Not a Valid BMP File");
-                colorSpace.blue.z = read4Bytes("ColorSpaceBlueZ", is, "Not a Valid BMP File");
+                colorSpaceType = read4Bytes("ColorSpaceType", is,
+                        "Not a Valid BMP File");
+                colorSpace.red.x = read4Bytes("ColorSpaceRedX", is,
+                        "Not a Valid BMP File");
+                colorSpace.red.y = read4Bytes("ColorSpaceRedY", is,
+                        "Not a Valid BMP File");
+                colorSpace.red.z = read4Bytes("ColorSpaceRedZ", is,
+                        "Not a Valid BMP File");
+                colorSpace.green.x = read4Bytes("ColorSpaceGreenX", is,
+                        "Not a Valid BMP File");
+                colorSpace.green.y = read4Bytes("ColorSpaceGreenY", is,
+                        "Not a Valid BMP File");
+                colorSpace.green.z = read4Bytes("ColorSpaceGreenZ", is,
+                        "Not a Valid BMP File");
+                colorSpace.blue.x = read4Bytes("ColorSpaceBlueX", is,
+                        "Not a Valid BMP File");
+                colorSpace.blue.y = read4Bytes("ColorSpaceBlueY", is,
+                        "Not a Valid BMP File");
+                colorSpace.blue.z = read4Bytes("ColorSpaceBlueZ", is,
+                        "Not a Valid BMP File");
                 gammaRed = read4Bytes("GammaRed", is, "Not a Valid BMP File");
-                gammaGreen = read4Bytes("GammaGreen", is, "Not a Valid BMP File");
+                gammaGreen = read4Bytes("GammaGreen", is,
+                        "Not a Valid BMP File");
                 gammaBlue = read4Bytes("GammaBlue", is, "Not a Valid BMP File");
             }
-            if (bitmapHeaderSize >= 124)
-            {
+            if (bitmapHeaderSize >= 124) {
                 // BITMAPV5HEADER
                 intent = read4Bytes("Intent", is, "Not a Valid BMP File");
-                profileData = read4Bytes("ProfileData", is, "Not a Valid BMP File");
-                profileSize = read4Bytes("ProfileSize", is, "Not a Valid BMP File");
+                profileData = read4Bytes("ProfileData", is,
+                        "Not a Valid BMP File");
+                profileSize = read4Bytes("ProfileSize", is,
+                        "Not a Valid BMP File");
                 reservedV5 = read4Bytes("Reserved", is, "Not a Valid BMP File");
             }
-        }
-        else
-        {
+        } else {
             throw new ImageReadException("Invalid/unsupported BMP file");
         }
 
-        if (verbose)
-        {
+        if (verbose) {
             this.debugNumber("identifier1", identifier1, 1);
             this.debugNumber("identifier2", identifier2, 1);
             this.debugNumber("fileSize", fileSize, 4);
@@ -217,25 +215,21 @@ public class BmpImageParser extends Imag
             this.debugNumber("vResolution", vResolution, 4);
             this.debugNumber("colorsUsed", colorsUsed, 4);
             this.debugNumber("colorsImportant", colorsImportant, 4);
-            if (bitmapHeaderSize >= 52 || compression == BI_BITFIELDS)
-            {
+            if (bitmapHeaderSize >= 52 || compression == BI_BITFIELDS) {
                 this.debugNumber("redMask", redMask, 4);
                 this.debugNumber("greenMask", greenMask, 4);
                 this.debugNumber("blueMask", blueMask, 4);
             }
-            if (bitmapHeaderSize >= 56)
-            {
+            if (bitmapHeaderSize >= 56) {
                 this.debugNumber("alphaMask", alphaMask, 4);
             }
-            if (bitmapHeaderSize >= 108)
-            {
+            if (bitmapHeaderSize >= 108) {
                 this.debugNumber("colorSpaceType", colorSpaceType, 4);
                 this.debugNumber("gammaRed", gammaRed, 4);
                 this.debugNumber("gammaGreen", gammaGreen, 4);
                 this.debugNumber("gammaBlue", gammaBlue, 4);
             }
-            if (bitmapHeaderSize >= 124)
-            {
+            if (bitmapHeaderSize >= 124) {
                 this.debugNumber("intent", intent, 4);
                 this.debugNumber("profileData", profileData, 4);
                 this.debugNumber("profileSize", profileSize, 4);
@@ -246,10 +240,10 @@ public class BmpImageParser extends Imag
         BmpHeaderInfo result = new BmpHeaderInfo(identifier1, identifier2,
                 fileSize, reserved, bitmapDataOffset, bitmapHeaderSize, width,
                 height, planes, bitsPerPixel, compression, bitmapDataSize,
-                hResolution, vResolution, colorsUsed, colorsImportant,
-                redMask, greenMask, blueMask, alphaMask, colorSpaceType,
-                colorSpace, gammaRed, gammaGreen, gammaBlue, intent,
-                profileData, profileSize, reservedV5);
+                hResolution, vResolution, colorsUsed, colorsImportant, redMask,
+                greenMask, blueMask, alphaMask, colorSpaceType, colorSpace,
+                gammaRed, gammaGreen, gammaBlue, intent, profileData,
+                profileSize, reservedV5);
         return result;
     }
 
@@ -259,24 +253,20 @@ public class BmpImageParser extends Imag
     private static final int BI_BITFIELDS = 3;
 
     private byte[] getRLEBytes(InputStream is, int RLESamplesPerByte)
-            throws IOException
-    {
+            throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
 
         // this.setDebug(true);
 
         boolean done = false;
-        while (!done)
-        {
+        while (!done) {
             int a = 0xff & this.readByte("RLE a", is, "BMP: Bad RLE");
             baos.write(a);
             int b = 0xff & this.readByte("RLE b", is, "BMP: Bad RLE");
             baos.write(b);
 
-            if (a == 0)
-            {
-                switch (b)
-                {
+            if (a == 0) {
+                switch (b) {
                 case 0: // EOL
                     break;
                 case 1: // EOF
@@ -321,16 +311,14 @@ public class BmpImageParser extends Imag
 
     private ImageContents readImageContents(InputStream is,
             FormatCompliance formatCompliance, boolean verbose)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         BmpHeaderInfo bhi = readBmpHeaderInfo(is, formatCompliance, verbose);
 
         int colorTableSize = bhi.colorsUsed;
         if (colorTableSize == 0)
             colorTableSize = (1 << bhi.bitsPerPixel);
 
-        if (verbose)
-        {
+        if (verbose) {
             this.debugNumber("ColorsUsed", bhi.colorsUsed, 4);
             this.debugNumber("BitsPerPixel", bhi.bitsPerPixel, 4);
             this.debugNumber("ColorTableSize", colorTableSize, 4);
@@ -345,8 +333,7 @@ public class BmpImageParser extends Imag
         int rleSamplesPerByte = 0;
         boolean rle = false;
 
-        switch (bhi.compression)
-        {
+        switch (bhi.compression) {
         case BI_RGB:
             if (verbose)
                 System.out.println("Compression: BI_RGB");
@@ -403,8 +390,7 @@ public class BmpImageParser extends Imag
             colorTable = this.readByteArray("ColorTable", paletteLength, is,
                     "Not a Valid BMP File");
 
-        if (verbose)
-        {
+        if (verbose) {
             this.debugNumber("paletteLength", paletteLength, 4);
             System.out.println("ColorTable: "
                     + ((colorTable == null) ? "null" : "" + colorTable.length));
@@ -414,8 +400,7 @@ public class BmpImageParser extends Imag
 
         int imageLineLength = ((((bhi.bitsPerPixel) * bhi.width) + 7) / 8);
 
-        if (verbose)
-        {
+        if (verbose) {
             // this.debugNumber("Total BitsPerPixel",
             // (ExtraBitsPerPixel + bhi.BitsPerPixel), 4);
             // this.debugNumber("Total Bit Per Line",
@@ -433,11 +418,11 @@ public class BmpImageParser extends Imag
 
         final int headerSize = BITMAP_FILE_HEADER_SIZE
                 + bhi.bitmapHeaderSize
-                + (bhi.bitmapHeaderSize == 40 &&  bhi.compression == BI_BITFIELDS ? 3*4 : 0);
+                + (bhi.bitmapHeaderSize == 40
+                        && bhi.compression == BI_BITFIELDS ? 3 * 4 : 0);
         int expectedDataOffset = headerSize + paletteLength;
 
-        if (verbose)
-        {
+        if (verbose) {
             this.debugNumber("bhi.BitmapDataOffset", bhi.bitmapDataOffset, 4);
             this.debugNumber("expectedDataOffset", expectedDataOffset, 4);
         }
@@ -468,8 +453,7 @@ public class BmpImageParser extends Imag
 
         PixelParser pixelParser;
 
-        switch (bhi.compression)
-        {
+        switch (bhi.compression) {
         case BI_RLE4:
         case BI_RLE8:
             pixelParser = new PixelParserRle(bhi, colorTable, imageData);
@@ -489,24 +473,19 @@ public class BmpImageParser extends Imag
     }
 
     private BmpHeaderInfo readBmpHeaderInfo(ByteSource byteSource,
-            boolean verbose) throws ImageReadException, IOException
-    {
+            boolean verbose) throws ImageReadException, IOException {
         InputStream is = null;
-        try
-        {
+        try {
             is = byteSource.getInputStream();
 
             // readSignature(is);
             return readBmpHeaderInfo(is, null, verbose);
-        } finally
-        {
-            try
-            {
+        } finally {
+            try {
                 if (is != null) {
                     is.close();
                 }
-            } catch (Exception e)
-            {
+            } catch (Exception e) {
                 Debug.debug(e);
             }
 
@@ -515,15 +494,13 @@ public class BmpImageParser extends Imag
 
     @Override
     public byte[] getICCProfileBytes(ByteSource byteSource, Map params)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         return null;
     }
 
     @Override
     public Dimension getImageSize(ByteSource byteSource, Map params)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         // make copy of params; we'll clear keys as we consume them.
         params = (params == null) ? new HashMap() : new HashMap(params);
 
@@ -533,8 +510,7 @@ public class BmpImageParser extends Imag
         if (params.containsKey(PARAM_KEY_VERBOSE))
             params.remove(PARAM_KEY_VERBOSE);
 
-        if (params.size() > 0)
-        {
+        if (params.size() > 0) {
             Object firstKey = params.keySet().iterator().next();
             throw new ImageReadException("Unknown parameter: " + firstKey);
         }
@@ -548,26 +524,22 @@ public class BmpImageParser extends Imag
 
     }
 
-    public byte[] embedICCProfile(byte image[], byte profile[])
-    {
+    public byte[] embedICCProfile(byte image[], byte profile[]) {
         return null;
     }
 
     @Override
-    public boolean embedICCProfile(File src, File dst, byte profile[])
-    {
+    public boolean embedICCProfile(File src, File dst, byte profile[]) {
         return false;
     }
 
     @Override
     public IImageMetadata getMetadata(ByteSource byteSource, Map params)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         return null;
     }
 
-    private String getBmpTypeDescription(int Identifier1, int Identifier2)
-    {
+    private String getBmpTypeDescription(int Identifier1, int Identifier2) {
         if ((Identifier1 == 'B') && (Identifier2 == 'M'))
             return "Windows 3.1x, 95, NT,";
         if ((Identifier1 == 'B') && (Identifier2 == 'A'))
@@ -586,8 +558,7 @@ public class BmpImageParser extends Imag
 
     @Override
     public ImageInfo getImageInfo(ByteSource byteSource, Map params)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         // make copy of params; we'll clear keys as we consume them.
         params = (params == null) ? new HashMap() : new HashMap(params);
 
@@ -597,8 +568,7 @@ public class BmpImageParser extends Imag
         if (params.containsKey(PARAM_KEY_VERBOSE))
             params.remove(PARAM_KEY_VERBOSE);
 
-        if (params.size() > 0)
-        {
+        if (params.size() > 0) {
             Object firstKey = params.keySet().iterator().next();
             throw new ImageReadException("Unknown parameter: " + firstKey);
         }
@@ -670,8 +640,7 @@ public class BmpImageParser extends Imag
 
     @Override
     public boolean dumpImageFile(PrintWriter pw, ByteSource byteSource)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         pw.println("bmp.dumpImageFile");
 
         ImageInfo imageData = getImageInfo(byteSource, null);
@@ -687,12 +656,11 @@ public class BmpImageParser extends Imag
 
     @Override
     public FormatCompliance getFormatCompliance(ByteSource byteSource)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         boolean verbose = false;
 
-        FormatCompliance result = new FormatCompliance(byteSource
-                .getDescription());
+        FormatCompliance result = new FormatCompliance(
+                byteSource.getDescription());
 
         InputStream is = null;
         try {
@@ -712,8 +680,7 @@ public class BmpImageParser extends Imag
 
     @Override
     public BufferedImage getBufferedImage(ByteSource byteSource, Map params)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         InputStream is = null;
         try {
             is = byteSource.getInputStream();
@@ -729,8 +696,7 @@ public class BmpImageParser extends Imag
     }
 
     public BufferedImage getBufferedImage(InputStream inputStream, Map params)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         // make copy of params; we'll clear keys as we consume them.
         params = (params == null) ? new HashMap() : new HashMap(params);
 
@@ -742,8 +708,7 @@ public class BmpImageParser extends Imag
         if (params.containsKey(BUFFERED_IMAGE_FACTORY))
             params.remove(BUFFERED_IMAGE_FACTORY);
 
-        if (params.size() > 0)
-        {
+        if (params.size() > 0) {
             Object firstKey = params.keySet().iterator().next();
             throw new ImageReadException("Unknown parameter: " + firstKey);
         }
@@ -760,8 +725,7 @@ public class BmpImageParser extends Imag
         int width = bhi.width;
         int height = bhi.height;
 
-        if (verbose)
-        {
+        if (verbose) {
             System.out.println("width: " + width);
             System.out.println("height: " + height);
             System.out.println("width*height: " + width * height);
@@ -781,21 +745,20 @@ public class BmpImageParser extends Imag
 
     @Override
     public void writeImage(BufferedImage src, OutputStream os, Map params)
-            throws ImageWriteException, IOException
-    {
+            throws ImageWriteException, IOException {
         // make copy of params; we'll clear keys as we consume them.
         params = (params == null) ? new HashMap() : new HashMap(params);
 
         PixelDensity pixelDensity = null;
-        
+
         // clear format key.
         if (params.containsKey(PARAM_KEY_FORMAT))
             params.remove(PARAM_KEY_FORMAT);
         if (params.containsKey(PARAM_KEY_PIXEL_DENSITY))
-            pixelDensity = (PixelDensity) params.remove(PARAM_KEY_PIXEL_DENSITY);
+            pixelDensity = (PixelDensity) params
+                    .remove(PARAM_KEY_PIXEL_DENSITY);
 
-        if (params.size() > 0)
-        {
+        if (params.size() > 0) {
             Object firstKey = params.keySet().iterator().next();
             throw new ImageWriteException("Unknown parameter: " + firstKey);
         }
@@ -840,8 +803,10 @@ public class BmpImageParser extends Imag
 
             bos.write4Bytes(BI_RGB); // Compression
             bos.write4Bytes(imagedata.length); // Bitmap Data Size
-            bos.write4Bytes(pixelDensity != null ? (int)Math.round(pixelDensity.horizontalDensityMetres()) : 0); // HResolution
-            bos.write4Bytes(pixelDensity != null ? (int)Math.round(pixelDensity.verticalDensityMetres()) : 0); // VResolution
+            bos.write4Bytes(pixelDensity != null ? (int) Math
+                    .round(pixelDensity.horizontalDensityMetres()) : 0); // HResolution
+            bos.write4Bytes(pixelDensity != null ? (int) Math
+                    .round(pixelDensity.verticalDensityMetres()) : 0); // VResolution
             if (palette == null)
                 bos.write4Bytes(0); // Colors
             else
@@ -861,7 +826,7 @@ public class BmpImageParser extends Imag
     /**
      * Extracts embedded XML metadata as XML string.
      * <p>
-     *
+     * 
      * @param byteSource
      *            File containing image data.
      * @param params
@@ -870,8 +835,7 @@ public class BmpImageParser extends Imag
      */
     @Override
     public String getXmpXml(ByteSource byteSource, Map params)
-            throws ImageReadException, IOException
-    {
+            throws ImageReadException, IOException {
         return null;
     }
 

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/ImageContents.java Sat May 26 21:19:03 2012
@@ -18,20 +18,18 @@ package org.apache.commons.imaging.forma
 
 import org.apache.commons.imaging.formats.bmp.pixelparsers.PixelParser;
 
-class ImageContents
-{
+class ImageContents {
     public final BmpHeaderInfo bhi;
     public final byte colorTable[];
     public final byte imageData[];
     public final PixelParser pixelParser;
 
     public ImageContents(BmpHeaderInfo bhi, byte ColorTable[],
-            byte ImageData[], PixelParser fPixelParser)
-    {
+            byte ImageData[], PixelParser fPixelParser) {
         this.bhi = bhi;
         this.colorTable = ColorTable;
         this.imageData = ImageData;
         this.pixelParser = fPixelParser;
     }
 
-}
\ No newline at end of file
+}

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParser.java Sat May 26 21:19:03 2012
@@ -24,8 +24,7 @@ import org.apache.commons.imaging.common
 import org.apache.commons.imaging.common.ImageBuilder;
 import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
-public abstract class PixelParser
-{
+public abstract class PixelParser {
     public final BmpHeaderInfo bhi;
     public final byte colorTable[];
     public final byte imageData[];
@@ -33,8 +32,7 @@ public abstract class PixelParser
     protected final BinaryFileParser bfp;
     protected final ByteArrayInputStream is;
 
-    public PixelParser(BmpHeaderInfo bhi, byte ColorTable[], byte ImageData[])
-    {
+    public PixelParser(BmpHeaderInfo bhi, byte ColorTable[], byte ImageData[]) {
         this.bhi = bhi;
         this.colorTable = ColorTable;
         this.imageData = ImageData;
@@ -46,8 +44,7 @@ public abstract class PixelParser
     public abstract void processImage(ImageBuilder imageBuilder)
             throws ImageReadException, IOException;
 
-    protected int getColorTableRGB(int index)
-    {
+    protected int getColorTableRGB(int index) {
         index *= 4;
         int blue = 0xff & colorTable[index + 0];
         int green = 0xff & colorTable[index + 1];
@@ -58,4 +55,4 @@ public abstract class PixelParser
         return rgb;
     }
 
-}
\ No newline at end of file
+}

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserBitFields.java Sat May 26 21:19:03 2012
@@ -21,8 +21,7 @@ import java.io.IOException;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
-public class PixelParserBitFields extends PixelParserSimple
-{
+public class PixelParserBitFields extends PixelParserSimple {
 
     private final int redShift;
     private final int greenShift;
@@ -35,8 +34,7 @@ public class PixelParserBitFields extend
     private final int alphaMask;
 
     public PixelParserBitFields(BmpHeaderInfo bhi, byte ColorTable[],
-            byte ImageData[])
-    {
+            byte ImageData[]) {
         super(bhi, ColorTable, ImageData);
 
         redMask = bhi.redMask;
@@ -50,54 +48,43 @@ public class PixelParserBitFields extend
         alphaShift = (alphaMask != 0 ? getMaskShift(alphaMask) : 0);
     }
 
-    private int getMaskShift(int mask)
-    {
+    private int getMaskShift(int mask) {
         int trailingZeroes = 0;
 
-        while ((0x1 & mask) == 0)
-        {
+        while ((0x1 & mask) == 0) {
             mask = 0x7fffffff & (mask >> 1);
             trailingZeroes++;
         }
 
         int maskLength = 0;
 
-        while ((0x1 & mask) == 1)
-        {
+        while ((0x1 & mask) == 1) {
             mask = 0x7fffffff & (mask >> 1);
             maskLength++;
         }
 
         return (trailingZeroes - (8 - maskLength));
     }
+
     private int bytecount = 0;
 
     @Override
-    public int getNextRGB() throws ImageReadException, IOException
-    {
+    public int getNextRGB() throws ImageReadException, IOException {
         int data;
 
-        if (bhi.bitsPerPixel == 8)
-        {
+        if (bhi.bitsPerPixel == 8) {
             data = 0xff & imageData[bytecount + 0];
             bytecount += 1;
-        }
-        else if (bhi.bitsPerPixel == 24)
-        {
+        } else if (bhi.bitsPerPixel == 24) {
             data = bfp.read3Bytes("Pixel", is, "BMP Image Data");
             bytecount += 3;
-        }
-        else if (bhi.bitsPerPixel == 32)
-        {
+        } else if (bhi.bitsPerPixel == 32) {
             data = bfp.read4Bytes("Pixel", is, "BMP Image Data");
             bytecount += 4;
-        }
-        else if (bhi.bitsPerPixel == 16)
-        {
+        } else if (bhi.bitsPerPixel == 16) {
             data = bfp.read2Bytes("Pixel", is, "BMP Image Data");
             bytecount += 2;
-        }
-        else
+        } else
             throw new ImageReadException("Unknown BitsPerPixel: "
                     + bhi.bitsPerPixel);
 
@@ -117,12 +104,10 @@ public class PixelParserBitFields extend
     }
 
     @Override
-    public void newline() throws ImageReadException, IOException
-    {
-        while (((bytecount) % 4) != 0)
-        {
+    public void newline() throws ImageReadException, IOException {
+        while (((bytecount) % 4) != 0) {
             bfp.readByte("Pixel", is, "BMP Image Data");
             bytecount++;
         }
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRgb.java Sat May 26 21:19:03 2012
@@ -21,11 +21,9 @@ import java.io.IOException;
 import org.apache.commons.imaging.ImageReadException;
 import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
-public class PixelParserRgb extends PixelParserSimple
-{
+public class PixelParserRgb extends PixelParserSimple {
     public PixelParserRgb(BmpHeaderInfo bhi, byte ColorTable[],
-            byte ImageData[])
-    {
+            byte ImageData[]) {
         super(bhi, ColorTable, ImageData);
 
     }
@@ -37,22 +35,19 @@ public class PixelParserRgb extends Pixe
     int pixelCount = 0;
 
     @Override
-    public int getNextRGB() throws ImageReadException, IOException
-    {
+    public int getNextRGB() throws ImageReadException, IOException {
         pixelCount++;
 
         if ((bhi.bitsPerPixel == 1) // always grayscale?
                 || (bhi.bitsPerPixel == 4)) // always grayscale?
         {
-            if (cached_bit_count < bhi.bitsPerPixel)
-            {
+            if (cached_bit_count < bhi.bitsPerPixel) {
                 if (cached_bit_count != 0)
                     throw new ImageReadException("Unexpected leftover bits: "
                             + cached_bit_count + "/" + bhi.bitsPerPixel);
 
                 cached_bit_count += 8;
-                cached_byte =
-                (0xff & imageData[bytecount]);
+                cached_byte = (0xff & imageData[bytecount]);
                 bytecount++;
             }
             int cache_mask = (1 << bhi.bitsPerPixel) - 1;
@@ -72,8 +67,7 @@ public class PixelParserRgb extends Pixe
             bytecount += 1;
 
             return rgb;
-        } else if (bhi.bitsPerPixel == 16)
-        {
+        } else if (bhi.bitsPerPixel == 16) {
             int data = bfp.read2Bytes("Pixel", is, "BMP Image Data");
 
             int blue = (0x1f & (data >> 0)) << 3;
@@ -86,8 +80,7 @@ public class PixelParserRgb extends Pixe
             bytecount += 2;
 
             return rgb;
-        } else if (bhi.bitsPerPixel == 24)
-        {
+        } else if (bhi.bitsPerPixel == 24) {
             int blue = 0xff & imageData[bytecount + 0];
             int green = 0xff & imageData[bytecount + 1];
             int red = 0xff & imageData[bytecount + 2];
@@ -98,8 +91,7 @@ public class PixelParserRgb extends Pixe
             bytecount += 3;
 
             return rgb;
-        } else if (bhi.bitsPerPixel == 32)
-        {
+        } else if (bhi.bitsPerPixel == 32) {
             int blue = 0xff & imageData[bytecount + 0];
             int green = 0xff & imageData[bytecount + 1];
             int red = 0xff & imageData[bytecount + 2];
@@ -117,14 +109,12 @@ public class PixelParserRgb extends Pixe
     }
 
     @Override
-    public void newline() throws ImageReadException, IOException
-    {
+    public void newline() throws ImageReadException, IOException {
         cached_bit_count = 0;
 
-        while (((bytecount) % 4) != 0)
-        {
+        while (((bytecount) % 4) != 0) {
             bfp.readByte("Pixel", is, "BMP Image Data");
             bytecount++;
         }
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserRle.java Sat May 26 21:19:03 2012
@@ -22,18 +22,15 @@ import org.apache.commons.imaging.ImageR
 import org.apache.commons.imaging.common.ImageBuilder;
 import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
-public class PixelParserRle extends PixelParser
-{
+public class PixelParserRle extends PixelParser {
 
     public PixelParserRle(BmpHeaderInfo bhi, byte ColorTable[],
-            byte ImageData[])
-    {
+            byte ImageData[]) {
         super(bhi, ColorTable, ImageData);
 
     }
 
-    private int getSamplesPerByte() throws ImageReadException
-    {
+    private int getSamplesPerByte() throws ImageReadException {
         if (bhi.bitsPerPixel == 8)
             return 1;
         else if (bhi.bitsPerPixel == 4)
@@ -43,25 +40,20 @@ public class PixelParserRle extends Pixe
                     + bhi.bitsPerPixel);
     }
 
-    private int[] convertDataToSamples(int data) throws ImageReadException
-    {
+    private int[] convertDataToSamples(int data) throws ImageReadException {
         int rgbs[];
-        if (bhi.bitsPerPixel == 8)
-        {
+        if (bhi.bitsPerPixel == 8) {
             rgbs = new int[1];
             rgbs[0] = getColorTableRGB(data);
-            //            pixels_written = 1;
-        }
-        else if (bhi.bitsPerPixel == 4)
-        {
+            // pixels_written = 1;
+        } else if (bhi.bitsPerPixel == 4) {
             rgbs = new int[2];
             int sample1 = data >> 4;
             int sample2 = 0x0f & data;
             rgbs[0] = getColorTableRGB(sample1);
             rgbs[1] = getColorTableRGB(sample2);
-            //            pixels_written = 2;
-        }
-        else
+            // pixels_written = 2;
+        } else
             throw new ImageReadException("BMP RLE: bad BitsPerPixel: "
                     + bhi.bitsPerPixel);
 
@@ -69,24 +61,19 @@ public class PixelParserRle extends Pixe
     }
 
     private int processByteOfData(int rgbs[], int repeat, int x, int y,
-            int width, int height, ImageBuilder imageBuilder)
-    {
-        //                int rbg
+            int width, int height, ImageBuilder imageBuilder) {
+        // int rbg
         int pixels_written = 0;
-        for (int i = 0; i < repeat; i++)
-        {
+        for (int i = 0; i < repeat; i++) {
 
-            if ((x >= 0) && (x < width) && (y >= 0) && (y < height))
-            {
-                //                    int rgb = 0xff000000;
-                //                    rgb = getNextRGB();
+            if ((x >= 0) && (x < width) && (y >= 0) && (y < height)) {
+                // int rgb = 0xff000000;
+                // rgb = getNextRGB();
                 int rgb = rgbs[i % rgbs.length];
-                //                                bi.setRGB(x, y, rgb);
+                // bi.setRGB(x, y, rgb);
                 imageBuilder.setRGB(x, y, rgb);
-                //                                bi.setRGB(x, y, 0xff00ff00);
-            }
-            else
-            {
+                // bi.setRGB(x, y, 0xff00ff00);
+            } else {
                 System.out.println("skipping bad pixel (" + x + "," + y + ")");
             }
 
@@ -98,109 +85,102 @@ public class PixelParserRle extends Pixe
     }
 
     @Override
-    public void processImage(ImageBuilder imageBuilder) throws ImageReadException,
-            IOException
-    {
+    public void processImage(ImageBuilder imageBuilder)
+            throws ImageReadException, IOException {
         int count = 0;
         int width = bhi.width;
         int height = bhi.height;
         int x = 0, y = height - 1;
 
-        //        bfp.setDebug(true);
+        // bfp.setDebug(true);
 
         boolean done = false;
-        while (!done)
-        {
+        while (!done) {
             count++;
-            //            if (count > 100)
-            //                return;
+            // if (count > 100)
+            // return;
 
             int a = 0xff & bfp.readByte("RLE (" + x + "," + y + ") a", is,
                     "BMP: Bad RLE");
-            //                baos.write(a);
+            // baos.write(a);
             int b = 0xff & bfp.readByte("RLE (" + x + "," + y + ")  b", is,
                     "BMP: Bad RLE");
-            //                baos.write(b);
+            // baos.write(b);
 
-            if (a == 0)
-            {
-                switch (b)
+            if (a == 0) {
+                switch (b) {
+                case 0: // EOL
                 {
-                    case 0 : // EOL
-                    {
-                        //                        System.out.println("EOL");
-                        y--;
-                        x = 0;
-                    }
-                        break;
-                    case 1 : // EOF
-                        //                        System.out
-                        //                                .println("xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
-                        done = true;
-                        break;
-                    case 2 : {
-                        //                        System.out
-                        //                                .println("xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
-                        int c = 0xff & bfp
-                                .readByte("RLE c", is, "BMP: Bad RLE");
-                        //                            baos.write(c);
-                        int d = 0xff & bfp
-                                .readByte("RLE d", is, "BMP: Bad RLE");
-                        //                            baos.write(d);
+                    // System.out.println("EOL");
+                    y--;
+                    x = 0;
+                }
+                    break;
+                case 1: // EOF
+                    // System.out
+                    // .println("xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+                    done = true;
+                    break;
+                case 2: {
+                    // System.out
+                    // .println("xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+                    int c = 0xff & bfp.readByte("RLE c", is, "BMP: Bad RLE");
+                    // baos.write(c);
+                    int d = 0xff & bfp.readByte("RLE d", is, "BMP: Bad RLE");
+                    // baos.write(d);
 
+                }
+                    break;
+                default: {
+                    // System.out
+                    // .println("xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
+
+                    int SamplesPerByte = getSamplesPerByte();
+                    int size = b / SamplesPerByte;
+                    if ((b % SamplesPerByte) > 0)
+                        size++;
+                    if ((size % 2) != 0)
+                        size++;
+
+                    // System.out.println("b: " + b);
+                    // System.out.println("size: " + size);
+                    // System.out.println("SamplesPerByte: " + SamplesPerByte);
+
+                    byte bytes[] = bfp.readByteArray("bytes", size, is,
+                            "RLE: Absolute Mode");
+
+                    int remaining = b;
+
+                    // while(true)
+                    for (int i = 0; remaining > 0; i++)
+                    // for (int i = 0; i < bytes.length; i++)
+                    {
+                        int samples[] = convertDataToSamples(0xff & bytes[i]);
+                        int towrite = Math.min(remaining, SamplesPerByte);
+                        // System.out.println("remaining: " + remaining);
+                        // System.out.println("SamplesPerByte: "
+                        // + SamplesPerByte);
+                        // System.out.println("towrite: " + towrite);
+                        int written = processByteOfData(samples, towrite, x, y,
+                                width, height, imageBuilder);
+                        // System.out.println("written: " + written);
+                        // System.out.println("");
+                        x += written;
+                        remaining -= written;
                     }
-                        break;
-                    default : {
-                        //                        System.out
-                        //                                .println("xXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX");
-
-                        int SamplesPerByte = getSamplesPerByte();
-                        int size = b / SamplesPerByte;
-                        if ((b % SamplesPerByte) > 0)
-                            size++;
-                        if ((size % 2) != 0)
-                            size++;
-
-                        //                        System.out.println("b: " + b);
-                        //                        System.out.println("size: " + size);
-                        //                        System.out.println("SamplesPerByte: " + SamplesPerByte);
-
-                        byte bytes[] = bfp.readByteArray("bytes", size, is,
-                                "RLE: Absolute Mode");
-
-                        int remaining = b;
-
-                        //                        while(true)
-                        for (int i = 0; remaining > 0; i++)
-                        //                                for (int i = 0; i < bytes.length; i++)
-                        {
-                            int samples[] = convertDataToSamples(0xff & bytes[i]);
-                            int towrite = Math.min(remaining, SamplesPerByte);
-                            //                            System.out.println("remaining: " + remaining);
-                            //                            System.out.println("SamplesPerByte: "
-                            //                                    + SamplesPerByte);
-                            //                            System.out.println("towrite: " + towrite);
-                            int written = processByteOfData(samples, towrite,
-                                    x, y, width, height, imageBuilder);
-                            //                            System.out.println("written: " + written);
-                            //                            System.out.println("");
-                            x += written;
-                            remaining -= written;
-                        }
-                        //                            baos.write(bytes);
-                    }
-                        break;
+                    // baos.write(bytes);
                 }
-            }
-            else
-            {
+                    break;
+                }
+            } else {
                 int rgbs[] = convertDataToSamples(b);
 
-                x += processByteOfData(rgbs, a, x, y, width, height, imageBuilder);
-                //                    x += processByteOfData(b, a, x, y, width, height, bi);
+                x += processByteOfData(rgbs, a, x, y, width, height,
+                        imageBuilder);
+                // x += processByteOfData(b, a, x, y, width, height, bi);
 
             }
         }
 
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/pixelparsers/PixelParserSimple.java Sat May 26 21:19:03 2012
@@ -22,11 +22,9 @@ import org.apache.commons.imaging.ImageR
 import org.apache.commons.imaging.common.ImageBuilder;
 import org.apache.commons.imaging.formats.bmp.BmpHeaderInfo;
 
-public abstract class PixelParserSimple extends PixelParser
-{
+public abstract class PixelParserSimple extends PixelParser {
     public PixelParserSimple(BmpHeaderInfo bhi, byte ColorTable[],
-            byte ImageData[])
-    {
+            byte ImageData[]) {
         super(bhi, ColorTable, ImageData);
     }
 
@@ -35,21 +33,18 @@ public abstract class PixelParserSimple 
     public abstract void newline() throws ImageReadException, IOException;
 
     @Override
-    public void processImage(ImageBuilder imageBuilder) throws ImageReadException,
-            IOException
-    {
-//        DataBuffer db = bi.getRaster().getDataBuffer();
-
-        for (int y = bhi.height - 1; y >= 0; y--)
-        {
-            for (int x = 0; x < bhi.width; x++)
-            {
+    public void processImage(ImageBuilder imageBuilder)
+            throws ImageReadException, IOException {
+        // DataBuffer db = bi.getRaster().getDataBuffer();
+
+        for (int y = bhi.height - 1; y >= 0; y--) {
+            for (int x = 0; x < bhi.width; x++) {
                 int rgb = getNextRGB();
 
                 imageBuilder.setRGB(x, y, rgb);
-//                db.setElem(y * bhi.width + x, rgb);
+                // db.setElem(y * bhi.width + x, rgb);
             }
             newline();
         }
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriter.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriter.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriter.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriter.java Sat May 26 21:19:03 2012
@@ -21,8 +21,7 @@ import java.io.IOException;
 
 import org.apache.commons.imaging.common.BinaryOutputStream;
 
-public abstract class BmpWriter
-{
+public abstract class BmpWriter {
     public abstract int getPaletteSize();
 
     public abstract int getBitsPerPixel();
@@ -31,4 +30,4 @@ public abstract class BmpWriter
             throws IOException;
 
     public abstract byte[] getImageData(BufferedImage src);
-}
\ No newline at end of file
+}

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterPalette.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterPalette.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterPalette.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterPalette.java Sat May 26 21:19:03 2012
@@ -23,13 +23,11 @@ import java.io.IOException;
 import org.apache.commons.imaging.common.BinaryOutputStream;
 import org.apache.commons.imaging.palette.SimplePalette;
 
-public class BmpWriterPalette extends BmpWriter
-{
+public class BmpWriterPalette extends BmpWriter {
     private final SimplePalette palette;
     private final int bitsPerSample;
 
-    public BmpWriterPalette(SimplePalette palette)
-    {
+    public BmpWriterPalette(SimplePalette palette) {
         this.palette = palette;
 
         if (palette.length() <= 2)
@@ -41,22 +39,18 @@ public class BmpWriterPalette extends Bm
     }
 
     @Override
-    public int getPaletteSize()
-    {
+    public int getPaletteSize() {
         return palette.length();
     }
 
     @Override
-    public int getBitsPerPixel()
-    {
+    public int getBitsPerPixel() {
         return bitsPerSample;
     }
 
     @Override
-    public void writePalette(BinaryOutputStream bos) throws IOException
-    {
-        for (int i = 0; i < palette.length(); i++)
-        {
+    public void writePalette(BinaryOutputStream bos) throws IOException {
+        for (int i = 0; i < palette.length(); i++) {
             int rgb = palette.getEntry(i);
 
             int red = 0xff & (rgb >> 16);
@@ -71,8 +65,7 @@ public class BmpWriterPalette extends Bm
     }
 
     @Override
-    public byte[] getImageData(BufferedImage src)
-    {
+    public byte[] getImageData(BufferedImage src) {
         int width = src.getWidth();
         int height = src.getHeight();
 
@@ -82,17 +75,14 @@ public class BmpWriterPalette extends Bm
         int bits_in_cache = 0;
 
         int bytecount = 0;
-        for (int y = height - 1; y >= 0; y--)
-        {
-            for (int x = 0; x < width; x++)
-            {
+        for (int y = height - 1; y >= 0; y--) {
+            for (int x = 0; x < width; x++) {
                 int argb = src.getRGB(x, y);
                 int rgb = 0xffffff & argb;
 
                 int index = palette.getPaletteIndex(rgb);
 
-                if (bitsPerSample == 8)
-                {
+                if (bitsPerSample == 8) {
                     baos.write(0xff & index);
                     bytecount++;
                 } else
@@ -100,8 +90,7 @@ public class BmpWriterPalette extends Bm
                 {
                     bit_cache = (bit_cache << bitsPerSample) | index;
                     bits_in_cache += bitsPerSample;
-                    if (bits_in_cache >= 8)
-                    {
+                    if (bits_in_cache >= 8) {
                         baos.write(0xff & bit_cache);
                         bytecount++;
                         bit_cache = 0;
@@ -110,8 +99,7 @@ public class BmpWriterPalette extends Bm
                 }
             }
 
-            if (bits_in_cache > 0)
-            {
+            if (bits_in_cache > 0) {
                 bit_cache = (bit_cache << (8 - bits_in_cache));
 
                 baos.write(0xff & bit_cache);
@@ -120,8 +108,7 @@ public class BmpWriterPalette extends Bm
                 bits_in_cache = 0;
             }
 
-            while ((bytecount % 4) != 0)
-            {
+            while ((bytecount % 4) != 0) {
                 baos.write(0);
                 bytecount++;
             }
@@ -129,4 +116,4 @@ public class BmpWriterPalette extends Bm
 
         return baos.toByteArray();
     }
-}
\ No newline at end of file
+}

Modified: commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterRgb.java
URL: http://svn.apache.org/viewvc/commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterRgb.java?rev=1342971&r1=1342970&r2=1342971&view=diff
==============================================================================
--- commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterRgb.java (original)
+++ commons/proper/imaging/trunk/src/main/java/org/apache/commons/imaging/formats/bmp/writers/BmpWriterRgb.java Sat May 26 21:19:03 2012
@@ -22,48 +22,42 @@ import java.io.IOException;
 
 import org.apache.commons.imaging.common.BinaryOutputStream;
 
-public class BmpWriterRgb extends BmpWriter
-{
-    //        private final boolean alpha;
+public class BmpWriterRgb extends BmpWriter {
+    // private final boolean alpha;
     //
-    //        public BmpWriterRgb(boolean alpha)
-    //        {
-    //            this.alpha = alpha;
-    //        }
+    // public BmpWriterRgb(boolean alpha)
+    // {
+    // this.alpha = alpha;
+    // }
 
     @Override
-    public int getPaletteSize()
-    {
+    public int getPaletteSize() {
         return 0;
     }
 
     @Override
-    public int getBitsPerPixel()
-    {
-        //            return alpha ? 32 : 24;
+    public int getBitsPerPixel() {
+        // return alpha ? 32 : 24;
         return 24;
     }
 
     @Override
-    public void writePalette(BinaryOutputStream bos) throws IOException
-    {
+    public void writePalette(BinaryOutputStream bos) throws IOException {
     }
 
     @Override
-    public byte[] getImageData(BufferedImage src)
-    {
+    public byte[] getImageData(BufferedImage src) {
         int width = src.getWidth();
         int height = src.getHeight();
 
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        //            BinaryOutputStream bos = new BinaryOutputStream(baos, BYTE_ORDER_Network);
+        // BinaryOutputStream bos = new BinaryOutputStream(baos,
+        // BYTE_ORDER_Network);
 
         int bytecount = 0;
-        for (int y = height - 1; y >= 0; y--)
-        {
-            //            for (int y = 0; y < height; y++)
-            for (int x = 0; x < width; x++)
-            {
+        for (int y = height - 1; y >= 0; y--) {
+            // for (int y = 0; y < height; y++)
+            for (int x = 0; x < width; x++) {
                 int argb = src.getRGB(x, y);
                 int rgb = 0xffffff & argb;
 
@@ -76,8 +70,7 @@ public class BmpWriterRgb extends BmpWri
                 baos.write(red);
                 bytecount += 3;
             }
-            while ((bytecount % 4) != 0)
-            {
+            while ((bytecount % 4) != 0) {
                 baos.write(0);
                 bytecount++;
             }
@@ -85,4 +78,4 @@ public class BmpWriterRgb extends BmpWri
 
         return baos.toByteArray();
     }
-}
\ No newline at end of file
+}



Mime
View raw message