This is an automated email from the ASF dual-hosted git repository. kinow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-imaging.git
commit 92056a4e495306ca1f26ee5efff00125d19b00d6 Author: Arturo Bernal <[email protected]> AuthorDate: Wed Apr 21 19:26:44 2021 +0200 [IMAGING-291] Fix Typo --- .../java/org/apache/commons/imaging/Imaging.java | 8 +++--- .../imaging/common/mylzw/MyLzwCompressor.java | 4 +-- .../imaging/formats/bmp/BmpWriterPalette.java | 12 ++++---- .../imaging/formats/bmp/PixelParserBitFields.java | 16 +++++------ .../imaging/formats/bmp/PixelParserRgb.java | 32 +++++++++++----------- .../imaging/formats/gif/GenericGifBlock.java | 14 +++++----- .../imaging/formats/gif/GifImageParser.java | 14 +++++----- .../commons/imaging/formats/jpeg/decoder/Dct.java | 2 +- .../imaging/formats/jpeg/segments/SosSegment.java | 10 +++---- .../png/scanlinefilters/ScanlineFilterPaeth.java | 8 +++--- .../commons/imaging/formats/pnm/FileInfo.java | 8 +++--- .../commons/imaging/formats/pnm/PbmFileInfo.java | 10 +++---- .../commons/imaging/formats/pnm/PbmWriter.java | 12 ++++---- .../commons/imaging/formats/pnm/PgmWriter.java | 10 +++---- .../commons/imaging/formats/pnm/PpmFileInfo.java | 4 +-- .../psd/datareaders/CompressedDataReader.java | 6 ++-- .../commons/imaging/formats/tiff/TiffField.java | 4 +-- .../constants/MicrosoftHdPhotoTagConstants.java | 22 +++++++-------- .../formats/tiff/datareaders/DataReaderStrips.java | 4 +-- .../formats/tiff/datareaders/DataReaderTiled.java | 4 +-- .../formats/tiff/write/TiffOutputField.java | 4 +-- .../commons/imaging/icc/IccTagDataTypes.java | 14 +++++----- .../org/apache/commons/imaging/internal/Debug.java | 14 +++++----- .../apache/commons/imaging/palette/Dithering.java | 2 +- .../commons/imaging/color/ColorCieLabTest.java | 6 ++-- .../tiff/ExampleReadFloatingPointData.java | 2 +- .../imaging/formats/jpeg/iptc/IptcParserTest.java | 2 +- .../formats/tiff/TiffFloatingPointReadTest.java | 2 +- 28 files changed, 125 insertions(+), 125 deletions(-) diff --git a/src/main/java/org/apache/commons/imaging/Imaging.java b/src/main/java/org/apache/commons/imaging/Imaging.java index b5b6f88..fd12bce 100644 --- a/src/main/java/org/apache/commons/imaging/Imaging.java +++ b/src/main/java/org/apache/commons/imaging/Imaging.java @@ -97,7 +97,7 @@ import org.apache.commons.imaging.icc.IccProfileParser; * a Java HashMap) to specify a set of keys and values for input. * The specification for support keys is provided by the ImagingConstants * interface as well as by format-specific interfaces such as - * JpegContants or TiffConstants. + * JpegConstants or TiffConstants. * </p> * * <h3>Example code</h3> @@ -1323,7 +1323,7 @@ public final class Imaging { /** * Reads the first image from an InputStream * using data-processing options specified through a parameters - * map. Options may be configured using the ImagingContants + * map. Options may be configured using the ImagingConstants * interface or the various format-specific implementations provided * by this package. * <p> @@ -1373,7 +1373,7 @@ public final class Imaging { /** * Reads the first image from a byte array * using data-processing options specified through a parameters - * map. Options may be configured using the ImagingContants + * map. Options may be configured using the ImagingConstants * interface or the various format-specific implementations provided * by this package. * <p> @@ -1422,7 +1422,7 @@ public final class Imaging { /** * Reads the first image from a file * using data-processing options specified through a parameters - * map. Options may be configured using the ImagingContants + * map. Options may be configured using the ImagingConstants * interface or the various format-specific implementations provided * by this package. * <p> diff --git a/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java b/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java index be6e335..a46e1e3 100644 --- a/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java +++ b/src/main/java/org/apache/commons/imaging/common/mylzw/MyLzwCompressor.java @@ -60,10 +60,10 @@ public class MyLzwCompressor { private void initializeStringTable() { codeSize = initialCodeSize; - final int intialEntriesCount = (1 << codeSize) + 2; + final int initialEntriesCount = (1 << codeSize) + 2; map.clear(); - for (codes = 0; codes < intialEntriesCount; codes++) { + for (codes = 0; codes < initialEntriesCount; codes++) { if ((codes != clearCode) && (codes != eoiCode)) { final ByteArray key = arrayToKey((byte) codes); diff --git a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterPalette.java b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterPalette.java index 64f6adc..04aa86d 100644 --- a/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterPalette.java +++ b/src/main/java/org/apache/commons/imaging/formats/bmp/BmpWriterPalette.java @@ -76,7 +76,7 @@ class BmpWriterPalette implements BmpWriter { int bitCache = 0; int bitsInCache = 0; - int bytecount = 0; + int byteCount = 0; for (int y = height - 1; y >= 0; y--) { for (int x = 0; x < width; x++) { final int argb = src.getRGB(x, y); @@ -86,14 +86,14 @@ class BmpWriterPalette implements BmpWriter { if (bitsPerSample == 8) { baos.write(0xff & index); - bytecount++; + byteCount++; } else { // 4 or 1 bitCache = (bitCache << bitsPerSample) | index; bitsInCache += bitsPerSample; if (bitsInCache >= 8) { baos.write(0xff & bitCache); - bytecount++; + byteCount++; bitCache = 0; bitsInCache = 0; } @@ -104,14 +104,14 @@ class BmpWriterPalette implements BmpWriter { bitCache = (bitCache << (8 - bitsInCache)); baos.write(0xff & bitCache); - bytecount++; + byteCount++; bitCache = 0; bitsInCache = 0; } - while ((bytecount % 4) != 0) { + while ((byteCount % 4) != 0) { baos.write(0); - bytecount++; + byteCount++; } } diff --git a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserBitFields.java b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserBitFields.java index 1862ae6..0d17f8e 100644 --- a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserBitFields.java +++ b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserBitFields.java @@ -38,7 +38,7 @@ class PixelParserBitFields extends PixelParserSimple { private final int blueMask; private final int alphaMask; - private int bytecount; + private int byteCount; PixelParserBitFields(final BmpHeaderInfo bhi, final byte[] colorTable, final byte[] imageData) { super(bhi, colorTable, imageData); @@ -82,20 +82,20 @@ class PixelParserBitFields extends PixelParserSimple { switch (bhi.bitsPerPixel) { case 8: - data = 0xff & imageData[bytecount + 0]; - bytecount += 1; + data = 0xff & imageData[byteCount + 0]; + byteCount += 1; break; case 24: data = read3Bytes("Pixel", is, "BMP Image Data", ByteOrder.LITTLE_ENDIAN); - bytecount += 3; + byteCount += 3; break; case 32: data = read4Bytes("Pixel", is, "BMP Image Data", ByteOrder.LITTLE_ENDIAN); - bytecount += 4; + byteCount += 4; break; case 16: data = read2Bytes("Pixel", is, "BMP Image Data", ByteOrder.LITTLE_ENDIAN); - bytecount += 2; + byteCount += 2; break; default: throw new ImageReadException("Unknown BitsPerPixel: " + bhi.bitsPerPixel); @@ -116,9 +116,9 @@ class PixelParserBitFields extends PixelParserSimple { @Override public void newline() throws ImageReadException, IOException { - while ((bytecount % 4) != 0) { + while ((byteCount % 4) != 0) { readByte("Pixel", is, "BMP Image Data"); - bytecount++; + byteCount++; } } } diff --git a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRgb.java b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRgb.java index e1ab6b6..dd12520 100644 --- a/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRgb.java +++ b/src/main/java/org/apache/commons/imaging/formats/bmp/PixelParserRgb.java @@ -25,7 +25,7 @@ import java.nio.ByteOrder; import org.apache.commons.imaging.ImageReadException; class PixelParserRgb extends PixelParserSimple { - private int bytecount; + private int byteCount; private int cachedBitCount; private int cachedByte; @@ -46,8 +46,8 @@ class PixelParserRgb extends PixelParserSimple { } cachedBitCount += 8; - cachedByte = (0xff & imageData[bytecount]); - bytecount++; + cachedByte = (0xff & imageData[byteCount]); + byteCount++; } final int cacheMask = (1 << bhi.bitsPerPixel) - 1; final int sample = cacheMask & (cachedByte >> (8 - bhi.bitsPerPixel)); @@ -57,11 +57,11 @@ class PixelParserRgb extends PixelParserSimple { return getColorTableRGB(sample); } if (bhi.bitsPerPixel == 8) { // always grayscale? - final int sample = 0xff & imageData[bytecount + 0]; + final int sample = 0xff & imageData[byteCount + 0]; final int rgb = getColorTableRGB(sample); - bytecount += 1; + byteCount += 1; return rgb; } @@ -75,31 +75,31 @@ class PixelParserRgb extends PixelParserSimple { final int rgb = (alpha << 24) | (red << 16) | (green << 8) | (blue << 0); - bytecount += 2; + byteCount += 2; return rgb; } if (bhi.bitsPerPixel == 24) { - final int blue = 0xff & imageData[bytecount + 0]; - final int green = 0xff & imageData[bytecount + 1]; - final int red = 0xff & imageData[bytecount + 2]; + final int blue = 0xff & imageData[byteCount + 0]; + final int green = 0xff & imageData[byteCount + 1]; + final int red = 0xff & imageData[byteCount + 2]; final int alpha = 0xff; final int rgb = (alpha << 24) | (red << 16) | (green << 8) | (blue << 0); - bytecount += 3; + byteCount += 3; return rgb; } if (bhi.bitsPerPixel == 32) { - final int blue = 0xff & imageData[bytecount + 0]; - final int green = 0xff & imageData[bytecount + 1]; - final int red = 0xff & imageData[bytecount + 2]; + final int blue = 0xff & imageData[byteCount + 0]; + final int green = 0xff & imageData[byteCount + 1]; + final int red = 0xff & imageData[byteCount + 2]; final int alpha = 0xff; final int rgb = (alpha << 24) | (red << 16) | (green << 8) | (blue << 0); - bytecount += 4; + byteCount += 4; return rgb; } @@ -112,9 +112,9 @@ class PixelParserRgb extends PixelParserSimple { public void newline() throws ImageReadException, IOException { cachedBitCount = 0; - while (((bytecount) % 4) != 0) { + while (((byteCount) % 4) != 0) { readByte("Pixel", is, "BMP Image Data"); - bytecount++; + byteCount++; } } } diff --git a/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java b/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java index 8f04bd8..4339fa7 100644 --- a/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java +++ b/src/main/java/org/apache/commons/imaging/formats/gif/GenericGifBlock.java @@ -21,12 +21,12 @@ import java.io.IOException; import java.util.List; class GenericGifBlock extends GifBlock { - final List<byte[]> subblocks; + final List<byte[]> subBlocks; - GenericGifBlock(final int blockCode, final List<byte[]> subblocks) { + GenericGifBlock(final int blockCode, final List<byte[]> subBlocks) { super(blockCode); - this.subblocks = subblocks; + this.subBlocks = subBlocks; } @@ -37,12 +37,12 @@ class GenericGifBlock extends GifBlock { public byte[] appendSubBlocks(final boolean includeLengths) throws IOException { final ByteArrayOutputStream out = new ByteArrayOutputStream(); - for (int i = 0; i < subblocks.size(); i++) { - final byte[] subblock = subblocks.get(i); + for (int i = 0; i < subBlocks.size(); i++) { + final byte[] subBlock = subBlocks.get(i); if (includeLengths && i > 0) { - out.write(subblock.length); + out.write(subBlock.length); } - out.write(subblock); + out.write(subBlock); } return out.toByteArray(); diff --git a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java index b7a5a25..9f99dc6 100644 --- a/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java +++ b/src/main/java/org/apache/commons/imaging/formats/gif/GifImageParser.java @@ -228,10 +228,10 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable { private GenericGifBlock readGenericGIFBlock(final InputStream is, final int code, final byte[] first) throws IOException { - final List<byte[]> subblocks = new ArrayList<>(); + final List<byte[]> subBlocks = new ArrayList<>(); if (first != null) { - subblocks.add(first); + subBlocks.add(first); } while (true) { @@ -239,10 +239,10 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable { if (bytes.length < 1) { break; } - subblocks.add(bytes); + subBlocks.add(bytes); } - return new GenericGifBlock(code, subblocks); + return new GenericGifBlock(code, subBlocks); } private List<GifBlock> readBlocks(final GifHeaderInfo ghi, final InputStream is, @@ -1061,7 +1061,7 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable { lzwMinimumCodeSize, ByteOrder.LITTLE_ENDIAN, false); // GIF // Mode); - final byte[] imagedata = new byte[width * height]; + final byte[] imageData = new byte[width * height]; for (int y = 0; y < height; y++) { for (int x = 0; x < width; x++) { final int argb = src.getRGB(x, y); @@ -1080,11 +1080,11 @@ public class GifImageParser extends ImageParser implements XmpEmbeddable { index = palette2.getPaletteIndex(rgb); } - imagedata[y * width + x] = (byte) index; + imageData[y * width + x] = (byte) index; } } - final byte[] compressed = compressor.compress(imagedata); + final byte[] compressed = compressor.compress(imageData); writeAsSubBlocks(bos, compressed); // image_data_total += compressed.length; } diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java index b455164..0a79c67 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/decoder/Dct.java @@ -19,7 +19,7 @@ final class Dct { /* * The book "JPEG still image data compression standard", by Pennebaker and * Mitchell, Chapter 4, discusses a number of approaches to the fast DCT. - * Here's the cost, exluding modified (de)quantization, for transforming an + * Here's the cost, excluding modified (de)quantization, for transforming an * 8x8 block: * * Algorithm Adds Multiplies RightShifts Total diff --git a/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegment.java b/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegment.java index 4b07074..ce43cb5 100644 --- a/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegment.java +++ b/src/main/java/org/apache/commons/imaging/formats/jpeg/segments/SosSegment.java @@ -71,14 +71,14 @@ public class SosSegment extends Segment { final int scanComponentSelector = readByte("scanComponentSelector", is, "Not a Valid JPEG File"); // Debug.debug("scanComponentSelector", scanComponentSelector); - final int acDcEntropoyCodingTableSelector = readByte( - "acDcEntropoyCodingTableSelector", is, + final int acDcEntropyCodingTableSelector = readByte( + "acDcEntropyCodingTableSelector", is, "Not a Valid JPEG File"); // Debug.debug("ac_dc_entrooy_coding_table_selector", - // acDcEntropoyCodingTableSelector); + // acDcEntropyCodingTableSelector); - final int dcCodingTableSelector = (acDcEntropoyCodingTableSelector >> 4) & 0xf; - final int acCodingTableSelector = acDcEntropoyCodingTableSelector & 0xf; + final int dcCodingTableSelector = (acDcEntropyCodingTableSelector >> 4) & 0xf; + final int acCodingTableSelector = acDcEntropyCodingTableSelector & 0xf; components[i] = new Component(scanComponentSelector, dcCodingTableSelector, acCodingTableSelector); } diff --git a/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java b/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java index 7334678..c2db166 100644 --- a/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java +++ b/src/main/java/org/apache/commons/imaging/formats/png/scanlinefilters/ScanlineFilterPaeth.java @@ -60,13 +60,13 @@ public class ScanlineFilterPaeth implements ScanlineFilter { } // above = 255; - int upperleft = 0; + int upperLeft = 0; if ((prevIndex >= 0) && (up != null)) { - upperleft = up[prevIndex]; + upperLeft = up[prevIndex]; } - // upperleft = 255; + // upperLeft = 255; - final int paethPredictor = paethPredictor(0xff & left, 0xff & above, 0xff & upperleft); + final int paethPredictor = paethPredictor(0xff & left, 0xff & above, 0xff & upperLeft); dst[i] = (byte) ((src[i] + paethPredictor) % 256); // dst[i] = (byte) ((src[i] + paethPredictor) ); diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java b/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java index 59dbd2a..6ae416f 100644 --- a/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java +++ b/src/main/java/org/apache/commons/imaging/formats/pnm/FileInfo.java @@ -26,12 +26,12 @@ import org.apache.commons.imaging.common.ImageBuilder; abstract class FileInfo { final int width; final int height; - final boolean rawbits; + final boolean rawBits; - FileInfo(final int width, final int height, final boolean rawbits) { + FileInfo(final int width, final int height, final boolean rawBits) { this.width = width; this.height = height; - this.rawbits = rawbits; + this.rawBits = rawBits; } abstract boolean hasAlpha(); @@ -89,7 +89,7 @@ abstract class FileInfo { // try // { - if (!rawbits) { + if (!rawBits) { final WhiteSpaceReader wsr = new WhiteSpaceReader(is); for (int y = 0; y < height; y++) { diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java b/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java index 36ef6eb..8497df4 100644 --- a/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java +++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PbmFileInfo.java @@ -24,7 +24,7 @@ import org.apache.commons.imaging.ImageFormats; import org.apache.commons.imaging.ImageInfo; class PbmFileInfo extends FileInfo { - private int bitcache; + private int bitCache; private int bitsInCache; PbmFileInfo(final int width, final int height, final boolean rawbits) { @@ -68,7 +68,7 @@ class PbmFileInfo extends FileInfo { @Override protected void newline() { - bitcache = 0; + bitCache = 0; bitsInCache = 0; } @@ -79,12 +79,12 @@ class PbmFileInfo extends FileInfo { if (bits < 0) { throw new IOException("PBM: Unexpected EOF"); } - bitcache = 0xff & bits; + bitCache = 0xff & bits; bitsInCache += 8; } - final int bit = 0x1 & (bitcache >> 7); - bitcache <<= 1; + final int bit = 0x1 & (bitCache >> 7); + bitCache <<= 1; bitsInCache--; if (bit == 0) { diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java b/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java index 05df172..22119c2 100644 --- a/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java +++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PbmWriter.java @@ -26,17 +26,17 @@ import org.apache.commons.imaging.ImageWriteException; class PbmWriter implements PnmWriter { - private final boolean rawbits; + private final boolean rawBits; - PbmWriter(final boolean rawbits) { - this.rawbits = rawbits; + PbmWriter(final boolean rawBits) { + this.rawBits = rawBits; } @Override 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); + os.write(rawBits ? PnmConstants.PBM_RAW_CODE : PnmConstants.PBM_TEXT_CODE); os.write(PnmConstants.PNM_SEPARATOR); final int width = src.getWidth(); @@ -64,7 +64,7 @@ class PbmWriter implements PnmWriter { sample = 1; } - if (rawbits) { + if (rawBits) { bitcache = (bitcache << 1) | (0x1 & sample); bitsInCache++; @@ -81,7 +81,7 @@ class PbmWriter implements PnmWriter { } } - if (rawbits && (bitsInCache > 0)) { + if (rawBits && (bitsInCache > 0)) { bitcache = bitcache << (8 - bitsInCache); os.write((byte) bitcache); bitcache = 0; diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java b/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java index 070fb07..561b6db 100644 --- a/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java +++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PgmWriter.java @@ -26,10 +26,10 @@ import org.apache.commons.imaging.ImageWriteException; class PgmWriter implements PnmWriter { - private final boolean rawbits; + private final boolean rawBits; - PgmWriter(final boolean rawbits) { - this.rawbits = rawbits; + PgmWriter(final boolean rawBits) { + this.rawBits = rawBits; } @Override @@ -38,7 +38,7 @@ class PgmWriter implements PnmWriter { // System.out.println // (b1 == 0x50 && b2 == 0x36) os.write(0x50); - os.write(rawbits ? 0x35 : 0x32); + os.write(rawBits ? 0x35 : 0x32); os.write(PnmConstants.PNM_SEPARATOR); final int width = src.getWidth(); @@ -61,7 +61,7 @@ class PgmWriter implements PnmWriter { final int blue = 0xff & (argb >> 0); final int sample = (red + green + blue) / 3; - if (rawbits) { + if (rawBits) { os.write((byte) sample); } else { os.write(Integer.toString(sample).getBytes(StandardCharsets.US_ASCII)); // max component value diff --git a/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java b/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java index b6923c5..203ebb8 100644 --- a/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java +++ b/src/main/java/org/apache/commons/imaging/formats/pnm/PpmFileInfo.java @@ -29,8 +29,8 @@ class PpmFileInfo extends FileInfo { private final float scale; private final int bytesPerSample; - PpmFileInfo(final int width, final int height, final boolean rawbits, final int max) throws ImageReadException { - super(width, height, rawbits); + PpmFileInfo(final int width, final int height, final boolean rawBits, final int max) throws ImageReadException { + super(width, height, rawBits); if (max <= 0) { throw new ImageReadException("PPM maxVal " + max + " is out of range [1;65535]"); } diff --git a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java index c0b3880..1a2515d 100644 --- a/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java +++ b/src/main/java/org/apache/commons/imaging/formats/psd/datareaders/CompressedDataReader.java @@ -50,9 +50,9 @@ public class CompressedDataReader implements DataReader { // this.setDebug(true); final int scanlineCount = height * header.channels; - final int[] scanlineBytecounts = new int[scanlineCount]; + final int[] scanlineByteCounts = new int[scanlineCount]; for (int i = 0; i < scanlineCount; i++) { - scanlineBytecounts[i] = BinaryFunctions.read2Bytes("scanline_bytecount[" + i + scanlineByteCounts[i] = BinaryFunctions.read2Bytes("scanline_bytecount[" + i + "]", is, "PSD: bad Image Data", bfp.getByteOrder()); } // System.out.println("fImageContents.Compression: " @@ -67,7 +67,7 @@ public class CompressedDataReader implements DataReader { for (int y = 0; y < height; y++) { final int index = channel * height + y; final byte[] packed = BinaryFunctions.readBytes("scanline", - is, scanlineBytecounts[index], + is, scanlineByteCounts[index], "PSD: Missing Image Data"); final byte[] unpacked = new PackBits().decompress(packed, width); diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java index ccab4a8..c1ab6f2 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/TiffField.java @@ -225,7 +225,7 @@ public class TiffField { final StringBuilder result = new StringBuilder(); for (int i = 0; i < values.length; i++) { - final short sval = values[i]; + final short sVal = values[i]; if (i > 50) { result.append("... (").append(values.length).append(")"); @@ -234,7 +234,7 @@ public class TiffField { if (i > 0) { result.append(", "); } - result.append(sval); + result.append(sVal); } return result.toString(); } diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java index 04c3d07..cc19f39 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/constants/MicrosoftHdPhotoTagConstants.java @@ -152,17 +152,17 @@ public final class MicrosoftHdPhotoTagConstants { public static final BinaryConstant PIXEL_FORMAT_VALUE_32_BIT_GRAY_FIXED_POINT = createMicrosoftHdPhotoGuidEndingWith((byte) 0x3f); - public static final TagInfoLong EXIF_TAG_TRANSFOMATION = new TagInfoLong( - "Transfomation", 0xbc02, + public static final TagInfoLong EXIF_TAG_TRANSFORMATION = new TagInfoLong( + "Transformation", 0xbc02, TiffDirectoryType.EXIF_DIRECTORY_UNKNOWN); - public static final int TRANSFOMATION_VALUE_HORIZONTAL_NORMAL = 0; - public static final int TRANSFOMATION_VALUE_MIRROR_VERTICAL = 1; - public static final int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL = 2; - public static final int TRANSFOMATION_VALUE_ROTATE_180 = 3; - public static final int TRANSFOMATION_VALUE_ROTATE_90_CW = 4; - public static final int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_90_CW = 5; - public static final int TRANSFOMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_270_CW = 6; - public static final int TRANSFOMATION_VALUE_ROTATE_270_CW = 7; + public static final int TRANSFORMATION_VALUE_HORIZONTAL_NORMAL = 0; + public static final int TRANSFORMATION_VALUE_MIRROR_VERTICAL = 1; + public static final int TRANSFORMATION_VALUE_MIRROR_HORIZONTAL = 2; + public static final int TRANSFORMATION_VALUE_ROTATE_180 = 3; + public static final int TRANSFORMATION_VALUE_ROTATE_90_CW = 4; + public static final int TRANSFORMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_90_CW = 5; + public static final int TRANSFORMATION_VALUE_MIRROR_HORIZONTAL_AND_ROTATE_270_CW = 6; + public static final int TRANSFORMATION_VALUE_ROTATE_270_CW = 7; public static final TagInfoLong EXIF_TAG_UNCOMPRESSED = new TagInfoLong( "Uncompressed", 0xbc03, @@ -231,7 +231,7 @@ public final class MicrosoftHdPhotoTagConstants { public static final List<TagInfo> ALL_MICROSOFT_HD_PHOTO_TAGS = Collections.unmodifiableList(Arrays.asList( EXIF_TAG_PIXEL_FORMAT, - EXIF_TAG_TRANSFOMATION, + EXIF_TAG_TRANSFORMATION, EXIF_TAG_UNCOMPRESSED, EXIF_TAG_IMAGE_TYPE, EXIF_TAG_IMAGE_WIDTH, diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java index 39269bc..ac185c3 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderStrips.java @@ -251,7 +251,7 @@ public final class DataReaderStrips extends ImageDataReader { @Override public ImageBuilder readImageData(final Rectangle subImageSpecification, final boolean hasAlpha, - final boolean isAlphaPremultiplied) + final boolean isAlphaPreMultiplied) throws ImageReadException, IOException { final Rectangle subImage; @@ -289,7 +289,7 @@ public final class DataReaderStrips extends ImageDataReader { // or working final ImageBuilder workingBuilder = new ImageBuilder(width, workingHeight, - hasAlpha, isAlphaPremultiplied); + hasAlpha, isAlphaPreMultiplied); if (planarConfiguration != TiffPlanarConfiguration.PLANAR) { for (int strip = strip0; strip <= strip1; strip++) { final long rowsPerStripLong = 0xFFFFffffL & rowsPerStrip; diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java index 5d28e34..d745301 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/datareaders/DataReaderTiled.java @@ -220,7 +220,7 @@ public final class DataReaderTiled extends ImageDataReader { @Override public ImageBuilder readImageData(final Rectangle subImageSpecification, final boolean hasAlpha, - final boolean isAlphaPremultiplied) + final boolean isAlphaPreMultiplied) throws ImageReadException, IOException { final Rectangle subImage; @@ -256,7 +256,7 @@ public final class DataReaderTiled extends ImageDataReader { final ImageBuilder workingBuilder = new ImageBuilder(workingWidth, workingHeight, - hasAlpha, isAlphaPremultiplied); + hasAlpha, isAlphaPreMultiplied); for (int iRow = row0; iRow <= row1; iRow++) { for (int iCol = col0; iCol <= col1; iCol++) { diff --git a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java index bfa9fae..6d1fbdc 100644 --- a/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java +++ b/src/main/java/org/apache/commons/imaging/formats/tiff/write/TiffOutputField.java @@ -37,9 +37,9 @@ public class TiffOutputField { private int sortHint = -1; private static final String NEWLINE = System.getProperty("line.separator"); - public TiffOutputField(final TagInfo tagInfo, final FieldType tagtype, final int count, + public TiffOutputField(final TagInfo tagInfo, final FieldType fieldType, final int count, final byte[] bytes) { - this(tagInfo.tag, tagInfo, tagtype, count, bytes); + this(tagInfo.tag, tagInfo, fieldType, count, bytes); } public TiffOutputField(final int tag, final TagInfo tagInfo, final FieldType fieldType, diff --git a/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java b/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java index 9ea08b2..131bcf4 100644 --- a/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java +++ b/src/main/java/org/apache/commons/imaging/icc/IccTagDataTypes.java @@ -80,16 +80,16 @@ public enum IccTagDataTypes implements IccTagDataType { try (InputStream bis = new ByteArrayInputStream(bytes)) { read4Bytes("type_signature", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN); read4Bytes("ignore", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN); - final int thesignature = read4Bytes("thesignature ", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN); + final int theSignature = read4Bytes("theSignature ", bis, "ICC: corrupt tag data", ByteOrder.BIG_ENDIAN); LOGGER.fine(prefix - + "thesignature: " - + Integer.toHexString(thesignature) + + "theSignature: " + + Integer.toHexString(theSignature) + " (" + new String(new byte[]{ - (byte) (0xff & (thesignature >> 24)), - (byte) (0xff & (thesignature >> 16)), - (byte) (0xff & (thesignature >> 8)), - (byte) (0xff & (thesignature >> 0)), }, StandardCharsets.US_ASCII) + (byte) (0xff & (theSignature >> 24)), + (byte) (0xff & (theSignature >> 16)), + (byte) (0xff & (theSignature >> 8)), + (byte) (0xff & (theSignature >> 0)), }, StandardCharsets.US_ASCII) + ")"); } } diff --git a/src/main/java/org/apache/commons/imaging/internal/Debug.java b/src/main/java/org/apache/commons/imaging/internal/Debug.java index 10ef1b6..526f669 100644 --- a/src/main/java/org/apache/commons/imaging/internal/Debug.java +++ b/src/main/java/org/apache/commons/imaging/internal/Debug.java @@ -144,11 +144,11 @@ public final class Debug { return result.toString(); } - private static String byteQuadToString(final int bytequad) { - final byte b1 = (byte) ((bytequad >> 24) & 0xff); - final byte b2 = (byte) ((bytequad >> 16) & 0xff); - final byte b3 = (byte) ((bytequad >> 8) & 0xff); - final byte b4 = (byte) ((bytequad >> 0) & 0xff); + private static String byteQuadToString(final int byteQuad) { + final byte b1 = (byte) ((byteQuad >> 24) & 0xff); + final byte b2 = (byte) ((byteQuad >> 16) & 0xff); + final byte b3 = (byte) ((byteQuad >> 8) & 0xff); + final byte b4 = (byte) ((byteQuad >> 0) & 0xff); final char c1 = (char) b1; final char c2 = (char) b2; @@ -157,8 +157,8 @@ public final class Debug { // return new String(new char[] { c1, c2, c3, c4 }); final StringBuilder buffer = new StringBuilder(31); buffer.append(new String(new char[]{c1, c2, c3, c4})); - buffer.append(" bytequad: "); - buffer.append(bytequad); + buffer.append(" byteQuad: "); + buffer.append(byteQuad); buffer.append(" b1: "); buffer.append(b1); buffer.append(" b2: "); diff --git a/src/main/java/org/apache/commons/imaging/palette/Dithering.java b/src/main/java/org/apache/commons/imaging/palette/Dithering.java index 32e5e2f..08c3406 100644 --- a/src/main/java/org/apache/commons/imaging/palette/Dithering.java +++ b/src/main/java/org/apache/commons/imaging/palette/Dithering.java @@ -21,7 +21,7 @@ import java.awt.image.BufferedImage; import org.apache.commons.imaging.ImageWriteException; /** - * Dithering algorithms to use when quantizing an image to paletted form. + * Dithering algorithms to use when quantizing an image to palette form. */ public final class Dithering { private Dithering() { diff --git a/src/test/java/org/apache/commons/imaging/color/ColorCieLabTest.java b/src/test/java/org/apache/commons/imaging/color/ColorCieLabTest.java index feeb4b8..5c9473d 100644 --- a/src/test/java/org/apache/commons/imaging/color/ColorCieLabTest.java +++ b/src/test/java/org/apache/commons/imaging/color/ColorCieLabTest.java @@ -36,17 +36,17 @@ public class ColorCieLabTest { } @Test - public void testLAssignement() { + public void testLAssignment() { assertEquals(1.0, color.L, 0.0); } @Test - public void testAAssignement() { + public void testAAssignment() { assertEquals(2.0, color.a, 0.0); } @Test - public void testBAssignement() { + public void testBAssignment() { assertEquals(3.0, color.b, 0.0); } diff --git a/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java b/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java index 7d5d964..4756f96 100644 --- a/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java +++ b/src/test/java/org/apache/commons/imaging/examples/tiff/ExampleReadFloatingPointData.java @@ -162,7 +162,7 @@ public class ExampleReadFloatingPointData { paletteList.add( new PaletteEntryForRange(minValue, maxValue, Color.black, Color.white)); // palette entries are defined for ranges minValue <= value < maxValue. - // Thus raster cells containing the maximumg value would not be + // Thus raster cells containing the maximum value would not be // color-coded unless we add an additional palette entry to // handle the single-value for the maximum. paletteList.add(new PaletteEntryForValue(maxValue, Color.white)); diff --git a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java index 6fff24e..7e816f9 100644 --- a/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/jpeg/iptc/IptcParserTest.java @@ -86,7 +86,7 @@ public class IptcParserTest { } /** - * Tests for IptcParser encoding support. See IMAGING-168 and pullr equest #124 for more. + * Tests for IptcParser encoding support. See IMAGING-168 and pull request #124 for more. * @throws IOException when reading input * @throws ImageReadException when parsing file */ diff --git a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointReadTest.java b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointReadTest.java index 264a781..ab6b3c9 100644 --- a/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointReadTest.java +++ b/src/test/java/org/apache/commons/imaging/formats/tiff/TiffFloatingPointReadTest.java @@ -170,7 +170,7 @@ public class TiffFloatingPointReadTest { checkSubImage(target, fullRaster, 0, height-1, width, 1); // top row checkSubImage(target, fullRaster, width-1, 0, 1, height); // right column - // test along the main diagnonal and a parallel that reaches the top-right corner + // test along the main diagonal and a parallel that reaches the top-right corner final int s = width-height; for(int i=0; i<height-8; i++){ checkSubImage(target, fullRaster, i, i, 8, 8);
